nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Tabify more menus

Browse Source 
* Status hilites
* Disclose option
* Symbol set selection
This commit is contained in:
Ray Chason
2026-08-20 08:14:13 -04:00
parent b52ea09e25
commit b08c4f92b2
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/botl.c
+6 -2
View File
@@ -4539,9 +4539,13 @@ status_hilite_menu(void)
#endif #endif
any = cg.zeroany; any = cg.zeroany;
any.a_int = fld + 1; any.a_int = fld + 1;
Sprintf(buf, "%-18s", initblstats[i].fldname); if (iflags.menu_tab_sep) {
Sprintf(buf, "%s\t", initblstats[i].fldname);
} else {
Sprintf(buf, "%-18s ", initblstats[i].fldname);
}
if (count) if (count)
Sprintf(eos(buf), " (%d defined)", count); Sprintf(eos(buf), "(%d defined)", count);
add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE, add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
clr, buf, MENU_ITEMFLAGS_NONE); clr, buf, MENU_ITEMFLAGS_NONE);
} }
src/options.c
+7 -2
View File
@@ -5703,8 +5703,13 @@ handler_disclose(void)
start_menu(tmpwin, MENU_BEHAVE_STANDARD); start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany; any = cg.zeroany;
for (i = 0; i < NUM_DISCLOSURE_OPTIONS; i++) { for (i = 0; i < NUM_DISCLOSURE_OPTIONS; i++) {
Sprintf(buf, "%-12s[%c%c]", disclosure_names[i], if (iflags.menu_tab_sep) {
flags.end_disclose[i], disclosure_options[i]); Sprintf(buf, "%s\t[%c%c]", disclosure_names[i],
flags.end_disclose[i], disclosure_options[i]);
} else {
Sprintf(buf, "%-12s[%c%c]", disclosure_names[i],
flags.end_disclose[i], disclosure_options[i]);
}
any.a_int = i + 1; any.a_int = i + 1;
add_menu(tmpwin, &nul_glyphinfo, &any, disclosure_options[i], add_menu(tmpwin, &nul_glyphinfo, &any, disclosure_options[i],
0, ATR_NONE, clr, buf, MENU_ITEMFLAGS_NONE); 0, ATR_NONE, clr, buf, MENU_ITEMFLAGS_NONE);
src/symbols.c
+6 -7
View File
@@ -979,8 +979,6 @@ symparse_find(const void *bstr_, const void *rec_)
return 0; return 0;
} }
DISABLE_WARNING_FORMAT_NONLITERAL
/* /*
* this is called from options.c to do the symset work. * this is called from options.c to do the symset work.
*/ */
@@ -994,7 +992,7 @@ do_symset(boolean rogueflag)
menu_item *symset_pick = (menu_item *) 0; menu_item *symset_pick = (menu_item *) 0;
boolean ready_to_switch = FALSE, boolean ready_to_switch = FALSE,
nothing_to_do = FALSE; nothing_to_do = FALSE;
char *symset_name, fmtstr[20]; char *symset_name;
struct symsetentry *sl; struct symsetentry *sl;
int res, which_set, setcount = 0, chosen = -2, defindx = 0; int res, which_set, setcount = 0, chosen = -2, defindx = 0;
int clr = NO_COLOR; int clr = NO_COLOR;
@@ -1041,7 +1039,6 @@ do_symset(boolean rogueflag)
return TRUE; return TRUE;
} }
Sprintf(fmtstr, "%%-%ds %%s", biggest + 2);
tmpwin = create_nhwindow(NHW_MENU); tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin, MENU_BEHAVE_STANDARD); start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany; any = cg.zeroany;
@@ -1072,7 +1069,11 @@ do_symset(boolean rogueflag)
any.a_int = sl->idx + 2; any.a_int = sl->idx + 2;
if (symset_name && !strcmpi(sl->name, symset_name)) if (symset_name && !strcmpi(sl->name, symset_name))
defindx = any.a_int; defindx = any.a_int;
Sprintf(buf, fmtstr, sl->name, sl->desc ? sl->desc : ""); if (iflags.menu_tab_sep) {
Sprintf(buf, "%s\t%s", sl->name, sl->desc ? sl->desc : "");
} else {
Sprintf(buf, "%-*s %s", biggest + 2, sl->name, sl->desc ? sl->desc : "");
}
add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
ATR_NONE, clr, buf, ATR_NONE, clr, buf,
(any.a_int == defindx) ? MENU_ITEMFLAGS_SELECTED (any.a_int == defindx) ? MENU_ITEMFLAGS_SELECTED
@@ -1177,6 +1178,4 @@ do_symset(boolean rogueflag)
return TRUE; return TRUE;
} }
RESTORE_WARNING_FORMAT_NONLITERAL
/*symbols.c*/ /*symbols.c*/