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

curses line-of-input prompting

Browse Source 
Redo the fake ESC handling for curses' wgetnstr() so that it
applies to all popup prompts rather than just to "Who are you?",
in case the player sets the 'popup_dialog' option.
This commit is contained in:
PatR
2021-01-06 15:59:55 -08:00
parent 2df4f08c0b
commit 7ba7873a41
3 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
win/curses/cursdial.c
View File

@@ -131,7 +131,8 @@ curses_line_input_dialog(const char *prompt, char *answer, int buffer)
int map_height, map_width, maxwidth, remaining_buf, winx, winy, count;
WINDOW *askwin, *bwin;
char *tmpstr;
int prompt_width, prompt_height = 1, height = prompt_height;
int prompt_width, prompt_height = 1, height = prompt_height,
answerx = 0, answery = 0, trylim;
char input[BUFSZ];
/* if messages were being suppressed for the remainder of the turn,
@@ -185,11 +186,28 @@ curses_line_input_dialog(const char *prompt, char *answer, int buffer)
wmove(askwin, count + 1, 0);
}
free(tmpstr);
/* remember where user's typed response will start, in case we
need to re-prompt */
getyx(askwin, answery, answerx);
}
echo();
curs_set(1);
wgetnstr(askwin, input, buffer - 1);
trylim = 10;
do {
/* move and clear are only needed for 2nd and subsequent passes */
wmove(askwin, answery, answerx);
wclrtoeol(askwin);
wgetnstr(askwin, input, buffer - 1);
/* ESC after some input kills that input and tries again;
ESC at the start cancels, leaving ESC in the result buffer.
[Note: wgetnstr() treats <escape> as an ordinary character
so user has to type <escape><return> for it to behave the
way we want it to.] */
if (input[0] != '\033' && index(input, '\033') != 0)
input[0] = '\0';
} while (--trylim > 0 && !input[0]);
curs_set(0);
Strcpy(answer, input);
werase(bwin);

32
win/curses/cursmain.c
View File

@@ -240,9 +240,6 @@ curses_player_selection()
void
curses_askname()
{
const char *bail_msg = "Until next time then...";
int trylimit = 10;
#ifdef SELECTSAVED
if (iflags.wc2_selectsaved && !iflags.renameinprogress)
switch (restore_menu(MAP_WIN)) {
@@ -255,29 +252,16 @@ curses_askname()
}
#endif /* SELECTSAVED */
do {
if (--trylimit < 0) {
bail_msg = "A name is required; giving up.";
goto bail;
}
g.plname[0] = '\0';
/* for askname(), this will use wgetnstr() which treats ESC like
an ordinary character; fake the behavior we want: as kill_char
if it follows any input or as cancel if it is at the start;
player has to type <escape><return> to get back here though */
curses_line_input_dialog("Who are you?", g.plname, PL_NSIZ);
if (g.plname[0] == '\033')
goto bail;
(void) mungspaces(g.plname);
} while (!g.plname[0] || index(g.plname, '\033') != 0);
/* we get here if input is non-empty and doesn't contain ESC */
return;
curses_line_input_dialog("Who are you?", g.plname, PL_NSIZ);
(void) mungspaces(g.plname);
if (g.plname[0] && g.plname[0] != '\033') {
iflags.renameallowed = TRUE; /* tty uses this, we don't [yet?] */
return;
}
bail:
curses_bail(bail_msg);
/* message is delivered via raw_print() */
curses_bail("\nUntil next time then...\n");
/*NOTREACHED*/
}