diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-06-23 19:59:32 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-06-23 19:59:32 +0000 |
| commit | c62cf92cb8baaaaef0f8f2ab7de2eb6168736f4a (patch) | |
| tree | aa7e7de3fcbe992caf0a4dc9a229a7cc04e044f9 /openbox/menu.c | |
| parent | 97792a403a52c12c2601a7b2caebdea197f0b5f0 (diff) | |
add shortcuts to add/remove desktops in the client list menus.
also make it so &-specified shortcuts are always underlined
Diffstat (limited to 'openbox/menu.c')
| -rw-r--r-- | openbox/menu.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/openbox/menu.c b/openbox/menu.c index 855828c6..5d9ea796 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -59,7 +59,8 @@ static void parse_menu_separator(ObParseInst *i, 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); + gchar **strippedlabel, guint *position, + gboolean *always_show); static void client_dest(ObClient *client, gpointer data) @@ -204,11 +205,13 @@ static ObMenu* menu_from_name(gchar *name) ((c) >= 'a' && (c) <= 'z')) static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut, - gchar **strippedlabel, guint *position) + gchar **strippedlabel, guint *position, + gboolean *always_show) { gunichar shortcut = 0; *position = 0; + *always_show = FALSE; g_assert(strippedlabel != NULL); @@ -233,6 +236,7 @@ static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut, 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) @@ -340,7 +344,8 @@ ObMenu* menu_new(const gchar *name, const gchar *title, self->data = data; self->shortcut = parse_shortcut(title, allow_shortcut_selection, - &self->title, &self->shortcut_position); + &self->title, &self->shortcut_position, + &self->shortcut_always_show); g_hash_table_replace(menu_hash, self->name, self); @@ -674,7 +679,8 @@ void menu_entry_set_label(ObMenuEntry *self, const gchar *label, g_free(self->data.normal.label); self->data.normal.shortcut = parse_shortcut(label, allow_shortcut, &self->data.normal.label, - &self->data.normal.shortcut_position); + &self->data.normal.shortcut_position, + &self->data.normal.shortcut_always_show); break; default: g_assert_not_reached(); |