don't activate and change desktops if the client's not on the current desktop and...

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index fceac8755836690df529d53ea88138816ec84013..2ca9b5182fdd6fa8a6716f93fcb2425812ab1b60 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -385,10 +385,18 @@ void client_manage(Window window)
         ob_debug("Want to focus new window 0x%x with time %u (last time %u)\n",
                  self->window, self->user_time, last_time);
 
-        /* If a nothing at all, or a parent was focused, then focus this
+        /* if it's on another desktop */
+        if (!(self->desktop == screen_desktop || self->desktop == DESKTOP_ALL)
+            && /* the timestamp is from before you changed desktops */
+            self->user_time && screen_desktop_user_time &&
+            !event_time_after(self->user_time, screen_desktop_user_time))
+        {
+            activate = FALSE;
+        }
+        /* If nothing is focused, or a parent was focused, then focus this
            always
         */
-        if (!focus_client || client_search_focus_parent(self) != NULL)
+        else if (!focus_client || client_search_focus_parent(self) != NULL)
             activate = TRUE;
         else
         {