more window port interface adjustments
further adjustments to the window port interface to pass a pointer to a glyph_info struct which describes not just the glyph number itself, but also the ttychar, the color, the glyphflags, and the symset index. This affects two existing window port calls that get passed glyphs and does the parameter consistently for both of them using the glyph_info struct pointer: print_glyph() add_menu(). The recently added glyphmod parameter is now unnecessary and has been removed.
This commit is contained in:
+2
-4
@@ -631,9 +631,9 @@ unsigned long mbehavior UNUSED;
|
||||
|
||||
/*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) */
|
||||
@@ -645,8 +645,6 @@ unsigned itemflags;
|
||||
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) {
|
||||
|
||||
Reference in New Issue
Block a user