mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-22 21:01:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

tweaks: move a function to before the one that calls it

Browse Source
This commit is contained in:
Benno Schulenberg 2020-03-16 10:17:15 +01:00
parent c20134c20d
commit 415e55ff37
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/winio.c
View File

@ -2280,6 +2280,26 @@ void warn_and_shortly_pause(const char *msg)
napms(1500); napms(1500);
} }
/* Write a key's representation plus a minute description of its function
* to the screen. For example, the key could be "^C" and its tag "Cancel".
* Key plus tag may occupy at most width columns. */
void post_one_key(const char *keystroke, const char *tag, int width)
{
wattron(bottomwin, interface_color_pair[KEY_COMBO]);
waddnstr(bottomwin, keystroke, actual_x(keystroke, width));
wattroff(bottomwin, interface_color_pair[KEY_COMBO]);
/* If the remaning space is too small, skip the description. */
width -= breadth(keystroke);
if (width < 2)
return;
waddch(bottomwin, ' ');
wattron(bottomwin, interface_color_pair[FUNCTION_TAG]);
waddnstr(bottomwin, tag, actual_x(tag, width - 1));
wattroff(bottomwin, interface_color_pair[FUNCTION_TAG]);
}
/* Display the shortcut list corresponding to menu on the last two rows /* Display the shortcut list corresponding to menu on the last two rows
* of the bottom portion of the window. */ * of the bottom portion of the window. */
void bottombars(int menu) void bottombars(int menu)
@ -2329,26 +2349,6 @@ void bottombars(int menu)
wrefresh(bottomwin); wrefresh(bottomwin);
} }
/* Write a key's representation plus a minute description of its function
* to the screen. For example, the key could be "^C" and its tag "Cancel".
* Key plus tag may occupy at most width columns. */
void post_one_key(const char *keystroke, const char *tag, int width)
{
wattron(bottomwin, interface_color_pair[KEY_COMBO]);
waddnstr(bottomwin, keystroke, actual_x(keystroke, width));
wattroff(bottomwin, interface_color_pair[KEY_COMBO]);
/* If the remaning space is too small, skip the description. */
width -= breadth(keystroke);
if (width < 2)
return;
waddch(bottomwin, ' ');
wattron(bottomwin, interface_color_pair[FUNCTION_TAG]);
waddnstr(bottomwin, tag, actual_x(tag, width - 1));
wattroff(bottomwin, interface_color_pair[FUNCTION_TAG]);
}
/* Redetermine current_y from the position of current relative to edittop, /* Redetermine current_y from the position of current relative to edittop,
* and put the cursor in the edit window at (current_y, "current_x"). */ * and put the cursor in the edit window at (current_y, "current_x"). */
void place_the_cursor(void) void place_the_cursor(void)