From 17436ce8179a0bd50694ed521ee3a6543987e9d5 Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Tue, 11 Mar 2008 03:03:53 +0000 Subject: [PATCH] Fix bug 79, add sentinels for function keys in case the user rebinds them to something else. Fix debug mode crash when the user typos a menu name. Add menus for pageup and pagedown bindings and make rebinding up and down actually do up and down and not page up and page down. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4221 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- BUGS | 10 ++++---- src/global.c | 67 ++++++++++++++++++++++++++++++++++++++++------------ src/help.c | 3 +++ src/rcfile.c | 11 +++++---- src/winio.c | 18 +++----------- 5 files changed, 69 insertions(+), 40 deletions(-) diff --git a/BUGS b/BUGS index a0f50f5d..92e81b08 100644 --- a/BUGS +++ b/BUGS @@ -5,11 +5,6 @@ of new if block for subnfunc values (75) - New backend code probably does not compile under anything but default options, if that (76) -- If a user only binds meta sequences to a function like left, right - page up/down, insert, and unbinds all other control and F keys for it, - nano will do the wrong thing when reading the key which is normally - assigned to it (79 - may not be worth fixing) - ** Fixed BUGS ** - Marked cutting sometimes leaves a newline in the file unintelligently, @@ -155,5 +150,10 @@ - Need a 'check-vitals-mapped' function to check that the end used didn't unbind all the keys for exit or cancel before starting up the editor (74) [FIXED] - -enable-tiny does not work with new code (78) [FIXED] +- If a user only binds meta sequences to a function like left, right + page up/down, insert, and unbinds all other control and F keys for it, + nano will do the wrong thing when reading the key which is normally + assigned to it (79 - may not be worth fixing) [FIXED] + $Id$ diff --git a/src/global.c b/src/global.c index 1e5a9a6f..75b8d079 100644 --- a/src/global.c +++ b/src/global.c @@ -205,15 +205,14 @@ size_t length_of_list(int menu) /* Set type of function based on the string */ function_type strtokeytype(char *str) { - if (str[0] == 'M' || str[0] == 'm') { + if (str[0] == 'M' || str[0] == 'm') return META; - } else if (str[0] == '^') { + else if (str[0] == '^') return CONTROL; - } else if (str[0] == 'F' || str[0] == 'F') { + else if (str[0] == 'F' || str[0] == 'F') return FKEY; - } else { + else return RAW; - } } /* Add a string to the new function list strict. @@ -267,7 +266,7 @@ const sc *first_sc_for(int menu, void *func) { /* If we're here we may have found only meta sequences, if so use one */ if (metasc) - return metasc->seq; + return metasc; #ifdef DEBUG fprintf(stderr, "Whoops, returning null given func %ld in menu %d\n", (long) func, menu); @@ -350,6 +349,32 @@ void assign_keyinfo(sc *s) s->seq = 0; else if (s->type == META && (!strcasecmp(&s->keystr[2], "space"))) s->seq = (int) ' '; + /* Note to translators: these strings are internal sentinel values, + and aren't presented to the user. Don't translate them */ + else if (s->type == RAW && (!strcasecmp(s->keystr, "kup"))) + s->seq = KEY_UP; + else if (s->type == RAW && (!strcasecmp(s->keystr, "kdown"))) + s->seq = KEY_DOWN; + else if (s->type == RAW && (!strcasecmp(s->keystr, "kleft"))) + s->seq = KEY_LEFT; + else if (s->type == RAW && (!strcasecmp(s->keystr, "kright"))) + s->seq = KEY_RIGHT; + else if (s->type == RAW && (!strcasecmp(s->keystr, "kinsert"))) + s->seq = KEY_IC; + else if (s->type == RAW && (!strcasecmp(s->keystr, "kdel"))) + s->seq = KEY_DC; + else if (s->type == RAW && (!strcasecmp(s->keystr, "kpup"))) + s->seq = KEY_PPAGE; + else if (s->type == RAW && (!strcasecmp(s->keystr, "kpdown"))) + s->seq = KEY_NPAGE; +#ifdef KEY_HOME + else if (s->type == RAW && (!strcasecmp(s->keystr, "khome"))) + s->seq = KEY_HOME; +#endif +#ifdef KEY_END + else if (s->type == RAW && (!strcasecmp(s->keystr, "kend"))) + s->seq = KEY_END; +#endif } @@ -999,12 +1024,15 @@ void shortcut_init(bool unjustify) #endif add_to_sclist(MMAIN, "^R", do_insertfile_void, 0, TRUE); add_to_sclist(MMAIN, "F5", do_insertfile_void, 0, TRUE); + add_to_sclist(MMAIN, "kinsert", do_insertfile_void, 0, TRUE); add_to_sclist(MMAIN|MBROWSER, "^W", do_search, 0, TRUE); add_to_sclist(MMAIN|MBROWSER, "F6", do_search, 0, TRUE); - add_to_sclist(MMAIN|MBROWSER, "^Y", do_page_up, 0, TRUE); - add_to_sclist(MMAIN|MBROWSER, "F7", do_page_up, 0, TRUE); - add_to_sclist(MMAIN|MBROWSER, "^V", do_page_down, 0, TRUE); - add_to_sclist(MMAIN|MBROWSER, "F8", do_page_down, 0, TRUE); + add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE, "^Y", do_page_up, 0, TRUE); + add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE, "F7", do_page_up, 0, TRUE); + add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE, "kpup", do_page_up, 0, TRUE); + add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE, "^V", do_page_down, 0, TRUE); + add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE, "F8", do_page_down, 0, TRUE); + add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE, "kpdown", do_page_down, 0, TRUE); add_to_sclist(MMAIN, "^K", do_cut_text_void, 0, TRUE); add_to_sclist(MMAIN, "F9", do_cut_text_void, 0, TRUE); add_to_sclist(MMAIN, "^U", do_uncut_text, 0, TRUE); @@ -1035,16 +1063,22 @@ void shortcut_init(bool unjustify) add_to_sclist(MMAIN, "M-}", do_indent_void, 0, TRUE); add_to_sclist(MMAIN, "M-{", do_unindent, 0, TRUE); add_to_sclist(MMAIN|MBROWSER|MHELP, "^F", do_right, 0, TRUE); + add_to_sclist(MMAIN|MBROWSER|MHELP, "kright", do_right, 0, TRUE); add_to_sclist(MMAIN|MBROWSER|MHELP, "^B", do_left, 0, TRUE); + add_to_sclist(MMAIN|MBROWSER|MHELP, "kleft", do_left, 0, TRUE); add_to_sclist(MMAIN, "^Space", do_next_word_void, 0, TRUE); add_to_sclist(MMAIN, "M-Space", do_prev_word_void, 0, TRUE); #endif add_to_sclist(MALL, "^Q", xon_complaint, 0, TRUE); add_to_sclist(MALL, "^X", xoff_complaint, 0, TRUE); add_to_sclist(MALL, "^P", do_up_void, 0, TRUE); + add_to_sclist(MALL, "kup", do_up_void, 0, TRUE); add_to_sclist(MALL, "^N", do_down_void, 0, TRUE); + add_to_sclist(MALL, "kdown", do_down_void, 0, TRUE); add_to_sclist(MALL, "^A", do_home, 0, TRUE); + add_to_sclist(MALL, "khome", do_home, 0, TRUE); add_to_sclist(MALL, "^E", do_end, 0, TRUE); + add_to_sclist(MALL, "kend", do_end, 0, TRUE); #ifndef NANO_TINY add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2, "^W", do_para_begin_void, 0, TRUE); @@ -1097,6 +1131,7 @@ void shortcut_init(bool unjustify) add_to_sclist(MALL, "^I", do_tab, 0, TRUE); add_to_sclist(MALL, "^M", do_enter, 0, TRUE); add_to_sclist(MALL, "^D", do_delete, 0, TRUE); + add_to_sclist(MALL, "kdel", do_delete, 0, TRUE); add_to_sclist(MALL, "^H", do_backspace, 0, TRUE); #ifndef NANO_TINY add_to_sclist(MALL, "M-T", do_cut_till_end, 0, TRUE); @@ -1121,10 +1156,6 @@ void shortcut_init(bool unjustify) #endif add_to_sclist((MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MWHEREISFILE|MGOTODIR), "^C", (void *) cancel_msg, 0, FALSE); - add_to_sclist(MHELP|MBROWSER|MWHEREISFILE, "^Y", do_page_up, 0, TRUE); - add_to_sclist(MHELP|MBROWSER|MWHEREISFILE, "F7", do_page_up, 0, TRUE); - add_to_sclist(MHELP|MBROWSER|MWHEREISFILE, "^V", do_page_down, 0, TRUE); - add_to_sclist(MHELP|MBROWSER|MWHEREISFILE, "F8", do_page_down, 0, TRUE); add_to_sclist(MHELP, "^X", do_exit, 0, TRUE); add_to_sclist(MHELP, "F2", do_exit, 0, TRUE); add_to_sclist(MWRITEFILE, "M-D", (void *) dos_format_msg, 0, FALSE); @@ -1236,8 +1267,14 @@ sc *strtosc(int menu, char *input) else if (!strcasecmp(input, "whereis")) s->scfunc = do_search; else if (!strcasecmp(input, "up")) - s->scfunc = do_page_up; + s->scfunc = do_up_void; else if (!strcasecmp(input, "down")) + s->scfunc = do_down_void; + else if (!strcasecmp(input, "pageup") + || !strcasecmp(input, "prevpage")) + s->scfunc = do_page_up; + else if (!strcasecmp(input, "pagedown") + || !strcasecmp(input, "nextpage")) s->scfunc = do_page_down; else if (!strcasecmp(input, "cut")) s->scfunc = do_cut_text_void; diff --git a/src/help.c b/src/help.c index 76f48f10..bcd8d8db 100644 --- a/src/help.c +++ b/src/help.c @@ -451,6 +451,9 @@ void help_init(void) if (scsfound == 3) continue; + if (s->type == RAW) + continue; + if ((s->menu & currmenu) == 0) continue; diff --git a/src/rcfile.c b/src/rcfile.c index 1c3c4f7c..253a321d 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -400,16 +400,17 @@ void parse_keybinding(char *ptr) } newsc = strtosc(menu, funcptr); -#ifdef DEBUG - fprintf(stderr, "newsc now address %d, menu func assigned = %d, menu = %d\n", - (int) newsc, (int) newsc->scfunc, menu); -#endif - if (newsc == NULL) { rcfile_error( N_("Could not map name \"%s\" to a function\n"), funcptr); return; } +#ifdef DEBUG + fprintf(stderr, "newsc now address %d, menu func assigned = %d, menu = %d\n", + (int) newsc, (int) newsc->scfunc, menu); +#endif + + newsc->keystr = keycopy; newsc->menu = menu; newsc->type = strtokeytype(newsc->keystr); diff --git a/src/winio.c b/src/winio.c index 70e1b2fe..8b1e5407 100644 --- a/src/winio.c +++ b/src/winio.c @@ -521,10 +521,6 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key) #endif retval = sc_seq_or((void *) do_right, *kbinput); break; -#ifdef KEY_HOME - /* HP-UX 10-11 doesn't support KEY_HOME. */ - case KEY_HOME: -#endif #ifdef KEY_SHOME /* HP-UX 10-11 and Slang don't support KEY_SHOME. */ case KEY_SHOME: @@ -536,29 +532,25 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key) case KEY_BACKSPACE: retval = sc_seq_or((void *) do_backspace, *kbinput); break; - case KEY_DC: #ifdef KEY_SDC /* Slang doesn't support KEY_SDC. */ case KEY_SDC: -#endif if (ISSET(REBIND_DELETE)) retval = sc_seq_or((void *) do_delete, *kbinput); else retval = sc_seq_or((void *) do_backspace, *kbinput); break; - case KEY_IC: +#endif #ifdef KEY_SIC /* Slang doesn't support KEY_SIC. */ case KEY_SIC: -#endif retval = sc_seq_or((void *) do_insertfile_void, *kbinput); break; - case KEY_NPAGE: +#endif case KEY_C3: /* PageDown (4) on numeric keypad with * NumLock off. */ retval = sc_seq_or((void *) do_page_down, *kbinput); break; - case KEY_PPAGE: case KEY_A3: /* PageUp (9) on numeric keypad with * NumLock off. */ retval = sc_seq_or((void *) do_page_up, *kbinput); @@ -572,10 +564,6 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key) break; case KEY_C1: /* End (1) on numeric keypad with * NumLock off. */ -#ifdef KEY_END - /* HP-UX 10-11 doesn't support KEY_END. */ - case KEY_END: -#endif #ifdef KEY_SEND /* HP-UX 10-11 and Slang don't support KEY_SEND. */ case KEY_SEND: @@ -2364,7 +2352,7 @@ void bottombars(int menu) continue; #ifdef DEBUG - fprintf(stderr, "found one! f->menus = %d\n", f->menus); + fprintf(stderr, "found one! f->menus = %d, desc = \"%s\"\n", f->menus, f->desc); #endif s = first_sc_for(menu, f->scfunc); if (s == NULL) { -- 2.39.5