summaryrefslogtreecommitdiff
path: root/openbox/client_list_combined_menu.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2009-12-22 11:44:07 -0500
committerDana Jansens <danakj@orodu.net>2009-12-22 11:44:07 -0500
commit7ac0b9196585654327a6a5967c1f55561722a401 (patch)
tree72c8b2fc7ad65af4d5fd5203fd05c0e970d58a54 /openbox/client_list_combined_menu.c
parentce24cbd045b2a93a04c5cd258137ab8572f2c429 (diff)
when holding Shift for the client list menus, bring the selected client to the current desktop (Request #4284)
Diffstat (limited to 'openbox/client_list_combined_menu.c')
-rw-r--r--openbox/client_list_combined_menu.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index 593010eb..5b79b806 100644
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -114,10 +114,12 @@ static void menu_execute(ObMenuEntry *self, ObMenuFrame *f,
else {
ObClient *t = self->data.normal.data;
if (t) { /* it's set to NULL if its destroyed */
- client_activate(t, TRUE, FALSE, TRUE, TRUE, TRUE);
+ gboolean here = state & ShiftMask;
+
+ client_activate(t, TRUE, here, TRUE, TRUE, TRUE);
/* if the window is omnipresent then we need to go to its
desktop */
- if (t->desktop == DESKTOP_ALL)
+ if (!here && t->desktop == DESKTOP_ALL)
screen_set_desktop(self->id, FALSE);
}
else