X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=1585a56d2ee3287e0df02abe3a0d121938f67cac;hb=6f5292c87ece138a2b80d102ba0919b105b1839a;hp=e2c55c6de15d05cfb0e5bb9c220d93c410deb841;hpb=22ff8c587d815c021cad13f46094a31cc79243cf;p=chaz%2Fopenbox diff --git a/openbox/menu.c b/openbox/menu.c index e2c55c6d..1585a56d 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -1,487 +1,454 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + menu.c for the Openbox window manager + Copyright (c) 2003 Ben 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 "client.h" -#include "grab.h" +#include "config.h" #include "screen.h" +#include "menuframe.h" #include "geom.h" -#include "plugin.h" - -GHashTable *menu_hash = NULL; -GSList *menu_visible = NULL; +#include "misc.h" +#include "client_menu.h" +#include "client_list_menu.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; -static void parse_menu(xmlDocPtr doc, xmlNodePtr node, void *data) +struct _ObMenuParseState { - parse_menu_full(doc, node, data, TRUE); + 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) +{ + /* menus can be associated with a client, so close any that are since + we are disappearing now */ + menu_frame_hide_all_client(client); } - -void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data, - gboolean newmenu) +void menu_startup(gboolean reconfig) { - Action *act; - xmlNodePtr nact; + xmlDocPtr doc; + xmlNodePtr node; + gboolean loaded = FALSE; + GSList *it; - gchar *id = NULL, *title = NULL, *label = NULL, *plugin; - ObMenu *menu = NULL, *parent; - - if (newmenu == TRUE) { - if (!parse_attr_string("id", node->parent, &id)) - goto parse_menu_fail; - if (!parse_attr_string("label", node->parent, &title)) - goto parse_menu_fail; + menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, + (GDestroyNotify)menu_destroy_hash_value); - g_message("menu label %s", title); + client_list_menu_startup(); + client_menu_startup(); - menu = menu_new(title, id, data ? *((ObMenu**)data) : NULL); + menu_parse_inst = parse_startup(); - if (data) - *((ObMenu**)data) = menu; - } else { - menu = (ObMenu *)data; - } - - while (node) { - if (!xmlStrcasecmp(node->name, (const xmlChar*) "menu")) { - if (parse_attr_string("plugin", node, &plugin)) { - PluginMenuCreateData data = { - .doc = doc, - .node = node, - .parent = menu - }; - parent = plugin_create(plugin, &data); - } else { - parent = menu; - parse_menu(doc, node->xmlChildrenNode, &parent); - menu_add_entry(menu, menu_entry_new_submenu(parent->label, - parent)); - } + 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 if (!xmlStrcasecmp(node->name, (const xmlChar*) "item")) { - if (parse_attr_string("label", node, &label)) { - if ((nact = parse_find_node("action", node->xmlChildrenNode))) - act = action_parse(doc, nact); - else - act = NULL; - if (act) - menu_add_entry(menu, menu_entry_new(label, act)); - else - menu_add_entry(menu, menu_entry_new_separator(label)); - g_free(label); - } + } + if (!loaded) { + if (parse_load_menu("menu.xml", &doc, &node)) { + parse_tree(menu_parse_inst, doc, node->children); + xmlFreeDoc(doc); } - node = node->next; } + + g_assert(menu_parse_state.parent == NULL); -parse_menu_fail: - g_free(id); - g_free(title); + if (!reconfig) + client_add_destructor(client_dest, NULL); } -void menu_control_show(ObMenu *self, int x, int y, ObClient *client); - -void menu_destroy_hash_key(ObMenu *menu) +void menu_shutdown(gboolean reconfig) { - g_free(menu); + if (!reconfig) + client_remove_destructor(client_dest); + + parse_shutdown(menu_parse_inst); + menu_parse_inst = NULL; + + menu_frame_hide_all(); + g_hash_table_destroy(menu_hash); + menu_hash = NULL; } -void menu_destroy_hash_value(ObMenu *self) +static gboolean menu_pipe_submenu(gpointer key, gpointer val, gpointer data) { - GList *it; + ObMenu *menu = val; + return menu->pipe_creator == data; +} - for (it = self->entries; it; it = it->next) - menu_entry_free(it->data); - g_list_free(self->entries); +void menu_pipe_execute(ObMenu *self) +{ + xmlDocPtr doc; + xmlNodePtr node; + gchar *output; + GError *err = NULL; - g_free(self->label); - g_free(self->name); + if (!self->execute) + return; - 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 (!g_spawn_command_line_sync(self->execute, &output, NULL, NULL, &err)) { + g_warning("Failed to execute command for pipe-menu: %s", err->message); + g_error_free(err); + return; + } - stacking_remove(self); + 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); - RrAppearanceFree(self->a_title); - XDestroyWindow(ob_display, self->title); - XDestroyWindow(ob_display, self->frame); - XDestroyWindow(ob_display, self->items); + menu_parse_state.pipe_creator = self; + menu_parse_state.parent = self; + parse_tree(menu_parse_inst, doc, node->children); + xmlFreeDoc(doc); + } else { + g_warning("Invalid output from pipe-menu: %s", self->execute); + } - g_free(self); + g_free(output); } -void menu_entry_free(ObMenuEntry *self) +static ObMenu* menu_from_name(gchar *name) { - g_free(self->label); - action_free(self->action); + ObMenu *self = NULL; - g_hash_table_remove(window_map, &self->item); + g_assert(name != NULL); - RrAppearanceFree(self->a_item); - RrAppearanceFree(self->a_disabled); - RrAppearanceFree(self->a_hilite); - XDestroyWindow(ob_display, self->item); + if (!(self = g_hash_table_lookup(menu_hash, name))) + g_warning("Attempted to access menu '%s' but it does not exist.", + name); + return self; +} - g_free(self); -} - -void menu_startup() +static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, + gpointer data) { -/* - ObMenu *m; - ObMenu *s; - ObMenu *t; - Action *a; -*/ - - menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, - (GDestroyNotify)menu_destroy_hash_key, - (GDestroyNotify)menu_destroy_hash_value); - - parse_register("menu", parse_menu, NULL); - -/* - 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)); + 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); + } + } +} - menu_add_entry(m, menu_entry_new_submenu("subz", s)); +static void parse_menu_separator(ObParseInst *i, + xmlDocPtr doc, xmlNodePtr node, + gpointer data) +{ + ObMenuParseState *state = data; - s = menu_new("empty", "chub", m); - menu_add_entry(m, menu_entry_new_submenu("empty", s)); + if (state->parent) + menu_add_separator(state->parent, -1); +} - s = menu_new("", "s-club", m); - menu_add_entry(m, menu_entry_new_submenu("empty", s)); +static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, + gpointer data) +{ + ObMenuParseState *state = data; + gchar *name = NULL, *title = NULL, *script = NULL; + ObMenu *menu; - s = menu_new(NULL, "h-club", m); - menu_add_entry(m, menu_entry_new_submenu("empty", s)); + if (!parse_attr_string("id", node, &name)) + goto parse_menu_fail; - s = menu_new(NULL, "g-club", m); + if (!g_hash_table_lookup(menu_hash, name)) { + if (!parse_attr_string("label", node, &title)) + goto parse_menu_fail; - 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)); + 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; - menu_add_entry(m, menu_entry_new_submenu("long", s)); - */ -} + old = state->parent; + state->parent = menu; + parse_tree(i, doc, node->children); + state->parent = old; + } + } + } -void menu_shutdown() -{ - g_hash_table_destroy(menu_hash); -} + if (state->parent) + menu_add_submenu(state->parent, -1, name); -static Window createWindow(Window parent, unsigned long mask, - XSetWindowAttributes *attrib) -{ - return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0, - RrDepth(ob_rr_inst), InputOutput, - RrVisual(ob_rr_inst), mask, attrib); - +parse_menu_fail: + g_free(name); + g_free(title); + g_free(script); } -ObMenu *menu_new_full(char *label, char *name, ObMenu *parent, - menu_controller_show show, menu_controller_update update) +ObMenu* menu_new(gchar *name, gchar *title, gpointer data) { - XSetWindowAttributes attrib; ObMenu *self; self = g_new0(ObMenu, 1); - self->obwin.type = Window_Menu; - self->label = g_strdup(label); self->name = g_strdup(name); - self->parent = parent; - self->open_submenu = NULL; + self->title = g_strdup(title); + self->data = data; - 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(RootWindow(ob_display, ob_screen), - CWOverrideRedirect|CWEventMask, &attrib); - attrib.event_mask = TITLE_EVENTMASK; - self->title = createWindow(self->frame, CWEventMask, &attrib); - self->items = createWindow(self->frame, 0, &attrib); - - self->a_title = self->a_items = NULL; - - XMapWindow(ob_display, self->title); - XMapWindow(ob_display, self->items); - - 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)); + g_hash_table_replace(menu_hash, self->name, self); return self; } -void menu_free(char *name) -{ - g_hash_table_remove(menu_hash, name); -} - -ObMenuEntry *menu_entry_new_full(char *label, Action *action, - ObMenuEntryRenderType render_type, - gpointer submenu) +static void menu_destroy_hash_value(ObMenu *self) { - ObMenuEntry *menu_entry = g_new0(ObMenuEntry, 1); - - menu_entry->label = g_strdup(label); - menu_entry->render_type = render_type; - menu_entry->action = action; + /* 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(); + } + } - menu_entry->hilite = FALSE; - menu_entry->enabled = TRUE; + if (self->destroy_func) + self->destroy_func(self, self->data); - menu_entry->submenu = submenu; + menu_clear_entries(self); + g_free(self->name); + g_free(self->title); + g_free(self->execute); - return menu_entry; + g_free(self); } -void menu_entry_set_submenu(ObMenuEntry *entry, ObMenu *submenu) +void menu_free(ObMenu *menu) { - g_assert(entry != NULL); - - entry->submenu = submenu; - - if(entry->parent != NULL) - entry->parent->invalid = TRUE; + g_hash_table_remove(menu_hash, menu->name); } -void menu_add_entry(ObMenu *menu, ObMenuEntry *entry) +void menu_show(gchar *name, gint x, gint y, ObClient *client) { - XSetWindowAttributes attrib; - - g_assert(menu != NULL); - g_assert(entry != NULL); - g_assert(entry->item == None); - - menu->entries = g_list_append(menu->entries, entry); - entry->parent = menu; - - attrib.event_mask = ENTRY_EVENTMASK; - entry->item = createWindow(menu->items, CWEventMask, &attrib); - XMapWindow(ob_display, entry->item); - - entry->a_item = entry->a_disabled = entry->a_hilite = NULL; - - menu->invalid = TRUE; - - g_hash_table_insert(window_map, &entry->item, menu); + ObMenu *self; + ObMenuFrame *frame; + + if (!(self = menu_from_name(name))) return; + + menu_frame_hide_all(); + + frame = menu_frame_new(self, client); + if (client && x < 0 && y < 0) + menu_frame_move(frame, + client->frame->area.x + client->frame->size.left, + client->frame->area.y + client->frame->size.top); + else + menu_frame_move(frame, + x - ob_rr_theme->bwidth, y - ob_rr_theme->bwidth); + menu_frame_show(frame, NULL); + if (frame->entries) + menu_frame_select_next(frame); } -void menu_show(char *name, int x, int y, ObClient *client) +static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id) { - ObMenu *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; + 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; } - menu_show_full(self, x, y, client); -} + return self; +} -void menu_show_full(ObMenu *self, int x, int y, ObClient *client) +void menu_entry_free(ObMenuEntry *self) { - g_assert(self != NULL); - - menu_render(self); - - self->client = client; - - if (!self->shown) { - if (!self->parent) { - grab_pointer(TRUE, None); - grab_keyboard(TRUE); + 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; } - menu_visible = g_slist_append(menu_visible, self); - } - if (self->show) { - self->show(self, x, y, client); - } else { - menu_control_show(self, x, y, client); + g_free(self); } } -void menu_hide(ObMenu *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; - - if (!self->parent) { - grab_keyboard(FALSE); - grab_pointer(FALSE, None); +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); } - menu_visible = g_slist_remove(menu_visible, self); } -} +#endif -void menu_clear(ObMenu *self) { - GList *it; - - for (it = self->entries; it; it = it->next) { - ObMenuEntry *entry = it->data; - menu_entry_free(entry); + while (self->entries) { + menu_entry_free(self->entries->data); + self->entries = g_list_delete_link(self->entries, self->entries); } - self->entries = NULL; - self->invalid = TRUE; } +void menu_entry_remove(ObMenuEntry *self) +{ + self->menu->entries = g_list_remove(self->menu->entries, self); + menu_entry_free(self); +} -ObMenuEntry *menu_find_entry(ObMenu *menu, Window win) +ObMenuEntry* menu_add_normal(ObMenu *self, gint id, gchar *label, + GSList *actions) { - GList *it; + ObMenuEntry *e; - for (it = menu->entries; it; it = it->next) { - ObMenuEntry *entry = it->data; - if (entry->item == win) - return entry; - } - return NULL; + e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_NORMAL, id); + e->data.normal.label = g_strdup(label); + e->data.normal.actions = actions; + + self->entries = g_list_append(self->entries, e); + return e; } -ObMenuEntry *menu_find_entry_by_pos(ObMenu *menu, int x, int y) +ObMenuEntry* menu_add_submenu(ObMenu *self, gint id, gchar *submenu) { - if (x < 0 || x >= menu->size.width || y < 0 || y >= menu->size.height) - return NULL; + ObMenuEntry *e; - y -= menu->title_h + ob_rr_theme->bwidth; - if (y < 0) return NULL; - - g_message ("%d %p", y/menu->item_h, g_list_nth_data(menu->entries, y / menu->item_h)); - return g_list_nth_data(menu->entries, y / menu->item_h); + e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SUBMENU, id); + e->data.submenu.name = g_strdup(submenu); + + self->entries = g_list_append(self->entries, e); + return e; } -void menu_entry_fire(ObMenuEntry *self) +ObMenuEntry* menu_add_separator(ObMenu *self, gint id) { - ObMenu *m; + ObMenuEntry *e; - if (self->action) { - self->action->data.any.c = self->parent->client; - self->action->func(&self->action->data); + e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SEPARATOR, id); - /* hide the whole thing */ - m = self->parent; - while (m->parent) m = m->parent; - menu_hide(m); - } + self->entries = g_list_append(self->entries, e); + return e; } -/* - Default menu controller action for showing. -*/ +void menu_set_update_func(ObMenu *self, ObMenuUpdateFunc func) +{ + self->update_func = func; +} -void menu_control_show(ObMenu *self, int x, int y, ObClient *client) { - guint i; - Rect *a = NULL; +void menu_set_execute_func(ObMenu *self, ObMenuExecuteFunc func) +{ + self->execute_func = func; +} - g_assert(!self->invalid); - - for (i = 0; i < screen_num_monitors; ++i) { - a = screen_physical_area_monitor(i); - if (RECT_CONTAINS(*a, x, y)) +void menu_set_destroy_func(ObMenu *self, ObMenuDestroyFunc func) +{ + self->destroy_func = func; +} + +ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id) +{ + ObMenuEntry *ret = NULL; + GList *it; + + for (it = self->entries; it; it = g_list_next(it)) { + ObMenuEntry *e = it->data; + + if (e->id == id) { + ret = e; break; + } } - g_assert(a != NULL); - self->xin_area = i; - - POINT_SET(self->location, - MIN(x, a->x + a->width - 1 - self->size.width), - MIN(y, a->y + a->height - 1 - self->size.height)); - XMoveWindow(ob_display, self->frame, self->location.x, self->location.y); - - 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); - } + return ret; } -void menu_control_mouseover(ObMenuEntry *self, gboolean enter) { - int x; - Rect *a; - - 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) { - 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 + - ob_rr_theme->bwidth; - - /* need to get the width. is this bad?*/ - menu_render(self->submenu); - - a = screen_physical_area_monitor(self->parent->xin_area); - - if (self->submenu->size.width + x >= a->x + a->width) - x = self->parent->location.x - self->submenu->size.width - - ob_rr_theme->bwidth; - - menu_show_full(self->submenu, x, - self->parent->location.y + self->y, - self->parent->client); - } +void menu_find_submenus(ObMenu *self) +{ + GList *it; + + for (it = self->entries; it; it = g_list_next(it)) { + ObMenuEntry *e = it->data; + + if (e->type == OB_MENU_ENTRY_TYPE_SUBMENU) + e->data.submenu.submenu = menu_from_name(e->data.submenu.name); } }