no more interactive mouse actions, they are evil etc. actions now "feel" much more...

[chaz/openbox] / openbox / menu.c

diff --git a/openbox/menu.c b/openbox/menu.c
index d954102762dc1d1309d8749208ccb4e70c7d79db..4a259387009c43bd491fea71fa6162cb1b83d0d6 100644 (file)
--- 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;
@@ -38,31 +39,38 @@ 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;
 }
 
-static void client_dest(ObClient *c)
+static void client_dest(gpointer client)
 {
     /* menus can be associated with a client, so close any that are since
        we are disappearing now */
-    menu_frame_hide_all_client(c);
+    menu_frame_hide_all_client(client);
 }
 
-void menu_startup()
+void menu_startup(gboolean reconfig)
 {
     xmlDocPtr doc;
     xmlNodePtr node;
@@ -77,7 +85,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);
@@ -87,25 +96,27 @@ void menu_startup()
     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);
         }
     }
     
-    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 +126,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;
@@ -125,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;
@@ -135,14 +151,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);
-        parse_tree(menu_parse_inst, doc, node->xmlChildrenNode);
-        menu_parse_state.menus = g_slist_remove(menu_parse_state.menus, self);
+        menu_parse_state.pipe_creator = self;
+        menu_parse_state.parent = self;
+        parse_tree(menu_parse_inst, doc, node->children);
         xmlFreeDoc(doc);
-
-        g_assert(menu_parse_state.menus == NULL);
+    } else {
+        g_warning("Invalid output from pipe-menu: %s", self->execute);
     }
 }
 
@@ -164,14 +181,16 @@ 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)
+            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));
-            menu_add_normal(state->menus->data, -1, label, acts);
+                    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);
         }
     }
@@ -183,8 +202,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 +221,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);
-                parse_tree(i, doc, node->xmlChildrenNode);
-                state->menus = g_slist_delete_link(state->menus, state->menus);
+                ObMenu *old;
+
+                old = state->parent;
+                state->parent = menu;
+                parse_tree(i, doc, node->children);
+                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);