curses: 'perm_invent' revisited

Redo the fix for using doset(#optionsfull) to toggle perm_invent
under curses.  Move it to curses code and let the core be unaware
of it.  It does the perm_invent update twice when creating the
window for that.

diff --git a/src/options.c b/src/options.c
index 70cae44398fd981abf68cfcdff9c0d657fbacef8..9ea9130e42531296232cda4c3e2e86f7839b6e48 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7 options.c       $NHDT-Date: 1655932898 2022/06/22 21:21:38 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.569 $ */
+/* NetHack 3.7 options.c       $NHDT-Date: 1661218575 2022/08/23 01:36:15 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.601 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Michael Allison, 2008. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -8292,20 +8292,6 @@ doset(void) /* changing options via menu by Per Liboriussen */
         check_gold_symbol();
         reglyph_darkroom();
         docrt();
-        /*
-         * docrt() calls update_inventory() but
-         * (*windowprocs.win_update_inventory)(0) for curses ends up
-         * calling back to docrt() after creating its perm_invent
-         * window.  That call back has become a no-op because of the
-         * program_state.in_docrt flag.  So call update_inventory()
-         * explicitly in case perm_invent was toggled.  It's only
-         * needed if perm_invent was off and is now on but won't kill
-         * anybody if done when not necessary.
-         * Note:  doset_simple() doesn't need this because it doesn't
-         * offer a chance to toggle perm_invent.
-         */
-        if (iflags.perm_invent)
-            update_inventory();
     }
     if (g.context.botl || g.context.botlx) {
         bot();
@@ -8313,13 +8299,14 @@ doset(void) /* changing options via menu by Per Liboriussen */
     return ECMD_OK;
 }
 
-/* doset('O' command) menu entries for compound options */
+/* doset(#optionsfull command) menu entries for compound options */
 static void
-doset_add_menu(winid win,          /* window to add to */
-               const char *option, /* option name */
-               int idx,            /* index in allopt[] */
-               int indexoffset)    /* value to add to index in allopt[],
-                                      or zero if option cannot be changed */
+doset_add_menu(
+    winid win,          /* window to add to */
+    const char *option, /* option name */
+    int idx,            /* index in allopt[] */
+    int indexoffset)    /* value to add to index in allopt[],
+                         * or zero if option cannot be changed */
 {
     const char *value = "unknown"; /* current value */
     char buf[BUFSZ], buf2[BUFSZ];

diff --git a/win/curses/cursmain.c b/win/curses/cursmain.c
index ff6769e6700b8c86424e10706dd39b3620537c86..4c55955072abf7ae4dfb38348c29002f8ed7c2c7 100644 (file)
--- a/win/curses/cursmain.c
+++ b/win/curses/cursmain.c
@@ -682,12 +682,21 @@ curses_update_inventory(int arg)
         return;
 
     if (!arg) {
+         /* if perm_invent is just being toggled on, we need to run the
+            update twice; the first time creates the window and organizes
+            the screen to fit it in, the second time populates it;
+            needed if we're called from docrt() because the "organizes
+            the screen" part calls docrt() and that skips recursive calls */
+         boolean no_inv_win_yet = !curses_get_nhwin(INV_WIN);
+
         /* Update inventory sidebar.  NetHack uses normal menu functions
            when gathering the inventory, and we don't want to change the
            underlying code.  So instead, track if an inventory update is
            being performed with a static variable. */
         inv_update = 1;
         curs_update_invt(0);
+        if (no_inv_win_yet)
+            curs_update_invt(0);
         inv_update = 0;
     } else {
         /* perform scrolling operations on persistent inventory window */