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

curses: urgent messages

Browse Source 
This is comparable to the recent fix for tty.  When messages aren't
currently being suppressed by use of ESC at --More-- (">>" for
curses), if an urgent message itself triggers --More--, don't start
suppressing messages if player dismisses it with ESC.
This commit is contained in:
PatR
2021-12-22 12:23:50 -08:00
parent 29cadc0452
commit 69906f0edb
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
win/curses/cursmain.c
View File

@@ -18,6 +18,7 @@ extern char erase_char, kill_char;
#endif
extern long curs_mesg_suppress_turn; /* from cursmesg.c */
extern boolean curs_mesg_suppress_suppression; /* ditto */
/* stubs for curses_procs{} */
#ifdef POSITIONBAR
@@ -500,8 +501,10 @@ curses_putstr(winid wid, int attr, const char *text)
/* this is comparable to tty's cw->flags &= ~WIN_STOP; if messages are
being suppressed after >>ESC, override that and resume showing them */
if ((mesgflags & ATR_URGENT) != 0)
if ((mesgflags & ATR_URGENT) != 0) {
curs_mesg_suppress_turn = -1L;
curs_mesg_suppress_suppression = TRUE;
}
if (wid == WIN_MESSAGE && (mesgflags & ATR_NOHISTORY) != 0) {
/* display message without saving it in recall history */
@@ -511,6 +514,9 @@ curses_putstr(winid wid, int attr, const char *text)
curses_attr = curses_convert_attr(attr);
curses_puts(wid, curses_attr, text);
}
/* urgent message handling is a one-shot operation; we're done */
curs_mesg_suppress_suppression = FALSE;
}
/* Display the file named str. Complain about missing files

12
win/curses/cursmesg.c
View File

@@ -21,6 +21,11 @@ extern char erase_char, kill_char;
for the current move; but hero might get more than one move per turn,
so the input routines need to be able to cancel this */
long curs_mesg_suppress_turn = -1L;
/* if a message is marked urgent, existing suppression will be overridden
so that messages resume being shown; this is used in case the urgent
message triggers More>> for the previous message and the player responds
with ESC; we need to avoid initiating suppression in that situation */
boolean curs_mesg_suppress_suppression = FALSE;
/* Message window routines for curses interface */
@@ -109,9 +114,10 @@ curses_message_win_puts(const char *message, boolean recursed)
/* bottom of message win */
if (++turn_lines > height
|| (turn_lines == height && mx > border_space)) {
/* Pause until key is hit - Esc suppresses any further
messages that turn */
if (curses_more() == '\033') {
/* pause until key is hit - ESC suppresses further messages
this turn unless an urgent message is being delivered */
if (curses_more() == '\033'
&& !curs_mesg_suppress_suppression) {
curs_mesg_suppress_turn = g.moves;
return;
}