From 6e136b19c4f2ef1bfe4abb5249f5d0b33b00a163 Mon Sep 17 00:00:00 2001 From: PatR Date: Sun, 22 Dec 2019 17:05:42 -0800 Subject: [PATCH] X11_add_menu() --- win/X11/winX.c | 4 ++-- win/X11/winmenu.c | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/win/X11/winX.c b/win/X11/winX.c index 8378fa568..05d82e0eb 100644 --- a/win/X11/winX.c +++ b/win/X11/winX.c @@ -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 */ /* NetHack may be freely redistributed. See license for details. */ @@ -1965,7 +1965,7 @@ boolean complain; any = cg.zeroany; while (dlb_fgets(line, LLEN, fp)) { X11_add_menu(newwin, NO_GLYPH, &any, 0, 0, ATR_NONE, - line, MENU_UNSELECTED); + line, MENU_ITEMFLAGS_NONE); } (void) dlb_fclose(fp); diff --git a/win/X11/winmenu.c b/win/X11/winmenu.c index 7ac8d2491..b86e02ae3 100644 --- a/win/X11/winmenu.c +++ b/win/X11/winmenu.c @@ -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 */ /* NetHack may be freely redistributed. See license for details. */ @@ -628,7 +628,7 @@ winid window; /*ARGSUSED*/ 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; int glyph; /* unused (for now) */ const anything *identifier; @@ -636,10 +636,11 @@ char ch; char gch; /* group accelerator (0 = no group) */ int attr; const char *str; -boolean preselected; +unsigned itemflags; { x11_menu_item *item; struct menu_info_t *menu_info; + boolean preselected = (itemflags & MENU_ITEMFLAGS_SELECTED) != 0; nhUse(glyph);