adjust bones filename buffer sizes to accommodate suffix
fix internal self-recover to work with recent fields added to checkpoint file
improvements to pronoun usage when hallucinating
-function calls made from map_glyphmod() based on dungeon level are now called
+function calls made from map_glyphinfo() based on dungeon level are now called
once per level
fast hero could have random clairvoyance happen more than once on same turn
using 'Q' on wielded weapon would offer to split stack; make using 'w' on a
unify trap effects for hero and monster stepping on the trap by trap type
replace the single permonst mname field with male, female, and gender-neutral
names pmnames[NUM_MGENDERS] fields
-add a new glyphmod parameter to window interface *_print_glyph() to be used
- to provide additional details to the window port beyond the glyph;
- window port mapglyph() calls and the function itself were removed
+adjust window port interface to pass a pointer to a glyph_info struct which
+ contains the glyph itself, the ttychar, the color, the glyphflags,
+ and the symset index; this affects two window port calls that get
+ passed glyphs: print_glyph() and add_menu().
B. High-level routines:
-print_glyph(window, x, y, glyph, bkglyph, glyphmod[3])
- -- Print the glyph at (x,y) on the given window. Glyphs are
- integers at the interface, mapped to whatever the window-
+print_glyph(window, x, y, glyphinfo, bkglyphinfo)
+ -- Print a glyph found within the glyphinfo at (x,y) on the
+ given window. The glyphs within the glyph_info struct are
+ integers and can be mapped to whatever the window-
port wants (symbol, font, color, attributes, ...there's
a 1-1 map between glyphs and distinct things on the map).
- -- bkglyph is a background glyph for potential use by some
- graphical or tiled environments to allow the depiction
+ -- bkglyphinfo contains a background glyph for potential use
+ by some graphical or tiled environments to allow the depiction
to fall against a background consistent with the grid
- around x,y. If bkglyph is NO_GLYPH, then the parameter
- should be ignored (do nothing with it).
- -- glyphmod (glyphmod[NUM_GLYPHNOD]) provides extended
- information about the glyph that window ports can use to
- enhance the display in various ways.
+ around x,y. If bkglyphinfo->glyph is NO_GLYPH, then the
+ parameter should be ignored (do nothing with it).
+ -- glyph_info struct fields:
+ int glyph; /* the display entity */
+ int color; /* color for window ports not using a tile */
+ int ttychar; /* the character mapping for the original tty
+ interace. Most or all window ports wanted
+ and used this for various things so it is
+ provided in 3.7+ */
+ short int symidx; /* offset into syms array */
+ unsigned glyphflags; /* more detail about the entity */
+
char yn_function(const char *ques, const char *choices, char default)
-- Print a prompt made up of ques, choices and default.
be used for menus.
-- mbehavior allows flags to be passed to alter the appearance
and/or behavior of the menu.
-add_menu(windid window, int glyph, const anything identifier,
- char accelerator, char groupacc,
- int attr, char *str, unsigned itemflags)
+add_menu(windid window, glyphinfo, const anything identifier, char accelerator,
+ char groupacc, int attr, char *str,
+ unsigned itemflags)
-- Add a text line str to the given menu window. If identifier
is 0, then the line cannot be selected (e.g. a title).
Otherwise, identifier is the value returned if the line is
accelerator. It is up to the window-port to make the
accelerator visible to the user (e.g. put "a - " in front
of str). The value attr is the same as in putstr().
- Glyph is an optional glyph to accompany the line. If
- window port cannot or does not want to display it, this
- is OK. If there is no glyph applicable, then this
- value will be NO_GLYPH.
+ -- glyphinfo (glyph_info type) may optionally contain a glyph
+ to accompany the line. If a window port cannot
+ or does not want to display it, this is OK. If there is no
+ glyph provided, then the value of glyphinfo->glyph will
+ be NO_GLYPH.
-- All accelerators should be in the range [A-Za-z],
but there are a few exceptions such as the tty player
selection code which uses '*'.
typedef struct {
xchar gnew; /* perhaps move this bit into the rm structure. */
int glyph;
-#ifndef UNBUFFERED_GLYPHMOD
- unsigned glyphmod[NUM_GLYPHMOD];
+#ifndef UNBUFFERED_GLYPHINFO
+ glyph_info glyphinfo;
#endif
} gbuf_entry;
E const struct const_globals cg;
+E const glyph_info nul_glyphinfo;
+
#undef E
#endif /* DECL_H */
#define glyph_is_unexplored(glyph) ((glyph) == GLYPH_UNEXPLORED)
#define glyph_is_nothing(glyph) ((glyph) == GLYPH_NOTHING)
-/* flags for map_glyphmod */
+/* glyphflags for map_glyphinfo */
-/* mgflags for altering map_glyphmod() internal behaviour */
+/* mgflags for altering map_glyphinfo() internal behaviour */
#define MG_FLAG_NORMAL 0x00
#define MG_FLAG_NOOVERRIDE 0x01
#define MG_FLAG_RETURNIDX 0x02
-/* Special mapped glyph flags encoded in glyphmod[GM_FLAGS] by map_glyphmod() */
+/* Special mapped glyphflags encoded by map_glyphinfo() */
#define MG_CORPSE 0x0001
#define MG_INVIS 0x0002
#define MG_DETECT 0x0004
E void NDECL(set_wall_state);
E void FDECL(unset_seenv, (struct rm *, int, int, int, int));
E int FDECL(warning_of, (struct monst *));
-E void FDECL(map_glyphmod, (XCHAR_P, XCHAR_P, int, unsigned, unsigned *));
+E void FDECL(map_glyphinfo, (XCHAR_P, XCHAR_P, int, unsigned, glyph_info *));
/* ### do.c ### */
E void FDECL(dump_forward_putstr, (winid, int, const char*, int));
E int FDECL(has_color, (int));
E int FDECL(glyph2ttychar, (int));
+E int FDECL(glyph2symidx, (int));
E char *FDECL(encglyph, (int));
E char *FDECL(decode_mixed, (char *, const char *));
E void FDECL(genl_putmixed, (winid, int, const char *));
struct tile_glyph_info_t {
unsigned short glyph;
- unsigned special;
+ unsigned glyphflags;
};
struct tile_map_info_t {
E void FDECL(X11_putstr, (winid, int, const char *));
E void FDECL(X11_display_file, (const char *, BOOLEAN_P));
E void FDECL(X11_start_menu, (winid, unsigned long));
-E void FDECL(X11_add_menu, (winid, int, const ANY_P *, CHAR_P, CHAR_P, int,
+E void FDECL(X11_add_menu, (winid, const glyph_info *, const ANY_P *,
+ CHAR_P, CHAR_P, int,
const char *, unsigned int));
E void FDECL(X11_end_menu, (winid, const char *));
E int FDECL(X11_select_menu, (winid, int, MENU_ITEM_P **));
E void FDECL(X11_cliparound, (int, int));
#endif
E void FDECL(X11_print_glyph, (winid, XCHAR_P, XCHAR_P,
- int, int, unsigned *));
+ const glyph_info *, const glyph_info *));
E void FDECL(X11_raw_print, (const char *));
E void FDECL(X11_raw_print_bold, (const char *));
E int NDECL(X11_nhgetch);
extern void curses_putstr(winid wid, int attr, const char *text);
extern void curses_display_file(const char *filename, BOOLEAN_P must_exist);
extern void curses_start_menu(winid wid, unsigned long);
-extern void curses_add_menu(winid wid, int glyph, const ANY_P * identifier,
+extern void curses_add_menu(winid wid, const glyph_info *,
+ const ANY_P * identifier,
CHAR_P accelerator, CHAR_P group_accel, int attr,
const char *str, unsigned int itemflags);
extern void curses_end_menu(winid wid, const char *prompt);
extern void curses_wait_synch(void);
extern void curses_cliparound(int x, int y);
extern void curses_print_glyph(winid wid, XCHAR_P x, XCHAR_P y,
- int glyph, int bkglyph, unsigned *glyphmod);
+ const glyph_info *, const glyph_info *);
extern void curses_raw_print(const char *str);
extern void curses_raw_print_bold(const char *str);
extern int curses_nhgetch(void);
const char *choices, CHAR_P def);
extern int curses_ext_cmd(void);
extern void curses_create_nhmenu(winid wid, unsigned long);
-extern void curses_add_nhmenu_item(winid wid, int glyph,
+extern void curses_add_nhmenu_item(winid wid, const glyph_info *,
const ANY_P *identifier, CHAR_P accelerator,
CHAR_P group_accel, int attr,
const char *str, unsigned itemflags);
/* cursinvt.c */
extern void curses_update_inv(void);
-extern void curses_add_inv(int, int, CHAR_P, attr_t, const char *);
+extern void curses_add_inv(int, const glyph_info *,
+ CHAR_P, attr_t, const char *);
/* cursinit.c */
E char *NDECL(mar_ask_name);
E int FDECL(mar_create_window, (int));
E void FDECL(mar_destroy_nhwindow, (int));
-E void FDECL(mar_print_glyph, (int, int, int, int, int));
+E void FDECL(mar_print_glyph, (int, int, int, const glyph_info *, const glyph_info *));
E void FDECL(mar_print_line, (int, int, int, char *));
E void FDECL(mar_set_message, (char *, char *, char *));
E Gem_menu_item *NDECL(mar_hol_inv);
E void FDECL(Gem_putstr, (winid, int, const char *));
E void FDECL(Gem_display_file, (const char *, BOOLEAN_P));
E void FDECL(Gem_start_menu, (winid, unsigned long));
-E void FDECL(Gem_add_menu, (winid, int, const ANY_P *, CHAR_P, CHAR_P, int,
+E void FDECL(Gem_add_menu, (winid, const glyph_info *,
+ const ANY_P *, CHAR_P, CHAR_P, int,
const char *, unsigned int));
E void FDECL(Gem_end_menu, (winid, const char *));
E int FDECL(Gem_select_menu, (winid, int, MENU_ITEM_P **));
E void FDECL(Gem_update_positionbar, (char *));
#endif
E void FDECL(Gem_print_glyph, (winid, XCHAR_P, XCHAR_P,
- int, int, unsigned *));
+ const glyph_info *, const glyph_info *));
E void FDECL(Gem_raw_print, (const char *));
E void FDECL(Gem_raw_print_bold, (const char *));
E int NDECL(Gem_nhgetch);
void FDECL((*win_putmixed), (winid, int, const char *));
void FDECL((*win_display_file), (const char *, BOOLEAN_P));
void FDECL((*win_start_menu), (winid, unsigned long));
- void FDECL((*win_add_menu), (winid, int, const ANY_P *, CHAR_P, CHAR_P,
- int, const char *, unsigned int));
+ void FDECL((*win_add_menu), (winid, const glyph_info *, const ANY_P *,
+ CHAR_P, CHAR_P, int,
+ const char *, unsigned int));
void FDECL((*win_end_menu), (winid, const char *));
int FDECL((*win_select_menu), (winid, int, MENU_ITEM_P **));
char FDECL((*win_message_menu), (CHAR_P, int, const char *));
void FDECL((*win_update_positionbar), (char *));
#endif
void FDECL((*win_print_glyph), (winid, XCHAR_P, XCHAR_P,
- int, int, unsigned *));
+ const glyph_info *, const glyph_info *));
void FDECL((*win_raw_print), (const char *));
void FDECL((*win_raw_print_bold), (const char *));
int NDECL((*win_nhgetch));
void FDECL((*win_putmixed), (CARGS, winid, int, const char *));
void FDECL((*win_display_file), (CARGS, const char *, BOOLEAN_P));
void FDECL((*win_start_menu), (CARGS, winid, unsigned long));
- void FDECL((*win_add_menu), (CARGS, winid, int, const ANY_P *, CHAR_P,
- CHAR_P, int, const char *, unsigned int));
+ void FDECL((*win_add_menu), (CARGS, winid, const glyph_info *,
+ const ANY_P *, CHAR_P, CHAR_P, int,
+ const char *, unsigned int));
void FDECL((*win_end_menu), (CARGS, winid, const char *));
int FDECL((*win_select_menu), (CARGS, winid, int, MENU_ITEM_P **));
char FDECL((*win_message_menu), (CARGS, CHAR_P, int, const char *));
void FDECL((*win_update_positionbar), (CARGS, char *));
#endif
void FDECL((*win_print_glyph), (CARGS, winid, XCHAR_P, XCHAR_P,
- int, int, unsigned *));
+ const glyph_info *,
+ const glyph_info *));
void FDECL((*win_raw_print), (CARGS, const char *));
void FDECL((*win_raw_print_bold), (CARGS, const char *));
int FDECL((*win_nhgetch), (CARGS));
extern void FDECL(safe_putmixed, (winid, int, const char *));
extern void FDECL(safe_display_file, (const char *, BOOLEAN_P));
extern void FDECL(safe_start_menu, (winid, unsigned long));
-extern void FDECL(safe_add_menu, (winid, int, const ANY_P *, CHAR_P, CHAR_P,
- int, const char *, unsigned int));
+extern void FDECL(safe_add_menu, (winid, const glyph_info *, const ANY_P *,
+ CHAR_P, CHAR_P, int, const char *,
+ unsigned int));
extern void FDECL(safe_end_menu, (winid, const char *));
extern int FDECL(safe_select_menu, (winid, int, MENU_ITEM_P **));
extern char FDECL(safe_message_menu, (CHAR_P, int, const char *));
extern void FDECL(safe_update_positionbar, (char *));
#endif
extern void FDECL(safe_print_glyph, (winid, XCHAR_P, XCHAR_P,
- int, int, unsigned *));
+ const glyph_info *, const glyph_info *));
extern void FDECL(safe_raw_print, (const char *));
extern void FDECL(safe_raw_print_bold, (const char *));
extern int NDECL(safe_nhgetch);
E void FDECL(tty_putstr, (winid, int, const char *));
E void FDECL(tty_display_file, (const char *, BOOLEAN_P));
E void FDECL(tty_start_menu, (winid, unsigned long));
-E void FDECL(tty_add_menu, (winid, int, const ANY_P *, CHAR_P, CHAR_P, int,
- const char *, unsigned int));
+E void FDECL(tty_add_menu, (winid, const glyph_info *, const ANY_P *,
+ CHAR_P, CHAR_P, int, const char *,
+ unsigned int));
E void FDECL(tty_end_menu, (winid, const char *));
E int FDECL(tty_select_menu, (winid, int, MENU_ITEM_P **));
E char FDECL(tty_message_menu, (CHAR_P, int, const char *));
#ifdef POSITIONBAR
E void FDECL(tty_update_positionbar, (char *));
#endif
-E void FDECL(tty_print_glyph, (winid, XCHAR_P, XCHAR_P, int, int, unsigned *));
+E void FDECL(tty_print_glyph, (winid, XCHAR_P, XCHAR_P,
+ const glyph_info *, const glyph_info *));
E void FDECL(tty_raw_print, (const char *));
E void FDECL(tty_raw_print_bold, (const char *));
E int NDECL(tty_nhgetch);
ANY_MASK32 /* 32-bit mask (stored as unsigned long) */
};
+/* glyph plus additional info */
+typedef struct gi {
+ int glyph; /* the display entity */
+ int color; /* color for window ports not using a tile */
+ int ttychar; /* the character mapping for the original tty
+ interace. Most or all window ports wanted
+ and used this for various things so it is
+ provided in 3.7+ */
+ short int symidx; /* offset into syms array */
+ unsigned glyphflags; /* more detail about the nature of the entity */
+} glyph_info;
+#define GLYPH_INFO_P struct gi
+
/* menu return list */
typedef struct mi {
anything item; /* identifier */
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,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE, buf,
MENU_ITEMFLAGS_NONE);
any.a_int++;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, "a monster",
- MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
+ "a monster", MENU_ITEMFLAGS_NONE);
any.a_int++;
Sprintf(buf, "the %s", surface(cc.x, cc.y));
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, buf,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE, buf,
MENU_ITEMFLAGS_NONE);
end_menu(tmpwin, "Aim for what?");
tohit = rn2(4);
if (!g.dungeons[i].dunlev_ureached)
continue;
any.a_int = i + 1;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
- g.dungeons[i].dname, MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, g.dungeons[i].dname, MENU_ITEMFLAGS_NONE);
num_ok_dungeons++;
last_ok_dungeon = i;
}
Sprintf(mbuf, "change sort order from \"%s\" to \"%s\"",
menutitle[g.condmenu_sortorder],
menutitle[1 - g.condmenu_sortorder]);
- add_menu(tmpwin, NO_GLYPH, &any, 'S', 0, ATR_NONE, mbuf,
- MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'S', 0, ATR_NONE,
+ mbuf, MENU_ITEMFLAGS_NONE);
any = cg.zeroany;
Sprintf(mbuf, "sorted %s", menutitle[g.condmenu_sortorder]);
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings, mbuf,
- MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ iflags.menu_headings, mbuf, MENU_ITEMFLAGS_NONE);
for (i = 0; i < SIZE(condtests); i++) {
idx = sequence[i];
Sprintf(mbuf, "cond_%-14s", condtests[idx].useroption);
any = cg.zeroany;
any.a_int = idx + 2; /* avoid zero and the sort change pick */
condtests[idx].choice = FALSE;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
mbuf,
condtests[idx].enabled
? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
for (i = arrmin; i < arrmax; i++) {
any = cg.zeroany;
any.a_int = i + adj;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
arr[i], MENU_ITEMFLAGS_NONE);
}
for (i = 0; i < SIZE(conditions); i++) {
any = cg.zeroany;
any.a_ulong = conditions[i].mask;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
conditions[i].text[0], MENU_ITEMFLAGS_NONE);
}
#endif
any = cg.zeroany;
any.a_int = (i + 1);
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
initblstats[i].fldname, MENU_ITEMFLAGS_NONE);
}
any = cg.zeroany;
any.a_int = onlybeh = BL_TH_ALWAYS_HILITE;
Sprintf(buf, "Always highlight %s", initblstats[fld].fldname);
- add_menu(tmpwin, NO_GLYPH, &any, 'a', 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'a', 0, ATR_NONE,
buf, MENU_ITEMFLAGS_NONE);
nopts++;
}
if (fld == BL_CONDITION) {
any = cg.zeroany;
any.a_int = onlybeh = BL_TH_CONDITION;
- add_menu(tmpwin, NO_GLYPH, &any, 'b', 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'b', 0, ATR_NONE,
"Bitmask of conditions", MENU_ITEMFLAGS_NONE);
nopts++;
}
any = cg.zeroany;
any.a_int = onlybeh = BL_TH_UPDOWN;
Sprintf(buf, "%s value changes", initblstats[fld].fldname);
- add_menu(tmpwin, NO_GLYPH, &any, 'c', 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'c', 0, ATR_NONE,
buf, MENU_ITEMFLAGS_NONE);
nopts++;
}
&& (at == ANY_INT || at == ANY_LONG)) {
any = cg.zeroany;
any.a_int = onlybeh = BL_TH_VAL_ABSOLUTE;
- add_menu(tmpwin, NO_GLYPH, &any, 'n', 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'n', 0, ATR_NONE,
"Number threshold", MENU_ITEMFLAGS_NONE);
nopts++;
}
if (initblstats[fld].idxmax >= 0) {
any = cg.zeroany;
any.a_int = onlybeh = BL_TH_VAL_PERCENTAGE;
- add_menu(tmpwin, NO_GLYPH, &any, 'p', 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'p', 0, ATR_NONE,
"Percentage threshold", MENU_ITEMFLAGS_NONE);
nopts++;
}
any = cg.zeroany;
any.a_int = onlybeh = BL_TH_TEXTMATCH;
Sprintf(buf, "%s text match", initblstats[fld].fldname);
- add_menu(tmpwin, NO_GLYPH, &any, 't', 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 't', 0, ATR_NONE,
buf, MENU_ITEMFLAGS_NONE);
nopts++;
}
Sprintf(buf, "Value goes down");
any = cg.zeroany;
any.a_int = 10 + LT_VALUE;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
buf, MENU_ITEMFLAGS_NONE);
if (str) {
str, (fld == BL_AC) ? "better (lower)" : "less");
any = cg.zeroany;
any.a_int = 10 + LE_VALUE;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
buf, MENU_ITEMFLAGS_NONE);
}
}
Sprintf(buf, "Value changes");
any = cg.zeroany;
any.a_int = 10 + EQ_VALUE;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
buf, MENU_ITEMFLAGS_NONE);
if (gtok) {
str, (fld == BL_AC) ? "worse (higher)" : "more");
any = cg.zeroany;
any.a_int = 10 + GE_VALUE;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
buf, MENU_ITEMFLAGS_NONE);
}
Sprintf(buf, "Value goes up");
any = cg.zeroany;
any.a_int = 10 + GT_VALUE;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
buf, MENU_ITEMFLAGS_NONE);
}
Sprintf(buf, "Select field %s value:", initblstats[fld].fldname);
if (hlstr->fld == fld) {
any = cg.zeroany;
any.a_int = hlstr->id;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
hlstr->str, MENU_ITEMFLAGS_NONE);
}
hlstr = hlstr->next;
} else {
any = cg.zeroany;
Sprintf(buf, "No current hilites for %s", initblstats[fld].fldname);
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, buf,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE, buf,
MENU_ITEMFLAGS_NONE);
}
/* separator line */
any = cg.zeroany;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, "",
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE, "",
MENU_ITEMFLAGS_NONE);
if (count) {
any = cg.zeroany;
any.a_int = -1;
- add_menu(tmpwin, NO_GLYPH, &any, 'X', 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'X', 0, ATR_NONE,
"Remove selected hilites",
MENU_ITEMFLAGS_NONE);
}
{
any = cg.zeroany;
any.a_int = -2;
- add_menu(tmpwin, NO_GLYPH, &any, 'Z', 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'Z', 0, ATR_NONE,
"Add a new hilite", MENU_ITEMFLAGS_NONE);
}
if (countall) {
any = cg.zeroany;
any.a_int = -1;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"View all hilites in config format",
MENU_ITEMFLAGS_NONE);
any = cg.zeroany;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, "",
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE, "",
MENU_ITEMFLAGS_NONE);
}
Sprintf(buf, "%-18s", initblstats[i].fldname);
if (count)
Sprintf(eos(buf), " (%d defined)", count);
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
buf, MENU_ITEMFLAGS_NONE);
}
char qbuf[QBUFSZ];
anything any = cg.zeroany;
- add_menu(menuwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(menuwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"[A] Command autocompletes", MENU_ITEMFLAGS_NONE);
Sprintf(qbuf, "[m] Command accepts '%c' prefix",
g.Cmd.spkeys[NHKF_REQMENU]);
- add_menu(menuwin, NO_GLYPH, &any, 0, 0, ATR_NONE, qbuf,
+ add_menu(menuwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE, qbuf,
MENU_ITEMFLAGS_NONE);
return (char *) 0;
} else {
redisplay = FALSE;
any = cg.zeroany;
start_menu(menuwin, MENU_BEHAVE_STANDARD);
- add_menu(menuwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(menuwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"Extended Commands List",
MENU_ITEMFLAGS_NONE);
- add_menu(menuwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(menuwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"", MENU_ITEMFLAGS_NONE);
Sprintf(buf, "Switch to %s commands that don't autocomplete",
menumode ? "including" : "excluding");
any.a_int = 1;
- add_menu(menuwin, NO_GLYPH, &any, 'a', 0, ATR_NONE, buf,
+ add_menu(menuwin, &nul_glyphinfo, &any, 'a', 0, ATR_NONE, buf,
MENU_ITEMFLAGS_NONE);
if (!*searchbuf) {
actual list of extended commands shown via separator lines;
having ':' as an explicit selector overrides the default
menu behavior for it; we retain 's' as a group accelerator */
- add_menu(menuwin, NO_GLYPH, &any, ':', 's', ATR_NONE,
+ add_menu(menuwin, &nul_glyphinfo, &any, ':', 's', ATR_NONE,
"Search extended commands",
MENU_ITEMFLAGS_NONE);
} else {
also want to hide it from general menu use) because it won't
work for interfaces which support ':' to search; use as a
general menu command takes precedence over group accelerator */
- add_menu(menuwin, NO_GLYPH, &any, 's', ':', ATR_NONE,
+ add_menu(menuwin, &nul_glyphinfo, &any, 's', ':', ATR_NONE,
buf, MENU_ITEMFLAGS_NONE);
}
if (wizard) {
any.a_int = 4;
- add_menu(menuwin, NO_GLYPH, &any, 'z', 0, ATR_NONE,
+ add_menu(menuwin, &nul_glyphinfo, &any, 'z', 0, ATR_NONE,
onelist ? "Switch to showing debugging commands in separate section"
: "Switch to showing all alphabetically, including debugging commands",
MENU_ITEMFLAGS_NONE);
}
any = cg.zeroany;
- add_menu(menuwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(menuwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"", MENU_ITEMFLAGS_NONE);
menushown[0] = menushown[1] = 0;
n = 0;
results menu. */
if (!menushown[pass]) {
Strcpy(buf, headings[pass]);
- add_menu(menuwin, NO_GLYPH, &any, 0, 0,
+ add_menu(menuwin, &nul_glyphinfo, &any, 0, 0,
iflags.menu_headings, buf,
MENU_ITEMFLAGS_NONE);
menushown[pass] = 1;
2nd field will be " " or " [A]" or " [m]" or "[mA]" */
Sprintf(buf, " %-14s %4s %s", efp->ef_txt,
doc_extcmd_flagstr(menuwin, efp), efp->ef_desc);
- add_menu(menuwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(menuwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
buf, MENU_ITEMFLAGS_NONE);
++n;
}
if (n)
- add_menu(menuwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(menuwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"", MENU_ITEMFLAGS_NONE);
}
if (*searchbuf && !n)
- add_menu(menuwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(menuwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"no matches", MENU_ITEMFLAGS_NONE);
else
(void) doc_extcmd_flagstr(menuwin, (struct ext_func_tab *) 0);
/* flush extended cmds for that letter already in buf */
Sprintf(buf, fmtstr, prompt);
any.a_char = prevaccelerator;
- add_menu(win, NO_GLYPH, &any, any.a_char, 0, ATR_NONE,
- buf, MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, any.a_char,
+ 0, ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
acount = 0;
if (!(accelerator != prevaccelerator || one_per_line))
wastoolong = TRUE;
/* flush buf */
Sprintf(buf, fmtstr, prompt);
any.a_char = prevaccelerator;
- add_menu(win, NO_GLYPH, &any, any.a_char, 0, ATR_NONE, buf,
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, any.a_char, 0,
+ ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
}
Sprintf(prompt, "Extended Command: %s", cbuf);
end_menu(win, prompt);
ordering, not their numerical PROP values), can only be
set to timed values here so show a separator */
any.a_int = 0;
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "--",
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, "--", MENU_ITEMFLAGS_NONE);
}
any.a_int = i + 1; /* +1: avoid 0 */
oldtimeout = u.uprops[p].intrinsic & TIMEOUT;
Sprintf(buf, "%-27s [%li]", propname, oldtimeout);
else
Sprintf(buf, "%s", propname);
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, buf,
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, ATR_NONE, buf,
MENU_ITEMFLAGS_NONE);
}
end_menu(win, "Which intrinsics?");
start_menu(men, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
any.a_int = 1;
- add_menu(men, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(men, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"known map without monsters, objects, and traps",
MENU_ITEMFLAGS_SELECTED);
any.a_int = 2;
- add_menu(men, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(men, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"known map without monsters and objects",
MENU_ITEMFLAGS_NONE);
any.a_int = 3;
- add_menu(men, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(men, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"known map without monsters",
MENU_ITEMFLAGS_NONE);
if (discover || wizard) {
any.a_int = 4;
- add_menu(men, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(men, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"full map without monsters, objects, and traps",
MENU_ITEMFLAGS_NONE);
if (wizard) {
any.a_int = 5;
- add_menu(men, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(men, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"internal levl[][].typ codes in base-36",
MENU_ITEMFLAGS_NONE);
any.a_int = 6;
- add_menu(men, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(men, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"legend of base-36 levl[][].typ codes",
MENU_ITEMFLAGS_NONE);
}
if ((ch = cmd_from_func(func)) != '\0') {
any = cg.zeroany;
any.a_nfunc = func;
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, text,
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, ATR_NONE, text,
MENU_ITEMFLAGS_NONE);
}
}
DUMMY, /* zeroany */
};
+/* glyph, color, ttychar, symidx, glyphflags */
+const glyph_info nul_glyphinfo =
+ { NO_GLYPH, NO_COLOR, ' ', 0, MG_UNEXPL };
+
#define ZERO(x) memset(&x, 0, sizeof(x))
void
lastnonblank = -1; /* buf[] index rather than map's x */
for (x = 1; x < COLNO; x++) {
int ch;
- unsigned glyphmod[NUM_GLYPHMOD];
+ glyph_info glyphinfo;
glyph = reveal_terrain_getglyph(x, y, FALSE, u.uswallow,
default_glyph, subset);
- map_glyphmod(x, y, glyph, 0, glyphmod);
- ch = (int) glyphmod[GM_TTYCHAR];
+ map_glyphinfo(x, y, glyph, 0, &glyphinfo);
+ ch = glyphinfo.ttychar;
buf[x - 1] = ch;
if (ch != ' ') {
blankrow = FALSE;
static int FDECL(check_pos, (int, int, int));
static int FDECL(get_bk_glyph, (XCHAR_P, XCHAR_P));
static int FDECL(tether_glyph, (int, int));
-#ifdef UNBUFFERED_GLYPHMOD
-static unsigned *FDECL(glyphmod_at, (XCHAR_P, XCHAR_P, int));
+#ifdef UNBUFFERED_GLYPHINFO
+static glyph_info *FDECL(glyphinfo_at, (XCHAR_P, XCHAR_P, int));
#endif
/*#define WA_VERBOSE*/ /* give (x,y) locations for all "bad" spots */
}
}
-static unsigned no_gm[NUM_GLYPHMOD] = {
- MG_BADXY, (unsigned) ' ', (unsigned) NO_COLOR
+static glyph_info no_ginfo = {
+ NO_GLYPH, 0, NO_COLOR, ' ', MG_BADXY
};
-#ifndef UNBUFFERED_GLYPHMOD
-#define Glyphmod_at(x, y, glyph) \
- (((x) < 0 || (y) < 0 || (x) >= COLNO || (y) >= ROWNO) ? &no_gm[0] \
- : &g.gbuf[(y)][(x)].glyphmod[0])
+#ifndef UNBUFFERED_GLYPHINFO
+#define Glyphinfo_at(x, y, glyph) \
+ (((x) < 0 || (y) < 0 || (x) >= COLNO || (y) >= ROWNO) ? &no_ginfo \
+ : &g.gbuf[(y)][(x)].glyphinfo)
#else
-static unsigned gm[NUM_GLYPHMOD];
-#define Glyphmod_at(x, y, glyph) glyphmod_at(x, y, glyph)
+static glyph_info ginfo;
+#define Glyphinfo_at(x, y, glyph) glyphinfo_at(x, y, glyph)
#endif
/*
redraw_map()
{
int x, y, glyph;
+ glyph_info bkglyphinfo = nul_glyphinfo;
/*
* Not sure whether this is actually necessary; save and restore did
for (y = 0; y < ROWNO; ++y)
for (x = 1; x < COLNO; ++x) {
glyph = glyph_at(x, y); /* not levl[x][y].glyph */
- print_glyph(WIN_MAP, x, y, glyph, get_bk_glyph(x, y),
- Glyphmod_at(x, y, glyph));
+ bkglyphinfo.glyph = get_bk_glyph(x, y);
+ print_glyph(WIN_MAP, x, y,
+ Glyphinfo_at(x, y, glyph), &bkglyphinfo);
}
flush_screen(1);
}
show_glyph(x, y, glyph)
int x, y, glyph;
{
-#ifndef UNBUFFERED_GLYPHMOD
- unsigned glyphmod[NUM_GLYPHMOD];
+#ifndef UNBUFFERED_GLYPHINFO
+ glyph_info glyphinfo;
#endif
/*
MAX_GLYPH, x, y);
return;
}
-#ifndef UNBUFFERED_GLYPHMOD
- /* without UNBUFFERED_GLYPHMOD defined the glyphmod values are buffered
+#ifndef UNBUFFERED_GLYPHINFO
+ /* without UNBUFFERED_GLYPHINFO defined the glyphinfo values are buffered
alongside the glyphs themselves for better performance, increased
buffer size */
- map_glyphmod(x, y, glyph, 0, glyphmod);
+ map_glyphinfo(x, y, glyph, 0, &glyphinfo);
#endif
if (g.gbuf[y][x].glyph != glyph
-#ifndef UNBUFFERED_GLYPHMOD
+#ifndef UNBUFFERED_GLYPHINFO
/* I don't think we have to test for changes in TTYCHAR or COLOR
because they typically only change if the glyph changed */
- || g.gbuf[y][x].glyphmod[GM_FLAGS] != glyphmod[GM_FLAGS]
+ || g.gbuf[y][x].glyphinfo.glyphflags != glyphinfo.glyphflags
#endif
|| iflags.use_background_glyph ) {
g.gbuf[y][x].glyph = glyph;
g.gbuf[y][x].gnew = 1;
-#ifndef UNBUFFERED_GLYPHMOD
- g.gbuf[y][x].glyphmod[GM_FLAGS] = glyphmod[GM_FLAGS];
- g.gbuf[y][x].glyphmod[GM_TTYCHAR] = glyphmod[GM_TTYCHAR];
- g.gbuf[y][x].glyphmod[GM_COLOR] = glyphmod[GM_COLOR];
+#ifndef UNBUFFERED_GLYPHINFO
+ g.gbuf[y][x].glyphinfo.glyph = glyphinfo.glyph;
+ g.gbuf[y][x].glyphinfo.glyphflags = glyphinfo.glyphflags;
+ g.gbuf[y][x].glyphinfo.ttychar = glyphinfo.ttychar;
+ g.gbuf[y][x].glyphinfo.color = glyphinfo.color;
#endif
if (g.gbuf_start[y] > x)
g.gbuf_start[y] = x;
static gbuf_entry nul_gbuf = {
0, /* gnew */
GLYPH_UNEXPLORED, /* glyph */
-#ifndef UNBUFFERED_GLYPHMOD
+#ifndef UNBUFFERED_GLYPHINFO
{(unsigned) ' ', (unsigned) NO_COLOR, MG_UNEXPL},
#endif
};
{
register int x, y;
gbuf_entry *gptr = &g.gbuf[0][0];
- unsigned *gmptr =
-#ifndef UNBUFFERED_GLYPHMOD
- &gptr->glyphmod[0];
+ glyph_info *giptr =
+#ifndef UNBUFFERED_GLYPHINFO
+ &gptr->glyphinfo;
#else
- &gm[0];
+ &ginfo;
- map_glyphmod(0, 0, GLYPH_UNEXPLORED, 0, gmptr);
+ map_glyphinfo(0, 0, GLYPH_UNEXPLORED, 0, giptr);
#endif
-#ifndef UNBUFFERED_GLYPHMOD
- nul_gbuf.gnew = (gmptr[GM_TTYCHAR] != nul_gbuf.glyphmod[GM_TTYCHAR]
- || gmptr[GM_COLOR] != nul_gbuf.glyphmod[GM_COLOR]
- || gmptr[GM_FLAGS] != nul_gbuf.glyphmod[GM_FLAGS])
+#ifndef UNBUFFERED_GLYPHINFO
+ nul_gbuf.gnew = (giptr->ttychar != nul_gbuf.glyphinfo.ttychar
+ || giptr->color != nul_gbuf.glyphinfo.color
+ || giptr->glyphflags != nul_gbuf.glyphinfo.glyphflags)
#else
- nul_gbuf.gnew = (gmptr[GM_TTYCHAR] != ' '
- || gmptr[GM_COLOR] != NO_COLOR
- || (gmptr[GM_FLAGS] & ~MG_UNEXPL) != 0)
+ nul_gbuf.gnew = (giptr->ttychar != ' '
+ || giptr->color != NO_COLOR
+ || (giptr->glyphflags & ~MG_UNEXPL) != 0)
#endif
? 1 : 0;
for (y = 0; y < ROWNO; y++) {
register int x, glyph;
register boolean force;
gbuf_entry *gptr = &g.gbuf[0][0];
- unsigned *gmptr =
-#ifndef UNBUFFERED_GLYPHMOD
- &gptr->glyphmod[0];
+ glyph_info bkglyphinfo = nul_glyphinfo;
+ glyph_info *giptr =
+#ifndef UNBUFFERED_GLYPHINFO
+ &gptr->glyphinfo;
#else
- &gm[0];
+ &ginfo;
- map_glyphmod(0, 0, GLYPH_UNEXPLORED, 0, gmptr);
+ map_glyphinfo(0, 0, GLYPH_UNEXPLORED, 0U, giptr);
#endif
-#ifndef UNBUFFERED_GLYPHMOD
- force = (gmptr[GM_TTYCHAR] != nul_gbuf.glyphmod[GM_TTYCHAR]
- || gmptr[GM_COLOR] != nul_gbuf.glyphmod[GM_COLOR]
- || gmptr[GM_FLAGS] != nul_gbuf.glyphmod[GM_FLAGS])
+#ifndef UNBUFFERED_GLYPHINFO
+ force = (giptr->ttychar != nul_gbuf.glyphinfo.ttychar
+ || giptr->color != nul_gbuf.glyphinfo.color
+ || giptr->glyphflags != nul_gbuf.glyphinfo.glyphflags)
#else
- force = (gmptr[GM_TTYCHAR] != ' '
- || gmptr[GM_COLOR] != NO_COLOR
- || (gmptr[GM_FLAGS] & ~MG_UNEXPL) != 0)
+ force = (giptr->ttychar != ' '
+ || giptr->color != NO_COLOR
+ || (giptr->glyphflags & ~MG_UNEXPL) != 0)
#endif
? 1 : 0;
for (x = start; x <= stop; x++) {
gptr = &g.gbuf[y][x];
glyph = gptr->glyph;
- if (force || glyph != GLYPH_UNEXPLORED)
- print_glyph(WIN_MAP, x, y, glyph,
- get_bk_glyph(x, y), Glyphmod_at(x, y, glyph));
+ if (force || glyph != GLYPH_UNEXPLORED) {
+ bkglyphinfo.glyph = get_bk_glyph(x, y);
+ print_glyph(WIN_MAP, x, y,
+ Glyphinfo_at(x, y, glyph), &bkglyphinfo);
+ }
}
}
static int flushing = 0;
static int delay_flushing = 0;
register int x, y;
+ glyph_info bkglyphinfo = nul_glyphinfo;
/* 3.7: don't update map, status, or perm_invent during save/restore */
if (g.program_state.saving || g.program_state.restoring)
for (; x <= g.gbuf_stop[y]; gptr++, x++)
if (gptr->gnew) {
- print_glyph(WIN_MAP, x, y, gptr->glyph,
- get_bk_glyph(x, y), Glyphmod_at(x, y, gptr->glyph));
+ bkglyphinfo.glyph = get_bk_glyph(x, y);
+ print_glyph(WIN_MAP, x, y,
+ Glyphinfo_at(x, y, gptr->glyph), &bkglyphinfo);
gptr->gnew = 0;
}
}
return g.gbuf[y][x].glyph;
}
-#ifdef UNBUFFERED_GLYPHMOD
-unsigned *
-glyphmod_at(x, y, glyph)
+#ifdef UNBUFFERED_GLYPHINFO
+glyph_info *
+glyphinfo_at(x, y, glyph)
xchar x, y;
int glyph;
{
- map_glyphmod(x, y, glyph, 0, gm);
- return &gm[0];
+ map_glyphinfo(x, y, glyph, 0, &ginfo);
+ return &ginfo;
}
#endif
#define GMAP_ALTARCOLOR 0x00000004
void
-map_glyphmod(x, y, glyph, mgflags, glyphmod)
+map_glyphinfo(x, y, glyph, mgflags, glyphinfo)
xchar x, y;
int glyph;
-unsigned mgflags, *glyphmod;
+unsigned mgflags;
+glyph_info *glyphinfo;
{
register int offset, idx;
int color = NO_COLOR;
do_mon_checks = FALSE;
if (x < 0 || y < 0 || x >= COLNO || y >= ROWNO) {
- glyphmod[GM_FLAGS] = MG_BADXY;
- glyphmod[GM_COLOR] = NO_COLOR;
- glyphmod[GM_TTYCHAR] = ' ';
+ glyphinfo->glyph = NO_GLYPH;
+ glyphinfo->glyphflags = MG_BADXY;
+ glyphinfo->color = NO_COLOR;
+ glyphinfo->ttychar = ' ';
return;
}
}
}
- glyphmod[GM_TTYCHAR] = ((mgflags & MG_FLAG_RETURNIDX) != 0) ? idx
- : g.showsyms[idx];
-
+ glyphinfo->symidx = idx;
+ glyphinfo->ttychar = g.showsyms[idx];
#ifdef TEXTCOLOR
/* Turn off color if no color defined, or rogue level w/o PC graphics. */
if (!has_color(color)
|| ((g.glyphmap_perlevel_flags & GMAP_ROGUELEVEL) && !has_rogue_color))
#endif
color = NO_COLOR;
- glyphmod[GM_COLOR] = color;
- glyphmod[GM_FLAGS] = special;
+ glyphinfo->color = color;
+ glyphinfo->glyphflags = special;
+ glyphinfo->glyph = glyph;
}
/* ------------------------------------------------------------------------ */
/* Reset the screen. */
vision_reset(); /* reset the blockages */
- g.glyphmap_perlevel_flags = 0L; /* force per-level map_glyphmod() changes */
+ g.glyphmap_perlevel_flags = 0L; /* force per-level map_glyphinfo() changes */
docrt(); /* does a full vision recalc */
flush_screen(-1);
iflags.getpos_coords);
Sprintf(fullbuf, "%s%s%s", firstmatch,
(*tmpbuf ? " " : ""), tmpbuf);
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, fullbuf,
- MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, fullbuf, MENU_ITEMFLAGS_NONE);
}
}
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,
- "a monster", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, abc ? 0 : any.a_char, 'C',
+ ATR_NONE, "a monster", MENU_ITEMFLAGS_NONE);
if (g.invent) {
/* we use y and n as accelerators so that we can accept user's
response keyed to old "name an individual object?" prompt */
any.a_char = 'i'; /* group accelerator 'y' */
- add_menu(win, NO_GLYPH, &any, abc ? 0 : any.a_char, 'y', ATR_NONE,
- "a particular object in inventory", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, abc ? 0 : any.a_char, 'y',
+ ATR_NONE, "a particular object in inventory",
+ MENU_ITEMFLAGS_NONE);
any.a_char = 'o'; /* group accelerator 'n' */
- add_menu(win, NO_GLYPH, &any, abc ? 0 : any.a_char, 'n', ATR_NONE,
- "the type of an object in inventory", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, abc ? 0 : any.a_char, 'n',
+ ATR_NONE, "the type of an object in inventory",
+ MENU_ITEMFLAGS_NONE);
}
any.a_char = 'f'; /* group accelerator ',' (or ':' instead?) */
- add_menu(win, NO_GLYPH, &any, abc ? 0 : any.a_char, ',', ATR_NONE,
- "the type of an object upon the floor", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, abc ? 0 : any.a_char, ',',
+ ATR_NONE, "the type of an object upon the floor",
+ MENU_ITEMFLAGS_NONE);
any.a_char = 'd'; /* group accelerator '\' */
- add_menu(win, NO_GLYPH, &any, abc ? 0 : any.a_char, '\\', ATR_NONE,
- "the type of an object on discoveries list", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, abc ? 0 : any.a_char, '\\',
+ ATR_NONE, "the type of an object on discoveries list",
+ MENU_ITEMFLAGS_NONE);
any.a_char = 'a'; /* group accelerator 'l' */
- add_menu(win, NO_GLYPH, &any, abc ? 0 : any.a_char, 'l', ATR_NONE,
- "record an annotation for the current level", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, abc ? 0 : any.a_char, 'l',
+ ATR_NONE, "record an annotation for the current level",
+ MENU_ITEMFLAGS_NONE);
end_menu(win, "What do you want to name?");
if (select_menu(win, PICK_ONE, &pick_list) > 0) {
ch = pick_list[0].item.a_char;
{ '.', "floor of a room", C(CLR_GRAY) }, /* room */
/*20*/ { '.', "dark part of a room", C(CLR_BLACK) }, /* dark room */
{ '#', "corridor", C(CLR_GRAY) }, /* dark corr */
- { '#', "lit corridor", C(CLR_GRAY) }, /* lit corr, see map_glyphmod() */
+ { '#', "lit corridor", C(CLR_GRAY) }, /* lit corr, see map_glyphinfo() */
{ '<', "staircase up", C(CLR_GRAY) }, /* upstair */
{ '>', "staircase down", C(CLR_GRAY) }, /* dnstair */
{ '<', "ladder up", C(CLR_BROWN) }, /* upladder */
{ '^', "anti-magic field", C(HI_ZAP) }, /* trap */
{ '^', "polymorph trap", C(CLR_BRIGHT_GREEN) }, /* trap */
{ '~', "vibrating square", C(CLR_MAGENTA) }, /* "trap" */
- /* zap colors are changed by map_glyphmod() to match type of beam */
+ /* zap colors are changed by map_glyphinfo() to match type of beam */
{ '|', "", C(CLR_GRAY) }, /* vbeam */
{ '-', "", C(CLR_GRAY) }, /* hbeam */
{ '\\', "", C(CLR_GRAY) }, /* lslant */
{ '*', "", C(HI_ZAP) },
{ '#', "poison cloud", C(CLR_BRIGHT_GREEN) }, /* part of a cloud */
{ '?', "valid position", C(CLR_BRIGHT_GREEN) }, /* target position */
- /* swallow colors are changed by map_glyphmod() to match engulfing monst */
+ /* swallow colors are changed by map_glyphinfo() to match engulfing monst */
{ '/', "", C(CLR_GREEN) }, /* swallow top left */
{ '-', "", C(CLR_GREEN) }, /* swallow top center */
{ '\\', "", C(CLR_GREEN) }, /* swallow top right */
{ '\\', "", C(CLR_GREEN) }, /* swallow bottom left */
{ '-', "", C(CLR_GREEN) }, /* swallow bottom center */
{ '/', "", C(CLR_GREEN) }, /* swallow bottom right */
- /* explosion colors are changed by map_glyphmod() to match type of expl. */
+ /* explosion colors are changed by map_glyphinfo() to match type of expl. */
{ '/', "", C(CLR_ORANGE) }, /* explosion top left */
{ '-', "", C(CLR_ORANGE) }, /* explosion top center */
{ '\\', "", C(CLR_ORANGE) }, /* explosion top right */
} else {
any.a_int = lchoices->idx + 1;
}
- add_menu(win, NO_GLYPH, &any, lchoices->menuletter, 0, ATR_NONE, entry,
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, lchoices->menuletter, 0,
+ ATR_NONE, entry, MENU_ITEMFLAGS_NONE);
/* this assumes there are at most 52 interesting levels */
if (lchoices->menuletter == 'z')
lchoices->menuletter = 'A';
}
if (bymenu) {
any = cg.zeroany;
- add_menu(win, NO_GLYPH, &any, 0, 0, iflags.menu_headings, buf,
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ iflags.menu_headings, buf, MENU_ITEMFLAGS_NONE);
} else
putstr(win, 0, buf);
anything any;
any = cg.zeroany;
- add_menu(g.en_win, NO_GLYPH, &any, 0, 0, ATR_NONE, buf,
+ add_menu(g.en_win, &nul_glyphinfo, &any, 0, 0, ATR_NONE, buf,
MENU_ITEMFLAGS_NONE);
} else
putstr(g.en_win, 0, buf);
if (i == VANQ_ALPHA_MIX || i == VANQ_MCLS_HTOL) /* skip these */
continue;
any.a_int = i + 1;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, vanqorders[i],
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
+ vanqorders[i],
(i == g.vanq_sortmode)
? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
}
Sprintf(eos(prompt),
" -- unidentified or partially identified item%s",
plur(unid_cnt));
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, prompt, MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, ATR_NONE, prompt,
+ MENU_ITEMFLAGS_NONE);
if (!unid_cnt) {
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"(all items are permanently identified already)",
MENU_ITEMFLAGS_NONE);
gotsomething = TRUE;
if (unid_cnt > 1)
Sprintf(eos(prompt), " (%s for all)",
visctrl(iflags.override_ID));
- add_menu(win, NO_GLYPH, &any, '_', iflags.override_ID, ATR_NONE,
- prompt, MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, '_', iflags.override_ID,
+ ATR_NONE, prompt, MENU_ITEMFLAGS_NONE);
gotsomething = TRUE;
}
} else if (xtra_choice) {
/* wizard override ID and xtra_choice are mutually exclusive */
if (flags.sortpack)
- add_menu(win, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
- "Miscellaneous", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ iflags.menu_headings,
+ "Miscellaneous", MENU_ITEMFLAGS_NONE);
any.a_char = HANDS_SYM; /* '-' */
- add_menu(win, NO_GLYPH, &any, HANDS_SYM, 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, HANDS_SYM, 0, ATR_NONE,
xtra_choice, MENU_ITEMFLAGS_NONE);
gotsomething = TRUE;
}
nextclass:
classcount = 0;
for (srtinv = sortedinvent; (otmp = srtinv->obj) != 0; ++srtinv) {
+ int tmpglyph;
+ glyph_info tmpglyphinfo = nul_glyphinfo;
+
if (lets && !index(lets, otmp->invlet))
continue;
if (!flags.sortpack || otmp->oclass == *invlet) {
any = cg.zeroany; /* all bits zero */
ilet = otmp->invlet;
if (flags.sortpack && !classcount) {
- add_menu(win, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ iflags.menu_headings,
let_to_name(*invlet, FALSE,
(want_reply && iflags.menu_head_objsym)),
MENU_ITEMFLAGS_NONE);
any.a_obj = otmp;
else
any.a_char = ilet;
- add_menu(win, obj_to_glyph(otmp, rn2_on_display_rng), &any, ilet,
+ tmpglyph = obj_to_glyph(otmp, rn2_on_display_rng);
+ map_glyphinfo(0, 0, tmpglyph, 0U, &tmpglyphinfo);
+ add_menu(win, &tmpglyphinfo, &any, ilet,
wizid ? def_oc_syms[(int) otmp->oclass].sym : 0,
ATR_NONE, doname(otmp), MENU_ITEMFLAGS_NONE);
gotsomething = TRUE;
}
if (iflags.force_invmenu && lets && want_reply) {
any = cg.zeroany;
- add_menu(win, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
- "Special", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ iflags.menu_headings, "Special", MENU_ITEMFLAGS_NONE);
any.a_char = '*';
- add_menu(win, NO_GLYPH, &any, '*', 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, '*', 0, ATR_NONE,
"(list everything)", MENU_ITEMFLAGS_NONE);
gotsomething = TRUE;
}
into the menu */
if (iflags.perm_invent && !lets && !gotsomething) {
any = cg.zeroany;
- add_menu(win, NO_GLYPH, &any, 0, 0, 0,
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, 0,
not_carrying_anything, MENU_ITEMFLAGS_NONE);
want_reply = FALSE;
}
struct obj *otmp;
char ilet, ret = 0;
char *invlet = flags.inv_order;
- int n, classcount, invdone = 0;
+ int n, classcount, invdone = 0, tmpglyph;
+ glyph_info tmpglyphinfo = nul_glyphinfo;
winid win;
anything any;
menu_item *selected;
if (!flags.sortpack || otmp->oclass == *invlet) {
if (flags.sortpack && !classcount) {
any = cg.zeroany; /* zero */
- add_menu(win, NO_GLYPH, &any, 0, 0,
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
iflags.menu_headings,
let_to_name(*invlet, FALSE, FALSE),
MENU_ITEMFLAGS_NONE);
classcount++;
}
any.a_char = ilet;
- add_menu(win, obj_to_glyph(otmp, rn2_on_display_rng),
- &any, ilet, 0, ATR_NONE,
- doname(otmp), MENU_ITEMFLAGS_NONE);
+ tmpglyph = obj_to_glyph(otmp, rn2_on_display_rng);
+ map_glyphinfo(0, 0, tmpglyph, 0U, &tmpglyphinfo);
+ add_menu(win, &tmpglyphinfo, &any, ilet, 0,
+ ATR_NONE, doname(otmp), MENU_ITEMFLAGS_NONE);
}
}
if (flags.sortpack && *++invlet)
any = cg.zeroany;
win = create_nhwindow(NHW_MENU);
start_menu(win, MENU_BEHAVE_STANDARD);
- add_menu(win, NO_GLYPH, &any, 0, 0, iflags.menu_headings, hdr,
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, iflags.menu_headings,
+ hdr, MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
+ "", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, ATR_NONE, txt,
MENU_ITEMFLAGS_NONE);
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, txt, MENU_ITEMFLAGS_NONE);
end_menu(win, (char *) 0);
if (select_menu(win, PICK_NONE, &selected) > 0)
free((genericptr_t) selected);
any = cg.zeroany;
if (*key)
any.a_char = key[0];
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, str,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE, str,
(*defval && *key && defval[0] == key[0])
? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
any = cg.zeroany; /* zero out all bits */
for (i = 0; disco_orders_descr[i]; ++i) {
any.a_int = disco_order_let[i];
- add_menu(tmpwin, NO_GLYPH, &any, (char) any.a_int, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, (char) any.a_int,
+ 0, ATR_NONE,
disco_orders_descr[i],
(disco_order_let[i] == flags.discosort)
? MENU_ITEMFLAGS_SELECTED
(only showing one class so can't span all classes) but the
chosen sort will stick and also apply to '\' usage */
any = cg.zeroany;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"", MENU_ITEMFLAGS_NONE);
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"Note: full alphabetical and alphabetical within class",
MENU_ITEMFLAGS_NONE);
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
" are equivalent for single class discovery, but",
MENU_ITEMFLAGS_NONE);
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
" will matter for future use of total discoveries.",
MENU_ITEMFLAGS_NONE);
}
Strcat(discosyms, "u");
if (!traditional) {
any.a_int = 'u';
- add_menu(tmpwin, NO_GLYPH, &any, menulet++, 0, ATR_NONE,
- unique_items, MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, menulet++,
+ 0, ATR_NONE, unique_items, MENU_ITEMFLAGS_NONE);
}
break;
}
Strcat(discosyms, "a");
if (!traditional) {
any.a_int = 'a';
- add_menu(tmpwin, NO_GLYPH, &any, menulet++, 0, ATR_NONE,
- artifact_items, MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, menulet++,
+ 0, ATR_NONE, artifact_items, MENU_ITEMFLAGS_NONE);
}
}
Sprintf(eos(discosyms), "%c", c);
if (!traditional) {
any.a_int = c;
- add_menu(tmpwin, NO_GLYPH, &any, menulet++, c,
- ATR_NONE, oclass_to_name(oclass, buf),
+ add_menu(tmpwin, &nul_glyphinfo, &any,
+ menulet++, c, ATR_NONE,
+ oclass_to_name(oclass, buf),
MENU_ITEMFLAGS_NONE);
}
}
if (oclass != prev_class) {
any.a_int = 0;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ iflags.menu_headings,
let_to_name(oclass, FALSE, FALSE),
MENU_ITEMFLAGS_NONE);
prev_class = oclass;
}
any.a_int = dis;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE,
obj_typename(dis), MENU_ITEMFLAGS_NONE);
}
}
/* note: separate `style_name' variable used
to avoid an optimizer bug in VAX C V2.3 */
any.a_int = i + 1;
- add_menu(tmpwin, NO_GLYPH, &any, *style_name, 0, ATR_NONE,
- style_name, MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, *style_name, 0,
+ ATR_NONE, style_name, MENU_ITEMFLAGS_NONE);
}
end_menu(tmpwin, "Select menustyle:");
if (select_menu(tmpwin, PICK_ONE, &style_pick) > 0) {
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",
+ add_menu(tmpwin, &nul_glyphinfo, &any, 't', 0, ATR_NONE, "top",
MENU_ITEMFLAGS_NONE);
any.a_int = ALIGN_BOTTOM;
- add_menu(tmpwin, NO_GLYPH, &any, 'b', 0, ATR_NONE, "bottom",
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'b', 0, ATR_NONE, "bottom",
MENU_ITEMFLAGS_NONE);
any.a_int = ALIGN_LEFT;
- add_menu(tmpwin, NO_GLYPH, &any, 'l', 0, ATR_NONE, "left",
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'l', 0, ATR_NONE, "left",
MENU_ITEMFLAGS_NONE);
any.a_int = ALIGN_RIGHT;
- add_menu(tmpwin, NO_GLYPH, &any, 'r', 0, ATR_NONE, "right",
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'r', 0, ATR_NONE, "right",
MENU_ITEMFLAGS_NONE);
Sprintf(abuf, "Select %s window placement relative to the map:",
(optidx == opt_align_message) ? "message" : "status");
Sprintf(buf, "%-12s[%c%c]", disclosure_names[i],
flags.end_disclose[i], disclosure_options[i]);
any.a_int = i + 1;
- add_menu(tmpwin, NO_GLYPH, &any, disclosure_options[i], 0,
- ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, disclosure_options[i],
+ 0, ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
disc_cat[i] = 0;
}
end_menu(tmpwin, "Change which disclosure options categories:");
any = cg.zeroany;
/* 'y','n',and '+' work as alternate selectors; '-' doesn't */
any.a_char = DISCLOSE_NO_WITHOUT_PROMPT;
- add_menu(tmpwin, NO_GLYPH, &any, 0, any.a_char, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0,
+ any.a_char, ATR_NONE,
"Never disclose, without prompting",
(c == any.a_char) ? MENU_ITEMFLAGS_SELECTED
: MENU_ITEMFLAGS_NONE);
any.a_char = DISCLOSE_YES_WITHOUT_PROMPT;
- add_menu(tmpwin, NO_GLYPH, &any, 0, any.a_char, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0,
+ any.a_char, ATR_NONE,
"Always disclose, without prompting",
(c == any.a_char) ? MENU_ITEMFLAGS_SELECTED
: MENU_ITEMFLAGS_NONE);
if (*disclosure_names[i] == 'v') {
any.a_char = DISCLOSE_SPECIAL_WITHOUT_PROMPT; /* '#' */
- add_menu(tmpwin, NO_GLYPH, &any, 0, any.a_char, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0,
+ any.a_char, ATR_NONE,
"Always disclose, pick sort order from menu",
(c == any.a_char) ? MENU_ITEMFLAGS_SELECTED
: MENU_ITEMFLAGS_NONE);
}
any.a_char = DISCLOSE_PROMPT_DEFAULT_NO;
- add_menu(tmpwin, NO_GLYPH, &any, 0, any.a_char, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0,
+ any.a_char, ATR_NONE,
"Prompt, with default answer of \"No\"",
(c == any.a_char) ? MENU_ITEMFLAGS_SELECTED
: MENU_ITEMFLAGS_NONE);
any.a_char = DISCLOSE_PROMPT_DEFAULT_YES;
- add_menu(tmpwin, NO_GLYPH, &any, 0, any.a_char, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0,
+ any.a_char, ATR_NONE,
"Prompt, with default answer of \"Yes\"",
(c == any.a_char) ? MENU_ITEMFLAGS_SELECTED
: MENU_ITEMFLAGS_NONE);
if (*disclosure_names[i] == 'v') {
any.a_char = DISCLOSE_PROMPT_DEFAULT_SPECIAL; /* '?' */
- add_menu(tmpwin, NO_GLYPH, &any, 0, any.a_char, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0,
+ any.a_char, ATR_NONE,
"Prompt, with default answer of \"Ask\" to request sort menu",
(c == any.a_char) ? MENU_ITEMFLAGS_SELECTED
: MENU_ITEMFLAGS_NONE);
any = cg.zeroany;
if (!WINDOWPORT("curses")) {
any.a_char = 's';
- add_menu(tmpwin, NO_GLYPH, &any, 's', 0, ATR_NONE,
- "single", MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 's',
+ 0, ATR_NONE, "single", MENU_ITEMFLAGS_NONE);
any.a_char = 'c';
- add_menu(tmpwin, NO_GLYPH, &any, 'c', 0, ATR_NONE,
- "combination", MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'c',
+ 0, ATR_NONE, "combination", MENU_ITEMFLAGS_NONE);
}
any.a_char = 'f';
- add_menu(tmpwin, NO_GLYPH, &any, 'f', 0, ATR_NONE, "full",
- MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'f',
+ 0, ATR_NONE, "full", MENU_ITEMFLAGS_NONE);
any.a_char = 'r';
- add_menu(tmpwin, NO_GLYPH, &any, 'r', 0, ATR_NONE, "reversed",
- MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'r',
+ 0, ATR_NONE, "reversed", MENU_ITEMFLAGS_NONE);
end_menu(tmpwin, "Select message history display type:");
if (select_menu(tmpwin, PICK_ONE, &window_pick) > 0) {
iflags.prevmsg_window = window_pick->item.a_char;
any = cg.zeroany;
for (i = 0; i < SIZE(npchoices); i++) {
any.a_int = i + 1;
- add_menu(tmpwin, NO_GLYPH, &any, 'a' + i, 0, ATR_NONE,
- npchoices[i], MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'a' + i,
+ 0, ATR_NONE, npchoices[i], MENU_ITEMFLAGS_NONE);
}
end_menu(tmpwin, "Select number_pad mode:");
if (select_menu(tmpwin, PICK_ONE, &mode_pick) > 0) {
if (paranoia[i].flagmask == PARANOID_BONES && !wizard)
continue;
any.a_int = paranoia[i].flagmask;
- add_menu(tmpwin, NO_GLYPH, &any, *paranoia[i].argname, 0,
- ATR_NONE, paranoia[i].explain,
+ add_menu(tmpwin, &nul_glyphinfo, &any, *paranoia[i].argname,
+ 0, ATR_NONE, paranoia[i].explain,
(flags.paranoia_bits & paranoia[i].flagmask)
? MENU_ITEMFLAGS_SELECTED
: MENU_ITEMFLAGS_NONE);
for (i = 0; i < SIZE(burdentype); i++) {
burden_name = burdentype[i];
any.a_int = i + 1;
- add_menu(tmpwin, NO_GLYPH, &any, burden_letters[i], 0, ATR_NONE,
- burden_name, MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, burden_letters[i],
+ 0, ATR_NONE, burden_name, MENU_ITEMFLAGS_NONE);
}
end_menu(tmpwin, "Select encumbrance level:");
if (select_menu(tmpwin, PICK_ONE, &burden_pick) > 0) {
for (i = 0; i < SIZE(runmodes); i++) {
mode_name = runmodes[i];
any.a_int = i + 1;
- add_menu(tmpwin, NO_GLYPH, &any, *mode_name, 0, ATR_NONE,
- mode_name, MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, *mode_name,
+ 0, ATR_NONE, mode_name, MENU_ITEMFLAGS_NONE);
}
end_menu(tmpwin, "Select run/travel display mode:");
if (select_menu(tmpwin, PICK_ONE, &mode_pick) > 0) {
for (i = 0; i < SIZE(sortltype); i++) {
sortl_name = sortltype[i];
any.a_char = *sortl_name;
- add_menu(tmpwin, NO_GLYPH, &any, *sortl_name, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, *sortl_name,
+ 0, ATR_NONE,
sortl_name, (flags.sortloot == *sortl_name)
? MENU_ITEMFLAGS_SELECTED
: MENU_ITEMFLAGS_NONE);
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,
+ add_menu(tmpwin, &nul_glyphinfo, &any, GPCOORDS_COMPASS,
+ 0, ATR_NONE,
"compass ('east' or '3s' or '2n,4w')",
(gp == GPCOORDS_COMPASS)
? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
any.a_char = GPCOORDS_COMFULL;
- add_menu(tmpwin, NO_GLYPH, &any, GPCOORDS_COMFULL, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, GPCOORDS_COMFULL,
+ 0, ATR_NONE,
"full compass ('east' or '3south' or '2north,4west')",
(gp == GPCOORDS_COMFULL)
? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
any.a_char = GPCOORDS_MAP;
- add_menu(tmpwin, NO_GLYPH, &any, GPCOORDS_MAP, 0, ATR_NONE,
- "map <x,y>",
+ add_menu(tmpwin, &nul_glyphinfo, &any, GPCOORDS_MAP,
+ 0, ATR_NONE, "map <x,y>",
(gp == GPCOORDS_MAP)
? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
any.a_char = GPCOORDS_SCREEN;
- add_menu(tmpwin, NO_GLYPH, &any, GPCOORDS_SCREEN, 0, ATR_NONE,
- "screen [row,column]",
+ add_menu(tmpwin, &nul_glyphinfo, &any, GPCOORDS_SCREEN,
+ 0, ATR_NONE, "screen [row,column]",
(gp == GPCOORDS_SCREEN)
? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
any.a_char = GPCOORDS_NONE;
- add_menu(tmpwin, NO_GLYPH, &any, GPCOORDS_NONE, 0, ATR_NONE,
- "none (no coordinates displayed)",
+ add_menu(tmpwin, &nul_glyphinfo, &any, GPCOORDS_NONE,
+ 0, ATR_NONE, "none (no coordinates displayed)",
(gp == GPCOORDS_NONE)
? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
any.a_long = 0L;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
+ "", MENU_ITEMFLAGS_NONE);
Sprintf(buf, "map: upper-left: <%d,%d>, lower-right: <%d,%d>%s",
1, 0, COLNO - 1, ROWNO - 1,
flags.verbose ? "; column 0 unused, off left edge" : "");
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
if (strcmp(windowprocs.name, "tty")) /* only show for non-tty */
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"screen: row is offset to accommodate tty interface's use of top line",
MENU_ITEMFLAGS_NONE);
#if COLNO == 80
Sprintf(buf, "screen: upper-left: [%02d,%02d], lower-right: [%d,%d]%s",
0 + 2, 1, ROWNO - 1 + 2, COLNO - 1, COL80ARG);
#undef COL80ARG
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
+ buf, MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
+ "", MENU_ITEMFLAGS_NONE);
end_menu(tmpwin,
"Select coordinate display when auto-describing a map position:");
if ((pick_cnt = select_menu(tmpwin, PICK_ONE, &window_pick)) > 0) {
start_menu(tmpwin, MENU_BEHAVE_STANDARD);
any = cg.zeroany;
any.a_char = (GFILTER_NONE + 1);
- add_menu(tmpwin, NO_GLYPH, &any, 'n',
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'n',
0, ATR_NONE, "no filtering",
(gf == GFILTER_NONE)
? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
any.a_char = (GFILTER_VIEW + 1);
- add_menu(tmpwin, NO_GLYPH, &any, 'v',
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'v',
0, ATR_NONE, "in view only",
(gf == GFILTER_VIEW)
? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
any.a_char = (GFILTER_AREA + 1);
- add_menu(tmpwin, NO_GLYPH, &any, 'a',
+ add_menu(tmpwin, &nul_glyphinfo, &any, 'a',
0, ATR_NONE, "in same area",
(gf == GFILTER_AREA)
? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
any.a_int = 1; /* -1 + 2 [see 'if (sl->name) {' below]*/
if (!symset_name)
defindx = any.a_int;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"Default Symbols",
(any.a_int == defindx) ? MENU_ITEMFLAGS_SELECTED
: MENU_ITEMFLAGS_NONE);
if (symset_name && !strcmpi(sl->name, symset_name))
defindx = any.a_int;
Sprintf(buf, fmtstr, sl->name, sl->desc ? sl->desc : "");
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, buf,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, buf,
(any.a_int == defindx) ? MENU_ITEMFLAGS_SELECTED
: MENU_ITEMFLAGS_NONE);
}
if (numapes) {
ape = g.apelist;
any = cg.zeroany;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ iflags.menu_headings,
"Always pickup '<'; never pickup '>'",
MENU_ITEMFLAGS_NONE);
for (i = 0; i < numapes && ape; i++) {
less than BUFSZ */
Sprintf(apebuf, "\"%c%s\"", ape->grab ? '<' : '>',
ape->pattern);
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, apebuf,
- MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, apebuf, MENU_ITEMFLAGS_NONE);
ape = ape->next;
}
}
Strcat(mcbuf, tmp->origstr);
/* combine main string and suffix */
Strcat(mcbuf, &buf[1]); /* skip buf[]'s initial quote */
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, mcbuf,
- MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, mcbuf, MENU_ITEMFLAGS_NONE);
tmp = tmp->next;
}
Sprintf(mcbuf, "%s menu colors",
Strcat(strncat(mtbuf, tmp->pattern, ln - 3), "...\"");
else
Strcat(strcat(mtbuf, tmp->pattern), "\"");
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, mtbuf,
- MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, mtbuf, MENU_ITEMFLAGS_NONE);
tmp = tmp->next;
}
Sprintf(mtbuf, "%s message types",
if (!colornames[i].name)
break;
any.a_int = i + 1;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, colornames[i].name,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, colornames[i].name,
(colornames[i].color == NO_COLOR) ? MENU_ITEMFLAGS_SELECTED
: MENU_ITEMFLAGS_NONE);
}
if (!attrnames[i].name)
break;
any.a_int = i + 1;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, attrnames[i].attr,
- attrnames[i].name,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ attrnames[i].attr, attrnames[i].name,
(attrnames[i].attr == default_attr) ? MENU_ITEMFLAGS_SELECTED
: MENU_ITEMFLAGS_NONE);
}
for (i = 0; i < SIZE(msgtype_names); i++)
if (msgtype_names[i].descr) {
any.a_int = msgtype_names[i].msgtyp + 1;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
- msgtype_names[i].descr, MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, msgtype_names[i].descr, MENU_ITEMFLAGS_NONE);
}
end_menu(tmpwin, "How to show the message");
pick_cnt = select_menu(tmpwin, PICK_ONE, &picks);
indexoffset = 1;
any = cg.zeroany;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, iflags.menu_headings,
"Booleans (selecting will toggle value):", MENU_ITEMFLAGS_NONE);
any.a_int = 0;
/* first list any other non-modifiable booleans, then modifiable ones */
else
Sprintf(buf, fmtstr_doset_tab,
name, *bool_p ? "true" : "false");
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, buf,
- MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
}
any = cg.zeroany;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, "", MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, iflags.menu_headings,
"Compounds (selecting will prompt for new value):",
MENU_ITEMFLAGS_NONE);
}
any = cg.zeroany;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
- "Other settings:", MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, "", MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ iflags.menu_headings, "Other settings:", MENU_ITEMFLAGS_NONE);
for (i = 0; (name = othropt[i].name) != 0; i++) {
if ((is_wc_option(name) && !wc_supported(name))
#ifdef PREFIXES_IN_USE
any = cg.zeroany;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, "", MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ iflags.menu_headings,
"Variable playground locations:", MENU_ITEMFLAGS_NONE);
for (i = 0; i < PREFIX_COUNT; i++)
doset_add_menu(tmpwin, fqn_prefix_names[i], -1, 0);
value);
else
Sprintf(buf, fmtstr_doset_tab, option, value);
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
}
static void
name, buf2);
else
Sprintf(buf, fmtstr_doset_tab, name, buf2);
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
}
/* display keys for menu actions; used by cmd.c '?i' and pager.c '?k' */
continue;
Sprintf(tmpbuf, action_titles[i].desc,
(i == 1) ? makeplural(optname) : optname);
- add_menu(tmpwin, NO_GLYPH, &any, action_titles[i].letr, 0, ATR_NONE,
- tmpbuf, (i == 3) ? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo,&any, action_titles[i].letr,
+ 0, ATR_NONE, tmpbuf,
+ (i == 3) ? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
}
end_menu(tmpwin, "Do what?");
if ((pick_cnt = select_menu(tmpwin, PICK_ONE, &pick_list)) > 0) {
}
}
any.a_int = *class_list;
- add_menu(win, NO_GLYPH, &any, accelerator, category ? *class_list : 0,
- ATR_NONE, buf,
+ add_menu(win, &nul_glyphinfo, &any, accelerator,
+ category ? *class_list : 0, ATR_NONE, buf,
selected ? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
++class_list;
if (category > 0) {
if (category == 1 && next_accelerator <= 'z') {
/* for objects, add "A - ' ' all classes", after a separator */
any = cg.zeroany;
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, "", MENU_ITEMFLAGS_NONE);
any.a_int = (int) ' ';
Sprintf(buf, "%c %s", (char) any.a_int, "all classes of objects");
/* we won't preselect this even if the incoming list is empty;
having it selected means that it would have to be explicitly
de-selected in order to select anything else */
- add_menu(win, NO_GLYPH, &any, 'A', 0, ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 'A', 0,
+ ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
}
end_menu(win, prompt);
n = select_menu(win, way ? PICK_ANY : PICK_ONE, &pick_list);
hallucinate = (Hallucination && !g.program_state.gameover);
const char *x_str;
nhsym tmpsym;
- unsigned glyphmod[NUM_GLYPHMOD];
+ glyph_info glyphinfo = nul_glyphinfo;
gobbledygook[0] = '\0'; /* no hallucinatory liquid (yet) */
if (looked) {
glyph = glyph_at(cc.x, cc.y);
/* Convert glyph at selected position to a symbol for use below. */
- map_glyphmod(cc.x, cc.y, glyph, 0, glyphmod);
- sym = glyphmod[GM_TTYCHAR];
-
- Sprintf(prefix, "%s ", encglyph(glyph));
+ map_glyphinfo(cc.x, cc.y, glyph, 0, &glyphinfo);
+ sym = glyphinfo.symidx;
+ Sprintf(prefix, "%s ", encglyph(glyphinfo.glyph));
} else
Sprintf(prefix, "%c ", sym);
case SYM_PET_OVERRIDE + SYM_OFF_X:
if (looked) {
/* convert to symbol without override in effect */
- map_glyphmod(cc.x, cc.y, glyph, MG_FLAG_NOOVERRIDE, glyphmod);
- sym = (int) glyphmod[GM_TTYCHAR];
+ map_glyphinfo(cc.x, cc.y, glyph, 0, &glyphinfo);
+ sym = glyphinfo.ttychar;
goto check_monsters;
}
break;
any.a_char = '/';
/* 'y' and 'n' to keep backwards compatibility with previous
versions: "Specify unknown object by cursor?" */
- add_menu(win, NO_GLYPH, &any,
+ add_menu(win, &nul_glyphinfo, &any,
flags.lootabc ? 0 : any.a_char, 'y', ATR_NONE,
"something on the map", MENU_ITEMFLAGS_NONE);
any.a_char = 'i';
- add_menu(win, NO_GLYPH, &any,
+ add_menu(win, &nul_glyphinfo, &any,
flags.lootabc ? 0 : any.a_char, 0, ATR_NONE,
"something you're carrying", MENU_ITEMFLAGS_NONE);
any.a_char = '?';
- add_menu(win, NO_GLYPH, &any,
+ add_menu(win, &nul_glyphinfo, &any,
flags.lootabc ? 0 : any.a_char, 'n', ATR_NONE,
"something else (by symbol or name)",
MENU_ITEMFLAGS_NONE);
if (!u.uswallow && !Hallucination) {
any = cg.zeroany;
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"", MENU_ITEMFLAGS_NONE);
/* these options work sensibly for the swallowed case,
but there's no reason for the player to use them then;
symbol/monster class letter doesn't match up with
bogus monster type, so suppress when hallucinating */
any.a_char = 'm';
- add_menu(win, NO_GLYPH, &any,
+ add_menu(win, &nul_glyphinfo, &any,
flags.lootabc ? 0 : any.a_char, 0, ATR_NONE,
"nearby monsters", MENU_ITEMFLAGS_NONE);
any.a_char = 'M';
- add_menu(win, NO_GLYPH, &any,
+ add_menu(win, &nul_glyphinfo, &any,
flags.lootabc ? 0 : any.a_char, 0, ATR_NONE,
"all monsters shown on map", MENU_ITEMFLAGS_NONE);
any.a_char = 'o';
- add_menu(win, NO_GLYPH, &any,
+ add_menu(win, &nul_glyphinfo, &any,
flags.lootabc ? 0 : any.a_char, 0, ATR_NONE,
"nearby objects", MENU_ITEMFLAGS_NONE);
any.a_char = 'O';
- add_menu(win, NO_GLYPH, &any,
+ add_menu(win, &nul_glyphinfo, &any,
flags.lootabc ? 0 : any.a_char, 0, ATR_NONE,
"all objects shown on map", MENU_ITEMFLAGS_NONE);
}
Strcpy(helpbuf, help_menu_items[i].text);
}
any.a_int = i + 1;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
helpbuf, MENU_ITEMFLAGS_NONE);
}
end_menu(tmpwin, "Select one item:");
int how; /* type of query */
boolean FDECL((*allow), (OBJ_P)); /* allow function */
{
- int i, n;
+ int i, n, tmpglyph;
winid win;
struct obj *curr, *last, fake_hero_object, *olist = *olist_p;
char *pack, packbuf[MAXOCLASSES + 1];
engulfer = (qflags & INCLUDE_HERO) != 0,
engulfer_minvent;
unsigned sortflags;
+ glyph_info tmpglyphinfo = nul_glyphinfo;
Loot *sortedolist, *srtoli;
*pick_list = (menu_item *) 0;
/* if sorting, print type name (once only) */
if (sorted && !printed_type_name) {
any = cg.zeroany;
- add_menu(win, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ iflags.menu_headings,
let_to_name(*pack, FALSE,
((how != PICK_NONE)
&& iflags.menu_head_objsym)),
}
any.a_obj = curr;
- add_menu(win, obj_to_glyph(curr, rn2_on_display_rng), &any,
+ tmpglyph = obj_to_glyph(curr, rn2_on_display_rng);
+ map_glyphinfo(0, 0, tmpglyph, 0U, &tmpglyphinfo);
+ add_menu(win, &tmpglyphinfo, &any,
(qflags & USE_INVLET) ? curr->invlet
: (first && curr->oclass == COIN_CLASS) ? '$' : 0,
def_oc_syms[(int) objects[curr->otyp].oc_class].sym,
if (sorted && n > 1) {
Sprintf(buf, "%s Creatures",
is_animal(u.ustuck->data) ? "Swallowed" : "Engulfed");
- add_menu(win, NO_GLYPH, &any, 0, 0, iflags.menu_headings, buf,
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, iflags.menu_headings, buf,
MENU_ITEMFLAGS_NONE);
}
fake_hero_object = cg.zeroobj;
fake_hero_object.quan = 1L; /* not strictly necessary... */
any.a_obj = &fake_hero_object;
- add_menu(win, mon_to_glyph(&g.youmonst, rn2_on_display_rng), &any,
+ tmpglyph = mon_to_glyph(&g.youmonst, rn2_on_display_rng);
+ map_glyphinfo(0, 0, tmpglyph, 0U, &tmpglyphinfo);
+ add_menu(win, &tmpglyphinfo, &any,
/* fake inventory letter, no group accelerator */
CONTAINED_SYM, 0, ATR_NONE, an(self_lookat(buf)),
MENU_ITEMFLAGS_NONE);
any = cg.zeroany;
any.a_int = 'A';
itemflags = MENU_ITEMFLAGS_SKIPINVERT;
- add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, invlet, 0, ATR_NONE,
(qflags & WORN_TYPES) ? "Auto-select every item being worn"
: "Auto-select every item",
itemflags);
any = cg.zeroany;
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, "", MENU_ITEMFLAGS_NONE);
}
if ((qflags & ALL_TYPES) && (ccount > 1)) {
any = cg.zeroany;
any.a_int = ALL_TYPES_SELECTED;
itemflags = MENU_ITEMFLAGS_SKIPINVERT;
- add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, invlet, 0, ATR_NONE,
(qflags & WORN_TYPES) ? "All worn types" : "All types",
itemflags);
invlet = 'b';
any = cg.zeroany;
any.a_int = curr->oclass;
add_menu(
- win, NO_GLYPH, &any, invlet++,
+ win, &nul_glyphinfo, &any, invlet++,
def_oc_syms[(int) objects[curr->otyp].oc_class].sym,
ATR_NONE, let_to_name(*pack, FALSE,
(how != PICK_NONE)
if (do_unpaid || (qflags & BILLED_TYPES) || do_blessed || do_cursed
|| do_uncursed || do_buc_unknown) {
any = cg.zeroany;
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, "", MENU_ITEMFLAGS_NONE);
}
/* unpaid items if there are any */
invlet = 'u';
any = cg.zeroany;
any.a_int = 'u';
- add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE, "Unpaid items",
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, invlet, 0,
+ ATR_NONE, "Unpaid items", MENU_ITEMFLAGS_NONE);
}
/* billed items: checked by caller, so always include if BILLED_TYPES */
if (qflags & BILLED_TYPES) {
invlet = 'x';
any = cg.zeroany;
any.a_int = 'x';
- add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, invlet, 0, ATR_NONE,
"Unpaid items already used up", MENU_ITEMFLAGS_NONE);
}
invlet = 'B';
any = cg.zeroany;
any.a_int = 'B';
- add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, invlet, 0, ATR_NONE,
"Items known to be Blessed", itemflags);
}
if (do_cursed) {
invlet = 'C';
any = cg.zeroany;
any.a_int = 'C';
- add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, invlet, 0, ATR_NONE,
"Items known to be Cursed", itemflags);
}
if (do_uncursed) {
invlet = 'U';
any = cg.zeroany;
any.a_int = 'U';
- add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, invlet, 0, ATR_NONE,
"Items known to be Uncursed", itemflags);
}
if (do_buc_unknown) {
invlet = 'X';
any = cg.zeroany;
any.a_int = 'X';
- add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, invlet, 0, ATR_NONE,
"Items of unknown Bless/Curse status", itemflags);
}
end_menu(win, qstr);
cobj = cobj->nexthere)
if (Is_container(cobj)) {
any.a_obj = cobj;
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE,
- doname(cobj), MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, doname(cobj), MENU_ITEMFLAGS_NONE);
}
end_menu(win, "Loot which containers?");
n = select_menu(win, PICK_ANY, &pick_list);
any.a_int = 1; /* ':' */
Sprintf(buf, "Look inside %s", thesimpleoname(obj));
- add_menu(win, NO_GLYPH, &any, menuselector[any.a_int], 0, ATR_NONE, buf,
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, menuselector[any.a_int], 0,
+ ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
if (outokay) {
any.a_int = 2; /* 'o' */
Sprintf(buf, "take %s out", something);
- add_menu(win, NO_GLYPH, &any, menuselector[any.a_int], 0, ATR_NONE,
- buf, MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, menuselector[any.a_int], 0,
+ ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
}
if (inokay) {
any.a_int = 3; /* 'i' */
Sprintf(buf, "put %s in", something);
- add_menu(win, NO_GLYPH, &any, menuselector[any.a_int], 0, ATR_NONE,
- buf, MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, menuselector[any.a_int], 0,
+ ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
}
if (outokay) {
any.a_int = 4; /* 'b' */
Sprintf(buf, "%stake out, then put in", inokay ? "both; " : "");
- add_menu(win, NO_GLYPH, &any, menuselector[any.a_int], 0, ATR_NONE,
- buf, MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, menuselector[any.a_int], 0,
+ ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
}
if (inokay) {
any.a_int = 5; /* 'r' */
Sprintf(buf, "%sput in, then take out",
outokay ? "both reversed; " : "");
- add_menu(win, NO_GLYPH, &any, menuselector[any.a_int], 0, ATR_NONE,
- buf, MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, menuselector[any.a_int], 0,
+ ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
any.a_int = 6; /* 's' */
Sprintf(buf, "stash one item into %s", thesimpleoname(obj));
- add_menu(win, NO_GLYPH, &any, menuselector[any.a_int], 0, ATR_NONE,
- buf, MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, menuselector[any.a_int], 0,
+ ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
}
any.a_int = 0;
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, "", MENU_ITEMFLAGS_NONE);
if (more_containers) {
any.a_int = 7; /* 'n' */
- add_menu(win, NO_GLYPH, &any, menuselector[any.a_int], 0, ATR_NONE,
- "loot next container", MENU_ITEMFLAGS_SELECTED);
+ add_menu(win, &nul_glyphinfo, &any, menuselector[any.a_int], 0,
+ ATR_NONE, "loot next container", MENU_ITEMFLAGS_SELECTED);
}
any.a_int = 8; /* 'q' */
Strcpy(buf, alreadyused ? "done" : "do nothing");
- add_menu(win, NO_GLYPH, &any, menuselector[any.a_int], 0, ATR_NONE, buf,
+ add_menu(win, &nul_glyphinfo, &any, menuselector[any.a_int], 0,
+ ATR_NONE, buf,
more_containers ? MENU_ITEMFLAGS_NONE : MENU_ITEMFLAGS_SELECTED);
end_menu(win, prompt);
if (Is_container(cobj)) {
++i;
any.a_obj = cobj;
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE,
- doname(cobj), MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, doname(cobj), MENU_ITEMFLAGS_NONE);
}
if (g.invent) {
any = cg.zeroany;
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"", MENU_ITEMFLAGS_NONE);
any.a_obj = &dummyobj;
/* use 'i' for inventory unless there are so many
containers that it's already being used */
i = (i <= 'i' - 'a' && !flags.lootabc) ? 'i' : 0;
- add_menu(win, NO_GLYPH, &any, i, 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, i, 0, ATR_NONE,
"tip something being carried", MENU_ITEMFLAGS_SELECTED);
}
end_menu(win, "Tip which container?");
clear_nhwindow(bannerwin);
/* COPYRIGHT_BANNER_[ABCD] */
for (k = 1; k <= 4; ++k)
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
copyright_banner_line(k), MENU_ITEMFLAGS_NONE);
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, "",
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE, "",
MENU_ITEMFLAGS_NONE);
}
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"Select one of your saved games", MENU_ITEMFLAGS_NONE);
for (k = 0; saved[k]; ++k) {
any.a_int = k + 1;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, saved[k],
- MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, saved[k], MENU_ITEMFLAGS_NONE);
}
clet = (k <= 'n' - 'a') ? 'n' : 0; /* new game */
any.a_int = -1; /* not >= 0 */
- add_menu(tmpwin, NO_GLYPH, &any, clet, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, clet, 0, ATR_NONE,
"Start a new character", MENU_ITEMFLAGS_NONE);
clet = (k + 1 <= 'q' - 'a') ? 'q' : 0; /* quit */
any.a_int = -2;
- add_menu(tmpwin, NO_GLYPH, &any, clet, 0, ATR_NONE,
+ add_menu(tmpwin, &nul_glyphinfo, &any, clet, 0, ATR_NONE,
"Never mind (quit)", MENU_ITEMFLAGS_SELECTED);
/* no prompt on end_menu, as we've done our own at the top */
end_menu(tmpwin, (char *) 0);
any.a_int = 0;
/* use four spaces of padding to fake a grayed out menu choice */
Sprintf(buf, "%4s%s forces %s", "", constrainer, forcedvalue);
- add_menu(where, NO_GLYPH, &any, 0, 0, ATR_NONE, buf,
+ add_menu(where, &nul_glyphinfo, &any, 0, 0, ATR_NONE, buf,
MENU_ITEMFLAGS_NONE);
} else if (what) {
any.a_int = RS_menu_arg(which);
Sprintf(buf, "Pick%s %s first", (f >= 0) ? " another" : "", what);
- add_menu(where, NO_GLYPH, &any, RS_menu_let[which], 0, ATR_NONE, buf,
- MENU_ITEMFLAGS_NONE);
+ add_menu(where, &nul_glyphinfo, &any, RS_menu_let[which], 0,
+ ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
} else if (which == RS_filter) {
char setfiltering[40];
any.a_int = RS_menu_arg(RS_filter);
Sprintf(setfiltering, "%s role/race/&c filtering",
gotrolefilter() ? "Reset" : "Set");
- add_menu(where, NO_GLYPH, &any, '~', 0, ATR_NONE,
+ add_menu(where, &nul_glyphinfo, &any, '~', 0, ATR_NONE,
setfiltering, MENU_ITEMFLAGS_NONE);
} else if (which == ROLE_RANDOM) {
any.a_int = ROLE_RANDOM;
- add_menu(where, NO_GLYPH, &any, '*', 0, ATR_NONE, "Random",
+ add_menu(where, &nul_glyphinfo, &any, '*', 0,
+ ATR_NONE, "Random",
preselect ? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
} else if (which == ROLE_NONE) {
any.a_int = ROLE_NONE;
- add_menu(where, NO_GLYPH, &any, 'q', 0, ATR_NONE, "Quit",
+ add_menu(where, &nul_glyphinfo, &any, 'q', 0,
+ ATR_NONE, "Quit",
preselect ? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
} else {
impossible("role_menu_extra: bad arg (%d)", which);
let = 'z'; /* assumes fewer than 26 sort choices... */
/* separate final choice from others with a blank line */
any.a_int = 0;
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, "",
- MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, "", MENU_ITEMFLAGS_NONE);
} else {
let = 'a' + i;
}
any.a_int = i + 1;
- add_menu(tmpwin, NO_GLYPH, &any, let, 0, ATR_NONE, spl_sortchoices[i],
+ add_menu(tmpwin, &nul_glyphinfo, &any, let, 0,
+ ATR_NONE, spl_sortchoices[i],
(i == g.spl_sortmode) ? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
}
end_menu(tmpwin, "View known spells list sorted");
Sprintf(buf, "Name\tLevel\tCategory\tFail\tRetention");
fmt = "%s\t%-d\t%s\t%-d%%\t%s";
}
- add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings, buf,
- MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
+ iflags.menu_headings, buf, MENU_ITEMFLAGS_NONE);
for (i = 0; i < MAXSPELL && spellid(i) != NO_SPELL; i++) {
splnum = !g.spl_orderindx ? i : g.spl_orderindx[i];
Sprintf(buf, fmt, spellname(splnum), spellev(splnum),
spellretention(splnum, retentionbuf));
any.a_int = splnum + 1; /* must be non-zero */
- add_menu(tmpwin, NO_GLYPH, &any, spellet(splnum), 0, ATR_NONE, buf,
- (splnum == splaction) ? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, spellet(splnum), 0,
+ ATR_NONE, buf,
+ (splnum == splaction)
+ ? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
}
how = PICK_ONE;
if (splaction == SPELLMENU_VIEW) {
} else {
/* more than 1 spell, add an extra menu entry */
any.a_int = SPELLMENU_SORT + 1;
- add_menu(tmpwin, NO_GLYPH, &any, '+', 0, ATR_NONE,
- "[sort spells]", MENU_ITEMFLAGS_NONE);
+ add_menu(tmpwin, &nul_glyphinfo, &any, '+', 0,
+ ATR_NONE, "[sort spells]", MENU_ITEMFLAGS_NONE);
}
}
end_menu(tmpwin, prompt);
any = cg.zeroany;
for (i = 0; i < SIZE(tports); ++i) {
any.a_int = (int) tports[i].menulet;
- add_menu(win, NO_GLYPH, &any, (char) any.a_int, 0, ATR_NONE,
- tports[i].menudesc,
+ add_menu(win, &nul_glyphinfo, &any, (char) any.a_int, 0,
+ ATR_NONE, tports[i].menudesc,
(tports[i].menulet == 'w') ? MENU_ITEMFLAGS_SELECTED
: MENU_ITEMFLAGS_NONE);
}
(u.ulevel < MAXULEV)
? "when you're more experienced"
: "if skill slots become available");
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, buf,
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
}
if (maxxed_cnt > 0) {
Sprintf(buf,
"(Skill%s flagged by \"#\" cannot be enhanced any further.)",
plur(maxxed_cnt));
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, buf,
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
}
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "",
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, "", MENU_ITEMFLAGS_NONE);
}
/* List the skills, making ones that could be advanced
/* Print headings for skill types */
any = cg.zeroany;
if (i == skill_ranges[pass].first)
- add_menu(win, NO_GLYPH, &any, 0, 0, iflags.menu_headings,
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ iflags.menu_headings,
skill_ranges[pass].name, MENU_ITEMFLAGS_NONE);
if (P_RESTRICTED(i))
sklnambuf);
}
any.a_int = can_advance(i, speedy) ? i + 1 : 0;
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, buf,
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, buf, MENU_ITEMFLAGS_NONE);
}
Strcpy(buf, (to_advance > 0) ? "Pick a skill to advance:"
static void FDECL(dump_display_nhwindow, (winid, BOOLEAN_P));
static void FDECL(dump_destroy_nhwindow, (winid));
static void FDECL(dump_start_menu, (winid, unsigned long));
-static void FDECL(dump_add_menu, (winid, int, const ANY_P *, CHAR_P,
+static void FDECL(dump_add_menu, (winid, const glyph_info *, const ANY_P *, CHAR_P,
CHAR_P, int, const char *, unsigned int));
static void FDECL(dump_end_menu, (winid, const char *));
static int FDECL(dump_select_menu, (winid, int, MENU_ITEM_P **));
static void FDECL(hup_exit_nhwindows, (const char *));
static winid FDECL(hup_create_nhwindow, (int));
static int FDECL(hup_select_menu, (winid, int, MENU_ITEM_P **));
-static void FDECL(hup_add_menu, (winid, int, const anything *, CHAR_P, CHAR_P,
- int, const char *, unsigned int));
+static void FDECL(hup_add_menu, (winid, const glyph_info *, const anything *,
+ CHAR_P, CHAR_P, int, const char *,
+ unsigned int));
static void FDECL(hup_end_menu, (winid, const char *));
static void FDECL(hup_putstr, (winid, int, const char *));
-static void FDECL(hup_print_glyph, (winid, XCHAR_P, XCHAR_P, int, int, unsigned *));
+static void FDECL(hup_print_glyph, (winid, XCHAR_P, XCHAR_P,
+ const glyph_info *, const glyph_info *));
static void FDECL(hup_outrip, (winid, int, time_t));
static void FDECL(hup_curs, (winid, int, int));
static void FDECL(hup_display_nhwindow, (winid, BOOLEAN_P));
/*ARGSUSED*/
static void
-hup_add_menu(window, glyph, identifier, sel, grpsel, attr, txt, itemflags)
+hup_add_menu(window, glyphinfo, identifier, sel, grpsel, attr, txt, itemflags)
winid window UNUSED;
-int glyph UNUSED, attr UNUSED;
+const glyph_info *glyphinfo UNUSED;
+int attr UNUSED;
const anything *identifier UNUSED;
char sel UNUSED, grpsel UNUSED;
const char *txt UNUSED;
/*ARGSUSED*/
static void
-hup_print_glyph(window, x, y, glyph, bkglyph, glyphmod)
+hup_print_glyph(window, x, y, glyphinfo, bkglyphinfo)
winid window UNUSED;
xchar x UNUSED, y UNUSED;
-int glyph UNUSED;
-int bkglyph UNUSED;
-unsigned *glyphmod UNUSED;
+const glyph_info *glyphinfo UNUSED;
+const glyph_info *bkglyphinfo UNUSED;
{
return;
}
/*ARGSUSED*/
static void
-dump_add_menu(win, glyph, identifier, ch, gch, attr, str, itemflags)
+dump_add_menu(win, glyphinfo, identifier, ch, gch, attr, str, itemflags)
winid win UNUSED;
-int glyph;
+const glyph_info *glyphinfo;
const anything *identifier UNUSED;
char ch;
char gch UNUSED;
unsigned int itemflags UNUSED;
{
if (dumplog_file) {
- if (glyph == NO_GLYPH)
+ if (glyphinfo->glyph == NO_GLYPH)
fprintf(dumplog_file, " %s\n", str);
else
fprintf(dumplog_file, " %c - %s\n", ch, str);
glyph2ttychar(glyph)
int glyph;
{
- int so;
- unsigned glyphmod[NUM_GLYPHMOD];
+ glyph_info glyphinfo;
- map_glyphmod(0, 0, glyph, MG_FLAG_RETURNIDX, glyphmod);
- so = (int) glyphmod[GM_TTYCHAR];
- if (so >= 0 && so < SYM_MAX)
- return (int) g.showsyms[so];
- else
- return ' ';
+ map_glyphinfo(0, 0, glyph, 0, &glyphinfo);
+ return glyphinfo.ttychar;
+}
+
+int
+glyph2symidx(glyph)
+int glyph;
+{
+ glyph_info glyphinfo;
+
+ map_glyphinfo(0, 0, glyph, 0, &glyphinfo);
+ return glyphinfo.symidx;
}
char *
{
static const char hex[] = "00112233445566778899aAbBcCdDeEfF";
char *put = buf;
- unsigned glyphmod[NUM_GLYPHMOD];
+ glyph_info glyphinfo = nul_glyphinfo;
if (!str)
return strcpy(buf, "");
gv = (gv * 16) + ((int) (dp - hex) / 2);
else
break;
- map_glyphmod(0, 0, gv, MG_FLAG_RETURNIDX, glyphmod);
- so = glyphmod[GM_TTYCHAR];
+ map_glyphinfo(0, 0, gv, 0, &glyphinfo);
+ so = glyphinfo.symidx;
*put++ = g.showsyms[so];
/* 'str' is ready for the next loop iteration and '*str'
should not be copied at the end of this iteration */
window->StartMenu(wid == WIN_INVEN);
}
-void NetHackQtBind::qt_add_menu(winid wid, int glyph,
+void NetHackQtBind::qt_add_menu(winid wid, const glyph_info *glyphinfo,
const ANY_P * identifier, CHAR_P ch, CHAR_P gch, int attr,
const char *str, unsigned itemflags)
{
NetHackQtWindow* window=id_to_window[(int)wid];
- window->AddMenu(glyph, identifier, ch, gch, attr,
+ window->AddMenu(glyphinfo->glyph, identifier, ch, gch, attr,
QString::fromLatin1(str),
itemflags);
}
NetHackQtWindow* window=id_to_window[(int)wid];
window->ClipAround(x,y);
}
-void NetHackQtBind::qt_print_glyph(winid wid,XCHAR_P x,XCHAR_P y,int glyph,
- int bkglyph UNUSED, unsigned *glyphmod)
+void NetHackQtBind::qt_print_glyph(winid wid,XCHAR_P x,XCHAR_P y,
+ const glyph_info *glyphinfo,
+ const glyph_info *bkglyphinfo UNUSED)
{
/* TODO: bkglyph */
NetHackQtWindow* window=id_to_window[(int)wid];
- window->PrintGlyph(x,y,glyph,glyphmod);
+ window->PrintGlyph(x,y,glyphinfo);
}
//void NetHackQtBind::qt_print_glyph_compose(winid wid,xchar x,xchar y,int glyph1, int glyph2)
//{
static void qt_putstr(winid wid, int attr, const QString& text);
static void qt_display_file(const char *filename, BOOLEAN_P must_exist);
static void qt_start_menu(winid wid, unsigned long mbehavior);
- static void qt_add_menu(winid wid, int glyph,
+ static void qt_add_menu(winid wid, const glyph_info *glyphinfo,
const ANY_P * identifier, CHAR_P ch, CHAR_P gch, int attr,
const char *str, unsigned int itemflags);
static void qt_end_menu(winid wid, const char *prompt);
static void qt_cliparound(int x, int y);
static void qt_cliparound_window(winid wid, int x, int y);
static void qt_print_glyph(winid wid, XCHAR_P x, XCHAR_P y,
- int glyph, int bkglyph, unsigned int *);
+ const glyph_info *glyphingo,
+ const glyph_info *bkglyphinfo);
static void qt_raw_print(const char *str);
static void qt_raw_print_bold(const char *str);
static int qt_nhgetch();
Changed(cursor.x(), cursor.y());
}
-void NetHackQtMapViewport::PrintGlyph(int x, int y, int theglyph,
- unsigned *glyphmod)
+void NetHackQtMapViewport::PrintGlyph(int x, int y,
+ const glyph_info *glyphinfo)
{
- Glyph(x, y) = (unsigned short) theglyph;
- Glyphttychar(x, y) = (unsigned short) glyphmod[GM_TTYCHAR];
- Glyphcolor(x, y) = (unsigned short) glyphmod[GM_COLOR];
- Glyphflags(x, y) = glyphmod[GM_FLAGS];
+ Glyph(x, y) = (unsigned short) glyphinfo->glyph;
+ Glyphttychar(x, y) = (unsigned short) glyphinfo->ttychar;
+ Glyphcolor(x, y) = (unsigned short) glyphinfo->color;
+ Glyphflags(x, y) = glyphinfo->glyphflags;
Changed(x, y);
}
ensureVisible(x,y,width()*0.45,height()*0.45);
}
-void NetHackQtMapWindow2::PrintGlyph(int x,int y,int glyph, unsigned *glyphmod)
+void NetHackQtMapWindow2::PrintGlyph(int x,int y,
+ const glyph_info *glyphinfo)
{
- m_viewport->PrintGlyph(x, y, glyph, glyphmod);
+ m_viewport->PrintGlyph(x, y, glyphinfo);
}
#if 0 //RLC
viewport.center(x,y,0.45,0.45);
}
-void NetHackQtMapWindow::PrintGlyph(int x,int y,int glyph, unsigned *glyphmod)
+void NetHackQtMapWindow::PrintGlyph(int x,int y, const glyph_info *glyphinfo)
{
- Glyph(x,y)=glyph;
- Glyphttychar(x,y)=glyphmod[GM_TTYCHAR];
- Glyphcolor(x,y)=glyphmod[GM_COLOR];
- Glyphflags(x,y)=glyphmod[GM_FLAGS];
+ Glyph(x,y)=glyphinfo->glyph;
+ Glyphttychar(x,y)=glyphinfo->ttychar;
+ Glyphcolor(x,y)=glyphinfo->color;
+ Glyphflags(x,y)=glyphinfo->glyphflags;
Changed(x,y);
}
void Clear();
void Display(bool block);
void CursorTo(int x,int y);
- void PrintGlyph(int x,int y,int glyph,unsigned *glyphmod);
+ void PrintGlyph(int x,int y, const glyph_info *glyphinfo);
void Changed(int x, int y);
void updateTiles();
void SetupTextmapFont(QPainter &painter);
virtual void CursorTo(int x,int y);
virtual void PutStr(int attr, const QString& text);
virtual void ClipAround(int x,int y);
- virtual void PrintGlyph(int x,int y,int glyph,unsigned *glyphmod);
+ virtual void PrintGlyph(int x,int y, const glyph_info *glyphinfo);
signals:
void resized();
int NetHackQtWindow::SelectMenu(int how UNUSED, MENU_ITEM_P **menu_list UNUSED)
{ puts("unexpected SelectMenu"); return 0; }
void NetHackQtWindow::ClipAround(int x UNUSED,int y UNUSED) { puts("unexpected ClipAround"); }
-void NetHackQtWindow::PrintGlyph(int x UNUSED,int y UNUSED,int glyph UNUSED, unsigned *glyphmod UNUSED) { puts("unexpected PrintGlyph"); }
+void NetHackQtWindow::PrintGlyph(int x UNUSED,int y UNUSED,const glyph_info *glyphinfo UNUSED) { puts("unexpected PrintGlyph"); }
//void NetHackQtWindow::PrintGlyphCompose(int x,int y,int,int) { puts("unexpected PrintGlyphCompose"); }
void NetHackQtWindow::UseRIP(int how UNUSED, time_t when UNUSED) { puts("unexpected UseRIP"); }
virtual void EndMenu(const QString& prompt);
virtual int SelectMenu(int how, MENU_ITEM_P **menu_list);
virtual void ClipAround(int x, int y);
- virtual void PrintGlyph(int x, int y, int glyph, unsigned *glyphmod);
+ virtual void PrintGlyph(int x, int y, const glyph_info *glyphinfo);
virtual void UseRIP(int how, time_t when);
int nhid;
any = cg.zeroany;
while (dlb_fgets(line, LLEN, fp)) {
- X11_add_menu(newwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ X11_add_menu(newwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
line, MENU_ITEMFLAGS_NONE);
}
(void) dlb_fclose(fp);
/* Global functions ======================================================= */
void
-X11_print_glyph(window, x, y, glyph, bkglyph, glyphmod)
+X11_print_glyph(window, x, y, glyphinfo, bkglyphinfo)
winid window;
xchar x, y;
-int glyph;
-int bkglyph UNUSED;
-unsigned *glyphmod UNUSED;
+const glyph_info *glyphinfo;
+const glyph_info *bkglyphinfo UNUSED;
{
struct map_info_t *map_info;
boolean update_bbox = FALSE;
{
unsigned short *t_ptr = &map_info->tile_map.glyphs[y][x].glyph;
- if (*t_ptr != glyph) {
- *t_ptr = glyph;
+ if (*t_ptr != glyphinfo->glyph) {
+ *t_ptr = glyphinfo->glyph;
if (map_info->is_tile)
update_bbox = TRUE;
}
register unsigned char *co_ptr;
#endif
- color = glyphmod[GM_COLOR];
- special = glyphmod[GM_FLAGS];
- och = glyphmod[GM_TTYCHAR];
+ color = glyphinfo->color;
+ special = glyphinfo->glyphflags;
+ och = glyphinfo->ttychar;
ch = (uchar) och;
- if (special != map_info->tile_map.glyphs[y][x].special) {
- map_info->tile_map.glyphs[y][x].special = special;
+ if (special != map_info->tile_map.glyphs[y][x].glyphflags) {
+ map_info->tile_map.glyphs[y][x].glyphflags = special;
update_bbox = TRUE;
}
for (x = 0; x < COLNO; x++)
for (y = 0; y < ROWNO; y++) {
tile_map->glyphs[y][x].glyph = !x ? g_nothg : g_unexp;
- tile_map->glyphs[y][x].special = 0;
+ tile_map->glyphs[y][x].glyphflags = 0;
text_map->text[y][x] = (uchar) (!x ? mgnothg : mgunexp);
#ifdef TEXTCOLOR
int dest_x = (cur_col - COL0_OFFSET) * tile_map->square_width;
int dest_y = row * tile_map->square_height;
- if ((tile_map->glyphs[row][cur_col].special & MG_FEMALE))
+ if ((tile_map->glyphs[row][cur_col].glyphflags & MG_FEMALE))
tile++; /* advance to the female tile variation */
src_x = (tile % TILES_PER_ROW) * tile_width;
src_y = (tile / TILES_PER_ROW) * tile_height;
src_x, src_y, tile_width, tile_height,
dest_x, dest_y);
- if (glyph_is_pet(glyph) && iflags.hilite_pet) {
+ if ((tile_map->glyphs[row][cur_col].glyphflags & MG_PET) && iflags.hilite_pet) {
/* draw pet annotation (a heart) */
XSetForeground(dpy, tile_map->black_gc,
pet_annotation.foreground);
XSetForeground(dpy, tile_map->black_gc,
BlackPixelOfScreen(screen));
}
- if ((tile_map->glyphs[row][cur_col].special & MG_OBJPILE)) {
+ if ((tile_map->glyphs[row][cur_col].glyphflags & MG_OBJPILE)) {
/* draw object pile annotation (a plus sign) */
XSetForeground(dpy, tile_map->black_gc,
pile_annotation.foreground);
/*ARGSUSED*/
void
-X11_add_menu(window, glyph, identifier, ch, gch, attr, str, itemflags)
+X11_add_menu(window, glyphinfo, identifier, ch, gch, attr, str, itemflags)
winid window;
-int glyph; /* unused (for now) */
+const glyph_info *glyphinfo UNUSED;
const anything *identifier;
char ch;
char gch; /* group accelerator (0 = no group) */
struct menu_info_t *menu_info;
boolean preselected = (itemflags & MENU_ITEMFLAGS_SELECTED) != 0;
- nhUse(glyph);
-
check_winid(window);
menu_info = window_list[window].menu_information;
if (!menu_info->is_menu) {
}
void
-chainin_add_menu(window, glyph, identifier, ch, gch, attr, str, itemflags)
+chainin_add_menu(window, glyphinfo, identifier, ch, gch, attr, str, itemflags)
winid window; /* window to use, must be of type NHW_MENU */
-int glyph; /* glyph to display with item (unused) */
+const glyph_info *glyphinfo; /* glyph and other glyph info to display with item */
const anything *identifier; /* what to return if selected */
char ch; /* keyboard accelerator (0 = pick our own) */
char gch; /* group accelerator (0 = no group) */
unsigned int itemflags; /* flags such as item is marked as selected
MENU_ITEMFLAGS_SELECTED */
{
- (*cibase->nprocs->win_add_menu)(cibase->ndata, window, glyph, identifier,
- ch, gch, attr, str, itemflags);
+ (*cibase->nprocs->win_add_menu)(cibase->ndata, window, glyphinfo,
+ identifier, ch, gch, attr, str, itemflags);
}
void
/* XXX can we decode the glyph in a meaningful way? */
void
-chainin_print_glyph(window, x, y, glyph, bkglyph, glyphmod)
+chainin_print_glyph(window, x, y, glyphinfo, bkglyphinfo)
winid window;
xchar x, y;
-int glyph, bkglyph;
-int glyphmod[NUM_GLYPHMOD];
+const glyph_info *glyphinfo;
+const glyph_info *bkglyphinfo;
{
- (*cibase->nprocs->win_print_glyph)(cibase->ndata, window, x, y, glyph, bkglyph, glyphmod);
+ (*cibase->nprocs->win_print_glyph)(cibase->ndata, window, x, y, glyphinfo, bkglyphinfo);
}
void
}
void
-chainout_add_menu(vp, window, glyph, identifier, ch, gch, attr, str,
+chainout_add_menu(vp, window, glyphinfo, identifier, ch, gch, attr, str,
itemflags)
void *vp;
winid window; /* window to use, must be of type NHW_MENU */
-int glyph; /* glyph to display with item (unused) */
+const glyph_info *glyphinfo /* glyph plus glyph info to display with item */
const anything *identifier; /* what to return if selected */
char ch; /* keyboard accelerator (0 = pick our own) */
char gch; /* group accelerator (0 = no group) */
{
struct chainout_data *tdp = vp;
- (*tdp->nprocs->win_add_menu)(window, glyph, identifier, ch, gch, attr,
- str, itemflags);
+ (*tdp->nprocs->win_add_menu)(window, glyphinfo, identifier, ch, gch,
+ attr, str, itemflags);
}
void
#endif
void
-chainout_print_glyph(vp, window, x, y, glyph, bkglyph, glyphmod)
+chainout_print_glyph(vp, window, x, y, glyphinfo, bkglyphinfo)
void *vp;
winid window;
xchar x, y;
-int glyph, bkglyph;
-int glyphmod[NUM_GLYPHMOD];
+const glyph_info *glyphinfo;
+const glyph_info *bkglyphinfo;
{
struct chainout_data *tdp = vp;
- (*tdp->nprocs->win_print_glyph)(window, x, y, glyph, bkglyph, glyphmod);
+ (*tdp->nprocs->win_print_glyph)(window, x, y, glyphinfo, bkglyphinfo);
}
void
}
void
-trace_add_menu(vp, window, glyph, identifier, ch, gch, attr, str, itemflags)
+trace_add_menu(vp, window, glyphinfo, identifier, ch, gch, attr, str, itemflags)
void *vp;
winid window; /* window to use, must be of type NHW_MENU */
-int glyph; /* glyph to display with item (unused) */
+const glyph_info *glyphinfo /* glyph plus glyph info to display with item */
const anything *identifier; /* what to return if selected */
char ch; /* keyboard accelerator (0 = pick our own) */
char gch; /* group accelerator (0 = no group) */
if (str) {
fprintf(wc_tracelogf,
- "%sadd_menu(%d, %d, %p, %s, %s, %d, '%s'(%d), %u)\n", INDENT,
- window, glyph, (void *) identifier, buf_ch, buf_gch, attr,
- str, (int) strlen(str), itemflags);
+ "%sadd_menu(%d, %d, %u, %p, %s, %s, %d, '%s'(%d), %u)\n", INDENT,
+ window, glyphinfo->glyph, glyphinfo->flags, (void *) identifier,
+ buf_ch, buf_gch, attr, str, (int) strlen(str), itemflags);
} else {
fprintf(wc_tracelogf,
- "%sadd_menu(%d, %d, %p, %s, %s, %d, NULL, %u)\n", INDENT,
- window, glyph, (void *) identifier, buf_ch, buf_gch, attr,
- itemflags);
+ "%sadd_menu(%d, %d, %u, %p, %s, %s, %d, NULL, %u)\n", INDENT,
+ window, glyphinfo->glyph, glyphinfo->flags, (void *) identifier,
+ buf_ch, buf_gch, attr, itemflags);
}
PRE;
- (*tdp->nprocs->win_add_menu)(tdp->ndata, window, glyph, identifier, ch,
- gch, attr, str, itemflags);
+ (*tdp->nprocs->win_add_menu)(tdp->ndata, window, glyphinfo,
+ identifier,ch, gch, attr, str, itemflags);
POST;
}
}
#endif
-/* XXX can we decode the glyph in a meaningful way? see map_glyphmod()?
+/* XXX can we decode the glyph in a meaningful way? see map_glyphinfo()?
genl_putmixed? */
void
-trace_print_glyph(vp, window, x, y, glyph, bkglyph, glyphmod)
+trace_print_glyph(vp, window, x, y, glyphinfo, bkglyphinfo)
void *vp;
winid window;
xchar x, y;
-int glyph, bkglyph;
-int glyphmod[NUM_GLYPHMOD];
+const glyph_info *glyphinfo;
+const glyph_info *bkglyphinfo;
{
struct trace_data *tdp = vp;
- fprintf(wc_tracelogf, "%sprint_glyph(%d, %d, %d, %d, %d, %lu)\n", INDENT, window,
- x, y, glyph, bkglyph, glyphmod);
+ fprintf(wc_tracelogf, "%sprint_glyph(%d, %d, %d, %d, %d)\n", INDENT, window,
+ x, y, glyphinfo->glyph, bkglyphinfo->glyph);
PRE;
- (*tdp->nprocs->win_print_glyph)(tdp->ndata, window, x, y, glyph, bkglyph, glyphmod);
+ (*tdp->nprocs->win_print_glyph)(tdp->ndata, window, x, y, glyphinfo, bkglyphinfo);
POST;
}
typedef struct nhmi {
winid wid; /* NetHack window id */
- int glyph; /* Menu glyphs */
+ glyph_info glyphinfo; /* holds menu glyph and additional glyph info */
anything identifier; /* Value returned if item selected */
CHAR_P accelerator; /* Character used to select item from menu */
CHAR_P group_accel; /* Group accelerator for menu item, if any */
curses_rtrim(new_str);
new_item = (nhmenu_item *) alloc((unsigned) sizeof (nhmenu_item));
new_item->wid = wid;
- new_item->glyph = NO_GLYPH;
+ new_item->glyphinfo = nul_glyphinfo;
new_item->identifier = cg.zeroany;
new_item->accelerator = '\0';
new_item->group_accel = '\0';
/* Add a menu item to the given menu window */
void
-curses_add_nhmenu_item(winid wid, int glyph, const ANY_P *identifier,
- CHAR_P accelerator, CHAR_P group_accel, int attr,
+curses_add_nhmenu_item(winid wid, const glyph_info *glyphinfo,
+ const ANY_P *identifier, CHAR_P accelerator,
+ CHAR_P group_accel, int attr,
const char *str, unsigned itemflags)
{
nhmenu_item *new_item, *current_items, *menu_item_ptr;
}
new_item = curs_new_menu_item(wid, str);
- new_item->glyph = glyph;
+ if (glyphinfo)
+ new_item->glyphinfo = *glyphinfo;
new_item->identifier = *identifier;
new_item->accelerator = accelerator;
new_item->group_accel = group_accel;
}
#if 0
/* FIXME: menuglyphs not implemented yet */
- if (menu_item_ptr->glyph != NO_GLYPH && iflags.use_menu_glyphs) {
- unsigned glyphmod[NUM_GLYPHMOD];
-
- map_glyphmod(0, 0, menu_item_ptr->glyph, 0U, glyphmod);
- color = (int) glyphmod[GM_COLOR];
-
+ if (menu_item_ptr->glyphinfo.glyph != NO_GLYPH && iflags.use_menu_glyphs) {
+ color = (int) menu_item_ptr->glyphinfo.color;
curses_toggle_color_attr(win, color, NONE, ON);
mvwaddch(win, menu_item_ptr->line_num + 1, start_col, curletter);
curses_toggle_color_attr(win, color, NONE, OFF);
CHAR_P def);
int curses_ext_cmd(void);
void curses_create_nhmenu(winid wid, unsigned long);
-void curses_add_nhmenu_item(winid wid, int glyph, const ANY_P *identifier,
- CHAR_P accelerator, CHAR_P group_accel, int attr,
+void curses_add_nhmenu_item(winid wid, const glyph_info *glyphinfo,
+ const ANY_P *identifier, CHAR_P accelerator,
+ CHAR_P group_accel, int attr,
const char *str, unsigned itemflags);
void curs_menu_set_bottom_heavy(winid);
void curses_finalize_nhmenu(winid wid, const char *prompt);
}
identifier.a_int = (count + 1); /* Must be non-zero */
- curses_add_menu(wid, NO_GLYPH, &identifier, curletter, 0,
+ curses_add_menu(wid, &nul_glyphinfo, &identifier, curletter, 0,
A_NORMAL, choices[count], MENU_ITEMFLAGS_NONE);
used_letters[count] = curletter;
}
/* Random Selection */
identifier.a_int = ROLE_RANDOM;
- curses_add_menu(wid, NO_GLYPH, &identifier, '*', 0, A_NORMAL, "Random",
- MENU_ITEMFLAGS_NONE);
+ curses_add_menu(wid, &nul_glyphinfo, &identifier, '*', 0,
+ A_NORMAL, "Random", MENU_ITEMFLAGS_NONE);
/* Quit prompt */
identifier.a_int = ROLE_NONE;
- curses_add_menu(wid, NO_GLYPH, &identifier, 'q', 0, A_NORMAL, "Quit",
- MENU_ITEMFLAGS_NONE);
+ curses_add_menu(wid, &nul_glyphinfo, &identifier, 'q', 0,
+ A_NORMAL, "Quit", MENU_ITEMFLAGS_NONE);
curses_end_menu(wid, prompt);
ret = curses_select_menu(wid, PICK_ONE, &selected);
if (ret == 1) {
/* Adds an inventory item. 'y' is 1 rather than 0 for the first item. */
void
-curses_add_inv(int y,
- int glyph UNUSED,
- CHAR_P accelerator, attr_t attr, const char *str)
+curses_add_inv(int y, const glyph_info *glyphinfo UNUSED, CHAR_P accelerator,
+ attr_t attr, const char *str)
{
WINDOW *win = curses_get_nhwin(INV_WIN);
int color = NO_COLOR;
}
#if 0 /* FIXME: MENU GLYPHS */
if (accelerator && glyph != NO_GLYPH && iflags.use_menu_glyphs) {
- unsigned glyphmod[NUM_GLYPHMOD];
int symbol;
attr_t glyphclr;
- map_glyphmod(0, 0, glyph, 0U, glyphmod);
- symbol = (int) glyphmod[GM_TTYCHAR];
- color = (int) glyphmod[GM_COLOR];
+ symbol = glyphinfo->ttychar;
+ color = glyphinfo->color;
glyphclr = curses_color_attr(color, 0);
wattron(win, glyphclr);
}
/*
-add_menu(winid wid, int glyph, const anything identifier,
+add_menu(winid wid, const glyph_info *glyphinfo,
+ const anything identifier,
char accelerator, char groupacc,
int attr, char *str, unsigned int itemflags)
-- Add a text line str to the given menu window. If identifier
accelerator. It is up to the window-port to make the
accelerator visible to the user (e.g. put "a - " in front
of str). The value attr is the same as in putstr().
- Glyph is an optional glyph to accompany the line. If
+ -- Glyph is an optional glyph to accompany the line and its
+ modifiers (if any) can be found in glyphinfo. If
window port cannot or does not want to display it, this
is OK. If there is no glyph applicable, then this
value will be NO_GLYPH.
menu is displayed, set bit MENU_ITEMFLAGS_SELECTED.
*/
void
-curses_add_menu(winid wid, int glyph, const ANY_P * identifier,
+curses_add_menu(winid wid, const glyph_info *glyphinfo,
+ const ANY_P * identifier,
CHAR_P accelerator, CHAR_P group_accel, int attr,
const char *str, unsigned itemflags)
{
curses_attr = curses_convert_attr(attr);
if (inv_update) {
- curses_add_inv(inv_update, glyph, accelerator, curses_attr, str);
+ curses_add_inv(inv_update, glyphinfo, accelerator, curses_attr, str);
inv_update++;
return;
}
- curses_add_nhmenu_item(wid, glyph, identifier, accelerator, group_accel,
+ curses_add_nhmenu_item(wid, glyphinfo, identifier, accelerator, group_accel,
curses_attr, str, itemflags);
}
}
/*
-print_glyph(window, x, y, glyph, bkglyph, glyphmod)
- -- Print the glyph at (x,y) on the given window. Glyphs are
- integers at the interface, mapped to whatever the window-
+print_glyph(window, x, y, glyphinfo, bkglyphinfo)
+ -- Print glyph at (x,y) on the given window. Glyphs are
+ integers within the glyph_info struct that is passed
+ at the interface, mapped to whatever the window-
port wants (symbol, font, color, attributes, ...there's
a 1-1 map between glyphs and distinct things on the map).
- bkglyph is to render the background behind the glyph.
+ bkglyphinfo is to render the background behind the glyph.
It's not used here.
- -- glyphmod (glyphmod[NUM_GLYPHNOD]) provides extended
- information about the glyph that window ports can use to
- enhance the display in various ways.
+ -- bkglyphinfo contains a background glyph for potential use
+ by some graphical or tiled environments to allow the depiction
+ to fall against a background consistent with the grid
+ around x,y. If bkglyphinfo->glyph is NO_GLYPH, then the
+ parameter should be ignored (do nothing with it).
+ -- glyph_info struct fields:
+ int glyph; the display entity
+ int color; color for window ports not using a tile
+ int ttychar; the character mapping for the original tty
+ interace. Most or all window ports wanted
+ and used this for various things so it is
+ provided in 3.7+
+ short int symidx; offset into syms array
+ unsigned glyphflags; more detail about the entity
*/
+
void
-curses_print_glyph(winid wid, XCHAR_P x, XCHAR_P y, int glyph,
- int bkglyph UNUSED, unsigned *glyphmod)
+curses_print_glyph(winid wid, XCHAR_P x, XCHAR_P y,
+ const glyph_info *glyphinfo, const glyph_info *bkglyphinfo UNUSED)
{
+ int glyph;
int ch;
int color;
unsigned int special;
int attr = -1;
- special = glyphmod[GM_FLAGS];
- ch = (int) glyphmod[GM_TTYCHAR];
- color = (int) glyphmod[GM_COLOR];
+ glyph = glyphinfo->glyph;
+ special = glyphinfo->glyphflags;
+ ch = glyphinfo->ttychar;
+ color = glyphinfo->color;
if ((special & MG_PET) && iflags.hilite_pet) {
attr = iflags.wc2_petattr;
}
/* water and lava look the same except for color; when color is off,
render lava in inverse video so that they look different */
if ((special & (MG_BW_LAVA | MG_BW_ICE)) != 0 && iflags.use_inverse) {
- attr = A_REVERSE; /* map_glyphmod() only sets this if color is off */
+ attr = A_REVERSE; /* map_glyphinfo() only sets this if color is off */
}
}
for (count = 0; count < num_messages; ++count) {
mesg = get_msg_line(do_lifo, count);
if (turn != mesg->turn && count != 0) {
- curses_add_menu(wid, NO_GLYPH, &Id, 0, 0, A_NORMAL, "---",
- MENU_ITEMFLAGS_NONE);
+ curses_add_menu(wid, &nul_glyphinfo, &Id, 0, 0,
+ A_NORMAL, "---", MENU_ITEMFLAGS_NONE);
}
- curses_add_menu(wid, NO_GLYPH, &Id, 0, 0, A_NORMAL, mesg->str,
- MENU_ITEMFLAGS_NONE);
+ curses_add_menu(wid, &nul_glyphinfo, &Id, 0, 0,
+ A_NORMAL, mesg->str, MENU_ITEMFLAGS_NONE);
turn = mesg->turn;
}
if (!count)
- curses_add_menu(wid, NO_GLYPH, &Id, 0, 0, A_NORMAL,
- "[No past messages available.]",
+ curses_add_menu(wid, &nul_glyphinfo, &Id, 0, 0,
+ A_NORMAL, "[No past messages available.]",
MENU_ITEMFLAGS_NONE);
curses_end_menu(wid, "");
Id = cg.zeroany;
while (dlb_fgets(buf, BUFSZ, fp) != NULL) {
- curses_add_menu(wid, NO_GLYPH, &Id, 0, 0, A_NORMAL, buf, FALSE);
+ curses_add_menu(wid, &nul_glyphinfo, &Id, 0, 0,
+ A_NORMAL, buf, FALSE);
}
dlb_fclose(fp);
return;
}
Id = cg.zeroany;
- curses_add_nhmenu_item(wid, NO_GLYPH, &Id, 0, 0, attr, text,
- MENU_ITEMFLAGS_NONE);
+ curses_add_nhmenu_item(wid, &nul_glyphinfo, &Id, 0, 0,
+ attr, text, MENU_ITEMFLAGS_NONE);
} else {
waddstr(win, text);
wnoutrefresh(win);
* later.
*/
void
-safe_add_menu(window, glyph, identifier, ch, gch, attr, str, itemflags)
+safe_add_menu(window, glyphinfo, identifier, ch, gch, attr, str, itemflags)
winid window; /* window to use, must be of type NHW_MENU */
-int glyph UNUSED; /* glyph to display with item (not used) */
+const glyph_info *glyphinfo UNUSED; /* glyph plus glyph info */
const anything *identifier; /* what to return if selected */
char ch; /* keyboard accelerator (0 = pick our own) */
char gch; /* group accelerator (0 = no group) */
* Print the glyph to the output device. Don't flush the output device.
*/
void
-safe_print_glyph(window, x, y, glyph, bkglyph, glyphmod)
-winid window;
-xchar x, y;
-int glyph;
-int bkglyph UNUSED;
-int glyphmod[NUM_GLYPHMOD] UNUSED;
+safe_print_glyph(window, x, y, glyphinfo, bkglyphinfo)
+winid window UNUSED;
+xchar x UNUSED, y UNUSED;
+const glyph_info *glyphinfo UNUSED;
+const glyph_info *bkglyphinfo UNUSED;
{
return;
}
VDECLCB(shim_display_file,(const char *name, BOOLEAN_P complain), "vsi", P2V name, A2P complain)
VDECLCB(shim_start_menu,(winid window, unsigned long mbehavior), "vii", A2P window, A2P mbehavior)
VDECLCB(shim_add_menu,
- (winid window, int glyph, const ANY_P *identifier, CHAR_P ch, CHAR_P gch, int attr, const char *str, unsigned int itemflags),
+ (winid window, const glyph_info *glyphinfo, const ANY_P *identifier, CHAR_P ch, CHAR_P gch, int attr, const char *str, unsigned int itemflags),
"viipiiisi",
- A2P window, A2P glyph, P2V identifier, A2P ch, A2P gch, A2P attr, P2V str, A2P itemflags)
+ A2P window, P2VP glyphinfo, P2V identifier, A2P ch, A2P gch, A2P attr, P2V str, A2P itemflags)
VDECLCB(shim_end_menu,(winid window, const char *prompt), "vis", A2P window, P2V prompt)
/* XXX: shim_select_menu menu_list is an output */
DECLCB(int, shim_select_menu,(winid window, int how, MENU_ITEM_P **menu_list), "iiio", A2P window, A2P how, P2V menu_list)
VDECLCB(shim_wait_synch,(void), "v")
VDECLCB(shim_cliparound,(int x, int y), "vii", A2P x, A2P y)
VDECLCB(shim_update_positionbar,(char *posbar), "vp", P2V posbar)
-VDECLCB(shim_print_glyph,(winid w, int x, int y, int glyph, int bkglyph, int glyphmod[NUM_GLYPHMOD]), "viiiii", A2P w, A2P x, A2P y, A2P glyph, A2P bkglyph, A2P glyphmod)
+VDECLCB(shim_print_glyph,(winid w, int x, int y, const glyph_info *glyph, const glyph_info *bkglyph), "viiiii", A2P w, A2P x, A2P y, V2P glyphinfo, V2P bkglyphinfo)
VDECLCB(shim_raw_print,(const char *str), "vs", P2V str)
VDECLCB(shim_raw_print_bold,(const char *str), "vs", P2V str)
DECLCB(int, shim_nhgetch,(void), "i")
/* add miscellaneous menu entries */
role_menu_extra(ROLE_RANDOM, win, TRUE);
any = cg.zeroany; /* separator, not a choice */
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "",
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, "", MENU_ITEMFLAGS_NONE);
role_menu_extra(RS_RACE, win, FALSE);
role_menu_extra(RS_GENDER, win, FALSE);
role_menu_extra(RS_ALGNMNT, win, FALSE);
/* add miscellaneous menu entries */
role_menu_extra(ROLE_RANDOM, win, TRUE);
any.a_int = 0; /* separator, not a choice */
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "",
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, "", MENU_ITEMFLAGS_NONE);
role_menu_extra(RS_ROLE, win, FALSE);
role_menu_extra(RS_GENDER, win, FALSE);
role_menu_extra(RS_ALGNMNT, win, FALSE);
/* add miscellaneous menu entries */
role_menu_extra(ROLE_RANDOM, win, TRUE);
any.a_int = 0; /* separator, not a choice */
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "",
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, "", MENU_ITEMFLAGS_NONE);
role_menu_extra(RS_ROLE, win, FALSE);
role_menu_extra(RS_RACE, win, FALSE);
role_menu_extra(RS_ALGNMNT, win, FALSE);
setup_algnmenu(win, TRUE, ROLE, RACE, GEND);
role_menu_extra(ROLE_RANDOM, win, TRUE);
any.a_int = 0; /* separator, not a choice */
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "",
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, "", MENU_ITEMFLAGS_NONE);
role_menu_extra(RS_ROLE, win, FALSE);
role_menu_extra(RS_RACE, win, FALSE);
role_menu_extra(RS_GENDER, win, FALSE);
races[RACE].adj,
(GEND == 1 && roles[ROLE].name.f) ? roles[ROLE].name.f
: roles[ROLE].name.m);
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, pbuf,
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, ATR_NONE, pbuf,
MENU_ITEMFLAGS_NONE);
/* blank separator */
any.a_int = 0;
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, "", MENU_ITEMFLAGS_NONE);
/* [ynaq] menu choices */
any.a_int = 1;
- add_menu(win, NO_GLYPH, &any, 'y', 0, ATR_NONE, "Yes; start game",
- MENU_ITEMFLAGS_SELECTED);
+ add_menu(win, &nul_glyphinfo, &any, 'y', 0,
+ ATR_NONE, "Yes; start game", MENU_ITEMFLAGS_SELECTED);
any.a_int = 2;
- add_menu(win, NO_GLYPH, &any, 'n', 0, ATR_NONE,
- "No; choose role again", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 'n', 0,
+ ATR_NONE, "No; choose role again", MENU_ITEMFLAGS_NONE);
if (iflags.renameallowed) {
any.a_int = 3;
- add_menu(win, NO_GLYPH, &any, 'a', 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, 'a', 0, ATR_NONE,
"Not yet; choose another name", MENU_ITEMFLAGS_NONE);
}
any.a_int = -1;
- add_menu(win, NO_GLYPH, &any, 'q', 0, ATR_NONE, "Quit",
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 'q', 0,
+ ATR_NONE, "Quit", MENU_ITEMFLAGS_NONE);
Sprintf(pbuf, "Is this ok? [yn%sq]", iflags.renameallowed ? "a" : "");
end_menu(win, pbuf);
n = select_menu(win, PICK_ONE, &selected);
any = cg.zeroany;
/* no extra blank line preceding this entry; end_menu supplies one */
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"Unacceptable roles", MENU_ITEMFLAGS_NONE);
setup_rolemenu(win, FALSE, ROLE_NONE, ROLE_NONE, ROLE_NONE);
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"Unacceptable races", MENU_ITEMFLAGS_NONE);
setup_racemenu(win, FALSE, ROLE_NONE, ROLE_NONE, ROLE_NONE);
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"Unacceptable genders", MENU_ITEMFLAGS_NONE);
setup_gendmenu(win, FALSE, ROLE_NONE, ROLE_NONE, ROLE_NONE);
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);
- add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE,
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, ATR_NONE, "", MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
"Unacceptable alignments", MENU_ITEMFLAGS_NONE);
setup_algnmenu(win, FALSE, ROLE_NONE, ROLE_NONE, ROLE_NONE);
}
/* !filtering implies reset_role_filtering() where we want to
mark this role as preseleted if current filter excludes it */
- add_menu(win, NO_GLYPH, &any, thisch, 0, ATR_NONE, an(rolenamebuf),
+ add_menu(win, &nul_glyphinfo, &any, thisch, 0,
+ ATR_NONE, an(rolenamebuf),
(!filtering && !role_ok)
? MENU_ITEMFLAGS_SELECTED : MENU_ITEMFLAGS_NONE);
lastch = thisch;
capital letter as unseen accelerator;
!filtering: resetting filter rather than picking, choose by
capital letter since lowercase role letters will be present */
- add_menu(win, NO_GLYPH, &any,
+ add_menu(win, &nul_glyphinfo, &any,
filtering ? this_ch : highc(this_ch),
filtering ? highc(this_ch) : 0,
ATR_NONE, races[i].noun,
this_ch = *genders[i].adj;
/* (see setup_racemenu for explanation of selector letters
and setup_rolemenu for preselection) */
- add_menu(win, NO_GLYPH, &any,
+ add_menu(win, &nul_glyphinfo, &any,
filtering ? this_ch : highc(this_ch),
filtering ? highc(this_ch) : 0,
ATR_NONE, genders[i].adj,
this_ch = *aligns[i].adj;
/* (see setup_racemenu for explanation of selector letters
and setup_rolemenu for preselection) */
- add_menu(win, NO_GLYPH, &any,
+ add_menu(win, &nul_glyphinfo, &any,
filtering ? this_ch : highc(this_ch),
filtering ? highc(this_ch) : 0,
ATR_NONE, aligns[i].adj,
* later.
*/
void
-tty_add_menu(window, glyph, identifier, ch, gch, attr, str, itemflags)
+tty_add_menu(window, glyphinfo, identifier, ch, gch, attr, str, itemflags)
winid window; /* window to use, must be of type NHW_MENU */
-int glyph UNUSED; /* glyph to display with item (not used) */
+const glyph_info *glyphinfo UNUSED; /* glyph info w/glyph to display w/item */
const anything *identifier; /* what to return if selected */
char ch; /* keyboard accelerator (0 = pick our own) */
char gch; /* group accelerator (0 = no group) */
anything any;
any = cg.zeroany; /* not selectable */
- tty_add_menu(window, NO_GLYPH, &any, 0, 0, ATR_NONE, "",
- MENU_ITEMFLAGS_NONE);
- tty_add_menu(window, NO_GLYPH, &any, 0, 0, ATR_NONE, prompt,
- MENU_ITEMFLAGS_NONE);
+ tty_add_menu(window, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, "", MENU_ITEMFLAGS_NONE);
+ tty_add_menu(window, &nul_glyphinfo, &any, 0, 0,
+ ATR_NONE, prompt, MENU_ITEMFLAGS_NONE);
}
/* 52: 'a'..'z' and 'A'..'Z'; avoids selector duplication within a page */
*/
void
-tty_print_glyph(window, x, y, glyph, bkglyph, glyphmod)
+tty_print_glyph(window, x, y, glyphinfo, bkglyphinfo)
winid window;
xchar x, y;
-#ifdef TTY_TILES_ESCCODES
-int glyph;
+#if defined(TTY_TILES_ESCCODES) || defined(MSDOS)
+const glyph_info *glyphinfo;
#else
-int glyph UNUSED;
+const glyph_info *glyphinfo UNUSED;
#endif
-int bkglyph UNUSED;
-unsigned *glyphmod; /* don't mark UNUSED as we need to revisit */
+const glyph_info *bkglyphinfo UNUSED;
{
boolean inverse_on = FALSE;
int ch, color;
+#if defined(TTY_TILES_ESCCODES) || defined(MSDOS)
+ int glyph;
+#endif
unsigned special;
HUPSKIP();
}
#endif
/* get glyph ttychar, color, and special flags */
- ch = (int) glyphmod[GM_TTYCHAR];
- color = (int) glyphmod[GM_COLOR];
- special = glyphmod[GM_FLAGS];
+ ch = glyphinfo->ttychar;
+ color = glyphinfo->color;
+ special = glyphinfo->glyphflags;
print_vt_code2(AVTC_SELECT_WINDOW, window);
typedef struct mswin_nethack_map_window {
HWND hWnd; /* window */
- int map[COLNO][ROWNO]; /* glyph map */
- int bkmap[COLNO][ROWNO]; /* backround glyph map */
- unsigned glyphmod[COLNO][ROWNO][NUM_GLYPHMOD];
+ glyph_info map[COLNO][ROWNO];
+ glyph_info bkmap[COLNO][ROWNO];
boolean mapDirty[COLNO][ROWNO]; /* dirty flag for map */
int mapMode; /* current map mode */
boolean bAsciiMode; /* switch ASCII/tiled mode */
static void paint(PNHMapWindow data, int i, int j);
static void dirtyAll(PNHMapWindow data);
static void dirty(PNHMapWindow data, int i, int j);
-static void setGlyph(PNHMapWindow data, int i, int j, int fg, int bg, unsigned *glyphmod);
+static void setGlyph(PNHMapWindow data, int i, int j,
+ const glyph_info *fg, const glyph_info *bg);
static void clearAll(PNHMapWindow data);
#if (VERSION_MAJOR < 4) && (VERSION_MINOR < 4) && (PATCHLEVEL < 2)
case MSNH_MSG_PRINT_GLYPH: {
PMSNHMsgPrintGlyph msg_data = (PMSNHMsgPrintGlyph) lParam;
setGlyph(data, msg_data->x, msg_data->y,
- msg_data->glyph, msg_data->bkglyph, msg_data->glyphmod);
+ &msg_data->glyphinfo, &msg_data->bkglyphinfo);
} break;
case MSNH_MSG_CLIPAROUND: {
for (col = 0; col < COLNO; col++) {
if (index >= msg_data->max_size)
break;
- if (data->map[col][row] == NO_GLYPH)
+ if (data->map[col][row].glyph == NO_GLYPH)
mgch = ' ';
- msg_data->buffer[index] = data->glyphmod[col][row][GM_TTYCHAR];
+ msg_data->buffer[index] = data->map[col][row].ttychar;
index++;
}
if (index >= msg_data->max_size - 1)
// int mgch;
#endif
layer = 0;
- glyph = data->map[i][j];
- bkglyph = data->bkmap[i][j];
+ glyph = data->map[i][j].glyph;
+ bkglyph = data->bkmap[i][j].glyph;
if (glyph == NO_GLYPH && bkglyph == NO_GLYPH) {
HBRUSH blackBrush = CreateSolidBrush(RGB(0, 0, 0));
if ((glyph != NO_GLYPH) && (glyph != bkglyph)) {
/* rely on NetHack core helper routine */
ntile = glyph2tile[glyph];
- if (data->glyphmod[i][j][GM_FLAGS] & MG_FEMALE)
+ if (data->map[i][j].glyphflags & MG_FEMALE)
ntile++;
t_x = TILEBMP_X(ntile);
t_y = TILEBMP_Y(ntile);
}
#ifdef USE_PILEMARK
- if ((glyph != NO_GLYPH) && (data->glyphmod[i][j][GM_FLAGS] & MG_PET)
+ if ((glyph != NO_GLYPH) && (data->map[i][j].glyphflags & MG_PET)
#else
if ((glyph != NO_GLYPH) && glyph_is_pet(glyph)
#endif
DeleteDC(hdcPetMark);
}
#ifdef USE_PILEMARK
- if ((glyph != NO_GLYPH) && (data->glyphmod[i][j][GM_FLAGS] & MG_OBJPILE)
+ if ((glyph != NO_GLYPH) && (data->map[i][j].glyphflags & MG_OBJPILE)
&& iflags.hilite_pile) {
/* apply pilemark transparently over other image */
HDC hdcPileMark;
static void
paintGlyph(PNHMapWindow data, int i, int j, RECT * rect)
{
- if (data->map[i][j] >= 0) {
+ if (data->map[i][j].glyph >= 0) {
char ch;
WCHAR wch;
nhglyph2charcolor(data->map[i][j], &ch, &color);
OldFg = SetTextColor(hDC, nhcolor_to_RGB(color));
#else
- ch = (char) data->glyphmod[i][j][GM_TTYCHAR];
- color = (int) data->glyphmod[i][j][GM_COLOR];
- if (((data->glyphmod[i][j][GM_FLAGS] & MG_PET) && iflags.hilite_pet)
- || ((data->glyphmod[i][j][GM_FLAGS] & (MG_DETECT | MG_BW_LAVA))
+ ch = (char) data->map[i][j].ttychar;
+ color = (int) data->map[i][j].color;
+ if (((data->map[i][j].glyphflags & MG_PET) && iflags.hilite_pet)
+ || ((data->map[i][j].glyphflags & (MG_DETECT | MG_BW_LAVA))
&& iflags.use_inverse)) {
back_brush =
CreateSolidBrush(nhcolor_to_RGB(CLR_GRAY));
}
}
-static void setGlyph(PNHMapWindow data, int i, int j, int fg, int bg, unsigned *glyphmod)
+static void setGlyph(PNHMapWindow data, int i, int j,
+ const glyph_info *fg, const glyph_info *bg)
{
- int gm;
-
- if ((data->map[i][j] != fg) || (data->bkmap[i][j] != bg)
- || data->glyphmod[i][j][GM_TTYCHAR] != glyphmod[GM_TTYCHAR]
- || data->glyphmod[i][j][GM_COLOR] != glyphmod[GM_COLOR]
- || data->glyphmod[i][j][GM_FLAGS] != glyphmod[GM_FLAGS]) {
- data->map[i][j] = fg;
- data->bkmap[i][j] = bg;
+ if ((data->map[i][j].glyph != fg->glyph)
+ || (data->bkmap[i][j].glyph != bg->glyph)
+ || data->map[i][j].ttychar != fg->ttychar
+ || data->map[i][j].color != fg->color
+ || data->map[i][j].glyphflags != fg->glyphflags) {
+ data->map[i][j] = *fg;
+ data->bkmap[i][j] = *bg;
data->mapDirty[i][j] = TRUE;
- for (gm = 0; gm < NUM_GLYPHMOD; ++gm)
- data->glyphmod[i][j][gm] = glyphmod[gm];
RECT rect;
nhcoord2display(data, i, j, &rect);
InvalidateRect(data->hWnd, &rect, FALSE);
{
for (int x = 0; x < COLNO; x++)
for (int y = 0; y < ROWNO; y++) {
- data->map[x][y] = NO_GLYPH;
- data->bkmap[x][y] = NO_GLYPH;
- data->glyphmod[x][y][GM_TTYCHAR] = ' ';
- data->glyphmod[x][y][GM_COLOR] = NO_COLOR;
- data->glyphmod[x][y][GM_FLAGS] = 0U;
+ data->map[x][y] = nul_glyphinfo;
+ data->bkmap[x][y] = nul_glyphinfo;
data->mapDirty[x][y] = TRUE;
}
InvalidateRect(data->hWnd, NULL, FALSE);
#define CHECK_HEIGHT 16
typedef struct mswin_menu_item {
- int glyph;
+ glyph_info glyphinfo;
ANY_P identifier;
CHAR_P accelerator;
CHAR_P group_accel;
#define NHMENU_IS_SELECTABLE(item) ((item).identifier.a_obj != NULL)
#define NHMENU_IS_SELECTED(item) ((item).count != 0)
-#define NHMENU_HAS_GLYPH(item) ((item).glyph != NO_GLYPH)
+#define NHMENU_HAS_GLYPH(item) ((item).glyphinfo.glyph != NO_GLYPH)
INT_PTR CALLBACK MenuWndProc(HWND, UINT, WPARAM, LPARAM);
LRESULT CALLBACK NHMenuListWndProc(HWND, UINT, WPARAM, LPARAM);
new_item = data->menu.size;
ZeroMemory(&data->menu.items[new_item],
sizeof(data->menu.items[new_item]));
- data->menu.items[new_item].glyph = msg_data->glyph;
+ data->menu.items[new_item].glyphinfo = msg_data->glyphinfo;
data->menu.items[new_item].identifier = *msg_data->identifier;
data->menu.items[new_item].accelerator = msg_data->accelerator;
data->menu.items[new_item].group_accel = msg_data->group_accel;
double monitorScale = win10_monitor_scale(hWnd);
saveBmp = SelectObject(tileDC, GetNHApp()->bmpMapTiles);
- ntile = glyph2tile[item->glyph];
+ ntile = glyph2tile[item->glyphinfo.glyph];
t_x =
(ntile % GetNHApp()->mapTilesPerLine) * GetNHApp()->mapTile_X;
t_y =
client_rt.right = min(client_rt.right, lpdis->rcItem.right);
if (NHMENU_IS_SELECTABLE(*item)
&& data->menu.items[lpdis->itemID].count != 0
- && item->glyph != NO_GLYPH) {
+ && item->glyphinfo.glyph != NO_GLYPH) {
if (data->menu.items[lpdis->itemID].count == -1) {
_stprintf(wbuf, TEXT("Count: All"));
} else {
typedef struct mswin_nhmsg_print_glyph {
XCHAR_P x;
XCHAR_P y;
- int glyph;
- int bkglyph;
- int glyphmod[NUM_GLYPHMOD];
+ glyph_info glyphinfo;
+ glyph_info bkglyphinfo;
} MSNHMsgPrintGlyph, *PMSNHMsgPrintGlyph;
typedef struct mswin_nhmsg_cliparound {
} MSNHMsgClipAround, *PMSNHMsgClipAround;
typedef struct mswin_nhmsg_add_menu {
- int glyph;
+ glyph_info glyphinfo;
const ANY_P *identifier;
CHAR_P accelerator;
CHAR_P group_accel;
} else
Strcpy(rolenamebuf, roles[i].name.m);
}
- add_menu(win, NO_GLYPH, &any, thisch, 0, ATR_NONE,
- an(rolenamebuf), MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, thisch, 0,
+ ATR_NONE, an(rolenamebuf), MENU_ITEMFLAGS_NONE);
lastch = thisch;
}
}
flags.initalign, PICK_RANDOM) + 1;
if (any.a_int == 0) /* must be non-zero */
any.a_int = randrole(FALSE) + 1;
- add_menu(win, NO_GLYPH, &any, '*', 0, ATR_NONE, "Random",
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, '*', 0,
+ ATR_NONE, "Random", MENU_ITEMFLAGS_NONE);
any.a_int = i + 1; /* must be non-zero */
- add_menu(win, NO_GLYPH, &any, 'q', 0, ATR_NONE, "Quit",
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 'q', 0,
+ ATR_NONE, "Quit", MENU_ITEMFLAGS_NONE);
Sprintf(pbuf, "Pick a role for your %s", plbuf);
end_menu(win, pbuf);
n = select_menu(win, PICK_ONE, &selected);
if (ok_race(flags.initrole, i, flags.initgend,
flags.initalign)) {
any.a_int = i + 1; /* must be non-zero */
- add_menu(win, NO_GLYPH, &any, races[i].noun[0], 0,
- ATR_NONE, races[i].noun, MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any,
+ races[i].noun[0], 0, ATR_NONE,
+ races[i].noun, MENU_ITEMFLAGS_NONE);
}
any.a_int = pick_race(flags.initrole, flags.initgend,
flags.initalign, PICK_RANDOM) + 1;
if (any.a_int == 0) /* must be non-zero */
any.a_int = randrace(flags.initrole) + 1;
- add_menu(win, NO_GLYPH, &any, '*', 0, ATR_NONE, "Random",
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, '*', 0,
+ ATR_NONE, "Random", MENU_ITEMFLAGS_NONE);
any.a_int = i + 1; /* must be non-zero */
- add_menu(win, NO_GLYPH, &any, 'q', 0, ATR_NONE, "Quit",
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 'q', 0,
+ ATR_NONE, "Quit", MENU_ITEMFLAGS_NONE);
Sprintf(pbuf, "Pick the race of your %s", plbuf);
end_menu(win, pbuf);
n = select_menu(win, PICK_ONE, &selected);
if (ok_gend(flags.initrole, flags.initrace, i,
flags.initalign)) {
any.a_int = i + 1;
- add_menu(win, NO_GLYPH, &any, genders[i].adj[0], 0,
- ATR_NONE, genders[i].adj, MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any,
+ genders[i].adj[0], 0, ATR_NONE,
+ genders[i].adj, MENU_ITEMFLAGS_NONE);
}
any.a_int = pick_gend(flags.initrole, flags.initrace,
flags.initalign, PICK_RANDOM) + 1;
if (any.a_int == 0) /* must be non-zero */
any.a_int = randgend(flags.initrole, flags.initrace) + 1;
- add_menu(win, NO_GLYPH, &any, '*', 0, ATR_NONE, "Random",
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, '*', 0,
+ ATR_NONE, "Random", MENU_ITEMFLAGS_NONE);
any.a_int = i + 1; /* must be non-zero */
- add_menu(win, NO_GLYPH, &any, 'q', 0, ATR_NONE, "Quit",
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 'q', 0,
+ ATR_NONE, "Quit", MENU_ITEMFLAGS_NONE);
Sprintf(pbuf, "Pick the gender of your %s", plbuf);
end_menu(win, pbuf);
n = select_menu(win, PICK_ONE, &selected);
if (ok_align(flags.initrole, flags.initrace,
flags.initgend, i)) {
any.a_int = i + 1;
- add_menu(win, NO_GLYPH, &any, aligns[i].adj[0], 0,
- ATR_NONE, aligns[i].adj, MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any,
+ aligns[i].adj[0], 0, ATR_NONE,
+ aligns[i].adj, MENU_ITEMFLAGS_NONE);
}
any.a_int = pick_align(flags.initrole, flags.initrace,
flags.initgend, PICK_RANDOM) + 1;
if (any.a_int == 0) /* must be non-zero */
any.a_int = randalign(flags.initrole, flags.initrace) + 1;
- add_menu(win, NO_GLYPH, &any, '*', 0, ATR_NONE, "Random",
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, '*', 0,
+ ATR_NONE, "Random", MENU_ITEMFLAGS_NONE);
any.a_int = i + 1; /* must be non-zero */
- add_menu(win, NO_GLYPH, &any, 'q', 0, ATR_NONE, "Quit",
- MENU_ITEMFLAGS_NONE);
+ add_menu(win, &nul_glyphinfo, &any, 'q', 0,
+ ATR_NONE, "Quit", MENU_ITEMFLAGS_NONE);
Sprintf(pbuf, "Pick the alignment of your %s", plbuf);
end_menu(win, pbuf);
n = select_menu(win, PICK_ONE, &selected);
}
/*
-add_menu(windid window, int glyph, const anything identifier,
+add_menu(windid window, const glyph_info *glyphinfo,
+ const anything identifier,
char accelerator, char groupacc,
int attr, char *str, unsigned int itemflags)
-- Add a text line str to the given menu window. If
-identifier
- is 0, then the line cannot be selected (e.g. a title).
+ identifier is 0, then the line cannot be selected (e.g. a title).
Otherwise, identifier is the value returned if the line is
selected. Accelerator is a keyboard key that can be used
to select the line. If the accelerator of a selectable
accelerator. It is up to the window-port to make the
accelerator visible to the user (e.g. put "a - " in front
of str). The value attr is the same as in putstr().
- Glyph is an optional glyph to accompany the line. If
- window port cannot or does not want to display it, this
+ Glyphinfo->glyph is an optional glyph to accompany the line.
+ If window port cannot or does not want to display it, this
is OK. If there is no glyph applicable, then this
value will be NO_GLYPH.
-- All accelerators should be in the range [A-Za-z].
menu is displayed, set preselected to TRUE.
*/
void
-mswin_add_menu(winid wid, int glyph, const ANY_P *identifier,
+mswin_add_menu(winid wid, const glyph_info *glyphinfo,
+ const ANY_P *identifier,
CHAR_P accelerator, CHAR_P group_accel, int attr,
const char *str, unsigned int itemflags)
{
boolean presel = ((itemflags & MENU_ITEMFLAGS_SELECTED) != 0);
- logDebug("mswin_add_menu(%d, %d, %p, %c, %c, %d, %s, %u)\n", wid, glyph,
+ logDebug("mswin_add_menu(%d, %d, %u, %p, %c, %c, %d, %s, %u)\n", wid,
+ glyphinfo->glyph, glyphinfo->glyphflags,
identifier, (char) accelerator, (char) group_accel, attr, str,
itemflags);
if ((wid >= 0) && (wid < MAXWINDOWS)
&& (GetNHApp()->windowlist[wid].win != NULL)) {
MSNHMsgAddMenu data;
ZeroMemory(&data, sizeof(data));
- data.glyph = glyph;
+ if (glyphinfo)
+ data.glyphinfo = *glyphinfo;
data.identifier = identifier;
data.accelerator = accelerator;
data.group_accel = group_accel;
}
/*
-print_glyph(window, x, y, glyph, bkglyph, glyphmod)
- -- Print the glyph at (x,y) on the given window. Glyphs are
- integers at the interface, mapped to whatever the window-
+print_glyph(window, x, y, glyphinfo, bkglyphinfo)
+ -- Print a glyph (glyphinfo->glyph) at (x,y) on the given
+ window. Glyphs are integers mapped to whatever the window-
port wants (symbol, font, color, attributes, ...there's
a 1-1 map between glyphs and distinct things on the map).
- -- bkglyph is a background glyph for potential use by some
- graphical or tiled environments to allow the depiction
+ -- bkglyphinfo contains a background glyph for potential use
+ by some graphical or tiled environments to allow the depiction
to fall against a background consistent with the grid
around x,y.
- -- glyphmod provides extended information about the glyph
- that window ports can use to enhance the display in
- various ways.
*/
void
-mswin_print_glyph(winid wid, XCHAR_P x, XCHAR_P y, int glyph, int bkglyph, unsigned *glyphmod)
+mswin_print_glyph(winid wid, XCHAR_P x, XCHAR_P y,
+ const glyph_info *glyphinfo, const glyph_info *bkglyphinfo)
{
- logDebug("mswin_print_glyph(%d, %d, %d, %d, %d, %lu)\n", wid, x, y, glyph, bkglyph, glyphmod);
+ logDebug("mswin_print_glyph(%d, %d, %d, %d, %d, %lu)\n", wid, x, y, glyphinfo->glyph, bkglyphinfo->glyph);
if ((wid >= 0) && (wid < MAXWINDOWS)
&& (GetNHApp()->windowlist[wid].win != NULL)) {
ZeroMemory(&data, sizeof(data));
data.x = x;
data.y = y;
- data.glyph = glyph;
- data.bkglyph = bkglyph;
- data.glyphmod[GM_TTYCHAR] = glyphmod[GM_TTYCHAR];
- data.glyphmod[GM_COLOR] = glyphmod[GM_COLOR];
- data.glyphmod[GM_FLAGS] = glyphmod[GM_FLAGS];
+ if (glyphinfo)
+ data.glyphinfo = *glyphinfo;
+ if (bkglyphinfo)
+ data.bkglyphinfo = *bkglyphinfo;
SendMessage(GetNHApp()->windowlist[wid].win, WM_MSNH_COMMAND,
(WPARAM) MSNH_MSG_PRINT_GLYPH, (LPARAM) &data);
}
void mswin_putstr_ex(winid wid, int attr, const char *text, int);
void mswin_display_file(const char *filename, BOOLEAN_P must_exist);
void mswin_start_menu(winid wid, unsigned long mbehavior);
-void mswin_add_menu(winid wid, int glyph, const ANY_P *identifier,
+void mswin_add_menu(winid wid, const glyph_info *glyphinfo,
+ const ANY_P *identifier,
CHAR_P accelerator, CHAR_P group_accel, int attr,
const char *str, unsigned int itemflags);
void mswin_end_menu(winid wid, const char *prompt);
void mswin_mark_synch(void);
void mswin_wait_synch(void);
void mswin_cliparound(int x, int y);
-void mswin_print_glyph(winid wid, XCHAR_P x, XCHAR_P y, int glyph, int bkglyph, unsigned *glyphmod);
+void mswin_print_glyph(winid wid, XCHAR_P x, XCHAR_P y,
+ const glyph_info *glyph, const glyph_info *bkglyph);
void mswin_raw_print(const char *str);
void mswin_raw_print_bold(const char *str);
void mswin_raw_print_flush();
projects / nethack / commitdiff