X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=ab2294ed89790dac04f8f13765e415ff605d0c7a;hb=8617f504a734e417e76e350977f656124bec1b51;hp=75380f1eb42c3b2fb380136164150fc0c72dc63b;hpb=5e5fdb1666ac4877ca4d26f5ca565a299bc4cc42;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index 75380f1e..ab2294ed 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -17,7 +17,8 @@ typedef struct _ObMenuParseState ObMenuParseState;
 
 struct _ObMenuParseState
 {
-    GSList *menus;
+    ObMenu *parent;
+    ObMenu *pipe_creator;
 };
 
 static GHashTable *menu_hash = NULL;
@@ -62,7 +63,7 @@ static void client_dest(gpointer client)
     menu_frame_hide_all_client(client);
 }
 
-void menu_startup()
+void menu_startup(gboolean reconfig)
 {
     xmlDocPtr doc;
     xmlNodePtr node;
@@ -77,7 +78,8 @@ void menu_startup()
 
     menu_parse_inst = parse_startup();
 
-    menu_parse_state.menus = NULL;
+    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);
@@ -98,14 +100,16 @@ void menu_startup()
         }
     }
     
-    g_assert(menu_parse_state.menus == NULL);
+    g_assert(menu_parse_state.parent == NULL);
 
-    client_add_destructor(client_dest);
+    if (!reconfig)
+        client_add_destructor(client_dest);
 }
 
-void menu_shutdown()
+void menu_shutdown(gboolean reconfig)
 {
-    client_remove_destructor(client_dest);
+    if (!reconfig)
+        client_remove_destructor(client_dest);
 
     parse_shutdown(menu_parse_inst);
     menu_parse_inst = NULL;
@@ -115,6 +119,12 @@ void menu_shutdown()
     menu_hash = NULL;
 }
 
+static gboolean menu_pipe_submenu(gpointer key, gpointer val, gpointer data)
+{
+    ObMenu *menu = val;
+    return menu->pipe_creator == data;
+}
+
 void menu_pipe_execute(ObMenu *self)
 {
     xmlDocPtr doc;
@@ -135,14 +145,15 @@ void menu_pipe_execute(ObMenu *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);
 
-        menu_parse_state.menus = g_slist_prepend(NULL, self);
+        menu_parse_state.pipe_creator = self;
+        menu_parse_state.parent = self;
         parse_tree(menu_parse_inst, doc, node->xmlChildrenNode);
-        menu_parse_state.menus = g_slist_remove(menu_parse_state.menus, self);
         xmlFreeDoc(doc);
-
-        g_assert(menu_parse_state.menus == NULL);
+    } else {
+        g_warning("Invalid output from pipe-menu: %s", self->execute);
     }
 }
 
@@ -164,14 +175,14 @@ static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
     ObMenuParseState *state = data;
     gchar *label;
     
-    if (state->menus) {
+    if (state->parent) {
         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, -1, label, acts);
+            menu_add_normal(state->parent, -1, label, acts);
             g_free(label);
         }
     }
@@ -183,8 +194,8 @@ static void parse_menu_separator(ObParseInst *i,
 {
     ObMenuParseState *state = data;
 
-    if (state->menus)
-        menu_add_separator(state->menus->data, -1);
+    if (state->parent)
+        menu_add_separator(state->parent, -1);
 }
 
 static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -202,18 +213,22 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             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 = ob_expand_tilde(script);
             } else {
-                state->menus = g_slist_prepend(state->menus, menu);
+                ObMenu *old;
+
+                old = state->parent;
+                state->parent = menu;
                 parse_tree(i, doc, node->xmlChildrenNode);
-                state->menus = g_slist_delete_link(state->menus, state->menus);
+                state->parent = old;
             }
         }
     }
 
-    if (state->menus)
-        menu_add_submenu(state->menus->data, -1, name);
+    if (state->parent)
+        menu_add_submenu(state->parent, -1, name);
 
 parse_menu_fail:
     g_free(name);