#include "client_list_menu.h"
#include "parser/parse.h"
-static GHashTable *menu_hash = NULL;
-
-ObParseInst *menu_parse_inst;
-
typedef struct _ObMenuParseState ObMenuParseState;
struct _ObMenuParseState
{
- GSList *menus;
+ ObMenu *parent;
+ ObMenu *pipe_creator;
};
+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);
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;
}
-void menu_startup()
+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(client);
+}
+
+void menu_startup(gboolean reconfig)
{
- ObMenuParseState parse_state;
xmlDocPtr doc;
xmlNodePtr node;
gboolean loaded = FALSE;
menu_parse_inst = parse_startup();
+ 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);
+ 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->children);
+ 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.xml", &doc, &node)) {
+ parse_tree(menu_parse_inst, doc, node->children);
+ xmlFreeDoc(doc);
+ }
}
+
+ g_assert(menu_parse_state.parent == NULL);
+
+ if (!reconfig)
+ client_add_destructor(client_dest);
}
-void menu_shutdown()
+void menu_shutdown(gboolean reconfig)
{
+ if (!reconfig)
+ client_remove_destructor(client_dest);
+
parse_shutdown(menu_parse_inst);
menu_parse_inst = NULL;
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;
+ 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))
+ {
+ 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);
+ xmlFreeDoc(doc);
+ } else {
+ g_warning("Invalid output from pipe-menu: %s", self->execute);
+ }
+}
+
static ObMenu* menu_from_name(gchar *name)
{
ObMenu *self = NULL;
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);
}
}
{
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,
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))
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);
+ menu->pipe_creator = state->pipe_creator;
+ if (parse_attr_string("execute", node, &script)) {
+ menu->execute = ob_expand_tilde(script);
+ } else {
+ 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);
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);
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);
projects / chaz / openbox / blobdiff