X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=4ffcca0d397adf6eb4ddf7cb5f1b5432e5d27f0e;hb=ec9dd7fdd7531d2ca951a0b812bf8e63b6e9a377;hp=f8a5efc5d9ea10500d7e3dce4baa4a4a0eda6906;hpb=e9a8e272c06fd0cc1a2d93418d261886e786b16f;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index f8a5efc5..4ffcca0d 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -1,489 +1,391 @@
+#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"
+#include "misc.h"
+#include "parser/parse.h"
 
-GHashTable *menu_hash = NULL;
-GSList *menu_visible = NULL;
+static GHashTable *menu_hash = NULL;
 
-#define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask | \
-			 LeaveWindowMask)
-#define TITLE_EVENTMASK (ButtonPressMask | ButtonMotionMask)
-#define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
-                         ButtonPressMask | ButtonReleaseMask)
+ObParseInst *menu_parse_inst;
 
-static void parse_menu(xmlDocPtr doc, xmlNodePtr node, void *data)
+typedef struct _ObMenuParseState ObMenuParseState;
+
+struct _ObMenuParseState
 {
-    parse_menu_full(doc, node, data, TRUE);
-}
+    GSList *menus;
+};
 
+static void menu_clear_entries_internal(ObMenu *self);
 
-void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data,
-                       gboolean newmenu)
+static ObMenu* menu_from_name(gchar *name)
 {
-    Action *act;
-    xmlNodePtr nact;
+    ObMenu *self = NULL;
 
-    gchar *id = NULL, *title = NULL, *label = NULL, *plugin;
-    ObMenu *menu = NULL, *parent;
+    g_assert(name != NULL);
 
-    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;
+    if (!(self = g_hash_table_lookup(menu_hash, name)))
+        g_warning("Attempted to access menu '%s' but it does not exist.",
+                  name);
+    return self;
+}  
+
+static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                            gpointer data)
+{
+    ObMenuParseState *state = data;
+    gchar *label;
+    
+    if (state->menus) {
+        if (parse_attr_string("label", node, &label)) {
+            GSList *acts = NULL;
+
+            for (node = node->xmlChildrenNode; node; node = node->next)
+                if (!xmlStrcasecmp(node->name, (const xmlChar*) "action"))
+                    acts = g_slist_append(acts, action_parse(i, doc, node));
+            menu_add_normal(state->menus->data, 0, label, acts);
+            g_free(label);
+        }
+    }
+}
 
-        g_message("menu label %s", title);
+static void parse_menu_separator(ObParseInst *i,
+                                 xmlDocPtr doc, xmlNodePtr node,
+                                 gpointer data)
+{
+    ObMenuParseState *state = data;
 
-        menu = menu_new(title, id, data ? *((ObMenu**)data) : NULL);
+    if (state->menus)
+        menu_add_separator(state->menus->data, 0);
+}
 
-        if (data)
-            *((ObMenu**)data) = menu;
-    } else {
-        menu = (ObMenu *)data;
+gboolean menu_open_plugin(ObParseInst *i, gchar *name, gchar *plugin)
+{
+    gboolean ret = FALSE;
+
+    if (plugin_open(plugin, i)) {
+        plugin_start(plugin);
+        if (g_hash_table_lookup(menu_hash, name))
+            ret = TRUE;
+        else
+            g_warning("Specified plugin '%s' did not provide the "
+                      "menu '%s'", plugin, name);
     }
-    
-    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);
-                g_free(plugin);
-            } else {
-                parent = menu;
-                parse_menu(doc, node->xmlChildrenNode, &parent);
-                menu_add_entry(menu, menu_entry_new_submenu(parent->label,
-                                                            parent));
-            }
+    return ret;
+}
 
-        }
-        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);
+static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                       gpointer data)
+{
+    ObMenuParseState *state = data;
+    gchar *name = NULL, *title = NULL, *plugin = NULL;
+
+    if (!parse_attr_string("id", node, &name))
+        goto parse_menu_fail;
+
+    if (!g_hash_table_lookup(menu_hash, name)) {
+        if (parse_attr_string("plugin", node, &plugin)) {
+            menu_open_plugin(i, name, plugin);
+        } else {
+            if (!parse_attr_string("label", node, &title))
+                goto parse_menu_fail;
+
+            if (menu_new(name, title, NULL)) {
+                state->menus = g_slist_prepend(state->menus, name);
+                parse_tree(i, doc, node->xmlChildrenNode);
+                state->menus = g_slist_delete_link(state->menus, state->menus);
             }
         }
-        node = node->next;
     }
 
+    if (state->menus)
+        menu_add_submenu(state->menus->data, 0, name);
+
 parse_menu_fail:
-    g_free(id);
+    g_free(name);
     g_free(title);
+    g_free(plugin);
 }
 
-void menu_control_show(ObMenu *self, int x, int y, ObClient *client);
-
-void menu_destroy_hash_key(ObMenu *menu)
-{
-    g_free(menu);
-}
 
 void menu_destroy_hash_value(ObMenu *self)
 {
-    GList *it;
+    /* XXX make sure its not visible */
 
-    for (it = self->entries; it; it = it->next)
-        menu_entry_free(it->data);
-    g_list_free(self->entries);
+    if (self->destroy_func)
+        self->destroy_func(self, self->data);
 
-    g_free(self->label);
+    menu_clear_entries_internal(self);
     g_free(self->name);
-
-    g_hash_table_remove(window_map, &self->title);
-    g_hash_table_remove(window_map, &self->frame);
-    g_hash_table_remove(window_map, &self->items);
-
-    stacking_remove(self);
-
-    RrAppearanceFree(self->a_title);
-    RrAppearanceFree(self->a_items);
-    XDestroyWindow(ob_display, self->title);
-    XDestroyWindow(ob_display, self->frame);
-    XDestroyWindow(ob_display, self->items);
-
-    g_free(self);
+    g_free(self->title);
 }
 
-void menu_entry_free(ObMenuEntry *self)
+void menu_startup(ObParseInst *i)
 {
-    g_free(self->label);
-    action_free(self->action);
-
-    g_hash_table_remove(window_map, &self->item);
-
-    RrAppearanceFree(self->a_item);
-    RrAppearanceFree(self->a_disabled);
-    RrAppearanceFree(self->a_hilite);
-    XDestroyWindow(ob_display, self->item);
-
-    g_free(self);
-}
-    
-void menu_startup()
-{
-/*
-    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,
+    menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
                                       (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));
-
-    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));
-    */
+    menu_parse_inst = parse_startup();
 }
 
 void menu_shutdown()
 {
+    parse_shutdown(menu_parse_inst);
+    menu_parse_inst = NULL;
+
+    menu_frame_hide_all();
     g_hash_table_destroy(menu_hash);
+    menu_hash = NULL;
 }
 
-static Window createWindow(Window parent, unsigned long mask,
-			   XSetWindowAttributes *attrib)
+gboolean menu_open(gchar *file, xmlDocPtr *doc, xmlNodePtr *node)
 {
-    return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
-			 RrDepth(ob_rr_inst), InputOutput,
-                         RrVisual(ob_rr_inst), mask, attrib);
-                       
+    gboolean loaded = TRUE;
+    gchar *p;
+
+    p = g_build_filename(g_get_home_dir(), ".openbox", file, NULL);
+    if (!parse_load(p, "openbox_menu", doc, node)) {
+        g_free(p);
+        p = g_build_filename(RCDIR, file, NULL);
+        if (!parse_load(p, "openbox_menu", doc, node)) {
+            g_free(p);
+            p = g_strdup(file);
+            if (!parse_load(p, "openbox_menu", doc, node)) {
+                g_warning("Failed to load menu from '%s'", file);
+                loaded = FALSE;
+            }
+        }
+    }
+    g_free(p);
+    return loaded;
 }
 
-ObMenu *menu_new_full(char *label, char *name, ObMenu *parent, 
-                    menu_controller_show show, menu_controller_update update)
+void menu_parse()
 {
-    XSetWindowAttributes attrib;
-    ObMenu *self;
+    ObMenuParseState parse_state;
+    xmlDocPtr doc;
+    xmlNodePtr node;
+    gboolean loaded = FALSE;
+    GSList *it;
 
-    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;
+    for (it = config_menu_files; it; it = g_slist_next(it)) {
+        if (menu_open(it->data, &doc, &node))
+            loaded = TRUE;
 
-    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;
+    }
+    if (!loaded)
+        loaded = menu_open("menu", &doc, &node);
 
-    self->plugin = NULL;
-    self->plugin_data = NULL;
+    if (loaded) {
+        parse_state.menus = 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);
+        parse_register(menu_parse_inst, "menu", parse_menu, &parse_state);
+        parse_register(menu_parse_inst, "item", parse_menu_item, &parse_state);
+        parse_register(menu_parse_inst, "separator",
+                       parse_menu_separator, &parse_state);
+        parse_tree(menu_parse_inst, doc, node->xmlChildrenNode);
+    }
+}
 
-    self->a_title = self->a_items = NULL;
+ObMenu* menu_new(gchar *name, gchar *title, gpointer data)
+{
+    ObMenu *self;
 
-    XMapWindow(ob_display, self->title);
-    XMapWindow(ob_display, self->items);
+    /*if (g_hash_table_lookup(menu_hash, name)) return FALSE;*/
 
-    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);
+    self = g_new0(ObMenu, 1);
+    self->name = g_strdup(name);
+    self->title = g_strdup(title);
+    self->data = data;
 
-    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)
+void menu_free(gchar *name)
 {
-    g_hash_table_remove(menu_hash, name);
+    ObMenu *self;
+    
+    if (!(self = menu_from_name(name))) return;
+    g_hash_table_remove(menu_hash, self->name);
 }
 
-ObMenuEntry *menu_entry_new_full(char *label, Action *action,
-                               ObMenuEntryRenderType render_type,
-                               gpointer submenu)
+void menu_show(gchar *name, gint x, gint y, ObClient *client)
 {
-    ObMenuEntry *menu_entry = g_new0(ObMenuEntry, 1);
-
-    menu_entry->label = g_strdup(label);
-    menu_entry->render_type = render_type;
-    menu_entry->action = action;
-
-    menu_entry->hilite = FALSE;
-    menu_entry->enabled = TRUE;
+    ObMenu *self;
+    ObMenuFrame *frame;
 
-    menu_entry->submenu = submenu;
+    if (!(self = menu_from_name(name))) return;
 
-    return menu_entry;
+    frame = menu_frame_new(self, client);
+    menu_frame_move(frame, x, y);
+    menu_frame_show(frame, NULL);
 }
 
-void menu_entry_set_submenu(ObMenuEntry *entry, ObMenu *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(ObMenu *menu, ObMenuEntry *entry)
+static 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_free(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_assert(menu != NULL);
-    g_assert(entry != NULL);
-    g_assert(entry->item == None);
+        g_free(self);
+    }
+}
 
-    menu->entries = g_list_append(menu->entries, entry);
-    entry->parent = menu;
+void menu_clear_entries(gchar *name)
+{
+    ObMenu *self;
 
-    attrib.event_mask = ENTRY_EVENTMASK;
-    entry->item = createWindow(menu->items, CWEventMask, &attrib);
-    XMapWindow(ob_display, entry->item);
+    if (!(self = menu_from_name(name))) return;
 
-    entry->a_item = entry->a_disabled = entry->a_hilite = NULL;
+    menu_clear_entries_internal(self);
+}
 
-    menu->invalid = TRUE;
+static void menu_clear_entries_internal(ObMenu *self)
+{
+    /* XXX assert that the menu isn't visible */
 
-    g_hash_table_insert(window_map, &entry->item, menu);
+    while (self->entries) {
+	menu_entry_free(self->entries->data);
+        self->entries = g_list_delete_link(self->entries, self->entries);
+    }
 }
 
-void menu_show(char *name, int x, int y, ObClient *client)
+ObMenuEntry* menu_add_normal(gchar *name, gint id, gchar *label,
+                             GSList *actions)
 {
     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 *e;
 
-    menu_show_full(self, x, y, client);
-}  
+    if (!(self = menu_from_name(name))) return;
+
+    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;
+}
 
-void menu_show_full(ObMenu *self, int x, int y, ObClient *client)
+ObMenuEntry* menu_add_submenu(gchar *name, gint id, gchar *submenu)
 {
-    g_assert(self != NULL);
-       
-    menu_render(self);
-    
-    self->client = client;
+    ObMenu *self;
+    ObMenuEntry *e;
 
-    if (!self->shown) {
-        if (!self->parent) {
-            grab_pointer(TRUE, None);
-            grab_keyboard(TRUE);
-        }
-        menu_visible = g_slist_append(menu_visible, self);
-    }
+    if (!(self = menu_from_name(name))) return;
 
-    if (self->show) {
-	self->show(self, x, y, client);
-    } else {
-      menu_control_show(self, x, y, client);
-    }
-}
+    e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SUBMENU, id);
+    e->data.submenu.name = g_strdup(submenu);
 
-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);
-        }
-        menu_visible = g_slist_remove(menu_visible, self);
-    }
+    self->entries = g_list_append(self->entries, e);
+    return e;
 }
 
-void menu_clear(ObMenu *self) {
-    GList *it;
-  
-    for (it = self->entries; it; it = it->next) {
-	ObMenuEntry *entry = it->data;
-	menu_entry_free(entry);
-    }
-    self->entries = NULL;
-    self->invalid = TRUE;
-}
+ObMenuEntry* menu_add_separator(gchar *name, gint id)
+{
+    ObMenu *self;
+    ObMenuEntry *e;
 
+    if (!(self = menu_from_name(name))) return;
 
-ObMenuEntry *menu_find_entry(ObMenu *menu, Window win)
-{
-    GList *it;
+    e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SEPARATOR, id);
 
-    for (it = menu->entries; it; it = it->next) {
-        ObMenuEntry *entry = it->data;
-        if (entry->item == win)
-            return entry;
-    }
-    return NULL;
+    self->entries = g_list_append(self->entries, e);
+    return e;
 }
 
-ObMenuEntry *menu_find_entry_by_pos(ObMenu *menu, int x, int y)
+void menu_set_update_func(gchar *name, ObMenuUpdateFunc func)
 {
-    if (x < 0 || x >= menu->size.width || y < 0 || y >= menu->size.height)
-        return NULL;
+    ObMenu *self;
 
-    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);
+    if (!(self = menu_from_name(name))) return;
+    self->update_func = func;
 }
 
-void menu_entry_fire(ObMenuEntry *self)
+void menu_set_execute_func(gchar *name, ObMenuExecuteFunc func)
 {
-    ObMenu *m;
+    ObMenu *self;
 
-    if (self->action) {
-        self->action->data.any.c = self->parent->client;
-        self->action->func(&self->action->data);
+    if (!(self = menu_from_name(name))) return;
+    self->execute_func = func;
+}
 
-        /* hide the whole thing */
-        m = self->parent;
-        while (m->parent) m = m->parent;
-        menu_hide(m);
-    }
+void menu_set_destroy_func(gchar *name, ObMenuDestroyFunc func)
+{
+    ObMenu *self;
+
+    if (!(self = menu_from_name(name))) return;
+    self->destroy_func = func;
 }
 
-/* 
-   Default menu controller action for showing.
-*/
+ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id)
+{
+    ObMenuEntry *ret = NULL;
+    GList *it;
 
-void menu_control_show(ObMenu *self, int x, int y, ObClient *client) {
-    guint i;
-    Rect *a = NULL;
+    for (it = self->entries; it; it = g_list_next(it)) {
+        ObMenuEntry *e = it->data;
 
-    g_assert(!self->invalid);
-    
-    for (i = 0; i < screen_num_monitors; ++i) {
-        a = screen_physical_area_monitor(i);
-        if (RECT_CONTAINS(*a, x, y))
+        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);
     }
 }