From 9cbc8ace421b413f764a84d2066e1ccc8f7c03c9 Mon Sep 17 00:00:00 2001 From: PatR Date: Sat, 15 Jun 2019 05:11:08 -0700 Subject: [PATCH] tty bug with multi-line prompts This effectively reverts 1ad2415315c1e6dbcdfcd4a4b22b6fb93ccef1f2 because it was interfering with prompts that spanned more than one line (by inserting '--More-- + erase' between displaying of prompt and getting input for the answer). So we're back to the situation where autodescribe feedback when moving the cursor will leave text on the second line if it generates text too wide for one line. (^R redraws the screen correctly.) --- doc/fixes36.3 | 9 +++++---- win/tty/topl.c | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/fixes36.3 b/doc/fixes36.3 index 231b49851..c7c3be730 100644 --- a/doc/fixes36.3 +++ b/doc/fixes36.3 @@ -1,4 +1,4 @@ -$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.53 $ $NHDT-Date: 1560597210 2019/06/15 11:13:30 $ +$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.54 $ $NHDT-Date: 1560600663 2019/06/15 12:11:03 $ This fixes36.3 file is here to capture information about updates in the 3.6.x lineage following the release of 3.6.2 in May 2019. Please note, however, @@ -89,6 +89,10 @@ using ^G to create "hidden mimic" shouldn't have marked it as undetected since for wizard mode 'wizweight' option, glob weight wasn't shown unless glob had shop price information attached curses: sometimes the message window would show a blank line after a prompt +tty: revert the attempt to fix "message line anomaly: if autodecribe feedback + wrapped to second line, the wrapped portion wasn't erased when a + shorter line was shown or getpos was dismissed" because it disrupted + prompts that spanned more than one line, a more significant issue Platform- and/or Interface-Specific Fixes or Features @@ -128,9 +132,6 @@ tty: re-do one optimization used when status conditions have all been removed and remove another that tried to check whether condition text to be displayed next was the same as the existing value; sometimes new status condition wouldn't be shown unless a screen redraw was forced -tty: message line anomaly: if autodecribe feedback wrapped to second line, - the wrapped portion wasn't erased when a shorter line was shown or - getpos was dismissed Windows: some startup error messages were not being delivered successfully diff --git a/win/tty/topl.c b/win/tty/topl.c index 0c6302250..ba21797a7 100644 --- a/win/tty/topl.c +++ b/win/tty/topl.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 topl.c $NHDT-Date: 1560387439 2019/06/13 00:57:19 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.45 $ */ +/* NetHack 3.6 topl.c $NHDT-Date: 1560600658 2019/06/15 12:10:58 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.46 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2009. */ /* NetHack may be freely redistributed. See license for details. */ @@ -156,8 +156,10 @@ const char *str; cl_end(); addtopl(str); +#if 0 /* this doesn't work as intended; it disrupts multi-line prompts */ if (ttyDisplay->cury && ttyDisplay->toplin != 3) more(); +#endif } }