Fix help menu keypad issues

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@416 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Chris Allegretta 2000-12-18 05:03:16 +00:00
parent 7492cecc27
commit d1627cffd0
3 changed files with 13 additions and 1 deletions

View File

@ -45,6 +45,10 @@ General
window when using nohelp toggle (bug discovered by Rocco Corsi). window when using nohelp toggle (bug discovered by Rocco Corsi).
- nano.1, nano.1.html: - nano.1, nano.1.html:
- Updated man page for -b, -e, -f and expanded explanation for -p. - Updated man page for -b, -e, -f and expanded explanation for -p.
- winio.c
do_help()
- Force keypad on so F-keys and PageUp/Down will work properly.
Added check for NANO_EXIT_FKEY to loop.
- utils.c: - utils.c:
new_magicline() new_magicline()
- Increment totsize!! We decrement it when we've read a file, - Increment totsize!! We decrement it when we've read a file,

View File

@ -134,6 +134,7 @@ void search_init_globals(void);
void replace_abort(void); void replace_abort(void);
void add_to_cutbuffer(filestruct * inptr); void add_to_cutbuffer(filestruct * inptr);
void do_replace_highlight(int highlight_flag, char *word); void do_replace_highlight(int highlight_flag, char *word);
void keypad_on(int yesno);
#ifdef NANO_EXTRA #ifdef NANO_EXTRA
void do_credits(void); void do_credits(void);
#endif #endif

View File

@ -1180,6 +1180,11 @@ int do_help(void)
int i, j, row = 0, page = 1, kbinput = 0, no_more = 0; int i, j, row = 0, page = 1, kbinput = 0, no_more = 0;
int no_help_flag = 0; int no_help_flag = 0;
/* Oh well, they've asked for the help menu, if the keypad is not on now
we're going to have to turn it on */
keypad_on(TRUE);
blank_edit(); blank_edit();
curs_set(0); curs_set(0);
blank_statusbar(); blank_statusbar();
@ -1265,7 +1270,9 @@ int do_help(void)
no_more = 1; no_more = 1;
continue; continue;
} }
} while ((kbinput = wgetch(edit)) != NANO_EXIT_KEY); } while ((kbinput = wgetch(edit)) != NANO_EXIT_KEY &&
kbinput != NANO_EXIT_FKEY);
if (no_help_flag) { if (no_help_flag) {
werase(bottomwin); werase(bottomwin);
wrefresh(bottomwin); wrefresh(bottomwin);