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

Revert "Improved readability of topline state management."

Browse Source 
This reverts commit 08a1910867.
This commit is contained in:
Bart House
2019-07-14 21:28:40 -07:00
parent 05d77d91b8
commit e83fcd0353
4 changed files with 36 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
win/tty/wintty.c
View File

@@ -332,7 +332,7 @@ int sig_unused UNUSED;
new_status_window();
if (u.ux) {
i = ttyDisplay->toplin;
ttyDisplay->toplin = TOPLINE_EMPTY;
ttyDisplay->toplin = 0;
docrt();
bot();
ttyDisplay->toplin = i;
@@ -420,7 +420,7 @@ char **argv UNUSED;
/* set up tty descriptor */
ttyDisplay = (struct DisplayDesc *) alloc(sizeof (struct DisplayDesc));
ttyDisplay->toplin = TOPLINE_EMPTY;
ttyDisplay->toplin = 0;
ttyDisplay->rows = hgt;
ttyDisplay->cols = wid;
ttyDisplay->curx = ttyDisplay->cury = 0;
@@ -1621,12 +1621,12 @@ winid window;
switch (cw->type) {
case NHW_MESSAGE:
if (ttyDisplay->toplin != TOPLINE_EMPTY) {
if (ttyDisplay->toplin) {
home();
cl_end();
if (cw->cury)
docorner(1, cw->cury + 1);
ttyDisplay->toplin = TOPLINE_EMPTY;
ttyDisplay->toplin = 0;
}
break;
case NHW_STATUS:
@@ -2317,13 +2317,12 @@ boolean blocking; /* with ttys, all windows are blocking */
switch (cw->type) {
case NHW_MESSAGE:
if (ttyDisplay->toplin == TOPLINE_NEED_MORE) {
if (ttyDisplay->toplin == 1) {
more();
ttyDisplay->toplin = TOPLINE_NEED_MORE; /* more resets this */
ttyDisplay->toplin = 1; /* more resets this */
tty_clear_nhwindow(window);
/* nhassert(ttyDisplay->toplin == TOPLINE_EMPTY); */
} else
ttyDisplay->toplin = TOPLINE_EMPTY;
ttyDisplay->toplin = 0;
cw->curx = cw->cury = 0;
if (!cw->active)
iflags.window_inited = TRUE;
@@ -2331,8 +2330,8 @@ boolean blocking; /* with ttys, all windows are blocking */
case NHW_MAP:
end_glyphout();
if (blocking) {
if (ttyDisplay->toplin != TOPLINE_EMPTY)
ttyDisplay->toplin = TOPLINE_NEED_MORE;
if (!ttyDisplay->toplin)
ttyDisplay->toplin = 1;
tty_display_nhwindow(WIN_MESSAGE, TRUE);
return;
}
@@ -2362,7 +2361,7 @@ boolean blocking; /* with ttys, all windows are blocking */
cw->offx = 0;
if (cw->type == NHW_MENU)
cw->offy = 0;
if (ttyDisplay->toplin == TOPLINE_NEED_MORE)
if (ttyDisplay->toplin == 1)
tty_display_nhwindow(WIN_MESSAGE, TRUE);
#ifdef H2344_BROKEN
if (cw->maxrow >= (int) ttyDisplay->rows
@@ -2378,7 +2377,7 @@ boolean blocking; /* with ttys, all windows are blocking */
cl_eos();
} else
clear_screen();
ttyDisplay->toplin = TOPLINE_EMPTY;
ttyDisplay->toplin = 0;
} else {
if (WIN_MESSAGE != WIN_ERR)
tty_clear_nhwindow(WIN_MESSAGE);
@@ -2407,9 +2406,8 @@ winid window;
switch (cw->type) {
case NHW_MESSAGE:
if (ttyDisplay->toplin != TOPLINE_EMPTY)
if (ttyDisplay->toplin)
tty_display_nhwindow(WIN_MESSAGE, TRUE);
/* nhassert(ttyDisplay->toplin == TOPLINE_EMPTY); */
/*FALLTHRU*/
case NHW_STATUS:
case NHW_BASE:
@@ -3160,11 +3158,10 @@ const char *mesg;
response to a prompt, we'll assume that the display is up to date */
tty_putstr(WIN_MESSAGE, 0, mesg);
/* if `mesg' didn't wrap (triggering --More--), force --More-- now */
if (ttyDisplay->toplin == TOPLINE_NEED_MORE) {
if (ttyDisplay->toplin == 1) {
more();
ttyDisplay->toplin = TOPLINE_NEED_MORE; /* more resets this */
ttyDisplay->toplin = 1; /* more resets this */
tty_clear_nhwindow(WIN_MESSAGE);
/* nhassert(ttyDisplay->toplin == TOPLINE_EMPTY); */
}
/* normally <ESC> means skip further messages, but in this case
it means cancel the current prompt; any other messages should
@@ -3204,7 +3201,7 @@ tty_wait_synch()
(void) fflush(stdout);
} else if (ttyDisplay->inread > program_state.gameover) {
/* this can only happen if we were reading and got interrupted */
ttyDisplay->toplin = TOPLINE_SPECIAL_PROMPT;
ttyDisplay->toplin = 3;
/* do this twice; 1st time gets the Quit? message again */
(void) tty_doprev_message();
(void) tty_doprev_message();
@@ -3533,9 +3530,8 @@ tty_nhgetch()
i = '\033'; /* map NUL to ESC since nethack doesn't expect NUL */
else if (i == EOF)
i = '\033'; /* same for EOF */
/* topline has been seen - we can clear need for more */
if (ttyDisplay && ttyDisplay->toplin == TOPLINE_NEED_MORE)
ttyDisplay->toplin = TOPLINE_NON_EMPTY;
if (ttyDisplay && ttyDisplay->toplin == 1)
ttyDisplay->toplin = 2;
#ifdef TTY_TILES_ESCCODES
{
/* hack to force output of the window select code */
@@ -3614,9 +3610,8 @@ tty_nhgetch()
i = '\033'; /* map NUL to ESC since nethack doesn't expect NUL */
else if (i == EOF)
i = '\033'; /* same for EOF */
/* topline has been seen - we can clear need for more */
if (ttyDisplay && ttyDisplay->toplin == TOPLINE_NEED_MORE)
ttyDisplay->toplin = TOPLINE_NON_EMPTY;
if (ttyDisplay && ttyDisplay->toplin == 1)
ttyDisplay->toplin = 2;
#ifdef TTY_TILES_ESCCODES
{
/* hack to force output of the window select code */
@@ -3661,9 +3656,8 @@ int *x, *y, *mod;
i = ntposkey(x, y, mod);
if (!i && mod && (*mod == 0 || *mod == EOF))
i = '\033'; /* map NUL or EOF to ESC, nethack doesn't expect either */
/* topline has been seen - we can clear need for more */
if (ttyDisplay && ttyDisplay->toplin == TOPLINE_NEED_MORE)
ttyDisplay->toplin = TOPLINE_NON_EMPTY;
if (ttyDisplay && ttyDisplay->toplin == 1)
ttyDisplay->toplin = 2;
#else /* !WIN32CON */
nhUse(x);
nhUse(y);