GList *menu_frame_visible;
+static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry,
+ ObMenuFrame *frame);
+static void menu_entry_frame_free(ObMenuEntryFrame *self);
static void menu_frame_render(ObMenuFrame *self);
static void menu_frame_update(ObMenuFrame *self);
void menu_frame_free(ObMenuFrame *self)
{
if (self) {
+ while (self->entries) {
+ menu_entry_frame_free(self->entries->data);
+ self->entries = g_list_delete_link(self->entries, self->entries);
+ }
+
stacking_remove(MENU_AS_WINDOW(self));
XDestroyWindow(ob_display, self->items);
}
}
-ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, ObMenuFrame *frame)
+static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry,
+ ObMenuFrame *frame)
{
ObMenuEntryFrame *self;
XSetWindowAttributes attr;
return self;
}
-void menu_entry_frame_free(ObMenuEntryFrame *self)
+static void menu_entry_frame_free(ObMenuEntryFrame *self)
{
if (self) {
XDestroyWindow(ob_display, self->icon);
void menu_frame_move(ObMenuFrame *self, gint x, gint y)
{
- /* XXX screen constraints */
RECT_SET_POINT(self->area, x, y);
XMoveWindow(ob_display, self->window, self->area.x, self->area.y);
}
break;
}
- /* XXX draw icons */
- if (0) {
+ if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+ self->entry->data.normal.icon_data)
+ {
XMoveResizeWindow(ob_display, self->icon, 0, 0,
self->frame->item_h, self->frame->item_h);
- /* XXX set the RGBA surface stuff */
+ self->a_icon->texture[0].data.rgba.width =
+ self->entry->data.normal.icon_width;
+ self->a_icon->texture[0].data.rgba.height =
+ self->entry->data.normal.icon_height;
+ self->a_icon->texture[0].data.rgba.data =
+ self->entry->data.normal.icon_data;
self->a_icon->surface.parent = item_a;
self->a_icon->surface.parentx = 0;
self->a_icon->surface.parenty = 0;
text_a->texture[0].data.text.string = e->entry->data.normal.label;
RrMinsize(text_a, &tw, &th);
- /* XXX has_icon = TRUE; */
+ if (e->entry->data.normal.icon_data)
+ has_icon = TRUE;
break;
case OB_MENU_ENTRY_TYPE_SUBMENU:
sub = e->entry->data.submenu.submenu;
void menu_entry_frame_execute(ObMenuEntryFrame *self, gboolean hide)
{
if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) {
+ /* grab all this shizzle, cuz when the menu gets hidden, 'self'
+ gets freed */
+ ObMenuEntry *entry = self->entry;
+ ObMenuExecuteFunc func = self->frame->menu->execute_func;
+ gpointer data = self->frame->menu->data;
+ GSList *acts = self->entry->data.normal.actions;
+ ObClient *client = self->frame->client;
+
/* release grabs before executing the shit */
menu_frame_hide_all();
- if (self->frame->menu->execute_func)
- self->frame->menu->execute_func(self, self->frame->menu->data);
+ if (func)
+ func(entry, data);
else {
GSList *it;
- for (it = self->entry->data.normal.actions; it;
- it = g_slist_next(it))
+ for (it = acts; it; it = g_slist_next(it))
{
ObAction *act = it->data;
- act->data.any.c = self->frame->client;
+ act->data.any.c = client;
act->func(&act->data);
}
}