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

X11_add_menu()

Browse Source
This commit is contained in:
PatR
2019-12-22 17:05:42 -08:00
parent d48f2a62ba
commit 6e136b19c4
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
win/X11/winX.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 winX.c $NHDT-Date: 1552441031 2019/03/13 01:37:11 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.73 $ */ /* NetHack 3.6 winX.c $NHDT-Date: 1577063125 2019/12/23 01:05:25 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.79 $ */
/* Copyright (c) Dean Luick, 1992 */ /* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1965,7 +1965,7 @@ boolean complain;
any = cg.zeroany; any = cg.zeroany;
while (dlb_fgets(line, LLEN, fp)) { while (dlb_fgets(line, LLEN, fp)) {
X11_add_menu(newwin, NO_GLYPH, &any, 0, 0, ATR_NONE, X11_add_menu(newwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
line, MENU_UNSELECTED); line, MENU_ITEMFLAGS_NONE);
} }
(void) dlb_fclose(fp); (void) dlb_fclose(fp);

7
win/X11/winmenu.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 winmenu.c $NHDT-Date: 1542245161 2018/11/15 01:26:01 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.33 $ */ /* NetHack 3.6 winmenu.c $NHDT-Date: 1577063136 2019/12/23 01:05:36 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.35 $ */
/* Copyright (c) Dean Luick, 1992 */ /* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -628,7 +628,7 @@ winid window;
/*ARGSUSED*/ /*ARGSUSED*/
void void
X11_add_menu(window, glyph, identifier, ch, gch, attr, str, preselected) X11_add_menu(window, glyph, identifier, ch, gch, attr, str, itemflags)
winid window; winid window;
int glyph; /* unused (for now) */ int glyph; /* unused (for now) */
const anything *identifier; const anything *identifier;
@@ -636,10 +636,11 @@ char ch;
char gch; /* group accelerator (0 = no group) */ char gch; /* group accelerator (0 = no group) */
int attr; int attr;
const char *str; const char *str;
boolean preselected; unsigned itemflags;
{ {
x11_menu_item *item; x11_menu_item *item;
struct menu_info_t *menu_info; struct menu_info_t *menu_info;
boolean preselected = (itemflags & MENU_ITEMFLAGS_SELECTED) != 0;
nhUse(glyph); nhUse(glyph);