fix a couple of options affecting perm_invent

When the 'O' command is used to change either 'menu_headings' or
'sortloot', inventory display can change so persistent inventory
needs to be updated.

Oddly, the flag to indicate initial options processing remained
True after options had been processed, but that ultimately didn't
matter here.  It's fixed now anyway.

Also, sort the WC2_xxx options in a couple of places.

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index 650b4a4440f02ce64b602b38fef729b449a79689..fe6096e4adf88790dcf905bf9e5fa8816f6b0f4a 100644 (file)
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -74,6 +74,7 @@ if the orc-town version of mine town has been loaded, creation of orc zombies
 when punished, involuntarily teleporting and landing within chain range of
        attached ball while encumbered worse than burdened could trigger
        "remove_object: obj not on floor" panic on hero's next move
+update persistent inventory when 'menu_headings' or 'sortloot' options change
 update persistent inventory when putting on a helmet causes it to auto-curse
 inventory cursing caused by "this water's no good" effect when drinking from
        a fountain didn't update persistent inventory window

diff --git a/doc/window.doc b/doc/window.doc
index 51fba3061b6c9771764f0ef323ccb4a300c0d441..6e7df40dd37c1c2b96ec809a7779062b37d539a0 100644 (file)
--- a/doc/window.doc
+++ b/doc/window.doc
@@ -806,13 +806,18 @@ to support:
   | player option      | bit in wincap mask |   for value        | type   |
   |--------------------+--------------------+--------------------+--------+
   |  fullscreen        | WC2_FULLSCREEN     | wc2_fullscreen     |boolean |
-  |  softkeyboard      | WC2_SOFTKEYBOARD   | wc2_softkeyboard   |boolean |
-  |  wraptext          | WC2_WRAPTEXT       | wc2_wraptext       |boolean |
-  |  selectsaved       | WC2_SELECTSAVED    | wc2_selectsaved    |boolean |
+  |  guicolor          | WC2_GUICOLOR       | wc2_guicolor       |boolean |
+  |  hilite_status     | WC2_HILITE_STATUS  | wc2_hilite_status  |strings |
   |  hitpointbar       | WC2_HITPOINTBAR    | wc2_hitpointbar    |boolean |
-  |  term_cols         | WC2_TERM_COLS      | wc2_term_cols      |int     |
-  |  term_rows         | WC2_TERM_ROWS      | wc2_term_rows      |int     |
+  |  petattr           | WC2_PETATTR        | wc2_petattr        |int     |
+  |  selectsaved       | WC2_SELECTSAVED    | wc2_selectsaved    |boolean |
+  |  softkeyboard      | WC2_SOFTKEYBOARD   | wc2_softkeyboard   |boolean |
+  |  statuslines       | WC2_STATUSLINES    | wc2_statuslines    |int     |
+  |  term_cols         | WC2_TERM_SIZE      | wc2_term_cols      |int     |
+  |  term_rows         | WC2_TERM_SIZE      | wc2_term_rows      |int     |
+  |  use_darkgray      | WC2_DARKGRAY       | wc2_darkgray       |boolean |
   |  windowborders     | WC2_WINDOWBORDERS  | wc2_windowborders  |int     |
+  |  wraptext          | WC2_WRAPTEXT       | wc2_wraptext       |boolean |
   +--------------------+--------------------+--------------------+--------+
 
   more wincap2 for STATUS_HILITES support and control
@@ -829,6 +834,13 @@ to support:
   |          fields should be redone |                           |
   +----------------------------------+---------------------------+
 
+  additional wincap2 flag bits for supported putstr() attributes
+  +----------------------------------+---------------------------+
+  |  avoid putting message into      | WC2_SUPPRESS_HIST         |
+  |          recall history          |                           |
+  |  draw extra attention to message | WC2_URGENT_MESG           |
+  +----------------------------------+---------------------------+
+
 align_message  -- where to place message window (top, bottom, left, right)
 align_status   -- where to place status display (top, bottom, left, right).
 ascii_map      -- port should display an ascii map if it can.

diff --git a/src/options.c b/src/options.c
index caa0484fca7e946a44951b922240d14f57fc54d6..9e662026af7893360f4092d1d87605bece7c7159 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -302,7 +302,7 @@ extern char *curses_fmt_attrs(char *);
  **********************************
  */
 boolean
-parseoptions(register char *opts,boolean tinitial, boolean tfrom_file)
+parseoptions(register char *opts, boolean tinitial, boolean tfrom_file)
 {
     char *op;
     boolean negated, got_match = FALSE;
@@ -353,12 +353,11 @@ parseoptions(register char *opts,boolean tinitial, boolean tfrom_file)
         has_val = TRUE;
 #endif
         optlen = optlen_wo_val;
-    }
 #if 0
-    else {
+    } else {
         has_val = FALSE;
-    }
 #endif
+    }
 
     for (i = 0; i < OPTCOUNT; ++i) {
         got_match = FALSE;
@@ -482,7 +481,7 @@ parseoptions(register char *opts,boolean tinitial, boolean tfrom_file)
     return FALSE;
 }
 
-int
+static int
 check_misc_menu_command(char *opts, char *op UNUSED)
 {
     int i;
@@ -711,8 +710,9 @@ optfn_boulder(int optidx UNUSED, int req, boolean negated UNUSED,
                initoptions_finish(), after all symset options
                have been processed */
             if (!g.opt_initial) {
-                nhsym sym = get_othersym(
-                    SYM_BOULDER, Is_rogue_level(&u.uz) ? ROGUESET : PRIMARY);
+                nhsym sym = get_othersym(SYM_BOULDER,
+                                         Is_rogue_level(&u.uz) ? ROGUESET
+                                                               : PRIMARY);
 
                 if (sym)
                     g.showsyms[SYM_BOULDER + SYM_OFF_X] = sym;
@@ -1545,8 +1545,7 @@ optfn_menu_headings(int optidx, int req, boolean negated UNUSED,
         tmpattr = match_str2attr(opts, TRUE);
         if (tmpattr == -1)
             return optn_err;
-        else
-            iflags.menu_headings = tmpattr;
+        iflags.menu_headings = tmpattr;
         return optn_ok;
     }
     if (req == get_val) {
@@ -4512,8 +4511,12 @@ handler_menu_headings(void)
 {
     int mhattr = query_attr("How to highlight menu headings:");
 
-    if (mhattr != -1)
+    if (mhattr != -1) {
         iflags.menu_headings = mhattr;
+        /* header highlighting affects persistent inventory display */
+        if (iflags.perm_invent)
+            update_inventory();
+    }
     return optn_ok;
 }
 
@@ -4689,8 +4692,7 @@ handler_pickup_types(void)
     char buf[BUFSZ];
 
     /* parseoptions will prompt for the list of types */
-    (void) parseoptions(strcpy(buf, "pickup_types"),
-                        FALSE, FALSE);
+    (void) parseoptions(strcpy(buf, "pickup_types"), FALSE, FALSE);
     return optn_ok;
 }
 
@@ -4750,6 +4752,9 @@ handler_sortloot(void)
         if (n > 1 && c == flags.sortloot)
             c = sortl_pick[1].item.a_char;
         flags.sortloot = c;
+        /* changing to or from 'f' affects persistent inventory display */
+        if (iflags.perm_invent)
+            update_inventory();
         free((genericptr_t) sortl_pick);
     }
     destroy_nhwindow(tmpwin);
@@ -5151,7 +5156,7 @@ handler_menu_colors(void)
            inventory window; we don't track whether an actual changed
            occurred, so just assume there was one and that it matters;
            if we're wrong, a redundant update is cheap... */
-        if (iflags.use_menu_color)
+        if (iflags.use_menu_color && iflags.perm_invent)
             update_inventory();
 
         /* menu colors aren't being used; if any are defined, remind
@@ -5855,6 +5860,7 @@ initoptions_finish(void)
         }
     }
 #endif
+    g.opt_initial = FALSE;
     return;
 }
 
@@ -8131,21 +8137,21 @@ static struct wc_Opt wc_options[] = {
 };
 static struct wc_Opt wc2_options[] = {
     { "fullscreen", WC2_FULLSCREEN },
-    { "softkeyboard", WC2_SOFTKEYBOARD },
-    { "wraptext", WC2_WRAPTEXT },
-    { "use_darkgray", WC2_DARKGRAY },
-    { "hitpointbar", WC2_HITPOINTBAR },
+    { "guicolor", WC2_GUICOLOR },
     { "hilite_status", WC2_HILITE_STATUS },
+    { "hitpointbar", WC2_HITPOINTBAR },
+    { "petattr", WC2_PETATTR },
+    { "softkeyboard", WC2_SOFTKEYBOARD },
     /* name shown in 'O' menu is different */
     { "status hilite rules", WC2_HILITE_STATUS },
     /* statushilites doesn't have its own bit */
     { "statushilites", WC2_HILITE_STATUS },
+    { "statuslines", WC2_STATUSLINES },
     { "term_cols", WC2_TERM_SIZE },
     { "term_rows", WC2_TERM_SIZE },
-    { "petattr", WC2_PETATTR },
-    { "guicolor", WC2_GUICOLOR },
-    { "statuslines", WC2_STATUSLINES },
+    { "use_darkgray", WC2_DARKGRAY },
     { "windowborders", WC2_WINDOWBORDERS },
+    { "wraptext", WC2_WRAPTEXT },
     { (char *) 0, 0L }
 };