+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+ menu.c for the Openbox window manager
+ Copyright (c) 2006 Mikael Magnusson
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ See the COPYING file for a copy of the GNU General Public License.
+*/
+
+#include "debug.h"
#include "menu.h"
#include "openbox.h"
#include "stacking.h"
-#include "grab.h"
-#include "render/theme.h"
+#include "client.h"
+#include "config.h"
#include "screen.h"
+#include "menuframe.h"
+#include "keyboard.h"
#include "geom.h"
-#include "plugin.h"
-
-GHashTable *menu_hash = NULL;
+#include "misc.h"
+#include "client_menu.h"
+#include "client_list_menu.h"
+#include "client_list_combined_menu.h"
+#include "gettext.h"
+#include "parser/parse.h"
-#define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask | \
- LeaveWindowMask)
-#define TITLE_EVENTMASK (ButtonPressMask | ButtonMotionMask)
-#define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
- ButtonPressMask | ButtonReleaseMask)
+typedef struct _ObMenuParseState ObMenuParseState;
-void menu_control_show(Menu *self, int x, int y, Client *client);
-
-void menu_destroy_hash_key(Menu *menu)
+struct _ObMenuParseState
+{
+ ObMenu *parent;
+ ObMenu *pipe_creator;
+};
+
+static GHashTable *menu_hash = NULL;
+static ObParseInst *menu_parse_inst;
+static ObMenuParseState menu_parse_state;
+
+static void menu_destroy_hash_value(ObMenu *self);
+static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ gpointer data);
+static void parse_menu_separator(ObParseInst *i,
+ xmlDocPtr doc, xmlNodePtr node,
+ gpointer data);
+static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ gpointer data);
+
+static void client_dest(ObClient *client, gpointer data)
{
- g_free(menu);
+ /* menus can be associated with a client, so close any that are since
+ we are disappearing now */
+ menu_frame_hide_all_client(client);
}
-void menu_destroy_hash_value(Menu *self)
+void menu_startup(gboolean reconfig)
{
- GList *it;
+ xmlDocPtr doc;
+ xmlNodePtr node;
+ gboolean loaded = FALSE;
+ GSList *it;
- for (it = self->entries; it; it = it->next)
- menu_entry_free(it->data);
- g_list_free(self->entries);
+ menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
+ (GDestroyNotify)menu_destroy_hash_value);
- g_free(self->label);
- g_free(self->name);
+ client_list_menu_startup(reconfig);
+ client_list_combined_menu_startup(reconfig);
+ client_menu_startup();
+
+ menu_parse_inst = parse_startup();
+
+ menu_parse_state.parent = NULL;
+ menu_parse_state.pipe_creator = NULL;
+ parse_register(menu_parse_inst, "menu", parse_menu, &menu_parse_state);
+ parse_register(menu_parse_inst, "item", parse_menu_item,
+ &menu_parse_state);
+ parse_register(menu_parse_inst, "separator",
+ parse_menu_separator, &menu_parse_state);
+
+ for (it = config_menu_files; it; it = g_slist_next(it)) {
+ if (parse_load_menu(it->data, &doc, &node)) {
+ loaded = TRUE;
+ parse_tree(menu_parse_inst, doc, node->children);
+ xmlFreeDoc(doc);
+ } else
+ g_message(_("Unable to find a valid menu file '%s'"),
+ (const gchar*)it->data);
+ }
+ if (!loaded) {
+ if (parse_load_menu("menu.xml", &doc, &node)) {
+ parse_tree(menu_parse_inst, doc, node->children);
+ xmlFreeDoc(doc);
+ } else
+ g_message(_("Unable to find a valid menu file '%s'"),
+ "menu.xml");
+ }
+
+ g_assert(menu_parse_state.parent == NULL);
- g_hash_table_remove(window_map, &self->title);
- g_hash_table_remove(window_map, &self->frame);
- g_hash_table_remove(window_map, &self->items);
+ if (!reconfig)
+ client_add_destructor(client_dest, NULL);
+}
- stacking_remove(self);
+void menu_shutdown(gboolean reconfig)
+{
+ if (!reconfig)
+ client_remove_destructor(client_dest);
- RrAppearanceFree(self->a_title);
- XDestroyWindow(ob_display, self->title);
- XDestroyWindow(ob_display, self->frame);
- XDestroyWindow(ob_display, self->items);
+ parse_shutdown(menu_parse_inst);
+ menu_parse_inst = NULL;
- g_free(self);
+ client_list_menu_shutdown(reconfig);
+ client_list_combined_menu_shutdown(reconfig);
+
+ menu_frame_hide_all();
+ g_hash_table_destroy(menu_hash);
+ menu_hash = NULL;
}
-void menu_entry_free(MenuEntry *self)
+static gboolean menu_pipe_submenu(gpointer key, gpointer val, gpointer data)
{
- g_free(self->label);
- action_free(self->action);
+ ObMenu *menu = val;
+ return menu->pipe_creator == data;
+}
- g_hash_table_remove(window_map, &self->item);
+void menu_pipe_execute(ObMenu *self)
+{
+ xmlDocPtr doc;
+ xmlNodePtr node;
+ gchar *output;
+ GError *err = NULL;
- RrAppearanceFree(self->a_item);
- RrAppearanceFree(self->a_disabled);
- RrAppearanceFree(self->a_hilite);
- XDestroyWindow(ob_display, self->item);
+ if (!self->execute)
+ return;
- g_free(self);
+ if (!g_spawn_command_line_sync(self->execute, &output, NULL, NULL, &err)) {
+ g_message(_("Failed to execute command for pipe-menu '%s': %s"),
+ self->execute, err->message);
+ g_error_free(err);
+ return;
+ }
+
+ if (parse_load_mem(output, strlen(output),
+ "openbox_pipe_menu", &doc, &node))
+ {
+ g_hash_table_foreach_remove(menu_hash, menu_pipe_submenu, self);
+ menu_clear_entries(self);
+
+ menu_parse_state.pipe_creator = self;
+ menu_parse_state.parent = self;
+ parse_tree(menu_parse_inst, doc, node->children);
+ xmlFreeDoc(doc);
+ } else {
+ g_message(_("Invalid output from pipe-menu '%s'"), self->execute);
+ }
+
+ g_free(output);
}
-
-void menu_startup()
+
+static ObMenu* menu_from_name(gchar *name)
{
- Menu *m;
- Menu *s;
- Menu *t;
- Action *a;
+ ObMenu *self = NULL;
- menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
- menu_destroy_hash_key,
- (GDestroyNotify)menu_destroy_hash_value);
+ g_assert(name != NULL);
+
+ if (!(self = g_hash_table_lookup(menu_hash, name)))
+ g_message(_("Attempted to access menu '%s' but it does not exist"),
+ name);
+ return self;
+}
- m = menu_new("sex menu", "root", NULL);
-
- a = action_from_string("execute");
- a->data.execute.path = g_strdup("xterm");
- menu_add_entry(m, menu_entry_new("xterm", a));
- a = action_from_string("restart");
- menu_add_entry(m, menu_entry_new("restart", a));
- menu_add_entry(m, menu_entry_new_separator("--"));
- a = action_from_string("exit");
- menu_add_entry(m, menu_entry_new("exit", a));
-
- /*
- s = menu_new("subsex menu", "submenu", m);
- a = action_from_string("execute");
- a->data.execute.path = g_strdup("xclock");
- menu_add_entry(s, menu_entry_new("xclock", a));
-
- menu_add_entry(m, menu_entry_new_submenu("subz", s));
-
- s = menu_new("empty", "chub", m);
- menu_add_entry(m, menu_entry_new_submenu("empty", s));
-
- s = menu_new("", "s-club", m);
- menu_add_entry(m, menu_entry_new_submenu("empty", s));
-
- s = menu_new(NULL, "h-club", m);
- menu_add_entry(m, menu_entry_new_submenu("empty", s));
-
- s = menu_new(NULL, "g-club", m);
-
- a = action_from_string("execute");
- a->data.execute.path = g_strdup("xterm");
- menu_add_entry(s, menu_entry_new("xterm", a));
- a = action_from_string("restart");
- menu_add_entry(s, menu_entry_new("restart", a));
- menu_add_entry(s, menu_entry_new_separator("--"));
- a = action_from_string("exit");
- menu_add_entry(s, menu_entry_new("exit", a));
-
- menu_add_entry(m, menu_entry_new_submenu("long", s));
- */
+static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ gpointer data)
+{
+ ObMenuParseState *state = data;
+ gchar *label;
+
+ if (state->parent) {
+ if (parse_attr_string("label", node, &label)) {
+ GSList *acts = NULL;
+
+ for (node = node->children; node; node = node->next)
+ if (!xmlStrcasecmp(node->name, (const xmlChar*) "action")) {
+ ObAction *a = action_parse
+ (i, doc, node, OB_USER_ACTION_MENU_SELECTION);
+ if (a)
+ acts = g_slist_append(acts, a);
+ }
+ menu_add_normal(state->parent, -1, label, acts);
+ g_free(label);
+ }
+ }
}
-void menu_shutdown()
+static void parse_menu_separator(ObParseInst *i,
+ xmlDocPtr doc, xmlNodePtr node,
+ gpointer data)
{
- g_hash_table_destroy(menu_hash);
+ ObMenuParseState *state = data;
+
+ 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 Window createWindow(Window parent, unsigned long mask,
- XSetWindowAttributes *attrib)
+static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ gpointer data)
{
- return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
- RrDepth(ob_rr_inst), InputOutput,
- RrVisual(ob_rr_inst), mask, attrib);
-
+ ObMenuParseState *state = data;
+ gchar *name = NULL, *title = NULL, *script = NULL;
+ ObMenu *menu;
+
+ if (!parse_attr_string("id", node, &name))
+ goto parse_menu_fail;
+
+ if (!g_hash_table_lookup(menu_hash, name)) {
+ if (!parse_attr_string("label", node, &title))
+ goto parse_menu_fail;
+
+ if ((menu = menu_new(name, title, NULL))) {
+ menu->pipe_creator = state->pipe_creator;
+ if (parse_attr_string("execute", node, &script)) {
+ menu->execute = parse_expand_tilde(script);
+ } else {
+ ObMenu *old;
+
+ old = state->parent;
+ state->parent = menu;
+ parse_tree(i, doc, node->children);
+ state->parent = old;
+ }
+ }
+ }
+
+ if (state->parent)
+ menu_add_submenu(state->parent, -1, name);
+
+parse_menu_fail:
+ g_free(name);
+ g_free(title);
+ g_free(script);
}
-Menu *menu_new_full(char *label, char *name, Menu *parent,
- menu_controller_show show, menu_controller_update update)
+ObMenu* menu_new(const gchar *name, const gchar *title, gpointer data)
{
- XSetWindowAttributes attrib;
- Menu *self;
+ ObMenu *self;
- self = g_new0(Menu, 1);
- self->obwin.type = Window_Menu;
- self->label = g_strdup(label);
+ self = g_new0(ObMenu, 1);
self->name = g_strdup(name);
- self->parent = parent;
- self->open_submenu = NULL;
-
- self->entries = NULL;
- self->shown = FALSE;
- self->invalid = TRUE;
-
- /* default controllers */
- self->show = show;
- self->hide = NULL;
- self->update = update;
- self->mouseover = NULL;
- self->selected = NULL;
-
- self->plugin = NULL;
- self->plugin_data = NULL;
-
- attrib.override_redirect = TRUE;
- attrib.event_mask = FRAME_EVENTMASK;
- self->frame = createWindow(ob_root, CWOverrideRedirect|CWEventMask, &attrib);
- attrib.event_mask = TITLE_EVENTMASK;
- self->title = createWindow(self->frame, CWEventMask, &attrib);
- self->items = createWindow(self->frame, 0, &attrib);
-
- XSetWindowBorderWidth(ob_display, self->frame, theme_bwidth);
- XSetWindowBackground(ob_display, self->frame, theme_b_color->pixel);
- XSetWindowBorderWidth(ob_display, self->title, theme_bwidth);
- XSetWindowBorder(ob_display, self->frame, theme_b_color->pixel);
- XSetWindowBorder(ob_display, self->title, theme_b_color->pixel);
-
- XMapWindow(ob_display, self->title);
- XMapWindow(ob_display, self->items);
-
- self->a_title = RrAppearanceCopy(theme_a_menu_title);
- self->a_items = RrAppearanceCopy(theme_a_menu);
-
- g_hash_table_insert(window_map, &self->frame, self);
- g_hash_table_insert(window_map, &self->title, self);
- g_hash_table_insert(window_map, &self->items, self);
- g_hash_table_insert(menu_hash, g_strdup(name), self);
-
- stacking_add(MENU_AS_WINDOW(self));
- stacking_raise(MENU_AS_WINDOW(self));
+ self->title = g_strdup(title);
+ self->data = data;
+
+ g_hash_table_replace(menu_hash, self->name, self);
return self;
}
-void menu_free(char *name)
+static void menu_destroy_hash_value(ObMenu *self)
{
- g_hash_table_remove(menu_hash, name);
+ /* make sure its not visible */
+ {
+ GList *it;
+ ObMenuFrame *f;
+
+ for (it = menu_frame_visible; it; it = g_list_next(it)) {
+ f = it->data;
+ if (f->menu == self)
+ menu_frame_hide_all();
+ }
+ }
+
+ if (self->destroy_func)
+ self->destroy_func(self, self->data);
+
+ menu_clear_entries(self);
+ g_free(self->name);
+ g_free(self->title);
+ g_free(self->execute);
+
+ g_free(self);
}
-MenuEntry *menu_entry_new_full(char *label, Action *action,
- MenuEntryRenderType render_type,
- gpointer submenu)
+void menu_free(ObMenu *menu)
{
- MenuEntry *menu_entry = g_new0(MenuEntry, 1);
-
- menu_entry->label = g_strdup(label);
- menu_entry->render_type = render_type;
- menu_entry->action = action;
+ g_hash_table_remove(menu_hash, menu->name);
+}
- menu_entry->hilite = FALSE;
- menu_entry->enabled = TRUE;
+void menu_show(gchar *name, gint x, gint y, ObClient *client)
+{
+ ObMenu *self;
+ ObMenuFrame *frame;
+
+ if (!(self = menu_from_name(name))
+ || keyboard_interactively_grabbed()) return;
+
+ /* if the requested menu is already the top visible menu, then don't
+ bother */
+ if (menu_frame_visible) {
+ frame = menu_frame_visible->data;
+ if (frame->menu == self)
+ return;
+ }
- menu_entry->submenu = submenu;
+ menu_frame_hide_all();
- return menu_entry;
+ frame = menu_frame_new(self, client);
+ if (!menu_frame_show_topmenu(frame, x, y))
+ menu_frame_free(frame);
+ else if (frame->entries) {
+ ObMenuEntryFrame *e = frame->entries->data;
+ if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+ e->entry->data.normal.enabled)
+ menu_frame_select(frame, e);
+ }
}
-void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu)
+static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id)
{
- g_assert(entry != NULL);
-
- entry->submenu = submenu;
+ ObMenuEntry *self;
+
+ g_assert(menu);
+
+ self = g_new0(ObMenuEntry, 1);
+ self->type = type;
+ self->menu = menu;
+ self->id = id;
+
+ switch (type) {
+ case OB_MENU_ENTRY_TYPE_NORMAL:
+ self->data.normal.enabled = TRUE;
+ break;
+ case OB_MENU_ENTRY_TYPE_SUBMENU:
+ case OB_MENU_ENTRY_TYPE_SEPARATOR:
+ break;
+ }
- if(entry->parent != NULL)
- entry->parent->invalid = TRUE;
+ return self;
}
-void menu_add_entry(Menu *menu, MenuEntry *entry)
+void menu_entry_free(ObMenuEntry *self)
{
- XSetWindowAttributes attrib;
+ if (self) {
+ switch (self->type) {
+ case OB_MENU_ENTRY_TYPE_NORMAL:
+ g_free(self->data.normal.label);
+ while (self->data.normal.actions) {
+ action_unref(self->data.normal.actions->data);
+ self->data.normal.actions =
+ g_slist_delete_link(self->data.normal.actions,
+ self->data.normal.actions);
+ }
+ break;
+ case OB_MENU_ENTRY_TYPE_SUBMENU:
+ g_free(self->data.submenu.name);
+ break;
+ case OB_MENU_ENTRY_TYPE_SEPARATOR:
+ break;
+ }
+
+ g_free(self);
+ }
+}
+
+void menu_clear_entries(ObMenu *self)
+{
+#ifdef DEBUG
+ /* assert that the menu isn't visible */
+ {
+ GList *it;
+ ObMenuFrame *f;
+
+ for (it = menu_frame_visible; it; it = g_list_next(it)) {
+ f = it->data;
+ g_assert(f->menu != self);
+ }
+ }
+#endif
- g_assert(menu != NULL);
- g_assert(entry != NULL);
- g_assert(entry->item == None);
+ while (self->entries) {
+ menu_entry_free(self->entries->data);
+ self->entries = g_list_delete_link(self->entries, self->entries);
+ }
+}
- menu->entries = g_list_append(menu->entries, entry);
- entry->parent = menu;
+void menu_entry_remove(ObMenuEntry *self)
+{
+ self->menu->entries = g_list_remove(self->menu->entries, self);
+ menu_entry_free(self);
+}
- attrib.event_mask = ENTRY_EVENTMASK;
- entry->item = createWindow(menu->items, CWEventMask, &attrib);
- XMapWindow(ob_display, entry->item);
- entry->a_item = RrAppearanceCopy(theme_a_menu_item);
- entry->a_disabled = RrAppearanceCopy(theme_a_menu_disabled);
- entry->a_hilite = RrAppearanceCopy(theme_a_menu_hilite);
+ObMenuEntry* menu_add_normal(ObMenu *self, gint id, const gchar *label,
+ GSList *actions)
+{
+ ObMenuEntry *e;
- menu->invalid = TRUE;
+ e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_NORMAL, id);
+ e->data.normal.label = g_strdup(label);
+ e->data.normal.actions = actions;
- g_hash_table_insert(window_map, &entry->item, menu);
+ self->entries = g_list_append(self->entries, e);
+ return e;
}
-void menu_show(char *name, int x, int y, Client *client)
+ObMenuEntry* menu_add_submenu(ObMenu *self, gint id, const gchar *submenu)
{
- Menu *self;
-
- self = g_hash_table_lookup(menu_hash, name);
- if (!self) {
- g_warning("Attempted to show menu '%s' but it does not exist.",
- name);
- return;
- }
-
- menu_show_full(self, x, y, client);
-}
+ ObMenuEntry *e;
-void menu_show_full(Menu *self, int x, int y, Client *client)
-{
- g_assert(self != NULL);
-
- menu_render(self);
-
- self->client = client;
+ e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SUBMENU, id);
+ e->data.submenu.name = g_strdup(submenu);
- if (self->show) {
- self->show(self, x, y, client);
- } else {
- menu_control_show(self, x, y, client);
- }
+ self->entries = g_list_append(self->entries, e);
+ return e;
}
-void menu_hide(Menu *self) {
- if (self->shown) {
- XUnmapWindow(ob_display, self->frame);
- self->shown = FALSE;
- if (self->open_submenu)
- menu_hide(self->open_submenu);
- if (self->parent && self->parent->open_submenu == self)
- self->parent->open_submenu = NULL;
+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);
-void menu_clear(Menu *self) {
- GList *it;
-
- for (it = self->entries; it; it = it->next) {
- MenuEntry *entry = it->data;
- menu_entry_free(entry);
- }
- self->entries = NULL;
- self->invalid = TRUE;
+ self->entries = g_list_append(self->entries, e);
+ return e;
}
+void menu_set_update_func(ObMenu *self, ObMenuUpdateFunc func)
+{
+ self->update_func = func;
+}
-MenuEntry *menu_find_entry(Menu *menu, Window win)
+void menu_set_execute_func(ObMenu *self, ObMenuExecuteFunc func)
{
- GList *it;
+ self->execute_func = func;
+}
- for (it = menu->entries; it; it = it->next) {
- MenuEntry *entry = it->data;
- if (entry->item == win)
- return entry;
- }
- return NULL;
+void menu_set_destroy_func(ObMenu *self, ObMenuDestroyFunc func)
+{
+ self->destroy_func = func;
}
-void menu_entry_fire(MenuEntry *self)
+ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id)
{
- Menu *m;
+ ObMenuEntry *ret = NULL;
+ GList *it;
- if (self->action) {
- self->action->data.any.c = self->parent->client;
- self->action->func(&self->action->data);
+ for (it = self->entries; it; it = g_list_next(it)) {
+ ObMenuEntry *e = it->data;
- /* hide the whole thing */
- m = self->parent;
- while (m->parent) m = m->parent;
- menu_hide(m);
+ if (e->id == id) {
+ ret = e;
+ break;
+ }
}
+ return ret;
}
-/*
- Default menu controller action for showing.
-*/
+void menu_find_submenus(ObMenu *self)
+{
+ GList *it;
-void menu_control_show(Menu *self, int x, int y, Client *client) {
- g_assert(!self->invalid);
-
- XMoveWindow(ob_display, self->frame,
- MIN(x, screen_physical_size.width - self->size.width),
- MIN(y, screen_physical_size.height - self->size.height));
- POINT_SET(self->location,
- MIN(x, screen_physical_size.width - self->size.width),
- MIN(y, screen_physical_size.height - self->size.height));
-
- if (!self->shown) {
- XMapWindow(ob_display, self->frame);
- stacking_raise(MENU_AS_WINDOW(self));
- self->shown = TRUE;
- } else if (self->shown && self->open_submenu) {
- menu_hide(self->open_submenu);
- }
-}
+ for (it = self->entries; it; it = g_list_next(it)) {
+ ObMenuEntry *e = it->data;
-void menu_control_mouseover(MenuEntry *self, gboolean enter) {
- int x;
- self->hilite = enter;
-
- if (enter) {
- if (self->parent->open_submenu && self->submenu
- != self->parent->open_submenu)
- menu_hide(self->parent->open_submenu);
-
- if (self->submenu) {
- self->parent->open_submenu = self->submenu;
-
- /* shouldn't be invalid since it must be displayed */
- g_assert(!self->parent->invalid);
- /* TODO: I don't understand why these bevels should be here.
- Something must be wrong in the width calculation */
- x = self->parent->location.x + self->parent->size.width +
- theme_bevel;
-
- /* need to get the width. is this bad?*/
- menu_render(self->submenu);
-
- if (self->submenu->size.width + x > screen_physical_size.width)
- x = self->parent->location.x - self->submenu->size.width -
- theme_bevel;
-
- menu_show_full(self->submenu, x,
- self->parent->location.y + self->y,
- self->parent->client);
- }
+ if (e->type == OB_MENU_ENTRY_TYPE_SUBMENU)
+ e->data.submenu.submenu = menu_from_name(e->data.submenu.name);
}
}
projects / chaz / openbox / blobdiff