'menu_headings' option

If the value is "no color&none" report it as "no-color&none" in 'm O'
and for #saveoptions.

Allow "OPTIONS=menu_headings" without any color or attribute value to
mean "no-color&inverse" as it once did before the player could choose
which attribute or color was supported, and matching the default used
when 'menu_headings' hasn't been specified at all.

Accept "OPTIONS=!menu_headings", meaning "no-color&none".

Explicitly reject "OPTIONS=!menu_headings:anything".  It was rejecting
that due to blanket rejection of negated option, but reporting "can't
both have a value and be negated" whether there was any value present
or not.

For preselected menu entries when interactively choosing a new value
via the submenu of 'm O', use the current color and attribute rather
than NO_COLOR and ATR_NONE.
This commit is contained in:
PatR
2023-11-14 21:33:09 -08:00
parent 830168f26e
commit fc52f0ef42
4 changed files with 45 additions and 33 deletions

View File

@@ -3911,14 +3911,14 @@ status_hilite_menu_add(int origfld)
}
choose_color:
clr = query_color(colorqry);
clr = query_color(colorqry, NO_COLOR);
if (clr == -1) {
if (behavior != BL_TH_ALWAYS_HILITE)
goto choose_value;
else
goto choose_behavior;
}
atr = query_attr(attrqry);
atr = query_attr(attrqry, ATR_NONE);
if (atr == -1)
goto choose_color;