From 59cd3e682b97302a523460cc6acb971a1d47c382 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Fri, 9 May 2014 11:44:17 +0000 Subject: [PATCH] Counting only shortcuts that are actually shown, so that clicking on the ones after ^T (Speller/Linter) will work again correctly. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4848 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 5 +++++ src/winio.c | 41 ++++++++++++++++------------------------- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b7f900f..9ca20258 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-05-09 Benno Schulenberg + * src/winio.c (get_mouseinput): Count only shortcuts that are actually + shown, so that clicking on the ones after ^T (Speller/Linter) will work + again correctly. This fixes the second part of Savannah bug #42093. + 2014-05-06 Benno Schulenberg * doc/texinfo/nano.texi: Let makeinfo figure out the node pointers. * doc/syntax/texinfo.nanorc: New file, colouring for Texinfo files. diff --git a/src/winio.c b/src/winio.c index 7542f3ce..01289364 100644 --- a/src/winio.c +++ b/src/winio.c @@ -1636,8 +1636,7 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts) /* The width of all the shortcuts, except for the last * two, in the shortcut list in bottomwin. */ int j; - /* The y-coordinate relative to the beginning of the - * shortcut list in bottomwin. */ + /* The calculated index number of the clicked item. */ size_t currslen; /* The number of shortcuts in the current shortcut * list. */ @@ -1657,10 +1656,6 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts) return 0; } - /* Calculate the y-coordinate relative to the beginning of - * the shortcut list in bottomwin. */ - j = *mouse_y - 1; - /* Get the shortcut lists' length. */ if (currmenu == MMAIN) currslen = MAIN_VISIBLE; @@ -1681,38 +1676,35 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts) else i = COLS / ((currslen / 2) + (currslen % 2)); - /* Calculate the x-coordinate relative to the beginning of - * the shortcut list in bottomwin, and add it to j. j - * should now be the index in the shortcut list of the - * shortcut we released/clicked on. */ - j = (*mouse_x / i) * 2 + j; + /* Calculate the one-based index in the shortcut list. */ + j = (*mouse_x / i) * 2 + *mouse_y; - /* Adjust j if we released on the last two shortcuts. */ - if ((j >= currslen) && (*mouse_x % i < COLS % i)) + /* Adjust the index if we hit the last two wider ones. */ + if ((j > currslen) && (*mouse_x % i < COLS % i)) j -= 2; #ifdef DEBUG fprintf(stderr, "Calculated %i as index in shortcut list, currmenu = %x.\n", j, currmenu); #endif /* Ignore releases/clicks of the first mouse button beyond * the last shortcut. */ - if (j >= currslen) + if (j > currslen) return 2; /* Go through the list of functions to determine which * shortcut in the current menu we released/clicked on. */ - f = allfuncs; - - while (TRUE) { - while ((f->menus & currmenu) == 0 + for (f = allfuncs; f != NULL; f = f->next) { + if ((f->menus & currmenu) == 0) + continue; #ifndef DISABLE_HELP - || strlen(f->help) == 0 + if (!f->help || strlen(f->help) == 0) + continue; #endif - ) - f = f->next; + if (first_sc_for(currmenu, f->scfunc) == NULL) + continue; + /* Tick off an actually shown shortcut. */ + j -= 1; if (j == 0) break; - f = f->next; - j -= 1; } #ifdef DEBUG fprintf(stderr, "Stopped on func %ld present in menus %x\n", (long)f->scfunc, f->menus); @@ -1721,8 +1713,7 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts) /* And put the corresponding key into the keyboard buffer. */ if (f != NULL) { const sc *s = first_sc_for(currmenu, f->scfunc); - if (s != NULL) - unget_kbinput(s->seq, s->type == META, FALSE); + unget_kbinput(s->seq, s->type == META, FALSE); } } else /* Handle releases/clicks of the first mouse button that -- 2.39.5