X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=374aeec1fc59a7b951acaf8e7bfa5fb3709318d8;hb=fd77a0a7b3f892925f203287b8b46c6ec9be94ea;hp=3e45fb93ca9961a7e253f41af995507155783161;hpb=50d662681160c309ea86268c0d05794b87b75593;p=chaz%2Fopenbox diff --git a/openbox/menu.c b/openbox/menu.c index 3e45fb93..374aeec1 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -34,7 +34,7 @@ #include "client_list_menu.h" #include "client_list_combined_menu.h" #include "gettext.h" -#include "obt/parse.h" +#include "obt/xml.h" #include "obt/paths.h" typedef struct _ObMenuParseState ObMenuParseState; @@ -46,7 +46,7 @@ struct _ObMenuParseState }; static GHashTable *menu_hash = NULL; -static ObtParseInst *menu_parse_inst; +static ObtXmlInst *menu_parse_inst; static ObMenuParseState menu_parse_state; static gboolean menu_can_hide = FALSE; @@ -58,13 +58,6 @@ static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut, gchar **strippedlabel, guint *position, gboolean *always_show); -static void client_dest(ObClient *client, gpointer data) -{ - /* 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) { gboolean loaded = FALSE; @@ -77,54 +70,48 @@ void menu_startup(gboolean reconfig) client_list_combined_menu_startup(reconfig); client_menu_startup(); - menu_parse_inst = obt_parse_instance_new(); + menu_parse_inst = obt_xml_instance_new(); menu_parse_state.parent = NULL; menu_parse_state.pipe_creator = NULL; - obt_parse_register(menu_parse_inst, "menu", parse_menu, &menu_parse_state); - obt_parse_register(menu_parse_inst, "item", parse_menu_item, - &menu_parse_state); - obt_parse_register(menu_parse_inst, "separator", + obt_xml_register(menu_parse_inst, "menu", parse_menu, &menu_parse_state); + obt_xml_register(menu_parse_inst, "item", parse_menu_item, + &menu_parse_state); + obt_xml_register(menu_parse_inst, "separator", parse_menu_separator, &menu_parse_state); for (it = config_menu_files; it; it = g_slist_next(it)) { - if (obt_parse_load_config_file(menu_parse_inst, - "openbox", - it->data, - "openbox_menu")) + if (obt_xml_load_config_file(menu_parse_inst, + "openbox", + it->data, + "openbox_menu")) { loaded = TRUE; - obt_parse_tree_from_root(menu_parse_inst); - obt_parse_close(menu_parse_inst); + obt_xml_tree_from_root(menu_parse_inst); + obt_xml_close(menu_parse_inst); } else g_message(_("Unable to find a valid menu file \"%s\""), (const gchar*)it->data); } if (!loaded) { - if (obt_parse_load_config_file(menu_parse_inst, - "openbox", - "menu.xml", - "openbox_menu")) + if (obt_xml_load_config_file(menu_parse_inst, + "openbox", + "menu.xml", + "openbox_menu")) { - obt_parse_tree_from_root(menu_parse_inst); - obt_parse_close(menu_parse_inst); + obt_xml_tree_from_root(menu_parse_inst); + obt_xml_close(menu_parse_inst); } else g_message(_("Unable to find a valid menu file \"%s\""), "menu.xml"); } g_assert(menu_parse_state.parent == NULL); - - if (!reconfig) - client_add_destroy_notify(client_dest, NULL); } void menu_shutdown(gboolean reconfig) { - if (!reconfig) - client_remove_destroy_notify(client_dest); - - obt_parse_instance_unref(menu_parse_inst); + obt_xml_instance_unref(menu_parse_inst); menu_parse_inst = NULL; client_list_menu_shutdown(reconfig); @@ -173,13 +160,13 @@ void menu_pipe_execute(ObMenu *self) return; } - if (obt_parse_load_mem(menu_parse_inst, output, strlen(output), - "openbox_pipe_menu")) + if (obt_xml_load_mem(menu_parse_inst, output, strlen(output), + "openbox_pipe_menu")) { menu_parse_state.pipe_creator = self; menu_parse_state.parent = self; - obt_parse_tree_from_root(menu_parse_inst); - obt_parse_close(menu_parse_inst); + obt_xml_tree_from_root(menu_parse_inst); + obt_xml_close(menu_parse_inst); } else { g_message(_("Invalid output from pipe-menu \"%s\""), self->execute); } @@ -218,6 +205,7 @@ static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut, *strippedlabel = NULL; } else { gchar *i; + gboolean escape; *strippedlabel = g_strdup(label); @@ -225,20 +213,33 @@ static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut, have to just use the first valid character */ - i = strchr(*strippedlabel, '_'); + /* allow __ to escape an underscore */ + i = *strippedlabel; + do { + escape = FALSE; + i = strchr(i, '_'); + if (i && *(i+1) == '_') { + gchar *j; + + /* remove the escape '_' from the string */ + for (j = i; *j != '\0'; ++j) + *j = *(j+1); + + ++i; + escape = TRUE; + } + } while (escape); + if (allow_shortcut && i != NULL) { /* there is an underscore in the string */ /* you have to use a printable ascii character for shortcuts don't allow space either, so you can have like "a _ b" */ - if (VALID_SHORTCUT(*(i+1)) || *(i+1) == '_') { - /* Allow you to escape the first _ by putting __ */ - if (*(i+1) != '_') { - shortcut = g_unichar_tolower(g_utf8_get_char(i+1)); - *position = i - *strippedlabel; - *always_show = TRUE; - } + if (VALID_SHORTCUT(*(i+1))) { + shortcut = g_unichar_tolower(g_utf8_get_char(i+1)); + *position = i - *strippedlabel; + *always_show = TRUE; /* remove the '_' from the string */ for (; *i != '\0'; ++i) @@ -269,18 +270,48 @@ static void parse_menu_item(xmlNodePtr node, gpointer data) { ObMenuParseState *state = data; gchar *label; + gchar *icon; + ObMenuEntry *e; if (state->parent) { - if (obt_parse_attr_string(node, "label", &label)) { + /* Don't try to extract "icon" attribute if icons in user-defined + menus are not enabled. */ + + if (obt_xml_attr_string(node, "label", &label)) { + xmlNodePtr c; GSList *acts = NULL; - for (node = node->children; node; node = node->next) - if (!xmlStrcasecmp(node->name, (const xmlChar*) "action")) { - ObActionsAct *a = actions_parse(node); - if (a) - acts = g_slist_append(acts, a); + c = obt_xml_find_node(node->children, "action"); + while (c) { + ObActionsAct *action = actions_parse(c); + if (action) + acts = g_slist_append(acts, action); + c = obt_xml_find_node(node->next, "action"); + } + e = menu_add_normal(state->parent, -1, label, acts, TRUE); + + if (config_menu_show_icons && + obt_xml_attr_string(node, "icon", &icon)) + { + RrImage *ic; + + ic = RrImageCacheFindName(ob_rr_icons, icon); + if (ic) + RrImageRef(ic); + else { + ic = RrImageNew(ob_rr_icons); + if (!RrImageAddPictureName(ic, icon)) { + RrImageUnref(ic); /* no need to keep it around */ + ic = NULL; + } } - menu_add_normal(state->parent, -1, label, acts, TRUE); + e->data.normal.icon = ic; + + if (e->data.normal.icon) + e->data.normal.icon_alpha = 0xff; + + g_free(icon); + } g_free(label); } } @@ -293,7 +324,7 @@ static void parse_menu_separator(xmlNodePtr node, gpointer data) if (state->parent) { gchar *label; - if (!obt_parse_attr_string(node, "label", &label)) + if (!obt_xml_attr_string(node, "label", &label)) label = NULL; menu_add_separator(state->parent, -1, label); @@ -307,23 +338,23 @@ static void parse_menu(xmlNodePtr node, gpointer data) gchar *name = NULL, *title = NULL, *script = NULL; ObMenu *menu; - if (!obt_parse_attr_string(node, "id", &name)) + if (!obt_xml_attr_string(node, "id", &name)) goto parse_menu_fail; if (!g_hash_table_lookup(menu_hash, name)) { - if (!obt_parse_attr_string(node, "label", &title)) + if (!obt_xml_attr_string(node, "label", &title)) goto parse_menu_fail; if ((menu = menu_new(name, title, TRUE, NULL))) { menu->pipe_creator = state->pipe_creator; - if (obt_parse_attr_string(node, "execute", &script)) { + if (obt_xml_attr_string(node, "execute", &script)) { menu->execute = obt_paths_expand_tilde(script); } else { ObMenu *old; old = state->parent; state->parent = menu; - obt_parse_tree(menu_parse_inst, node->children); + obt_xml_tree(menu_parse_inst, node->children); state->parent = old; } } @@ -343,7 +374,7 @@ ObMenu* menu_new(const gchar *name, const gchar *title, { ObMenu *self; - self = g_new0(ObMenu, 1); + self = g_slice_new0(ObMenu); self->name = g_strdup(name); self->data = data; @@ -362,7 +393,7 @@ ObMenu* menu_new(const gchar *name, const gchar *title, more_menu->more_menu will always be NULL, since there is only 1 for each menu. */ - self->more_menu = g_new0(ObMenu, 1); + self->more_menu = g_slice_new0(ObMenu); self->more_menu->name = _("More..."); self->more_menu->title = _("More..."); self->more_menu->data = data; @@ -392,9 +423,9 @@ static void menu_destroy_hash_value(ObMenu *self) g_free(self->name); g_free(self->title); g_free(self->execute); - g_free(self->more_menu); + g_slice_free(ObMenu, self->more_menu); - g_free(self); + g_slice_free(ObMenu, self); } void menu_free(ObMenu *menu) @@ -455,10 +486,10 @@ void menu_show(gchar *name, gint x, gint y, gboolean mouse, ObClient *client) menu_can_hide = TRUE; else { menu_can_hide = FALSE; - obt_main_loop_timeout_add(ob_main_loop, - config_menu_hide_delay * 1000, - menu_hide_delay_func, - NULL, g_direct_equal, NULL); + g_timeout_add_full(G_PRIORITY_DEFAULT, + config_menu_hide_delay, + menu_hide_delay_func, + NULL, NULL); } } } @@ -474,7 +505,7 @@ static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id) g_assert(menu); - self = g_new0(ObMenuEntry, 1); + self = g_slice_new0(ObMenuEntry); self->ref = 1; self->type = type; self->menu = menu; @@ -519,7 +550,7 @@ void menu_entry_unref(ObMenuEntry *self) break; } - g_free(self); + g_slice_free(ObMenuEntry, self); } } @@ -623,6 +654,11 @@ void menu_set_execute_func(ObMenu *self, ObMenuExecuteFunc func) self->more_menu->execute_func = func; /* keep it in sync */ } +void menu_set_cleanup_func(ObMenu *self, ObMenuCleanupFunc func) +{ + self->cleanup_func = func; +} + void menu_set_destroy_func(ObMenu *self, ObMenuDestroyFunc func) { self->destroy_func = func;