make activate take a here parameter

diff --git a/openbox/client.c b/openbox/client.c
index 41bd57f..a1deded 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2533,16 +2533,19 @@ void client_unfocus(ObClient *self)
     focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING);
 }
 
-void client_activate(ObClient *self)
+void client_activate(ObClient *self, gboolean here)
 {
     if (client_normal(self) && screen_showing_desktop)
         screen_show_desktop(FALSE);
     if (self->iconic)
         client_iconify(self, FALSE, FALSE);
     if (self->desktop != DESKTOP_ALL &&
-        self->desktop != screen_desktop)
-        screen_set_desktop(self->desktop);
-    else if (!self->frame->visible)
+        self->desktop != screen_desktop) {
+        if (here)
+            client_set_desktop(self, screen_desktop, FALSE);
+        else
+            screen_set_desktop(self->desktop);
+    } else if (!self->frame->visible)
         /* if its not visible for other reasons, then don't mess
            with it */
         return;

diff --git a/openbox/client.h b/openbox/client.h
index dba6786..080225c 100644 (file)
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -395,8 +395,11 @@ gboolean client_focus(ObClient *self);
 void client_unfocus(ObClient *self);
 
 /*! Activates the client for use, focusing, uniconifying it, etc. To be used
-  when the user deliberately selects a window for use. */
-void client_activate(ObClient *self);
+  when the user deliberately selects a window for use.
+  @param here If true, then the client is brought to the current desktop;
+              otherwise, the desktop is changed to where the client lives.
+*/
+void client_activate(ObClient *self, gboolean here);
 
 /*! Calculates the stacking layer for the client window */
 void client_calc_layer(ObClient *self);

diff --git a/openbox/event.c b/openbox/event.c
index 97f01fb..ed0e096 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -939,7 +939,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
            client_close(client);
        } else if (msgtype == prop_atoms.net_active_window) {
            ob_debug("net_active_window for 0x%lx\n", client->window);
-            client_activate(client);
+            client_activate(client, FALSE);
        } else if (msgtype == prop_atoms.net_wm_moveresize) {
            ob_debug("net_wm_moveresize for 0x%lx\n", client->window);
             if ((Atom)e->xclient.data.l[2] ==

diff --git a/openbox/focus.c b/openbox/focus.c
index 9949dea..3bb0ae8 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -278,7 +278,7 @@ ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done,
         goto done_cycle;
     } else if (done) {
         if (focus_cycle_target)
-            client_activate(focus_cycle_target);
+            client_activate(focus_cycle_target, FALSE);
         goto done_cycle;
     }