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

window port interface change - add mbehavior flags to start_menu()

Browse Source 
Provide a way to communicate additional behaviors and/or appearances
desired from NetHack window port menus.

This is foundation work for changes to follow at a future date.
This commit is contained in:
nhmall
2020-02-20 20:12:51 -05:00
parent 8e6e4922f8
commit d81c096ce6
55 changed files with 170 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmain.c
View File

@@ -573,7 +573,7 @@ display_gamewindows()
WIN_INVEN = create_nhwindow(NHW_MENU);
/* in case of early quit where WIN_INVEN could be destroyed before
ever having been used, use it here to pacify the Qt interface */
start_menu(WIN_INVEN), end_menu(WIN_INVEN, (char *) 0);
start_menu(WIN_INVEN, 0U), end_menu(WIN_INVEN, (char *) 0);
#ifdef MAC
/* This _is_ the right place for this - maybe we will

2
src/apply.c
View File

@@ -3259,7 +3259,7 @@ struct obj *obj;
any = cg.zeroany; /* set all bits to zero */
any.a_int = 1; /* use index+1 (cant use 0) as identifier */
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any.a_int++;
Sprintf(buf, "an object on the %s", surface(cc.x, cc.y));
add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, buf,

2
src/artifact.c
View File

@@ -1527,7 +1527,7 @@ struct obj *obj;
anything any;
any = cg.zeroany; /* set all bits to zero */
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
/* use index+1 (cant use 0) as identifier */
for (i = num_ok_dungeons = 0; i < g.n_dgns; i++) {
if (!g.dungeons[i].dunlev_ureached)

16
src/botl.c
View File

@@ -1050,7 +1050,7 @@ cond_menu(VOID_ARGS)
(sortorder) ? cond_cmp : menualpha_cmp);
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
any.a_int = 1;
@@ -2321,7 +2321,7 @@ int arrmin, arrmax;
int adj = (arrmin > 0) ? 1 : arrmax;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
for (i = arrmin; i < arrmax; i++) {
any = cg.zeroany;
@@ -2666,7 +2666,7 @@ query_conditions()
menu_item *picks = (menu_item *) 0;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
for (i = 0; i < SIZE(conditions); i++) {
any = cg.zeroany;
@@ -3230,7 +3230,7 @@ status_hilite_menu_choose_field()
menu_item *picks = (menu_item *) 0;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
for (i = 0; i < MAXBLSTATS; i++) {
#ifndef SCORE_ON_BOTL
@@ -3273,7 +3273,7 @@ int fld;
at = initblstats[fld].anytype;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
if (fld != BL_CONDITION) {
any = cg.zeroany;
@@ -3360,7 +3360,7 @@ boolean ltok, gtok;
menu_item *picks = (menu_item *) 0;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
if (ltok) {
if (str)
@@ -3903,7 +3903,7 @@ int fld;
}
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
if (count) {
hlstr = status_hilite_str;
@@ -4037,7 +4037,7 @@ shlmenu_redo:
redo = FALSE;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
status_hilite_linestr_gather();
countall = status_hilite_linestr_countfield(BL_FLUSH);

12
src/cmd.c
View File

@@ -357,7 +357,7 @@ doextlist(VOID_ARGS)
while (redisplay) {
redisplay = FALSE;
any = cg.zeroany;
start_menu(menuwin);
start_menu(menuwin, MENU_BEHAVE_STANDARD);
add_menu(menuwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
"Extended Commands List",
MENU_ITEMFLAGS_NONE);
@@ -576,7 +576,7 @@ extcmd_via_menu()
/* otherwise... */
win = create_nhwindow(NHW_MENU);
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
Sprintf(fmtstr, "%%-%ds", biggest + 15);
prompt[0] = '\0';
wastoolong = FALSE; /* True => had to wrap due to line width
@@ -1476,7 +1476,7 @@ wiz_intrinsic(VOID_ARGS)
any = cg.zeroany;
win = create_nhwindow(NHW_MENU);
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
for (i = 0; (propname = propertynames[i].prop_name) != 0; ++i) {
p = propertynames[i].prop_num;
if (p == HALLUC_RES) {
@@ -1620,7 +1620,7 @@ doterrain(VOID_ARGS)
* a legend for the levl[][].typ codes dump
*/
men = create_nhwindow(NHW_MENU);
start_menu(men);
start_menu(men, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
any.a_int = 1;
add_menu(men, NO_GLYPH, &any, 0, 0, ATR_NONE,
@@ -3716,7 +3716,7 @@ int x, y;
struct monst *mtmp;
win = create_nhwindow(NHW_MENU);
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
if (IS_DOOR(typ)) {
boolean key_or_pick, card;
@@ -3817,7 +3817,7 @@ boolean doit;
menu_item *picks = (menu_item *) 0;
win = create_nhwindow(NHW_MENU);
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
if (IS_FOUNTAIN(typ) || IS_SINK(typ)) {
Sprintf(buf, "Drink from the %s",

4
src/do_name.c
View File

@@ -581,7 +581,7 @@ int gloc;
}
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
/* gather_locs returns array[0] == you. skip it. */
@@ -1348,7 +1348,7 @@ docallcmd()
boolean abc = flags.lootabc;
win = create_nhwindow(NHW_MENU);
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
any.a_char = 'm'; /* group accelerator 'C' */
add_menu(win, NO_GLYPH, &any, abc ? 0 : any.a_char, 'C', ATR_NONE,

2
src/dungeon.c
View File

@@ -2128,7 +2128,7 @@ xchar *rdgn;
winid win = create_nhwindow(NHW_MENU);
if (bymenu) {
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
lchoices.idx = 0;
lchoices.menuletter = 'a';
}

4
src/insight.c
View File

@@ -235,7 +235,7 @@ int final; /* ENL_GAMEINPROGRESS:0, ENL_GAMEOVERALIVE, ENL_GAMEOVERDEAD */
g.en_win = create_nhwindow(NHW_MENU);
g.en_via_menu = !final;
if (g.en_via_menu)
start_menu(g.en_win);
start_menu(g.en_win, MENU_BEHAVE_STANDARD);
Strcpy(tmpbuf, g.plname);
*tmpbuf = highc(*tmpbuf); /* same adjustment as bottom line */
@@ -2016,7 +2016,7 @@ set_vanq_order()
int i, n, choice;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany; /* zero out all bits */
for (i = 0; i < SIZE(vanqorders); i++) {
if (i == VANQ_ALPHA_MIX || i == VANQ_MCLS_HTOL) /* skip these */

6
src/invent.c
View File

@@ -2642,7 +2642,7 @@ long *out_cnt;
sortedinvent = sortloot(&g.invent, sortflags, FALSE,
(boolean FDECL((*), (OBJ_P))) 0);
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
if (wizard && iflags.override_ID) {
int unid_cnt;
@@ -2810,7 +2810,7 @@ char avoidlet;
if (g.invent) {
win = create_nhwindow(NHW_MENU);
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
while (!invdone) {
any = cg.zeroany; /* set all bits to zero */
classcount = 0;
@@ -4272,7 +4272,7 @@ const char *hdr, *txt;
any = cg.zeroany;
win = create_nhwindow(NHW_MENU);
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
add_menu(win, NO_GLYPH, &any, 0, 0, iflags.menu_headings, hdr,
MENU_ITEMFLAGS_NONE);
add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);

2
src/nhlua.c
View File

@@ -480,7 +480,7 @@ lua_State *L;
luaL_checktype(L, argc, LUA_TTABLE);
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
lua_pushnil(L); /* first key */
while (lua_next(L, argc) != 0) {

4
src/o_init.c
View File

@@ -520,7 +520,7 @@ doclassdisco()
|| flags.menu_style == MENU_COMBINATION);
if (!traditional) {
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
}
any = cg.zeroany;
menulet = 'a';
@@ -680,7 +680,7 @@ rename_disco()
any = cg.zeroany;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
/*
* Skip the "unique objects" section (each will appear within its

44
src/options.c
View File

@@ -1443,7 +1443,7 @@ const char *prompt;
menu_item *picks = (menu_item *) 0;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
for (i = 0; i < SIZE(colornames); i++) {
if (!colornames[i].name)
@@ -1489,7 +1489,7 @@ const char *prompt;
if (prompt && strstri(prompt, "menu headings"))
default_attr = iflags.menu_headings;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
for (i = 0; i < SIZE(attrnames); i++) {
if (!attrnames[i].name)
@@ -1588,7 +1588,7 @@ query_msgtype()
menu_item *picks = (menu_item *) 0;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
for (i = 0; i < SIZE(msgtype_names); i++)
if (msgtype_names[i].descr) {
@@ -4536,7 +4536,7 @@ doset() /* changing options via menu by Per Liboriussen */
unsigned longest_name_len;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
#ifdef notyet /* SYSCF */
/* XXX I think this is still fragile. Fixing initial/from_file and/or
@@ -4754,7 +4754,7 @@ int numtotal;
opt_idx = 0;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
for (i = 0; i < SIZE(action_titles); i++) {
char tmpbuf[BUFSZ];
@@ -4800,7 +4800,7 @@ boolean setinitial, setfromfile;
menu_item *style_pick = (menu_item *) 0;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
for (i = 0; i < SIZE(menutype); i++) {
style_name = menutype[i];
@@ -4820,7 +4820,7 @@ boolean setinitial, setfromfile;
menu_item *paranoia_picks = (menu_item *) 0;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
for (i = 0; paranoia[i].flagmask != 0; ++i) {
if (paranoia[i].flagmask == PARANOID_BONES && !wizard)
@@ -4852,7 +4852,7 @@ boolean setinitial, setfromfile;
menu_item *burden_pick = (menu_item *) 0;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
for (i = 0; i < SIZE(burdentype); i++) {
burden_name = burdentype[i];
@@ -4883,7 +4883,7 @@ boolean setinitial, setfromfile;
menu_item *disclosure_pick = (menu_item *) 0;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
for (i = 0; i < NUM_DISCLOSURE_OPTIONS; i++) {
Sprintf(buf, "%-12s[%c%c]", disclosure_names[i],
@@ -4911,7 +4911,7 @@ boolean setinitial, setfromfile;
Sprintf(buf, "Disclosure options for %s:",
disclosure_names[i]);
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
/* 'y','n',and '+' work as alternate selectors; '-' doesn't */
any.a_char = DISCLOSE_NO_WITHOUT_PROMPT;
@@ -4960,7 +4960,7 @@ boolean setinitial, setfromfile;
menu_item *mode_pick = (menu_item *) 0;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
for (i = 0; i < SIZE(runmodes); i++) {
mode_name = runmodes[i];
@@ -4980,7 +4980,7 @@ boolean setinitial, setfromfile;
char gp = iflags.getpos_coords;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
any.a_char = GPCOORDS_COMPASS;
add_menu(tmpwin, NO_GLYPH, &any, GPCOORDS_COMPASS, 0, ATR_NONE,
@@ -5044,7 +5044,7 @@ boolean setinitial, setfromfile;
char gf = iflags.getloc_filter;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
any.a_char = (GFILTER_NONE + 1);
add_menu(tmpwin, NO_GLYPH, &any, 'n',
@@ -5079,7 +5079,7 @@ boolean setinitial, setfromfile;
menu_item *window_pick = (menu_item *) 0;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
if (!WINDOWPORT("curses")) {
any.a_char = 's';
@@ -5110,7 +5110,7 @@ boolean setinitial, setfromfile;
menu_item *sortl_pick = (menu_item *) 0;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
for (i = 0; i < SIZE(sortltype); i++) {
sortl_name = sortltype[i];
@@ -5137,7 +5137,7 @@ boolean setinitial, setfromfile;
boolean msg = (*(optname + 6) == 'm');
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
any.a_int = ALIGN_TOP;
add_menu(tmpwin, NO_GLYPH, &any, 't', 0, ATR_NONE, "top",
@@ -5172,7 +5172,7 @@ boolean setinitial, setfromfile;
menu_item *mode_pick = (menu_item *) 0;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
for (i = 0; i < SIZE(npchoices); i++) {
any.a_int = i + 1;
@@ -5249,7 +5249,7 @@ boolean setinitial, setfromfile;
struct plinemsg_type *tmp = g.plinemsg_types;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
mt_idx = 0;
while (tmp) {
@@ -5329,7 +5329,7 @@ boolean setinitial, setfromfile;
char clrbuf[QBUFSZ];
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
mc_idx = 0;
while (tmp) {
@@ -5403,7 +5403,7 @@ boolean setinitial, setfromfile;
menu_item *pick_list = (menu_item *) 0;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
if (numapes) {
ape = g.apelist;
any = cg.zeroany;
@@ -5489,7 +5489,7 @@ boolean setinitial, setfromfile;
Sprintf(fmtstr, "%%-%ds %%s", biggest + 2);
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
any.a_int = 1; /* -1 + 2 [see 'if (sl->name) {' below]*/
if (!symset_name)
@@ -6526,7 +6526,7 @@ char *class_select;
next_accelerator = 'a';
any = cg.zeroany;
win = create_nhwindow(NHW_MENU);
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
while (*class_list) {
const char *text;
boolean selected;

4
src/pager.c
View File

@@ -1232,7 +1232,7 @@ coord *click_cc;
any = cg.zeroany;
win = create_nhwindow(NHW_MENU);
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
any.a_char = '/';
/* 'y' and 'n' to keep backwards compatibility with previous
versions: "Specify unknown object by cursor?" */
@@ -2111,7 +2111,7 @@ dohelp()
int sel;
any = cg.zeroany; /* zero all bits */
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
for (i = 0; help_menu_items[i].text; i++) {
if (!wizard && help_menu_items[i].f == dispfile_debughelp)

10
src/pickup.c
View File

@@ -935,7 +935,7 @@ boolean FDECL((*allow), (OBJ_P)); /* allow function */
(qflags & BY_NEXTHERE) ? TRUE : FALSE, allow);
win = create_nhwindow(NHW_MENU);
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
/*
* Run through the list and add the objects to the menu. If
@@ -1126,7 +1126,7 @@ int how; /* type of query */
}
win = create_nhwindow(NHW_MENU);
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
pack = flags.inv_order;
if (qflags & CHOOSE_ALL) {
@@ -1888,7 +1888,7 @@ doloot()
any.a_void = 0;
win = create_nhwindow(NHW_MENU);
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
for (cobj = g.level.objects[cc.x][cc.y]; cobj;
cobj = cobj->nexthere)
@@ -2964,7 +2964,7 @@ boolean outokay, inokay, alreadyused, more_containers;
any = cg.zeroany;
win = create_nhwindow(NHW_MENU);
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
any.a_int = 1; /* ':' */
Sprintf(buf, "Look inside %s", thesimpleoname(obj));
@@ -3061,7 +3061,7 @@ dotip()
any = cg.zeroany;
win = create_nhwindow(NHW_MENU);
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
for (cobj = g.level.objects[cc.x][cc.y], i = 0; cobj;
cobj = cobj->nexthere)

2
src/restore.c
View File

@@ -1429,7 +1429,7 @@ winid bannerwin; /* if not WIN_ERR, clear window and show copyright in menu */
saved = get_saved_games(); /* array of character names */
if (saved && *saved) {
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany; /* no selection */
if (bannerwin != WIN_ERR) {
/* for tty; erase copyright notice and redo it in the menu */

4
src/spell.c
View File

@@ -1559,7 +1559,7 @@ spellsortmenu()
int i, n, choice;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany; /* zero out all bits */
for (i = 0; i < SIZE(spl_sortchoices); i++) {
@@ -1642,7 +1642,7 @@ int *spell_no;
anything any;
tmpwin = create_nhwindow(NHW_MENU);
start_menu(tmpwin);
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany; /* zero out all bits */
/*

2
src/teleport.c
View File

@@ -608,7 +608,7 @@ dotelecmd()
int i, tmode;
win = create_nhwindow(NHW_MENU);
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
for (i = 0; i < SIZE(tports); ++i) {
any.a_int = (int) tports[i].menulet;

2
src/weapon.c
View File

@@ -1194,7 +1194,7 @@ enhance_weapon_skill()
}
win = create_nhwindow(NHW_MENU);
start_menu(win);
start_menu(win, MENU_BEHAVE_STANDARD);
/* start with a legend if any entries will be annotated
with "*" or "#" below */

17
src/windows.c
View File

@@ -66,7 +66,7 @@ static winid FDECL(dump_create_nhwindow, (int));
static void FDECL(dump_clear_nhwindow, (winid));
static void FDECL(dump_display_nhwindow, (winid, BOOLEAN_P));
static void FDECL(dump_destroy_nhwindow, (winid));
static void FDECL(dump_start_menu, (winid));
static void FDECL(dump_start_menu, (winid, unsigned long));
static void FDECL(dump_add_menu, (winid, int, const ANY_P *, CHAR_P,
CHAR_P, int, const char *, unsigned int));
static void FDECL(dump_end_menu, (winid, const char *));
@@ -536,6 +536,7 @@ static int NDECL(hup_int_ndecl);
static void NDECL(hup_void_ndecl);
static void FDECL(hup_void_fdecl_int, (int));
static void FDECL(hup_void_fdecl_winid, (winid));
static void FDECL(hup_void_fdecl_winid_ulong, (winid, unsigned long));
static void FDECL(hup_void_fdecl_constchar_p, (const char *));
static struct window_procs hup_procs = {
@@ -550,7 +551,7 @@ static struct window_procs hup_procs = {
hup_create_nhwindow, hup_void_fdecl_winid, /* clear_nhwindow */
hup_display_nhwindow, hup_void_fdecl_winid, /* destroy_nhwindow */
hup_curs, hup_putstr, hup_putstr, /* putmixed */
hup_display_file, hup_void_fdecl_winid, /* start_menu */
hup_display_file, hup_void_fdecl_winid_ulong, /* start_menu */
hup_add_menu, hup_end_menu, hup_select_menu, genl_message_menu,
hup_void_ndecl, /* update_inventory */
hup_void_ndecl, /* mark_synch */
@@ -857,6 +858,15 @@ winid window UNUSED;
return;
}
/*ARGUSED*/
static void
hup_void_fdecl_winid_ulong(window, mbehavior)
winid window UNUSED;
unsigned long mbehavior UNUSED;
{
return;
}
/*ARGUSED*/
static void
hup_void_fdecl_constchar_p(string)
@@ -1314,8 +1324,9 @@ winid win UNUSED;
/*ARGUSED*/
static void
dump_start_menu(win)
dump_start_menu(win, mbehavior)
winid win UNUSED;
unsigned long mbehavior;
{
return;
}