remove debug prints

[chaz/openbox] / openbox / menu.c

diff --git a/openbox/menu.c b/openbox/menu.c
index 464011c89154865ef794a5a5f1aadb7eea4e5206..8cc1c872f2c642fb36704fceff3ccde993406922 100644 (file)
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -13,10 +13,6 @@
 #include "client_list_menu.h"
 #include "parser/parse.h"
 
-static GHashTable *menu_hash = NULL;
-
-ObParseInst *menu_parse_inst;
-
 typedef struct _ObMenuParseState ObMenuParseState;
 
 struct _ObMenuParseState
@@ -24,6 +20,10 @@ struct _ObMenuParseState
     GSList *menus;
 };
 
+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);
@@ -55,9 +55,15 @@ static gboolean menu_open(gchar *file, xmlDocPtr *doc, xmlNodePtr *node)
     return loaded;
 }
 
+static void client_dest(ObClient *c)
+{
+    /* menus can be associated with a client, so close any that are since
+       we are disappearing now */
+    menu_frame_hide_all_client(c);
+}
+
 void menu_startup()
 {
-    ObMenuParseState parse_state;
     xmlDocPtr doc;
     xmlNodePtr node;
     gboolean loaded = FALSE;
@@ -71,28 +77,36 @@ void menu_startup()
 
     menu_parse_inst = parse_startup();
 
+    menu_parse_state.menus = 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 (menu_open(it->data, &doc, &node))
+        if (menu_open(it->data, &doc, &node)) {
             loaded = TRUE;
-
+            parse_tree(menu_parse_inst, doc, node->xmlChildrenNode);
+            xmlFreeDoc(doc);
+        }
     }
-    if (!loaded)
-        loaded = menu_open("menu", &doc, &node);
-
-    if (loaded) {
-        parse_state.menus = NULL;
-
-        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);
-        xmlFreeDoc(doc);
+    if (!loaded) {
+        if (menu_open("menu", &doc, &node)) {
+            parse_tree(menu_parse_inst, doc, node->xmlChildrenNode);
+            xmlFreeDoc(doc);
+        }
     }
+    
+    g_assert(menu_parse_state.menus == NULL);
+
+    client_add_destructor(client_dest);
 }
 
 void menu_shutdown()
 {
+    client_remove_destructor(client_dest);
+
     parse_shutdown(menu_parse_inst);
     menu_parse_inst = NULL;
 
@@ -101,6 +115,37 @@ void menu_shutdown()
     menu_hash = NULL;
 }
 
+void menu_pipe_execute(ObMenu *self)
+{
+    xmlDocPtr doc;
+    xmlNodePtr node;
+    gchar *output;
+    GError *err = NULL;
+
+    if (!self->execute)
+        return;
+
+    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;
+    }
+
+    if (parse_load_mem(output, strlen(output),
+                       "openbox_pipe_menu", &doc, &node))
+    {
+        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);
+        xmlFreeDoc(doc);
+
+        g_assert(menu_parse_state.menus == NULL);
+    }
+}
+
 static ObMenu* menu_from_name(gchar *name)
 {
     ObMenu *self = NULL;
@@ -146,7 +191,7 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                        gpointer data)
 {
     ObMenuParseState *state = data;
-    gchar *name = NULL, *title = NULL;
+    gchar *name = NULL, *title = NULL, *script = NULL;
     ObMenu *menu;
 
     if (!parse_attr_string("id", node, &name))
@@ -157,9 +202,13 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             goto parse_menu_fail;
 
         if ((menu = menu_new(name, title, NULL))) {
-            state->menus = g_slist_prepend(state->menus, menu);
-            parse_tree(i, doc, node->xmlChildrenNode);
-            state->menus = g_slist_delete_link(state->menus, state->menus);
+            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);
+            }
         }
     }
 
@@ -169,27 +218,13 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
 parse_menu_fail:
     g_free(name);
     g_free(title);
-}
-
-
-static void menu_destroy_hash_value(ObMenu *self)
-{
-    /* XXX make sure its not visible */
-
-    if (self->destroy_func)
-        self->destroy_func(self, self->data);
-
-    menu_clear_entries(self);
-    g_free(self->name);
-    g_free(self->title);
+    g_free(script);
 }
 
 ObMenu* menu_new(gchar *name, gchar *title, gpointer data)
 {
     ObMenu *self;
 
-    /*if (g_hash_table_lookup(menu_hash, name)) return FALSE;*/
-
     self = g_new0(ObMenu, 1);
     self->name = g_strdup(name);
     self->title = g_strdup(title);
@@ -200,6 +235,19 @@ ObMenu* menu_new(gchar *name, gchar *title, gpointer data)
     return self;
 }
 
+static void menu_destroy_hash_value(ObMenu *self)
+{
+    /* XXX make sure its not visible */
+
+    if (self->destroy_func)
+        self->destroy_func(self, self->data);
+
+    menu_clear_entries(self);
+    g_free(self->name);
+    g_free(self->title);
+    g_free(self->execute);
+}
+
 void menu_free(ObMenu *menu)
 {
     g_hash_table_remove(menu_hash, menu->name);
@@ -215,6 +263,8 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client)
     frame = menu_frame_new(self, client);
     menu_frame_move(frame, x, y);
     menu_frame_show(frame, NULL);
+    if (frame->entries)
+        menu_frame_select_next(frame);
 }
 
 static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id)