alternative to display_inventory for window-port

Several window ports that support perm_invent were
using a call back to the core display_inventory()
function.

While calling from the window port back to core functions
is arguably not ideal in the first place, it was recently
brought to light that code NetHack-3.7 code changes to
display_inventory() actually caused it to stop repopulating
the perm_invent window as intended under certain circumstances.

For now, provide an alternative function, repopulate_perminvent(),
that hopefullshould still work the way it did previously.

There will likely be some additional changes after this to
further improve things, at some point.

For now though, this
Resolves #1454

doc/window.txt

@@ -284,7 +284,7 @@ update_inventory(arg)
 		-- For an argument of 0:
 		   -- Indicate to the window port that the inventory has
 		      been changed.
-		   -- Merely calls display_inventory() for window-ports
+		   -- Merely calls repopulate_perminvent() for window-ports
 		      that leave the window up, otherwise empty.
 		-- or for a non-zero argument:
 		   -- Prompts the user for a menu scrolling action and
@@ -1001,6 +1001,10 @@ char display_inventory(lets, want_reply)
 		-- Calls a start_menu()/add_menu()/select_menu() sequence.
 		   It returns the item selected, or '\0' if none is selected.
 		   Returns '\033' if the menu was canceled.
+void repopulate_perminvent(void)
+                -- a minimal alternative to display_inventory() that
+                   focuses only on repopulating the permanent inventory
+                   window.
 raw_printf(str, ...)
 		-- Like raw_print(), but accepts arguments like printf().  This
 		   routine processes the arguments and then calls raw_print().

include/extern.h

@@ -1358,6 +1358,7 @@ extern void sync_perminvent(void);
 extern void perm_invent_toggled(boolean negated);
 extern void prepare_perminvent(winid window);
 extern struct obj *carrying_stoning_corpse(void);
+extern void repopulate_perminvent(void);
 
 /* ### ioctl.c ### */
 

src/invent.c

@@ -4047,6 +4047,13 @@ display_inventory(const char *lets, boolean want_reply)
                            FALSE, want_reply, (long *) 0);
 }
 
+void
+repopulate_perminvent(void)
+{
+        (void) display_pickinv(NULL, (char *) 0, (char *) 0,
+                               FALSE, FALSE, (long *) 0);
+}
+
 /*
  * Show what is current using inventory letters.
  *

win/Qt/qt_bind.cpp

@@ -502,7 +502,7 @@ void NetHackQtBind::qt_update_inventory(int arg UNUSED)
 
     /* doesn't work yet
     if (program_state.something_worth_saving && iflags.perm_invent)
-        display_inventory(NULL, false);
+        repopulate_perminvent();
     */
 }
 

win/X11/winX.c

@@ -1295,7 +1295,7 @@ X11_update_inventory(int arg)
         if (program_state.in_moveloop || program_state.gameover) {
             updated_inventory = 1; /* hack to avoid mapping&raising window */
             if (!arg) {
-                (void) display_inventory((char *) 0, FALSE);
+                repopulate_perminvent();
             } else {
                 x11_scroll_perminv(arg);
             }

win/curses/cursinvt.c

@@ -96,7 +96,7 @@ curs_update_invt(int arg)
         /* ask core to display full inventory in a PICK_NONE menu;
            instead of setting up an ordinary menu, it will indirectly
            call curs_add_invt() for each line (including class headers) */
-        display_inventory(NULL, FALSE);
+        repopulate_perminvent();
         curs_invt_updated(win);
 
     } else {

win/shim/winshim.c

@@ -172,11 +172,11 @@ VDECLCB(shim_status_update,
     "vipiiip",
     A2P fldidx, P2V ptr, A2P chg, A2P percent, A2P color, P2V colormasks)
 #ifdef __EMSCRIPTEN__
-/* XXX: calling display_inventory() from shim_update_inventory() causes reentrancy that breaks emscripten Asyncify */
+/* XXX: calling repopulate_perminvent() from shim_update_inventory() causes reentrancy that breaks emscripten Asyncify */
-/* this should be fine since according to windows.doc, the only purpose of shim_update_inventory() is to call display_inventory() */
+/* this should be fine since according to windows.doc, the only purpose of shim_update_inventory() is to call repopulate_perminvent() */
 void shim_update_inventory(int a1 UNUSED) {
     if(iflags.perm_invent) {
-        display_inventory(NULL, FALSE);
+        repopulate_perminvent();
     }
 }
 

win/win32/mswproc.c

@@ -1248,7 +1248,7 @@ mswin_select_menu(winid wid, int how, MENU_ITEM_P **selected)
 
 /*
     -- Indicate to the window port that the inventory has been changed.
-    -- Merely calls display_inventory() for window-ports that leave the
+    -- Merely calls repopulate_perminvent() for window-ports that leave the
         window up, otherwise empty.
 */
 void
@@ -1257,7 +1257,7 @@ mswin_update_inventory(int arg)
     logDebug("mswin_update_inventory(%d)\n", arg);
     if (iflags.perm_invent && program_state.something_worth_saving
         && iflags.window_inited && WIN_INVEN != WIN_ERR)
-        display_inventory(NULL, FALSE);
+        repopulate_perminvent();
 }
 
 win_request_info *