when holding Shift for the client list menus, bring the selected client to the curren...

diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index 593010ebf5fd4691d50570e97cd31818bfab9ec9..5b79b806b09d3e6a22ca62ee566eeef7e2817e53 100644 (file)
--- 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

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index 2e87259befef7828d6ef5e1e6d6d2352469e0c3a..c49e63e997f2dd3bca6bfa1e60a81b1aeefda7b4 100644 (file)
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -101,10 +101,12 @@ static void desk_menu_execute(ObMenuEntry *self, ObMenuFrame *f,
 {
     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