X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=7197868b79c76230fd335813b57bc20f5b43854a;hb=9aa42c2ae7b457db6efc1703dd47d1e3ac5e75e8;hp=3a0cb12a9ce3da394e782150e4a53ba68dc08bfd;hpb=c4e4760c41f10aae6af19a4363cb247c71edee4b;p=chaz%2Fopenbox diff --git a/openbox/menu.c b/openbox/menu.c index 3a0cb12a..7197868b 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -1,7 +1,8 @@ -/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*- +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- menu.c for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2006 Mikael Magnusson + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,10 +25,13 @@ #include "config.h" #include "screen.h" #include "menuframe.h" +#include "keyboard.h" #include "geom.h" #include "misc.h" #include "client_menu.h" #include "client_list_menu.h" +#include "client_list_combined_menu.h" +#include "gettext.h" #include "parser/parse.h" typedef struct _ObMenuParseState ObMenuParseState; @@ -50,8 +54,11 @@ static void parse_menu_separator(ObParseInst *i, gpointer data); static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, gpointer data); +static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut, + gchar **strippedlabel, guint *position); -static void client_dest(gpointer client) + +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 */ @@ -68,7 +75,8 @@ void menu_startup(gboolean reconfig) menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify)menu_destroy_hash_value); - client_list_menu_startup(); + client_list_menu_startup(reconfig); + client_list_combined_menu_startup(reconfig); client_menu_startup(); menu_parse_inst = parse_startup(); @@ -86,19 +94,23 @@ void menu_startup(gboolean reconfig) loaded = TRUE; parse_tree(menu_parse_inst, doc, node->children); xmlFreeDoc(doc); - } + } else + g_message(_("Unable to find a valid menu file '%s'"), + (const gchar*)it->data); } if (!loaded) { if (parse_load_menu("menu.xml", &doc, &node)) { parse_tree(menu_parse_inst, doc, node->children); xmlFreeDoc(doc); - } + } else + g_message(_("Unable to find a valid menu file '%s'"), + "menu.xml"); } g_assert(menu_parse_state.parent == NULL); if (!reconfig) - client_add_destructor(client_dest); + client_add_destructor(client_dest, NULL); } void menu_shutdown(gboolean reconfig) @@ -109,6 +121,9 @@ void menu_shutdown(gboolean reconfig) parse_shutdown(menu_parse_inst); menu_parse_inst = NULL; + client_list_menu_shutdown(reconfig); + client_list_combined_menu_shutdown(reconfig); + menu_frame_hide_all(); g_hash_table_destroy(menu_hash); menu_hash = NULL; @@ -131,7 +146,8 @@ void menu_pipe_execute(ObMenu *self) 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_message(_("Failed to execute command for pipe-menu '%s': %s"), + self->execute, err->message); g_error_free(err); return; } @@ -147,7 +163,7 @@ void menu_pipe_execute(ObMenu *self) parse_tree(menu_parse_inst, doc, node->children); xmlFreeDoc(doc); } else { - g_warning("Invalid output from pipe-menu: %s", self->execute); + g_message(_("Invalid output from pipe-menu '%s'"), self->execute); } g_free(output); @@ -160,11 +176,65 @@ static ObMenu* menu_from_name(gchar *name) g_assert(name != NULL); if (!(self = g_hash_table_lookup(menu_hash, name))) - g_warning("Attempted to access menu '%s' but it does not exist.", + g_message(_("Attempted to access menu '%s' but it does not exist"), name); return self; } +#define VALID_SHORTCUT(c) (((c) >= '0' && (c) <= '9') || \ + ((c) >= 'A' && (c) <= 'Z') || \ + ((c) >= 'a' && (c) <= 'z')) + +static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut, + gchar **strippedlabel, guint *position) +{ + gunichar shortcut = 0; + + *position = 0; + + g_assert(strippedlabel != NULL); + + if (label == NULL) { + *strippedlabel = NULL; + } else { + gchar *i; + + *strippedlabel = g_strdup(label); + + /* if allow_shortcut is false, then you can't use the &, instead you + have to just use the first valid character + */ + + i = strchr(*strippedlabel, '&'); + if (allow_shortcut && i != NULL) { + /* there is an ampersand 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))) { + shortcut = g_unichar_tolower(g_utf8_get_char(i+1)); + *position = i - *strippedlabel; + + /* remove the & from the string */ + for (; *i != '\0'; ++i) + *i = *(i+1); + } + } else { + /* there is no ampersand, so find the first valid character to use + instead */ + + for (i = *strippedlabel; *i != '\0'; ++i) + if (VALID_SHORTCUT(*i)) { + *position = i - *strippedlabel; + shortcut = g_unichar_tolower(g_utf8_get_char(i)); + break; + } + } + } + return shortcut; +} + static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, gpointer data) { @@ -176,11 +246,13 @@ static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, GSList *acts = NULL; 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, - OB_USER_ACTION_MENU_SELECTION)); - menu_add_normal(state->parent, -1, label, acts); + if (!xmlStrcasecmp(node->name, (const xmlChar*) "action")) { + ObAction *a = action_parse + (i, doc, node, OB_USER_ACTION_MENU_SELECTION); + if (a) + acts = g_slist_append(acts, a); + } + menu_add_normal(state->parent, -1, label, acts, FALSE); g_free(label); } } @@ -192,8 +264,15 @@ static void parse_menu_separator(ObParseInst *i, { ObMenuParseState *state = data; - if (state->parent) - menu_add_separator(state->parent, -1); + if (state->parent) { + gchar *label; + + if (!parse_attr_string("label", node, &label)) + label = NULL; + + menu_add_separator(state->parent, -1, label); + g_free(label); + } } static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, @@ -210,7 +289,7 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, if (!parse_attr_string("label", node, &title)) goto parse_menu_fail; - if ((menu = menu_new(name, title, NULL))) { + if ((menu = menu_new(name, title, FALSE, NULL))) { menu->pipe_creator = state->pipe_creator; if (parse_attr_string("execute", node, &script)) { menu->execute = parse_expand_tilde(script); @@ -234,15 +313,18 @@ parse_menu_fail: g_free(script); } -ObMenu* menu_new(gchar *name, gchar *title, gpointer data) +ObMenu* menu_new(const gchar *name, const gchar *title, + gboolean allow_shortcut, gpointer data) { ObMenu *self; self = g_new0(ObMenu, 1); self->name = g_strdup(name); - self->title = g_strdup(title); self->data = data; + self->shortcut = parse_shortcut(title, allow_shortcut, &self->title, + &self->shortcut_position); + g_hash_table_replace(menu_hash, self->name, self); return self; @@ -283,15 +365,28 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client) ObMenu *self; ObMenuFrame *frame; - if (!(self = menu_from_name(name))) return; + if (!(self = menu_from_name(name)) + || keyboard_interactively_grabbed()) return; + + /* if the requested menu is already the top visible menu, then don't + bother */ + if (menu_frame_visible) { + frame = menu_frame_visible->data; + if (frame->menu == self) + return; + } menu_frame_hide_all(); frame = menu_frame_new(self, client); - menu_frame_move(frame, x, y); - menu_frame_show(frame, NULL); - if (frame->entries) - menu_frame_select_next(frame); + if (!menu_frame_show_topmenu(frame, x, y)) + menu_frame_free(frame); + else if (frame->entries) { + ObMenuEntryFrame *e = frame->entries->data; + if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && + e->entry->data.normal.enabled) + menu_frame_select(frame, e, FALSE); + } } static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id) @@ -324,7 +419,7 @@ void menu_entry_free(ObMenuEntry *self) case OB_MENU_ENTRY_TYPE_NORMAL: g_free(self->data.normal.label); while (self->data.normal.actions) { - action_free(self->data.normal.actions->data); + action_unref(self->data.normal.actions->data); self->data.normal.actions = g_slist_delete_link(self->data.normal.actions, self->data.normal.actions); @@ -357,7 +452,7 @@ void menu_clear_entries(ObMenu *self) #endif while (self->entries) { - menu_entry_free(self->entries->data); + menu_entry_free(self->entries->data); self->entries = g_list_delete_link(self->entries, self->entries); } } @@ -368,20 +463,21 @@ void menu_entry_remove(ObMenuEntry *self) menu_entry_free(self); } -ObMenuEntry* menu_add_normal(ObMenu *self, gint id, gchar *label, - GSList *actions) +ObMenuEntry* menu_add_normal(ObMenu *self, gint id, const gchar *label, + GSList *actions, gboolean allow_shortcut) { ObMenuEntry *e; e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_NORMAL, id); - e->data.normal.label = g_strdup(label); e->data.normal.actions = actions; + menu_entry_set_label(e, label, allow_shortcut); + self->entries = g_list_append(self->entries, e); return e; } -ObMenuEntry* menu_add_submenu(ObMenu *self, gint id, gchar *submenu) +ObMenuEntry* menu_add_submenu(ObMenu *self, gint id, const gchar *submenu) { ObMenuEntry *e; @@ -392,12 +488,14 @@ ObMenuEntry* menu_add_submenu(ObMenu *self, gint id, gchar *submenu) return e; } -ObMenuEntry* menu_add_separator(ObMenu *self, gint id) +ObMenuEntry* menu_add_separator(ObMenu *self, gint id, const gchar *label) { ObMenuEntry *e; e = menu_entry_new(self, OB_MENU_ENTRY_TYPE_SEPARATOR, id); + menu_entry_set_label(e, label, FALSE); + self->entries = g_list_append(self->entries, e); return e; } @@ -444,3 +542,27 @@ void menu_find_submenus(ObMenu *self) e->data.submenu.submenu = menu_from_name(e->data.submenu.name); } } + +void menu_entry_set_label(ObMenuEntry *self, const gchar *label, + gboolean allow_shortcut) +{ + switch (self->type) { + case OB_MENU_ENTRY_TYPE_SEPARATOR: + g_free(self->data.separator.label); + self->data.separator.label = g_strdup(label); + break; + case OB_MENU_ENTRY_TYPE_NORMAL: + g_free(self->data.normal.label); + self->data.normal.shortcut = + parse_shortcut(label, allow_shortcut, &self->data.normal.label, + &self->data.normal.shortcut_position); + break; + default: + g_assert_not_reached(); + } +} + +void menu_show_all_shortcuts(ObMenu *self, gboolean show) +{ + self->show_all_shortcuts = show; +}