nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

curses: honor menu_next_page/&c option settings

Browse Source 
tty and X11 honor the menu_xxx options.  Qt currently doesn't
support menu manipulation by keyboard.  curses does support that
but was only handling the default menu keys.
This commit is contained in:
PatR
2021-02-05 01:04:48 -08:00
parent b14c47132f
commit 74213666bf
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes37.0
+1
View File
@@ -378,6 +378,7 @@ spells that require a target spot rather than a direction (like skilled
prevent wish request "death wand" from matching Death monster and producing a prevent wish request "death wand" from matching Death monster and producing a
random wand instead of a wand of death random wand instead of a wand of death
grammar bit: "you hear a [AEF] note squeak in the distance" (should be "an") grammar bit: "you hear a [AEF] note squeak in the distance" (should be "an")
curses interface failed to honor menu_xxx option settings for menu interaction
Fixes to 3.7.0-x Problems that Were Exposed Via git Repository Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
win/curses/cursdial.c
+7 -3
View File
@@ -1305,7 +1305,7 @@ menu_display_page(nhmenu *menu, WINDOW * win, int page_num, char *selectors)
static int static int
menu_get_selections(WINDOW * win, nhmenu *menu, int how) menu_get_selections(WINDOW * win, nhmenu *menu, int how)
{ {
int curletter; int curletter, menucmd;
int count = -1; int count = -1;
int count_letter = '\0'; int count_letter = '\0';
int curpage = !menu->bottom_heavy ? 1 : menu->num_pages; int curpage = !menu->bottom_heavy ? 1 : menu->num_pages;
@@ -1342,7 +1342,9 @@ menu_get_selections(WINDOW * win, nhmenu *menu, int how)
break; break;
case PICK_ANY: case PICK_ANY:
if (curletter <= 0 || curletter >= 256 || !selectors[curletter]) { if (curletter <= 0 || curletter >= 256 || !selectors[curletter]) {
switch (curletter) { menucmd = (curletter <= 0 || curletter >= 255) ? curletter
: (int) (uchar) map_menu_cmd(curletter);
switch (menucmd) {
case MENU_SELECT_PAGE: case MENU_SELECT_PAGE:
(void) menu_operation(win, menu, SELECT, curpage); (void) menu_operation(win, menu, SELECT, curpage);
break; break;
@@ -1377,7 +1379,9 @@ menu_get_selections(WINDOW * win, nhmenu *menu, int how)
} }
if (curletter <= 0 || curletter >= 256 || !selectors[curletter]) { if (curletter <= 0 || curletter >= 256 || !selectors[curletter]) {
switch (curletter) { menucmd = (curletter <= 0 || curletter >= 255) ? curletter
: (int) (uchar) map_menu_cmd(curletter);
switch (menucmd) {
case KEY_ESC: case KEY_ESC:
num_selected = -1; num_selected = -1;
dismiss = TRUE; dismiss = TRUE;