X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=cd4b5cb168fe2e2d79563b5adb1ac2f7efcf1aef;hb=b317f0140398308fce5fbd262ad99a290b54a449;hp=c52f30131b5b76d212ff6836061142d820ddf07b;hpb=806a8c411f10c7a2292bfac15d77c8609f56ee71;p=chaz%2Fopenbox diff --git a/openbox/menu.c b/openbox/menu.c index c52f3013..cd4b5cb1 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; @@ -38,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; } @@ -77,7 +85,8 @@ void menu_startup(gboolean reconfig) 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,18 +96,18 @@ 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); } } - g_assert(menu_parse_state.menus == NULL); + g_assert(menu_parse_state.parent == NULL); if (!reconfig) client_add_destructor(client_dest); @@ -117,6 +126,12 @@ void menu_shutdown(gboolean reconfig) 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; @@ -127,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; @@ -137,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); } } @@ -166,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); } } @@ -185,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, @@ -204,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); @@ -262,6 +283,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);