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

Merge branch 'combo_msg_window_vs_getlin' of https://github.com/entrez/NetHack into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2023-12-10 10:39:58 -05:00
parent c17cc6740b 79cdcff7e4
commit 0006ff7d01
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
win/tty/getline.c
View File

@@ -48,7 +48,7 @@ hooked_tty_getlin(
register char *obufp = bufp; register char *obufp = bufp;
register int c; register int c;
struct WinDesc *cw = wins[WIN_MESSAGE]; struct WinDesc *cw = wins[WIN_MESSAGE];
boolean doprev = 0; boolean doprev = FALSE;
if (ttyDisplay->toplin == TOPLINE_NEED_MORE && !(cw->flags & WIN_STOP)) if (ttyDisplay->toplin == TOPLINE_NEED_MORE && !(cw->flags & WIN_STOP))
more(); more();
@@ -100,29 +100,36 @@ hooked_tty_getlin(
*bufp = 0; *bufp = 0;
} }
if (c == C('p')) { /* ctrl-P, doesn't honor rebinding #prevmsg cmd */ if (c == C('p')) { /* ctrl-P, doesn't honor rebinding #prevmsg cmd */
if (iflags.prevmsg_window != 's') { int sav = ttyDisplay->inread;
int sav = ttyDisplay->inread;
ttyDisplay->inread = 0; ttyDisplay->inread = 0;
if (iflags.prevmsg_window == 's'
|| (iflags.prevmsg_window == 'c' && !doprev)) {
/* msg_window:single, or msg_window:combination while it's
behaving like msg_window:single */
if (!doprev)
(void) tty_doprev_message(); /* need two initially */
(void) tty_doprev_message(); (void) tty_doprev_message();
ttyDisplay->inread = sav; ttyDisplay->inread = sav;
doprev = TRUE;
continue;
} else {
/* msg_window:full or reverse, or msg_window:combination while
it's behaving like msg_window:full */
(void) tty_doprev_message();
ttyDisplay->inread = sav;
doprev = FALSE;
tty_clear_nhwindow(WIN_MESSAGE); tty_clear_nhwindow(WIN_MESSAGE);
cw->maxcol = cw->maxrow; cw->maxcol = cw->maxrow;
addtopl(query); addtopl(query);
addtopl(" "); addtopl(" ");
*bufp = 0; *bufp = 0;
addtopl(obufp); addtopl(obufp);
} else {
if (!doprev)
(void) tty_doprev_message(); /* need two initially */
(void) tty_doprev_message();
doprev = 1;
continue;
} }
} else if (doprev && iflags.prevmsg_window == 's') { } else if (doprev) {
tty_clear_nhwindow(WIN_MESSAGE); tty_clear_nhwindow(WIN_MESSAGE);
cw->maxcol = cw->maxrow; cw->maxcol = cw->maxrow;
doprev = 0; doprev = FALSE;
addtopl(query); addtopl(query);
addtopl(" "); addtopl(" ");
*bufp = 0; *bufp = 0;