From: Pasi Kallinen Date: Tue, 10 Oct 2017 12:29:46 +0000 (+0300) Subject: Add context menu for current location X-Git-Tag: NetHack-3.6.1_RC01~292 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99c6b7f4da951def294ab61b565f2933a30fd632;p=nethack Add context menu for current location Add a new boolean option herecmd_menu. If this is on, and using a windowport that supports mouse, clicking on your character pops up a menu of actions doable in that location. Basically this is nothing new, as almost all of the same actions were done before on the mouse click. You can also pop up the context menu with the #herecmdmenu extended command --- diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index 0d934b465..b7b2258cf 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -982,6 +982,8 @@ Force a lock. Autocompletes. Default key is 'M-f'. Show what type of thing a map symbol corresponds to. Default key is ';'. .lp #help Show the help menu. Default key is '?', and 'h' if number_pad is on. +.lp #herecmdmenu +Show a menu of possible actions in your current location. .lp #history Show long version and game history. Default key is 'V'. .lp #inventory @@ -2556,6 +2558,9 @@ with the `/' command, ask if you want to see it (default on). Turning help off makes just looking at things faster, since you aren't interrupted with the ``More info?'' prompt, but it also means that you might miss some interesting and/or important information. Persistent. +.lp herecmd_menu +When using a windowport that supports mouse and clicking on yourself, show +a menu of possible actions for this location. Same as herecmdmenu command. .lp hilite_pet Visually distinguish pets from similar animals (default off). The behavior of this option depends on the type of windowing you use. diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index 9119ac17d..66610799e 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -3124,6 +3124,10 @@ Turning help off makes just looking at things faster, since you aren't interrupted with the ``{\tt More info?}'' prompt, but it also means that you might miss some interesting and/or important information. Persistent. %.lp +\item[\ib{herecmd\verb+_+menu}] +When using a windowport that supports mouse and clicking on yourself, show +a menu of possible actions for this location. Same as herecmdmenu command. +%.lp \item[\ib{hilite\verb+_+pet}] Visually distinguish pets from similar animals (default off). The behavior of this option depends on the type of windowing you use. diff --git a/doc/fixes36.1 b/doc/fixes36.1 index ab147170d..1a3d60848 100644 --- a/doc/fixes36.1 +++ b/doc/fixes36.1 @@ -687,6 +687,8 @@ Master Key of Thievery always finds door and chest traps if used to lock or blessed (for non-rogues); player is offered the opportunity to disarm "Elbereth" must now be the only engraved text on a square to function "Elbereth" now erodes based on attacks by the player, not monsters scared +option herecmd_menu to make a mouse click on your character pop up + a context menu, and extended command #herecmdmenu to do the same Platform- and/or Interface-Specific New Features diff --git a/include/flag.h b/include/flag.h index 415688a92..5b205e5b7 100644 --- a/include/flag.h +++ b/include/flag.h @@ -191,6 +191,7 @@ struct instance_flags { * behaviour of various NetHack functions and probably warrant * a structure of their own elsewhere some day. */ + boolean herecmd_menu; /* use menu when mouseclick on yourself */ boolean invis_goldsym; /* gold symbol is ' '? */ int parse_config_file_src; /* hack for parse_config_line() */ int in_lava_effects; /* hack for Boots_off() */ diff --git a/src/cmd.c b/src/cmd.c index add6ebd52..4c8372115 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -114,6 +114,7 @@ static int NDECL(dosuspend_core); /**/ static int NDECL((*timed_occ_fn)); +STATIC_PTR int NDECL(doherecmdmenu); STATIC_PTR int NDECL(doprev_message); STATIC_PTR int NDECL(timed_occupation); STATIC_PTR int NDECL(doextcmd); @@ -181,6 +182,8 @@ STATIC_DCL void FDECL(attributes_enlightenment, (int, int)); static const char *readchar_queue = ""; static coord clicklook_cc; +STATIC_DCL void FDECL(add_herecmd_menuitem, (winid, int NDECL((*)), const char *)); +STATIC_DCL char FDECL(here_cmd_menu, (BOOLEAN_P)); STATIC_DCL char *NDECL(parse); STATIC_DCL void FDECL(show_direction_keys, (winid, CHAR_P, BOOLEAN_P)); STATIC_DCL boolean FDECL(help_dir, (CHAR_P, int, const char *)); @@ -2899,6 +2902,7 @@ struct ext_func_tab extcmdlist[] = { { ';', "glance", "show what type of thing a map symbol corresponds to", doquickwhatis, IFBURIED | GENERALCMD }, { '?', "help", "give a help message", dohelp, IFBURIED | GENERALCMD }, + { '\0', "herecmdmenu", "show menu of commands you can do here", doherecmdmenu, IFBURIED }, { 'V', "history", "show long version and game history", dohistory, IFBURIED | GENERALCMD }, { 'i', "inventory", "show your inventory", ddoinv, IFBURIED }, @@ -4658,6 +4662,124 @@ register int x, y; return x >= 1 && x <= COLNO - 1 && y >= 0 && y <= ROWNO - 1; } +STATIC_PTR int +doherecmdmenu(VOID_ARGS) +{ + char ch = here_cmd_menu(TRUE); + + if (ch) + return 1; + + return 0; +} + +STATIC_OVL void +add_herecmd_menuitem(win, func, text) +winid win; +int NDECL((*func)); +const char *text; +{ + char ch; + anything any; + + if ((ch = cmd_from_func(func)) != '\0') { + any.a_void = (genericptr_t)func; + add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, text, MENU_UNSELECTED); + } +} + +STATIC_OVL char +here_cmd_menu(doit) +boolean doit; +{ + winid win; + anything any; + char ch; + char buf[BUFSZ]; + schar typ = levl[u.ux][u.uy].typ; + int npick; + menu_item *picks = (menu_item *) 0; + + win = create_nhwindow(NHW_MENU); + start_menu(win); + + if (IS_FOUNTAIN(typ) || IS_SINK(typ)) { + Sprintf(buf, "Drink from the %s", + defsyms[IS_FOUNTAIN(typ) ? S_fountain : S_sink].explanation); + add_herecmd_menuitem(win, dodrink, buf); + } + + if (IS_FOUNTAIN(typ)) + add_herecmd_menuitem(win, dodip, + "Dip something into the fountain"); + + if (IS_THRONE(typ)) + add_herecmd_menuitem(win, dosit, + "Sit on the throne"); + + if ((u.ux == xupstair && u.uy == yupstair) + || (u.ux == sstairs.sx && u.uy == sstairs.sy + && sstairs.up) + || (u.ux == xupladder && u.uy == yupladder)) { + Sprintf(buf, "Go up the %s", + (u.ux == xupladder && u.uy == yupladder) + ? "ladder" : "stairs"); + add_herecmd_menuitem(win, doup, buf); + } + + if ((u.ux == xdnstair && u.uy == ydnstair) + || (u.ux == sstairs.sx && u.uy == sstairs.sy + && !sstairs.up) + || (u.ux == xdnladder && u.uy == ydnladder)) { + Sprintf(buf, "Go down the %s", + (u.ux == xupladder && u.uy == yupladder) + ? "ladder" : "stairs"); + add_herecmd_menuitem(win, dodown, buf); + } + + if (OBJ_AT(u.ux, u.uy)) { + struct obj *otmp = level.objects[u.ux][u.uy]; + Sprintf(buf, "Pick up %s", otmp->nexthere ? "items" : doname(otmp)); + add_herecmd_menuitem(win, dopickup, buf); + + if (Is_container(otmp)) { + Sprintf(buf, "Loot %s", doname(otmp)); + add_herecmd_menuitem(win, doloot, buf); + } + + if (otmp->oclass == FOOD_CLASS) { + Sprintf(buf, "Eat %s", doname(otmp)); + add_herecmd_menuitem(win, doeat, buf); + } + } + + if (invent) + add_herecmd_menuitem(win, dodrop, "Drop items"); + + add_herecmd_menuitem(win, donull, "Rest one turn"); + add_herecmd_menuitem(win, dosearch, "Search around you"); + add_herecmd_menuitem(win, dolook, "Look at what is here"); + + end_menu(win, "What do you want to do?"); + npick = select_menu(win, PICK_ONE, &picks); + destroy_nhwindow(win); + if (npick > 0) { + if (doit) { + int NDECL((*func)) = picks->item.a_void; + int ret = func(); + + free((genericptr_t)picks); + return (char)ret; + } else { + ch = cmd_from_func(picks->item.a_void); + free((genericptr_t)picks); + return ch; + } + } + return '\0'; +} + + static NEARDATA int last_multi; /* @@ -4692,6 +4814,11 @@ int x, y, mod; } if (x == 0 && y == 0) { + if (iflags.herecmd_menu) { + cmd[0] = here_cmd_menu(FALSE); + return cmd; + } + /* here */ if (IS_FOUNTAIN(levl[u.ux][u.uy].typ) || IS_SINK(levl[u.ux][u.uy].typ)) { diff --git a/src/options.c b/src/options.c index 7086a7b5e..56db02537 100644 --- a/src/options.c +++ b/src/options.c @@ -129,6 +129,7 @@ static struct Bool_Opt { { "fullscreen", &iflags.wc2_fullscreen, FALSE, SET_IN_FILE }, { "goldX", &iflags.goldX, FALSE, SET_IN_GAME }, { "help", &flags.help, TRUE, SET_IN_GAME }, + { "herecmd_menu", &iflags.herecmd_menu, FALSE, SET_IN_GAME }, { "hilite_pet", &iflags.wc_hilite_pet, FALSE, SET_IN_GAME }, /*WC*/ { "hilite_pile", &iflags.hilite_pile, FALSE, SET_IN_GAME }, { "hitpointbar", &iflags.wc2_hitpointbar, FALSE, SET_IN_GAME }, /*WC2*/