Re: [NetHack/NetHack] Prompts can overwrite copyright notice on the
starting screen (Issue #783) On 2022-06-01 12:22 p.m., NetSysFire wrote: > Steps to reproduce: > >1. Get any prompt and answer it. In my case it was a horribly old > save I forgot about or when I wiztested something and forgot > about that save, too. >2. See that the copyright information got overwritten by the prompt: > >There is already a game in progress under your name. Destroy old game? [yn] (n) > By Stichting Mathematisch Centrum and M. Stephenson. > Version 3.7.0-59 Unix Work-in-progress, built May 31 2022 12:28:31. > See license for details. > > > Shall I pick character's race, role, gender and alignment for you? [ynaq] > > Expected behavior: > > Redraw after a prompt was answered, so the prompt vanishes and the > entirety of the starting screen will be shown. > > NetHack, Copyright 1985-2022 > By Stichting Mathematisch Centrum and M. Stephenson. > Version 3.7.0-59 Unix Work-in-progress, built May 31 2022 12:28:31. > See license for details. > > > Shall I pick character's race, role, gender and alignment for you? [ynaq] > > Proposed severity: low. Not gamebreaking, it is cosmetic only and does > not have any other consequences. > The Copyright notice is placed by tty internal routines writing onto the BASE_WINDOW fairly early in the startup sequence. The prompt to "Destroy old game? [yn] (n)" is using the in-game routine to write to the message window at the top of the screen and prompt there, just like in-game prompts and messages. If the player answered 'y' to that, the prompt for "Shall I pick character's race, role, gender and alignment..." appeared immediately after. That one, however, is written using the BASE_WINDOW routines in tty, like the copyright notice. This change does the following: It moves the copyright lines down a little bit leaving room for the "Destroy.." prompts. It places the "Shall I pick characters's..." prompt further down the screen by default, leaving some room for about 3 raw_print startup messages after the copyright notice, just in case there are any. The "Shall I pick character's..." prompt will still appear immediately if there is a prompt such as "Destroy old game?..." There were a couple of other issues around raw_print startup messages too. Those are delivered using a raw_print mechanism to ensure they are written even if the window-port is not fully operational. However, they were only on the screen for the blink of an eye. This call sequence in restore.c made them disappear almost immediately: docrt() -> cls() Put in a mechanism to detect the presence of raw_print messages from the early startup, and if there were some, wait for a keypress before obliterating the unread notifications.
This commit is contained in:
@@ -115,12 +115,12 @@ struct window_procs tty_procs = {
|
||||
| WC2_HILITE_STATUS | WC2_HITPOINTBAR | WC2_FLUSH_STATUS
|
||||
| WC2_RESET_STATUS
|
||||
#endif
|
||||
| WC2_DARKGRAY | WC2_SUPPRESS_HIST | WC2_URGENT_MESG | WC2_STATUSLINES)
|
||||
| WC2_DARKGRAY | WC2_SUPPRESS_HIST | WC2_URGENT_MESG | WC2_STATUSLINES
|
||||
| WC2_U_UTF8STR
|
||||
#if !defined(NO_TERMS) || defined(WIN32)
|
||||
| WC2_U_24BITCOLOR
|
||||
#endif
|
||||
,
|
||||
),
|
||||
#ifdef TEXTCOLOR
|
||||
{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, /* color availability */
|
||||
#else
|
||||
@@ -481,12 +481,29 @@ tty_init_nhwindows(int *argcp UNUSED, char **argv UNUSED)
|
||||
|
||||
tty_clear_nhwindow(BASE_WINDOW);
|
||||
|
||||
tty_putstr(BASE_WINDOW, 0, "");
|
||||
/* Once pline() is functional, error-related prompts such as
|
||||
* those relating to save files etc. can intrude on the
|
||||
* copyright information display because their prompts are
|
||||
* up at the very top in the message window.
|
||||
* Move the copyright information a little further down to
|
||||
* row 3, out of the way. */
|
||||
|
||||
tty_curs(BASE_WINDOW, 1, 4);
|
||||
for (i = 1; i <= 4; ++i)
|
||||
tty_putstr(BASE_WINDOW, 0, copyright_banner_line(i));
|
||||
tty_putstr(BASE_WINDOW, 0, "");
|
||||
tty_display_nhwindow(BASE_WINDOW, FALSE);
|
||||
|
||||
/* Move to a default location for the "Shall I pick .." player
|
||||
* selection prompts, which also use the BASE_WINDOW. Leave
|
||||
* room for as many as 3 unexpected raw_prints early startup
|
||||
* messages above that.
|
||||
* If there is a topline message prompt, before the
|
||||
* "Shall I pick ..." prompt, the latter will end up appearing
|
||||
* immediately after the topline message prompt. There should
|
||||
* now be room. */
|
||||
tty_curs(BASE_WINDOW, 1, 11);
|
||||
|
||||
/* 'statuslines' defaults to set_in_config, allowed but invisible;
|
||||
make it dynamically settable if feasible, otherwise visible */
|
||||
if (tty_procs.wincap2 & WC2_STATUSLINES)
|
||||
|
||||
Reference in New Issue
Block a user