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

let you select an omnipresent window on another desktop

Browse source
This commit is contained in:
Dana Jansens 2007-08-04 15:24:59 -04:00
parent fba55d8d9f
commit 2c50fae347
2 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
openbox/client_list_combined_menu.c
View file

@ -32,7 +32,7 @@
ObMenu *combined_menu;
#define CLIENT -1
#define SEPARATOR -1
#define ADD_DESKTOP -2
#define REMOVE_DESKTOP -3
@ -49,7 +49,7 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
gboolean empty = TRUE;
gboolean onlyiconic = TRUE;
menu_add_separator(menu, CLIENT, screen_desktop_names[desktop]);
menu_add_separator(menu, SEPARATOR, 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) &&
@ -61,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, CLIENT, title, NULL, FALSE);
e = menu_add_normal(menu, desktop, title, NULL, FALSE);
g_free(title);
} else {
onlyiconic = FALSE;
e = menu_add_normal(menu, CLIENT, c->title, NULL, FALSE);
e = menu_add_normal(menu, desktop, c->title, NULL, FALSE);
}
if (config_menu_client_list_icons
@ -87,7 +87,7 @@ 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, CLIENT, NULL);
menu_add_separator(menu, SEPARATOR, NULL);
e = menu_add_normal(menu, desktop, _("Go there..."), NULL, TRUE);
if (desktop == screen_desktop)
@ -95,7 +95,7 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
}
}
menu_add_separator(menu, CLIENT, _("Manage desktops"));
menu_add_separator(menu, SEPARATOR, _("Manage desktops"));
menu_add_normal(menu, ADD_DESKTOP, _("_Add new desktop"), NULL, TRUE);
menu_add_normal(menu, REMOVE_DESKTOP, _("_Remove last desktop"),
NULL, TRUE);
@ -106,11 +106,7 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
static void menu_execute(ObMenuEntry *self, ObMenuFrame *f,
ObClient *c, guint state, gpointer data)
{
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) {
if (self->id == ADD_DESKTOP) {
screen_add_desktop(FALSE);
menu_frame_hide_all();
}
@ -118,8 +114,18 @@ static void menu_execute(ObMenuEntry *self, ObMenuFrame *f,
screen_remove_desktop(FALSE);
menu_frame_hide_all();
}
else
screen_set_desktop(self->id, TRUE);
else {
ObClient *t = self->data.normal.data;
if (t) { /* it's set to NULL if its destroyed */
client_activate(t, FALSE, TRUE, TRUE, TRUE);
/* if the window is omnipresent then we need to go to its
desktop */
if (t->desktop == DESKTOP_ALL)
screen_set_desktop(self->id, FALSE);
}
else
screen_set_desktop(self->id, TRUE);
}
}
static void client_dest(ObClient *client, gpointer data)

20
openbox/client_list_menu.c
View file

@ -37,7 +37,7 @@ typedef struct
guint desktop;
} DesktopData;
#define CLIENT -1
#define SEPARATOR -1
#define ADD_DESKTOP -2
#define REMOVE_DESKTOP -3
@ -63,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, CLIENT, title, NULL, FALSE);
e = menu_add_normal(menu, d->desktop, title, NULL, FALSE);
g_free(title);
} else {
onlyiconic = FALSE;
e = menu_add_normal(menu, CLIENT, c->title, NULL, FALSE);
e = menu_add_normal(menu, d->desktop, c->title, NULL, FALSE);
}
if (config_menu_client_list_icons
@ -88,7 +88,7 @@ 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, CLIENT, NULL);
menu_add_separator(menu, SEPARATOR, NULL);
e = menu_add_normal(menu, d->desktop, _("Go there..."), NULL, TRUE);
if (d->desktop == screen_desktop)
@ -101,9 +101,13 @@ static gboolean desk_menu_update(ObMenuFrame *frame, gpointer data)
static void desk_menu_execute(ObMenuEntry *self, ObMenuFrame *f,
ObClient *c, guint state, gpointer data)
{
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);
ObClient *t = self->data.normal.data;
if (t) { /* it's set to NULL if its destroyed */
client_activate(t, FALSE, TRUE, TRUE, TRUE);
/* if the window is omnipresent then we need to go to its
desktop */
if (t->desktop == DESKTOP_ALL)
screen_set_desktop(self->id, FALSE);
}
else
screen_set_desktop(self->id, TRUE);
@ -148,7 +152,7 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
desktop_menus = g_slist_append(desktop_menus, submenu);
}
menu_add_separator(menu, CLIENT, NULL);
menu_add_separator(menu, SEPARATOR, NULL);
menu_add_normal(menu, ADD_DESKTOP, _("_Add new desktop"), NULL, TRUE);
menu_add_normal(menu, REMOVE_DESKTOP, _("_Remove last desktop"),
NULL, TRUE);