nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add shortcuts to add/remove desktops in the client list menus.

Browse source 
also make it so &-specified shortcuts are always underlined
This commit is contained in:
Dana Jansens 2007-06-23 19:59:32 +00:00
parent 97792a403a
commit c62cf92cb8
5 changed files with 67 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
openbox/client_list_combined_menu.c
View file

@ -32,6 +32,10 @@
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 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
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 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
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,23 +87,37 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
/* 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);
}

32
openbox/client_list_menu.c
View file

@ -37,6 +37,10 @@ typedef struct
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 @@ static gboolean desk_menu_update(ObMenuFrame *frame, gpointer data)
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 @@ static gboolean desk_menu_update(ObMenuFrame *frame, gpointer data)
/* 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,9 +148,27 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
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)
{
/* This concise function removes all references to a closed
@ -175,6 +198,7 @@ void client_list_menu_startup(gboolean reconfig)
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)

14
openbox/menu.c
View file

@ -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();

4
openbox/menu.h
View file

@ -64,6 +64,8 @@ struct _ObMenu
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 @@ struct _ObNormalMenuEntry {
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;

2
openbox/menuframe.c
View file

@ -401,6 +401,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
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 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
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;