ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: compute the sizes of the subwindows in a more direct manner

master
Benno Schulenberg 2016-07-27 12:25:18 +02:00
parent f311c0af87
commit df7353b312
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/nano.c
View File

@ -689,11 +689,14 @@ void die_save_file(const char *die_filename
free(targetname); free(targetname);
} }
#define TOP_ROWS (ISSET(MORE_SPACE) ? 1 : 2)
#define BOTTOM_ROWS (ISSET(NO_HELP) ? 1 : 3)
/* Initialize the three window portions nano uses. */ /* Initialize the three window portions nano uses. */
void window_init(void) void window_init(void)
{ {
/* If the screen height is too small, get out. */ /* If the screen height is too small, get out. */
editwinrows = LINES - 5 + more_space() + no_help(); editwinrows = LINES - TOP_ROWS - BOTTOM_ROWS;
if (COLS < MIN_EDITOR_COLS || editwinrows < MIN_EDITOR_ROWS) if (COLS < MIN_EDITOR_COLS || editwinrows < MIN_EDITOR_ROWS)
die(_("Window size is too small for nano...\n")); die(_("Window size is too small for nano...\n"));
@ -714,10 +717,9 @@ void window_init(void)
delwin(bottomwin); delwin(bottomwin);
/* Set up the windows. */ /* Set up the windows. */
topwin = newwin(2 - more_space(), COLS, 0, 0); topwin = newwin(TOP_ROWS, COLS, 0, 0);
edit = newwin(editwinrows, COLS, 2 - more_space(), 0); edit = newwin(editwinrows, COLS, TOP_ROWS, 0);
bottomwin = newwin(3 - no_help(), COLS, editwinrows + (2 - bottomwin = newwin(BOTTOM_ROWS, COLS, TOP_ROWS + editwinrows, 0);
more_space()), 0);
/* Turn the keypad on for the windows, if necessary. */ /* Turn the keypad on for the windows, if necessary. */
if (!ISSET(REBIND_KEYPAD)) { if (!ISSET(REBIND_KEYPAD)) {
@ -1043,21 +1045,6 @@ void version(void)
printf("\n"); printf("\n");
} }
/* Return 1 if the MORE_SPACE flag is set, and 0 otherwise. This is
* used to calculate the sizes and Y coordinates of the subwindows. */
int more_space(void)
{
return ISSET(MORE_SPACE) ? 1 : 0;
}
/* Return 2 if the NO_HELP flag is set, and 0 otherwise. This is used
* to calculate the sizes and Y coordinates of the subwindows, because
* having NO_HELP adds two lines to the edit window. */
int no_help(void)
{
return ISSET(NO_HELP) ? 2 : 0;
}
/* Indicate that the current file has no name, in a way that gets the /* Indicate that the current file has no name, in a way that gets the
* user's attention. This is used when trying to save a file with no * user's attention. This is used when trying to save a file with no
* name with the TEMP_FILE flag set, just before the filename prompt. */ * name with the TEMP_FILE flag set, just before the filename prompt. */

2
src/proto.h
View File

@ -476,8 +476,6 @@ void print_opt_full(const char *shortflag
, const char *desc); , const char *desc);
void usage(void); void usage(void);
void version(void); void version(void);
int more_space(void);
int no_help(void);
void no_current_file_name_warning(void); void no_current_file_name_warning(void);
void do_exit(void); void do_exit(void);
void close_and_go(void); void close_and_go(void);