add shortcuts to add/remove desktops in the client list menus. also make it so &-specified shortcuts are always underlined
Dana Jansens danakj@orodu.net
5 files changed,
67 insertions(+),
13 deletions(-)
M
openbox/client_list_combined_menu.c
→
openbox/client_list_combined_menu.c
@@ -32,6 +32,10 @@ #define MENU_NAME "client-list-combined-menu"
ObMenu *combined_menu; +#define CLIENT -1 +#define ADD_DESKTOP -2 +#define REMOVE_DESKTOP -3 + static gboolean self_update(ObMenuFrame *frame, gpointer data) { ObMenu *menu = frame->menu;@@ -45,7 +49,7 @@ for (desktop = 0; desktop < screen_num_desktops; desktop++) {
gboolean empty = TRUE; gboolean onlyiconic = TRUE; - menu_add_separator(menu, -1, screen_desktop_names[desktop]); + menu_add_separator(menu, CLIENT, screen_desktop_names[desktop]); for (it = focus_order; it; it = g_list_next(it)) { ObClient *c = it->data; if (client_normal(c) && (!c->skip_taskbar || c->iconic) &&@@ -57,11 +61,11 @@ empty = FALSE;
if (c->iconic) { gchar *title = g_strdup_printf("(%s)", c->icon_title); - e = menu_add_normal(menu, -1, title, NULL, FALSE); + e = menu_add_normal(menu, CLIENT, title, NULL, FALSE); g_free(title); } else { onlyiconic = FALSE; - e = menu_add_normal(menu, -1, c->title, NULL, FALSE); + e = menu_add_normal(menu, CLIENT, c->title, NULL, FALSE); } if (config_menu_client_list_icons@@ -83,22 +87,36 @@
/* no entries or only iconified windows, so add a * way to go to this desktop without uniconifying a window */ if (!empty) - menu_add_separator(menu, -1, NULL); + menu_add_separator(menu, CLIENT, NULL); e = menu_add_normal(menu, desktop, _("Go there..."), NULL, TRUE); if (desktop == screen_desktop) e->data.normal.enabled = FALSE; } } + + menu_add_separator(menu, CLIENT, _("Manage desktops")); + menu_add_normal(menu, ADD_DESKTOP, _("&Add new desktop"), NULL, TRUE); + menu_add_normal(menu, REMOVE_DESKTOP, _("&Remove last desktop"), + NULL, TRUE); + return TRUE; /* always show the menu */ } static void menu_execute(ObMenuEntry *self, ObMenuFrame *f, ObClient *c, guint state, gpointer data) { - if (self->id == -1) { + if (self->id == CLIENT) { if (self->data.normal.data) /* it's set to NULL if its destroyed */ client_activate(self->data.normal.data, FALSE, TRUE, TRUE, TRUE); + } + else if (self->id == ADD_DESKTOP) { + screen_add_desktop(FALSE); + menu_frame_hide_all(); + } + else if (self->id == REMOVE_DESKTOP) { + screen_remove_desktop(FALSE); + menu_frame_hide_all(); } else screen_set_desktop(self->id, TRUE);
M
openbox/client_list_menu.c
→
openbox/client_list_menu.c
@@ -37,6 +37,10 @@ {
guint desktop; } DesktopData; +#define CLIENT -1 +#define ADD_DESKTOP -2 +#define REMOVE_DESKTOP -3 + static gboolean desk_menu_update(ObMenuFrame *frame, gpointer data) { ObMenu *menu = frame->menu;@@ -59,11 +63,11 @@ empty = FALSE;
if (c->iconic) { gchar *title = g_strdup_printf("(%s)", c->icon_title); - e = menu_add_normal(menu, -1, title, NULL, FALSE); + e = menu_add_normal(menu, CLIENT, title, NULL, FALSE); g_free(title); } else { onlyiconic = FALSE; - e = menu_add_normal(menu, -1, c->title, NULL, FALSE); + e = menu_add_normal(menu, CLIENT, c->title, NULL, FALSE); } if (config_menu_client_list_icons@@ -84,19 +88,20 @@
/* no entries or only iconified windows, so add a * way to go to this desktop without uniconifying a window */ if (!empty) - menu_add_separator(menu, -1, NULL); + menu_add_separator(menu, CLIENT, NULL); e = menu_add_normal(menu, d->desktop, _("Go there..."), NULL, TRUE); if (d->desktop == screen_desktop) e->data.normal.enabled = FALSE; } + return TRUE; /* always show */ } static void desk_menu_execute(ObMenuEntry *self, ObMenuFrame *f, ObClient *c, guint state, gpointer data) { - if (self->id == -1) { + if (self->id == CLIENT) { if (self->data.normal.data) /* it's set to NULL if its destroyed */ client_activate(self->data.normal.data, FALSE, TRUE, TRUE, TRUE); }@@ -143,7 +148,25 @@
desktop_menus = g_slist_append(desktop_menus, submenu); } + menu_add_separator(menu, CLIENT, NULL); + menu_add_normal(menu, ADD_DESKTOP, _("&Add new desktop"), NULL, TRUE); + menu_add_normal(menu, REMOVE_DESKTOP, _("&Remove last desktop"), + NULL, TRUE); + return TRUE; /* always show */ +} + +static void self_execute(ObMenuEntry *self, ObMenuFrame *f, + ObClient *c, guint state, gpointer data) +{ + if (self->id == ADD_DESKTOP) { + screen_add_desktop(FALSE); + menu_frame_hide_all(); + } + else if (self->id == REMOVE_DESKTOP) { + screen_remove_desktop(FALSE); + menu_frame_hide_all(); + } } static void client_dest(ObClient *client, gpointer data)@@ -175,6 +198,7 @@ client_add_destroy_notify(client_dest, NULL);
menu = menu_new(MENU_NAME, _("Desktops"), TRUE, NULL); menu_set_update_func(menu, self_update); + menu_set_execute_func(menu, self_execute); } void client_list_menu_shutdown(gboolean reconfig)
M
openbox/menu.c
→
openbox/menu.c
@@ -59,7 +59,8 @@ 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); + gchar **strippedlabel, guint *position, + gboolean *always_show); static void client_dest(ObClient *client, gpointer data)@@ -204,11 +205,13 @@ ((c) >= 'A' && (c) <= 'Z') || \
((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 @@ */
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 @@ self->name = g_strdup(name);
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 @@ 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); + &self->data.normal.shortcut_position, + &self->data.normal.shortcut_always_show); break; default: g_assert_not_reached();
M
openbox/menu.h
→
openbox/menu.h
@@ -64,6 +64,8 @@ displayed as a submenu */
gunichar shortcut; /*! The shortcut's position in the string */ guint shortcut_position; + /*! If the shortcut was specified by & and should always be drawn */ + gboolean shortcut_always_show; /*! If the shortcut key should be shown in menu entries even when it is the first character in the string */@@ -105,6 +107,8 @@ /*! The shortcut key that would be used to activate this menu entry */
gunichar shortcut; /*! The shortcut's position in the string */ guint shortcut_position; + /*! If the shortcut was specified by & and should always be drawn */ + gboolean shortcut_always_show; /* state */ gboolean enabled;
M
openbox/menuframe.c
→
openbox/menuframe.c
@@ -401,6 +401,7 @@ self->a_text_selected : self->a_text_normal));
text_a->texture[0].data.text.string = self->entry->data.normal.label; if (self->entry->data.normal.shortcut && (self->frame->menu->show_all_shortcuts || + self->entry->data.normal.shortcut_always_show || self->entry->data.normal.shortcut_position > 0)) { text_a->texture[0].data.text.shortcut = TRUE;@@ -416,6 +417,7 @@ self->a_text_normal);
sub = self->entry->data.submenu.submenu; text_a->texture[0].data.text.string = sub ? sub->title : ""; if (sub->shortcut && (self->frame->menu->show_all_shortcuts || + sub->shortcut_always_show || sub->shortcut_position > 0)) { text_a->texture[0].data.text.shortcut = TRUE;