curses message window refresh

Sometimes curses tears down and recreates all its windows (when the
display is resized, for instance) and after doing that it repopulates
the message window with data saved for use by ^P.  But it was showing
the oldest messages available rather than the most recent ones.

There is still room for improvement.  That process combines short
messages but the refresh is based on the available number of lines;
combining messages can result in lines at the bottom of the message
window being left blank.  This could be fixed by reverse-scrolling the
window and inserting more messages at the top, or by combining short
messages in history data instead of at refresh time.  The second seems
easier but won't handle changing the message window's width sensibly,
and neither method handles wrapped, long lines well.  A More>> prompt
(possibly more than one) is issued if the refresh shows too many lines
(either because long messages already took multiple lines or because
the window has become narrower and ones which used to fit now need to
be wrapped).

diff --git a/doc/fixes36.3 b/doc/fixes36.3
index 93b7087976fe737d60fca9f50059102beb622957..dc0c5c8a8755dbccbb2f8ced5a85e0a35622a9d1 100644 (file)
--- a/doc/fixes36.3
+++ b/doc/fixes36.3
@@ -1,4 +1,4 @@
-$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.12 $ $NHDT-Date: 1558562367 2019/05/22 21:59:27 $
+$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.14 $ $NHDT-Date: 1558662976 2019/05/24 01:56:16 $
 
 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,
@@ -37,6 +37,12 @@ curses: if message window is only one line, cancelling some prompts with ESC
        left the prompts visible on the message line instead of erasing them
 curses: support EDIT_GETLIN (but like with tty, it's disabled by default) to
        pre-load an earlier response as the default answer for some prompts
+curses: when display windows get reconfigured (after setting align_status,
+       align_message, statuslines, windowborders or due to external resize),
+       the message window was being refreshed with the oldest available N
+       messages rather than most recent N.  [Still room for improvement;
+       when feasible it combines short lines, resulting in N messages on
+       fewer than N lines and leaving some of the available lines blank.]
 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

diff --git a/win/curses/cursmesg.c b/win/curses/cursmesg.c
index 4daf1784bfcf60960eb86c0502a3788cffa2bd06..ab22a25862ca6cee99375b205d3540c4348b3521 100644 (file)
--- a/win/curses/cursmesg.c
+++ b/win/curses/cursmesg.c
@@ -275,25 +275,42 @@ curses_clear_unhighlight_message_window()
 void
 curses_last_messages()
 {
-    boolean border = curses_window_has_border(MESSAGE_WIN);
     nhprev_mesg *mesg;
-    int i, j, height, width;
+    int i, height, width;
+    int border = curses_window_has_border(MESSAGE_WIN) ? 1 : 0;
+    WINDOW *win = curses_get_nhwin(MESSAGE_WIN);
 
     curses_get_window_size(MESSAGE_WIN, &height, &width);
+    werase(win);
+    mx = my = border;
 
-    if (border)
-        mx = my = 1;
-    else
-        mx = my = 0;
-
+    /*
+     * FIXME!
+     *  This shouldn't be relying on a naive line count to decide where
+     *  to start and stop because curses_message_win_puts() combines short
+     *  lines.  So we can end up with blank lines at bottom of the message
+     *  window, missing out on one or more older messages which could have
+     *  been included at the top.
+     *
+     *  3.6.2 showed oldest available N lines (by starting at
+     *  num_mesages - 1 and working back toward 0 until window height was
+     *  reached [via index 'j' which is gone now]) rather than most recent
+     *  N (start at height - 1 and work way up through 0) so showed wrong
+     *  lines even if N lines had been the right way to handle this.
+     */
     ++last_messages;
-    for (j = 0, i = num_messages - 1; i > 0 && j < height; --i, ++j) {
+    i = min(height, num_messages) - 1;
+    for ( ; i > 0; --i) {
         mesg = get_msg_line(TRUE, i);
         if (mesg && mesg->str && *mesg->str)
             curses_message_win_puts(mesg->str, TRUE);
     }
     curses_message_win_puts(toplines, TRUE);
     --last_messages;
+
+    if (border)
+        box(win, 0, 0);
+    wrefresh(win);
 }
 
 
@@ -329,7 +346,7 @@ curses_teardown_messages(void)
     num_messages = 0;
 }
 
-/* Display previous message window messages in reverse chron order */
+/* Display previous messages in a popup (via menu so can scroll backwards) */
 
 void
 curses_prev_mesg()
@@ -362,6 +379,8 @@ curses_prev_mesg()
     if (!do_lifo)
         curs_menu_set_bottom_heavy(wid);
     curses_select_menu(wid, PICK_NONE, &selected);
+    if (selected) /* should always be null for PICK_NONE but be paranoid */
+        free((genericptr_t) selected);
     curses_del_wid(wid);
 }
 
@@ -712,6 +731,7 @@ mesg_add_line(const char *mline)
         /* create a new list element */
         current_mesg = (nhprev_mesg *) alloc((unsigned) sizeof (nhprev_mesg));
         current_mesg->str = dupstr(mline);
+        current_mesg->next_mesg = current_mesg->prev_mesg = (nhprev_mesg *) 0;
     } else {
         /* instead of discarding list element being forced out, reuse it */
         current_mesg = first_mesg;