revert my commit of d3th, it fucked up focus badly

[chaz/openbox] / openbox / menu.c

diff --git a/openbox/menu.c b/openbox/menu.c
index ab2294ed89790dac04f8f13765e415ff605d0c7a..231777f214e589850975e36262480582f96336e3 100644 (file)
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -39,20 +39,27 @@ static gboolean menu_open(gchar *file, xmlDocPtr *doc, xmlNodePtr *node)
     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 (file[0] == '/') {
+        if (!parse_load(file, "openbox_menu", doc, node)) {
+            g_warning("Failed to load menu from '%s'", file);
+            loaded = FALSE;
+        }
+    } else {
+        p = g_build_filename(g_get_home_dir(), ".openbox", file, NULL);
         if (!parse_load(p, "openbox_menu", doc, node)) {
             g_free(p);
-            p = g_strdup(file);
+            p = g_build_filename(RCDIR, file, NULL);
             if (!parse_load(p, "openbox_menu", doc, node)) {
-                g_warning("Failed to load menu from '%s'", file);
-                loaded = FALSE;
+                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);
     }
-    g_free(p);
     return loaded;
 }
 
@@ -89,13 +96,13 @@ void menu_startup(gboolean reconfig)
     for (it = config_menu_files; it; it = g_slist_next(it)) {
         if (menu_open(it->data, &doc, &node)) {
             loaded = TRUE;
-            parse_tree(menu_parse_inst, doc, node->xmlChildrenNode);
+            parse_tree(menu_parse_inst, doc, node->children);
             xmlFreeDoc(doc);
         }
     }
     if (!loaded) {
         if (menu_open("menu.xml", &doc, &node)) {
-            parse_tree(menu_parse_inst, doc, node->xmlChildrenNode);
+            parse_tree(menu_parse_inst, doc, node->children);
             xmlFreeDoc(doc);
         }
     }
@@ -135,8 +142,7 @@ void menu_pipe_execute(ObMenu *self)
     if (!self->execute)
         return;
 
-    if (!g_spawn_command_line_sync(self->execute, &output, NULL, NULL, &err))
-    {
+    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;
@@ -150,11 +156,13 @@ void menu_pipe_execute(ObMenu *self)
 
         menu_parse_state.pipe_creator = self;
         menu_parse_state.parent = self;
-        parse_tree(menu_parse_inst, doc, node->xmlChildrenNode);
+        parse_tree(menu_parse_inst, doc, node->children);
         xmlFreeDoc(doc);
     } else {
         g_warning("Invalid output from pipe-menu: %s", self->execute);
     }
+
+    g_free(output);
 }
 
 static ObMenu* menu_from_name(gchar *name)
@@ -179,9 +187,11 @@ static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         if (parse_attr_string("label", node, &label)) {
             GSList *acts = NULL;
 
-            for (node = node->xmlChildrenNode; node; node = node->next)
+            for (node = node->children; node; node = node->next)
                 if (!xmlStrcasecmp(node->name, (const xmlChar*) "action"))
-                    acts = g_slist_append(acts, action_parse(i, doc, node));
+                    acts = g_slist_append(acts, action_parse
+                                          (i, doc, node,
+                                           OB_USER_ACTION_MENU_SELECTION));
             menu_add_normal(state->parent, -1, label, acts);
             g_free(label);
         }
@@ -221,7 +231,7 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
 
                 old = state->parent;
                 state->parent = menu;
-                parse_tree(i, doc, node->xmlChildrenNode);
+                parse_tree(i, doc, node->children);
                 state->parent = old;
             }
         }
@@ -252,7 +262,17 @@ ObMenu* menu_new(gchar *name, gchar *title, gpointer data)
 
 static void menu_destroy_hash_value(ObMenu *self)
 {
-    /* XXX make sure its not visible */
+    /* 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);
@@ -261,6 +281,8 @@ static void menu_destroy_hash_value(ObMenu *self)
     g_free(self->name);
     g_free(self->title);
     g_free(self->execute);
+
+    g_free(self);
 }
 
 void menu_free(ObMenu *menu)
@@ -275,6 +297,8 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client)
 
     if (!(self = menu_from_name(name))) return;
 
+    menu_frame_hide_all();
+
     frame = menu_frame_new(self, client);
     menu_frame_move(frame, x, y);
     menu_frame_show(frame, NULL);
@@ -331,7 +355,18 @@ void menu_entry_free(ObMenuEntry *self)
 
 void menu_clear_entries(ObMenu *self)
 {
-    /* XXX assert that the menu isn't visible */
+#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
 
     while (self->entries) {
        menu_entry_free(self->entries->data);