less negatives means less confusing.. but yeah. get rid of omnipresent check in focus...

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 2e8965e2cd957d609ec13e24fa83e4d43bbcc010..381753ae9d8fcc67e4b4e9eeca0c298b06bda11a 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -530,16 +530,17 @@ void screen_set_desktop(guint num, gboolean dofocus)
         }
     }
 
+    if (focus_client && (focus_client->desktop == DESKTOP_ALL ||
+                         focus_client->desktop == screen_desktop))
+        dofocus = FALSE;
+
     /* have to try focus here because when you leave an empty desktop
        there is no focus out to watch for
 
        do this before hiding the windows so if helper windows are coming
        with us, they don't get hidden
     */
-    if (dofocus
-        && (!focus_client || (focus_client->desktop != DESKTOP_ALL
-                              && focus_client->desktop != num))
-        && (c = focus_fallback(TRUE)))
+    if (dofocus && (c = focus_fallback(TRUE)))
     {
         /* only do the flicker reducing stuff ahead of time if we are going
            to call xsetinputfocus on the window ourselves. otherwise there is