From 7c72c1f141fa7aea54f0e6ccafb104779d3f26b6 Mon Sep 17 00:00:00 2001 From: PatR Date: Mon, 9 Jan 2023 23:34:32 -0800 Subject: [PATCH] identifying via menu From the newsgroup: identifying by menu pops up multiple menus in succession if the player picks fewer invent entries than are being granted, but the second and subsequent ones could cover up the message window and hide the feedback from prior ones. If multiple popup menus are needed when identifying, issue --More-- before each menu after the first. The code seemed to be trying to do this already, but it should have used wait_synch() rather than mark_synch(), or perhaps used display_nhwindow(WIN_MESSAGE, TRUE) instead of either one of those. For curses, both mark_synch() and wait_synch() were no-ops. Now they do something. X11's behavior wasn't right either; it seemed to be lagging one message behind (something I had noticed recently and then forgotten about; I still don't remember the context then so don't know whether this fixes that earlier situation). --- doc/fixes3-7-0.txt | 4 ++++ include/wincurs.h | 1 + src/invent.c | 10 ++++++---- win/X11/winX.c | 4 +++- win/curses/cursmain.c | 12 ++++++++---- win/curses/cursmesg.c | 13 ++++++++++--- win/curses/cursmesg.h | 1 + 7 files changed, 33 insertions(+), 12 deletions(-) diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt index f8a3c53d0..1243d392e 100644 --- a/doc/fixes3-7-0.txt +++ b/doc/fixes3-7-0.txt @@ -1078,6 +1078,9 @@ sleeping or unconscious hero attacked by Medusa would meet her gaze if a trap killed both the hero's steed and the hero an impossible "dmonsfree: N+1 removed doesn't match N pending" warning could occur prevent paralyzed hero from helping nymph or succubus remove worn armor +when identifying items via menu and more than one pass is needed (so when + identifying 3 items and player only picks 1, for instance), issue + --More-- because the next menu might cover up the ID message(s) Fixes to 3.7.0-x Problems that Were Exposed Via git Repository @@ -1545,6 +1548,7 @@ curses: if a menu of objects contains at least one iron ball, and player is group accelerator rather than the start of a count curses: obey timed_delay option curses: support tty-style extended role/race/&c selection at start of new game +curses: implement mark_synch() and wait_synch() macOS: Xcode project was failing to build if the path to the NetHack source tree contained a space; the issue was within some shell script code contained within the project diff --git a/include/wincurs.h b/include/wincurs.h index 5e057fae9..03bc4d527 100644 --- a/include/wincurs.h +++ b/include/wincurs.h @@ -221,6 +221,7 @@ extern void curses_cleanup(void); extern void curses_message_win_puts(const char *message, boolean recursed); extern void curses_got_input(void); +extern int curses_got_output(void); extern int curses_block(boolean require_tab); /* for MSGTYPE=STOP */ extern int curses_more(void); extern void curses_clear_unhighlight_message_window(void); diff --git a/src/invent.c b/src/invent.c index 39ea9a795..a7e743b5c 100644 --- a/src/invent.c +++ b/src/invent.c @@ -2351,7 +2351,8 @@ menu_identify(int id_limit) for (i = 0; i < n; i++, id_limit--) (void) identify(pick_list[i].item.a_obj); free((genericptr_t) pick_list); - mark_synch(); /* Before we loop to pop open another menu */ + if (id_limit) + wait_synch(); /* Before we loop to pop open another menu */ first = 0; } else if (n == -2) { /* player used ESC to quit menu */ break; @@ -2381,8 +2382,9 @@ count_unidentified(struct obj *objchn) /* dialog with user to identify a given number of items; 0 means all */ void -identify_pack(int id_limit, - boolean learning_id) /* T: just read unknown identify scroll */ +identify_pack( + int id_limit, + boolean learning_id) /* T: just read unknown identify scroll */ { struct obj *obj; int n, unid_cnt = count_unidentified(gi.invent); @@ -2396,7 +2398,7 @@ identify_pack(int id_limit, for (obj = gi.invent; obj; obj = obj->nobj) { if (not_fully_identified(obj)) { (void) identify(obj); - if (unid_cnt == 1) + if (--unid_cnt < 1) break; } } diff --git a/win/X11/winX.c b/win/X11/winX.c index 337d0c46c..690b34b8e 100644 --- a/win/X11/winX.c +++ b/win/X11/winX.c @@ -1334,8 +1334,10 @@ X11_mark_synch(void) void X11_wait_synch(void) { - if (x_inited) + if (x_inited) { + X11_mark_synch(); XFlush(XtDisplay(toplevel)); + } } /* Both resume_ and suspend_ are called from ioctl.c and unixunix.c. */ diff --git a/win/curses/cursmain.c b/win/curses/cursmain.c index c20aad69a..2d29dacd6 100644 --- a/win/curses/cursmain.c +++ b/win/curses/cursmain.c @@ -150,8 +150,9 @@ init_nhwindows(int* argcp, char** argv) ** windows? Or at least all but WIN_INFO? -dean */ void -curses_init_nhwindows(int *argcp UNUSED, - char **argv UNUSED) +curses_init_nhwindows( + int *argcp UNUSED, + char **argv UNUSED) { #ifdef PDCURSES char window_title[BUFSZ]; @@ -745,12 +746,12 @@ curses_ctrl_nhwindow( /* mark_synch() -- Don't go beyond this point in I/O on any channel until - all channels are caught up to here. Can be an empty call - for the moment + all channels are caught up to here. */ void curses_mark_synch(void) { + curses_refresh_nethack_windows(); } /* @@ -762,6 +763,9 @@ wait_synch() -- Wait until all pending output is complete (*flush*() for void curses_wait_synch(void) { + if (curses_got_output()) + (void) curses_more(); + curses_mark_synch(); /* [do we need 'if (counting) curses_count_window((char *)0);' here?] */ } diff --git a/win/curses/cursmesg.c b/win/curses/cursmesg.c index 6da089c6b..d1e82af49 100644 --- a/win/curses/cursmesg.c +++ b/win/curses/cursmesg.c @@ -182,9 +182,16 @@ curses_got_input(void) } int -curses_block(boolean noscroll) /* noscroll - blocking because of msgtype - * = stop/alert else blocking because - * window is full, so need to scroll after */ +curses_got_output(void) +{ + return turn_lines; +} + +int +curses_block( + boolean noscroll) /* noscroll - blocking because of MSGTYPE=STOP/ALERT + * else blocking because window is full, so need to + * scroll after */ { static const char resp[] = " \r\n\033"; /* space, enter, esc */ static int prev_x = -1, prev_y = -1, blink = 0; diff --git a/win/curses/cursmesg.h b/win/curses/cursmesg.h index 88c62d97b..6653532db 100644 --- a/win/curses/cursmesg.h +++ b/win/curses/cursmesg.h @@ -11,6 +11,7 @@ void curses_message_win_puts(const char *message, boolean recursed); void curses_got_input(void); +int curses_got_output(void); int curses_block(boolean require_tab); int curses_more(void); void curses_clear_unhighlight_message_window(void);