struct _ObMenuParseState
{
- GSList *menus;
+ ObMenu *parent;
ObMenu *pipe_creator;
};
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;
}
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,
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);
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;
menu_clear_entries(self);
menu_parse_state.pipe_creator = 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 = NULL;
+ 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);
}
+
+ g_free(output);
}
static ObMenu* menu_from_name(gchar *name)
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,
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);
static void menu_destroy_hash_value(ObMenu *self)
{
- /* XXX make sure its not visible */
+ /* make sure its not visible */
+ {
+ GList *it;
+ ObMenuFrame *f;
+
+ for (it = menu_frame_visible; it; it = g_list_next(it)) {
+ f = it->data;
+ if (f->menu == self)
+ menu_frame_hide_all();
+ }
+ }
if (self->destroy_func)
self->destroy_func(self, self->data);
g_free(self->name);
g_free(self->title);
g_free(self->execute);
+
+ g_free(self);
}
void menu_free(ObMenu *menu)
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);
void menu_clear_entries(ObMenu *self)
{
- /* XXX assert that the menu isn't visible */
+#ifdef DEBUG
+ /* assert that the menu isn't visible */
+ {
+ GList *it;
+ ObMenuFrame *f;
+
+ for (it = menu_frame_visible; it; it = g_list_next(it)) {
+ f = it->data;
+ g_assert(f->menu != self);
+ }
+ }
+#endif
while (self->entries) {
menu_entry_free(self->entries->data);