nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

1) get rid of menu titles

Browse source 
2) let separators have labels, when they have a label, then they will appear like a menu title used to

so if you want a menu title, you use a separator in the menu itself at the top

more style work may be needed
This commit is contained in:
Dana Jansens 2007-04-22 00:36:54 +00:00
parent 854b2ae684
commit 957963e272
11 changed files with 152 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/menu.xml.in
View file

@ -33,6 +33,7 @@
</menu>
<menu id="root-menu" label="Openbox 3">
<separator label="Openbox" />
<menu id="apps-menu" />
<menu id="games-menu" />
<separator />

22
openbox/client_list_combined_menu.c
View file

@ -48,13 +48,7 @@ static void self_update(ObMenuFrame *frame, gpointer data)
gboolean empty = TRUE;
/* Don't need a separator at the very top */
if (desktop > 0)
menu_add_separator(menu, -1);
e = menu_add_normal(menu, -1, NULL, NULL);
e->data.normal.enabled = FALSE;
e->data.normal.label = g_strdup(screen_desktop_names[desktop]);
/* The one at the bottom will always have entries below it though */
menu_add_separator(menu, -1);
menu_add_separator(menu, -1, screen_desktop_names[desktop]);
for (it = focus_order, i = 0; it; it = g_list_next(it), ++i) {
ObClient *c = it->data;
if (client_normal(c) && (!c->skip_taskbar || c->iconic) &&
@ -66,11 +60,6 @@ static void self_update(ObMenuFrame *frame, gpointer data)
empty = FALSE;
if (!icons && c->iconic) {
icons = TRUE;
menu_add_separator(menu, -1);
}
act = action_from_string("Activate",
OB_USER_ACTION_MENU_SELECTION);
act->data.activate.any.c = c;
@ -79,8 +68,13 @@ static void self_update(ObMenuFrame *frame, gpointer data)
OB_USER_ACTION_MENU_SELECTION);
act->data.desktop.desk = desktop;
acts = g_slist_append(acts, act);
e = menu_add_normal(menu, i, (c->iconic ?
c->icon_title : c->title), acts);
if (c->iconic) {
gchar *title = g_strdup_printf("(%s)", c->icon_title);
e = menu_add_normal(menu, i, title, acts);
g_free(title);
} else
e = menu_add_normal(menu, i, c->title, acts);
if (config_menu_client_list_icons
&& (icon = client_icon(c, 32, 32))) {

15
openbox/client_list_menu.c
View file

@ -44,7 +44,6 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
DesktopData *d = data;
GList *it;
gint i;
gboolean icons = FALSE;
gboolean empty = TRUE;
menu_clear_entries(menu);
@ -61,11 +60,6 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
empty = FALSE;
if (!icons && c->iconic) {
icons = TRUE;
menu_add_separator(menu, -1);
}
act = action_from_string("Activate",
OB_USER_ACTION_MENU_SELECTION);
act->data.activate.any.c = c;
@ -74,8 +68,13 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
OB_USER_ACTION_MENU_SELECTION);
act->data.desktop.desk = d->desktop;
acts = g_slist_append(acts, act);
e = menu_add_normal(menu, i,
(c->iconic ? c->icon_title : c->title), acts);
if (c->iconic) {
gchar *title = g_strdup_printf("(%s)", c->icon_title);
e = menu_add_normal(menu, i, title, acts);
g_free(title);
} else
e = menu_add_normal(menu, i, c->title, acts);
if (config_menu_client_list_icons
&& (icon = client_icon(c, 32, 32))) {

14
openbox/client_menu.c
View file

@ -57,8 +57,6 @@ static void client_update(ObMenuFrame *frame, gpointer data)
ObMenuEntry *e;
GList *it;
frame->show_title = FALSE;
for (it = menu->entries; it; it = g_list_next(it)) {
e = it->data;
if (e->type == OB_MENU_ENTRY_TYPE_NORMAL)
@ -140,7 +138,7 @@ static void send_to_update(ObMenuFrame *frame, gpointer data)
guint desk;
if (i >= screen_num_desktops) {
menu_add_separator(menu, -1);
menu_add_separator(menu, -1, NULL);
desk = DESKTOP_ALL;
name = _("All desktops");
@ -192,11 +190,7 @@ void client_menu_startup()
menu = menu_new(CLIENT_MENU_NAME, _("Client menu"), NULL);
menu_set_update_func(menu, client_update);
e = menu_add_submenu(menu, CLIENT_SEND_TO, SEND_TO_MENU_NAME);
e->data.normal.mask = ob_rr_theme->desk_mask;
e->data.normal.mask_normal_color = ob_rr_theme->menu_color;
e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color;
menu_add_submenu(menu, CLIENT_SEND_TO, SEND_TO_MENU_NAME);
menu_add_submenu(menu, CLIENT_LAYER, LAYER_MENU_NAME);
@ -238,7 +232,7 @@ void client_menu_startup()
OB_USER_ACTION_MENU_SELECTION));
menu_add_normal(menu, CLIENT_DECORATE, _("Decorate"), acts);
menu_add_separator(menu, -1);
menu_add_separator(menu, -1, NULL);
acts = g_slist_prepend(NULL, action_from_string
("Move", OB_USER_ACTION_MENU_SELECTION));
@ -248,7 +242,7 @@ void client_menu_startup()
("Resize", OB_USER_ACTION_MENU_SELECTION));
menu_add_normal(menu, CLIENT_RESIZE, _("Resize"), acts);
menu_add_separator(menu, -1);
menu_add_separator(menu, -1, NULL);
acts = g_slist_prepend(NULL, action_from_string
("Close", OB_USER_ACTION_MENU_SELECTION));

16
openbox/menu.c
View file

@ -2,7 +2,7 @@
menu.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
Copyright (c) 2003 Ben Jansens
Copyright (c) 2003-2007 Dana Jansens
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -201,8 +201,15 @@ static void parse_menu_separator(ObParseInst *i,
{
ObMenuParseState *state = data;
if (state->parent)
menu_add_separator(state->parent, -1);
if (state->parent) {
gchar *label;
if (!parse_attr_string("label", node, &label))
label = NULL;
menu_add_separator(state->parent, -1, label);
g_free(label);
}
}
static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@ -414,11 +421,12 @@ ObMenuEntry* menu_add_submenu(ObMenu *self, gint id, const gchar *submenu)
return e;
}
ObMenuEntry* menu_add_separator(ObMenu *self, gint id)
ObMenuEntry* menu_add_separator(ObMenu *self, gint id, const gchar *label)
{
ObMenuEntry *e;
e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SEPARATOR, id);
e->data.separator.label = g_strdup(label);
self->entries = g_list_append(self->entries, e);
return e;

6
openbox/menu.h
View file

@ -1,7 +1,7 @@
/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
menu.h for the Openbox window manager
Copyright (c) 2003 Ben Jansens
Copyright (c) 2003-2007 Dana Jansens
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -100,7 +100,7 @@ struct _ObSubmenuMenuEntry {
};
struct _ObSeparatorMenuEntry {
gchar foo; /* placeholder */
gchar *label;
};
struct _ObMenuEntry
@ -136,7 +136,7 @@ void menu_set_destroy_func(ObMenu *menu, ObMenuDestroyFunc func);
ObMenuEntry* menu_add_normal(ObMenu *menu, gint id, const gchar *label,
GSList *actions);
ObMenuEntry* menu_add_submenu(ObMenu *menu, gint id, const gchar *submenu);
ObMenuEntry* menu_add_separator(ObMenu *menu, gint id);
ObMenuEntry* menu_add_separator(ObMenu *menu, gint id, const gchar *label);
void menu_clear_entries(ObMenu *menu);
void menu_entry_remove(ObMenuEntry *self);

193
openbox/menuframe.c
View file

@ -2,7 +2,7 @@
menuframe.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
Copyright (c) 2003 Ben Jansens
Copyright (c) 2003-2007 Dana Jansens
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -33,7 +33,6 @@
#define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask |\
LeaveWindowMask)
#define TITLE_EVENTMASK (ButtonPressMask | ButtonMotionMask)
#define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
ButtonPressMask | ButtonReleaseMask)
@ -54,6 +53,22 @@ static Window createWindow(Window parent, gulong mask,
RrVisual(ob_rr_inst), mask, attrib);
}
GHashTable *menu_frame_map;
void menu_frame_startup(gboolean reconfig)
{
if (reconfig) return;
menu_frame_map = g_hash_table_new(g_int_hash, g_int_equal);
}
void menu_frame_shutdown(gboolean reconfig)
{
if (reconfig) return;
g_hash_table_destroy(menu_frame_map);
}
ObMenuFrame* menu_frame_new(ObMenu *menu, ObClient *client)
{
ObMenuFrame *self;
@ -63,18 +78,12 @@ ObMenuFrame* menu_frame_new(ObMenu *menu, ObClient *client)
self->type = Window_Menu;
self->menu = menu;
self->selected = NULL;
self->show_title = TRUE;
self->client = client;
self->direction_right = TRUE;
attr.event_mask = FRAME_EVENTMASK;
self->window = createWindow(RootWindow(ob_display, ob_screen),
CWEventMask, &attr);
attr.event_mask = TITLE_EVENTMASK;
self->title = createWindow(self->window, CWEventMask, &attr);
self->items = createWindow(self->window, 0, NULL);
XMapWindow(ob_display, self->items);
self->a_title = RrAppearanceCopy(ob_rr_theme->a_menu_title);
self->a_items = RrAppearanceCopy(ob_rr_theme->a_menu);
@ -94,8 +103,6 @@ void menu_frame_free(ObMenuFrame *self)
stacking_remove(MENU_AS_WINDOW(self));
XDestroyWindow(ob_display, self->items);
XDestroyWindow(ob_display, self->title);
XDestroyWindow(ob_display, self->window);
RrAppearanceFree(self->a_items);
@ -116,11 +123,17 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry,
self->frame = frame;
attr.event_mask = ENTRY_EVENTMASK;
self->window = createWindow(self->frame->items, CWEventMask, &attr);
self->window = createWindow(self->frame->window, CWEventMask, &attr);
self->text = createWindow(self->window, 0, NULL);
if (entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR) {
g_hash_table_insert(menu_frame_map, &self->window, self);
g_hash_table_insert(menu_frame_map, &self->text, self);
if (entry->type == OB_MENU_ENTRY_TYPE_NORMAL) {
self->icon = createWindow(self->window, 0, NULL);
g_hash_table_insert(menu_frame_map, &self->icon, self);
}
if (entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
self->bullet = createWindow(self->window, 0, NULL);
g_hash_table_insert(menu_frame_map, &self->bullet, self);
}
XMapWindow(ob_display, self->window);
@ -159,9 +172,15 @@ static void menu_entry_frame_free(ObMenuEntryFrame *self)
if (self) {
XDestroyWindow(ob_display, self->text);
XDestroyWindow(ob_display, self->window);
if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR) {
g_hash_table_insert(menu_frame_map, &self->text, self);
g_hash_table_insert(menu_frame_map, &self->window, self);
if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) {
XDestroyWindow(ob_display, self->icon);
g_hash_table_insert(menu_frame_map, &self->icon, self);
}
if (self->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
XDestroyWindow(ob_display, self->bullet);
g_hash_table_insert(menu_frame_map, &self->bullet, self);
}
RrAppearanceFree(self->a_normal);
@ -193,10 +212,8 @@ void menu_frame_place_topmenu(ObMenuFrame *self, gint x, gint y)
x = self->client->frame->area.x + self->client->frame->size.left;
y = self->client->frame->area.y + self->client->frame->size.top;
} else {
if (config_menu_middle) {
x -= self->area.width / 2;
}
y -= self->title_h;
if (config_menu_middle)
y -= self->area.height / 2;
}
menu_frame_move(self, x, y);
}
@ -215,8 +232,7 @@ void menu_frame_place_submenu(ObMenuFrame *self)
else
x = self->parent->area.x - self->area.width + overlap + bwidth;
y = self->parent->area.y + self->parent->title_h +
self->parent_entry->area.y;
y = self->parent->area.y + self->parent_entry->area.y;
if (config_menu_middle)
y -= (self->area.height - (bwidth * 2) - self->item_h) / 2;
else
@ -260,19 +276,27 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
ObMenu *sub;
ObMenuFrame *frame = self->frame;
item_a = ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
!self->entry->data.normal.enabled) ?
self->a_disabled :
(self == self->frame->selected ?
self->a_selected :
self->a_normal));
switch (self->entry->type) {
case OB_MENU_ENTRY_TYPE_NORMAL:
case OB_MENU_ENTRY_TYPE_SUBMENU:
item_a = ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
!self->entry->data.normal.enabled) ?
self->a_disabled :
(self == self->frame->selected ?
self->a_selected :
self->a_normal));
th = self->frame->item_h;
break;
case OB_MENU_ENTRY_TYPE_SEPARATOR:
th = SEPARATOR_HEIGHT + 2*PADDING;
if (self->entry->data.separator.label) {
item_a = self->frame->a_title;
item_a->texture[0].data.text.string =
self->entry->data.separator.label;
th = self->frame->title_h;
} else {
item_a = self->a_normal;
th = SEPARATOR_HEIGHT + 2*PADDING;
}
break;
default:
g_assert_not_reached();
@ -285,17 +309,19 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
item_a->surface.parenty = self->area.y;
RrPaint(item_a, self->window, self->area.width, self->area.height);
text_a = ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
!self->entry->data.normal.enabled) ?
self->a_text_disabled :
(self == self->frame->selected ?
self->a_text_selected :
self->a_text_normal));
switch (self->entry->type) {
case OB_MENU_ENTRY_TYPE_NORMAL:
text_a = (!self->entry->data.normal.enabled ?
self->a_text_disabled :
(self == self->frame->selected ?
self->a_text_selected :
self->a_text_normal));
text_a->texture[0].data.text.string = self->entry->data.normal.label;
break;
case OB_MENU_ENTRY_TYPE_SUBMENU:
text_a = (self == self->frame->selected ?
self->a_text_selected :
self->a_text_normal);
sub = self->entry->data.submenu.submenu;
text_a->texture[0].data.text.string = sub ? sub->title : "";
break;
@ -327,24 +353,26 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
self->frame->item_h - 2*PADDING);
break;
case OB_MENU_ENTRY_TYPE_SEPARATOR:
XMoveResizeWindow(ob_display, self->text, PADDING, PADDING,
self->area.width - 2*PADDING, SEPARATOR_HEIGHT);
self->a_separator->surface.parent = item_a;
self->a_separator->surface.parentx = PADDING;
self->a_separator->surface.parenty = PADDING;
self->a_separator->texture[0].data.lineart.color =
text_a->texture[0].data.text.color;
self->a_separator->texture[0].data.lineart.x1 = 2*PADDING;
self->a_separator->texture[0].data.lineart.y1 = SEPARATOR_HEIGHT / 2;
self->a_separator->texture[0].data.lineart.x2 =
self->area.width - 4*PADDING;
self->a_separator->texture[0].data.lineart.y2 = SEPARATOR_HEIGHT / 2;
RrPaint(self->a_separator, self->text,
self->area.width - 2*PADDING, SEPARATOR_HEIGHT);
if (self->entry->data.separator.label == NULL) {
XMoveResizeWindow(ob_display, self->text, PADDING, PADDING,
self->area.width - 2*PADDING, SEPARATOR_HEIGHT);
self->a_separator->surface.parent = item_a;
self->a_separator->surface.parentx = PADDING;
self->a_separator->surface.parenty = PADDING;
self->a_separator->texture[0].data.lineart.color =
text_a->texture[0].data.text.color;
self->a_separator->texture[0].data.lineart.x1 = 2*PADDING;
self->a_separator->texture[0].data.lineart.y1 = SEPARATOR_HEIGHT/2;
self->a_separator->texture[0].data.lineart.x2 =
self->area.width - 4*PADDING;
self->a_separator->texture[0].data.lineart.y2 = SEPARATOR_HEIGHT/2;
RrPaint(self->a_separator, self->text,
self->area.width - 2*PADDING, SEPARATOR_HEIGHT);
}
break;
}
if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR &&
if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
self->entry->data.normal.icon_data)
{
XMoveResizeWindow(ob_display, self->icon,
@ -368,7 +396,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
self->frame->item_h - frame->item_margin.top
- frame->item_margin.bottom);
XMapWindow(ob_display, self->icon);
} else if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR &&
} else if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
self->entry->data.normal.mask)
{
RrColor *c;
@ -430,7 +458,6 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
static void menu_frame_render(ObMenuFrame *self)
{
gint w = 0, h = 0;
gint allitems_h = 0;
gint tw, th; /* temps */
GList *it;
gboolean has_icon = FALSE;
@ -440,24 +467,7 @@ static void menu_frame_render(ObMenuFrame *self)
XSetWindowBorder(ob_display, self->window,
RrColorPixel(ob_rr_theme->menu_b_color));
if (!self->parent && self->show_title) {
XMoveWindow(ob_display, self->title,
-ob_rr_theme->mbwidth, h - ob_rr_theme->mbwidth);
self->a_title->texture[0].data.text.string = self->menu->title;
RrMinsize(self->a_title, &tw, &th);
tw = MIN(tw, MAX_MENU_WIDTH) + ob_rr_theme->paddingx * 2;
w = MAX(w, tw);
th = ob_rr_theme->menu_title_height;
h += (self->title_h = th + ob_rr_theme->mbwidth);
XSetWindowBorderWidth(ob_display, self->title, ob_rr_theme->mbwidth);
XSetWindowBorder(ob_display, self->title,
RrColorPixel(ob_rr_theme->menu_b_color));
}
XMoveWindow(ob_display, self->items, 0, h);
/* find text dimensions */
STRUT_SET(self->item_margin, 0, 0, 0, 0);
@ -471,6 +481,12 @@ static void menu_frame_render(ObMenuFrame *self)
th += 2*PADDING;
self->item_h = th;
self->a_title->texture[0].data.text.string = "";
RrMinsize(self->a_title, &tw, &th);
tw += 2*PADDING;
th += 2*PADDING;
self->title_h = th;
RrMargins(e->a_normal, &l, &t, &r, &b);
STRUT_SET(self->item_margin,
MAX(self->item_margin.left, l),
@ -492,11 +508,13 @@ static void menu_frame_render(ObMenuFrame *self)
} else
self->item_h = 0;
/* render the entries */
for (it = self->entries; it; it = g_list_next(it)) {
RrAppearance *text_a;
ObMenuEntryFrame *e = it->data;
RECT_SET_POINT(e->area, 0, allitems_h);
RECT_SET_POINT(e->area, 0, h);
XMoveWindow(ob_display, e->window, 0, e->area.y);
text_a = ((e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
@ -528,15 +546,21 @@ static void menu_frame_render(ObMenuFrame *self)
tw += self->item_h - PADDING;
break;
case OB_MENU_ENTRY_TYPE_SEPARATOR:
tw = 0;
th = SEPARATOR_HEIGHT;
if (e->entry->data.separator.label != NULL) {
self->a_title->texture[0].data.text.string =
e->entry->data.separator.label;
RrMinsize(self->a_title, &tw, &th);
tw = MIN(tw, MAX_MENU_WIDTH);
} else {
tw = 0;
th = SEPARATOR_HEIGHT;
}
break;
}
tw += 2*PADDING;
th += 2*PADDING;
w = MAX(w, tw);
h += th;
allitems_h += th;
}
self->text_x = PADDING;
@ -550,26 +574,13 @@ static void menu_frame_render(ObMenuFrame *self)
}
if (!w) w = 10;
if (!allitems_h) {
allitems_h = 3;
h += 3;
}
if (!h) h = 3;
XResizeWindow(ob_display, self->window, w, h);
XResizeWindow(ob_display, self->items, w, allitems_h);
self->inner_w = w;
if (!self->parent && self->show_title) {
XResizeWindow(ob_display, self->title,
w, self->title_h - ob_rr_theme->mbwidth);
RrPaint(self->a_title, self->title,
w, self->title_h - ob_rr_theme->mbwidth);
XMapWindow(ob_display, self->title);
} else
XUnmapWindow(ob_display, self->title);
RrPaint(self->a_items, self->items, w, allitems_h);
RrPaint(self->a_items, self->window, w, h);
for (it = self->entries; it; it = g_list_next(it))
menu_entry_frame_render(it->data);
@ -625,10 +636,10 @@ static gboolean menu_frame_show(ObMenuFrame *self)
if (menu_frame_visible == NULL) {
/* no menus shown yet */
if (!grab_pointer(TRUE, OB_CURSOR_NONE))
if (!grab_pointer(TRUE, OB_CURSOR_POINTER))
return FALSE;
if (!grab_keyboard(TRUE)) {
grab_pointer(FALSE, OB_CURSOR_NONE);
grab_pointer(FALSE, OB_CURSOR_POINTER);
return FALSE;
}
}
@ -683,6 +694,7 @@ gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y)
gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
ObMenuEntryFrame *parent_entry)
{
ObMenuEntryFrame *e;
gint dx, dy;
if (menu_frame_is_visible(self))
@ -726,6 +738,9 @@ gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
XMapWindow(ob_display, self->window);
if (screen_pointer_pos(&dx, &dy) && (e = menu_entry_frame_under(dx, dy)))
++e->ignore_enters;
return TRUE;
}
@ -805,7 +820,7 @@ ObMenuEntryFrame* menu_entry_frame_under(gint x, gint y)
if ((frame = menu_frame_under(x, y))) {
x -= ob_rr_theme->mbwidth + frame->area.x;
y -= frame->title_h + ob_rr_theme->mbwidth + frame->area.y;
y -= ob_rr_theme->mbwidth + frame->area.y;
for (it = frame->entries; it; it = g_list_next(it)) {
ObMenuEntryFrame *e = it->data;

17
openbox/menuframe.h
View file

@ -2,7 +2,7 @@
menuframe.h for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
Copyright (c) 2003 Ben Jansens
Copyright (c) 2003-2007 Dana Jansens
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -57,23 +57,17 @@ struct _ObMenuFrame
/* If the submenus are being drawn to the right or the left */
gboolean direction_right;
/* If a titlebar is displayed for the menu or not (for top-level menus) */
gboolean show_title;
/* On-screen area (including borders!) */
Rect area;
Strut item_margin;
gint inner_w; /* inside the borders */
gint title_h; /* includes the bwidth below it */
gint title_h; /* height of all title items */
gint item_h; /* height of all normal items */
gint text_x; /* offset at which the text appears in the items */
gint text_w; /* width of the text area in the items */
gint monitor; /* monitor on which to show the menu in xinerama */
Window title;
Window items;
RrAppearance *a_title;
RrAppearance *a_items;
};
@ -83,6 +77,8 @@ struct _ObMenuEntryFrame
struct _ObMenuEntry *entry;
ObMenuFrame *frame;
guint ignore_enters;
Rect area;
Window window;
@ -104,6 +100,11 @@ struct _ObMenuEntryFrame
RrAppearance *a_text_selected;
};
extern GHashTable *menu_frame_map;
void menu_frame_startup(gboolean reconfig);
void menu_frame_shutdown(gboolean reconfig);
ObMenuFrame* menu_frame_new(struct _ObMenu *menu, struct _ObClient *client);
void menu_frame_free(ObMenuFrame *self);

2
openbox/openbox.c
View file

@ -276,6 +276,7 @@ gint main(gint argc, gchar **argv)
keyboard_startup(reconfigure);
mouse_startup(reconfigure);
menu_startup(reconfigure);
menu_frame_startup(reconfigure);
if (!reconfigure) {
/* get all the existing windows */
@ -305,6 +306,7 @@ gint main(gint argc, gchar **argv)
client_unmanage_all();
}
menu_frame_shutdown(reconfigure);
menu_shutdown(reconfigure);
mouse_shutdown(reconfigure);
keyboard_shutdown(reconfigure);

2
openbox/window.c
View file

@ -1,7 +1,7 @@
/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
window.c for the Openbox window manager
Copyright (c) 2003 Ben Jansens
Copyright (c) 2003-2007 Dana Jansens
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

2
openbox/window.h
View file

@ -1,7 +1,7 @@
/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
window.h for the Openbox window manager
Copyright (c) 2003 Ben Jansens
Copyright (c) 2003-2007 Dana Jansens
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by