diff options
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/menu.c | 22 | ||||
| -rw-r--r-- | openbox/menu.h | 4 | ||||
| -rw-r--r-- | openbox/menuframe.c | 4 |
3 files changed, 25 insertions, 5 deletions
diff --git a/openbox/menu.c b/openbox/menu.c index 21c00a31..344e1a5a 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -134,7 +134,22 @@ void menu_shutdown(gboolean reconfig) static gboolean menu_pipe_submenu(gpointer key, gpointer val, gpointer data) { ObMenu *menu = val; - return menu->pipe_creator == data; + return menu->pipe_creator != NULL; +} + +static void clear_cache(gpointer key, gpointer val, gpointer data) +{ + ObMenu *menu = val; + if (menu->execute) + menu_clear_entries(menu); +} + +void menu_clear_pipe_caches() +{ + /* delete any pipe menus' submenus */ + g_hash_table_foreach_remove(menu_hash, menu_pipe_submenu, NULL); + /* empty the top level pipe menus */ + g_hash_table_foreach(menu_hash, clear_cache, NULL); } void menu_pipe_execute(ObMenu *self) @@ -146,6 +161,8 @@ void menu_pipe_execute(ObMenu *self) if (!self->execute) return; + if (self->entries) /* the entries are already created and cached */ + return; if (!g_spawn_command_line_sync(self->execute, &output, NULL, NULL, &err)) { g_message(_("Failed to execute command for pipe-menu '%s': %s"), @@ -157,9 +174,6 @@ 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.pipe_creator = self; menu_parse_state.parent = self; parse_tree(menu_parse_inst, doc, node->children); diff --git a/openbox/menu.h b/openbox/menu.h index 591dfb65..6288d870 100644 --- a/openbox/menu.h +++ b/openbox/menu.h @@ -165,8 +165,10 @@ ObMenu* menu_new(const gchar *name, const gchar *title, gboolean allow_shortcut_selection, gpointer data); void menu_free(ObMenu *menu); -/* Repopulate a pipe-menu by running its command */ +/*! Repopulate a pipe-menu by running its command */ void menu_pipe_execute(ObMenu *self); +/*! Clear a pipe-menu's entries */ +void menu_clear_pipe_caches(); void menu_show_all_shortcuts(ObMenu *self, gboolean show); diff --git a/openbox/menuframe.c b/openbox/menuframe.c index 654cf2ba..fa9e8e9d 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -1058,6 +1058,8 @@ void menu_frame_hide_all() } if ((it = g_list_last(menu_frame_visible))) menu_frame_hide(it->data); + + menu_clear_pipe_caches(); } void menu_frame_hide_all_client(ObClient *client) @@ -1068,6 +1070,8 @@ void menu_frame_hide_all_client(ObClient *client) if (f->client == client) menu_frame_hide(f); } + + menu_clear_pipe_caches(); } |