M openbox/action.c → openbox/action.c

@@ -1588,7 +1588,7 @@ if (data->sendto.desk < screen_num_desktops ||
         data->sendto.desk == DESKTOP_ALL) {
         client_set_desktop(c, data->sendto.desk, data->sendto.follow);
         if (data->sendto.follow && data->sendto.desk != screen_desktop)
-            screen_set_desktop(data->sendto.desk, c != focus_client);
+            screen_set_desktop(data->sendto.desk, TRUE);
     }
 }
 
@@ -1601,7 +1601,7 @@ data->desktop.desk == DESKTOP_ALL)
     {
         screen_set_desktop(data->desktop.desk, TRUE);
         if (data->inter.any.interactive)
-            screen_desktop_popup(data->desktop.desk, focus_client->desktop != DESKTOP_ALL);
+            screen_desktop_popup(data->desktop.desk, TRUE);
     }
 }
 
@@ -1621,7 +1621,7 @@ NotifyWhileGrabbed and applications don't like that. */
     if (!data->sendtodir.inter.any.interactive ||
         (data->sendtodir.inter.final && !data->sendtodir.inter.cancel))
     {
-        if (d != screen_desktop) screen_set_desktop(d, focus_client->desktop != DESKTOP_ALL);
+        if (d != screen_desktop) screen_set_desktop(d, TRUE);
     }
 }
 
@@ -1645,7 +1645,7 @@ (data->sendtodir.inter.final && !data->sendtodir.inter.cancel))
     {
         client_set_desktop(c, d, data->sendtodir.follow);
         if (data->sendtodir.follow && d != screen_desktop)
-            screen_set_desktop(d, c != focus_client);
+            screen_set_desktop(d, TRUE);
     }
 }
 

M openbox/focus.c → openbox/focus.c

@@ -94,7 +94,8 @@ net_active_window, window, active);
     }
 }
 
-static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
+static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old,
+                                       gboolean send_focus)
 {
     GList *it;
     ObClient *c;
@@ -103,10 +104,14 @@ ob_debug_type(OB_DEBUG_FOCUS, "trying pointer stuff\n");
     if (config_focus_follow && !config_focus_last)
         if ((c = client_under_pointer()) &&
             (allow_refocus || c != old) &&
-            (client_normal(c) &&
-             client_focus(c)))
+            client_normal(c) &&
+            /* if we're sending focus then try to */
+            ((send_focus && client_focus(c)) ||
+             /* if not just see if we could try, or it's already focused */
+             (!send_focus && (c == old || client_can_focus(c)))))
         {
-            ob_debug_type(OB_DEBUG_FOCUS, "found in pointer stuff\n");
+            ob_debug_type(OB_DEBUG_FOCUS, "found in pointer stuff (%d)\n",
+                          send_focus);
             return c;
         }
 
@@ -114,9 +119,11 @@ ob_debug_type(OB_DEBUG_FOCUS, "trying omnipresentness\n");
     if (allow_refocus && old &&
         old->desktop == DESKTOP_ALL &&
         client_normal(old) &&
-        client_focus(old))
+        /* this one is only for when not sending focus, to keep it there */
+        !send_focus)
     {
-        ob_debug_type(OB_DEBUG_FOCUS, "found in omnipresentness\n");
+        ob_debug_type(OB_DEBUG_FOCUS, "found in omnipresentness (%d)\n",
+                      send_focus);
         return old;
     }
 
@@ -134,9 +141,13 @@ */
         if (c->desktop == screen_desktop &&
             client_normal(c) &&
             (allow_refocus || c != old) &&
-            client_focus(c))
+            /* if we're sending focus then try to */
+            ((send_focus && client_focus(c)) ||
+             /* if not just see if we could try, or it's already focused */
+             (!send_focus && (c == old || client_can_focus(c)))))
         {
-            ob_debug_type(OB_DEBUG_FOCUS, "found in focus order\n");
+            ob_debug_type(OB_DEBUG_FOCUS, "found in focus order (%d)\n",
+                          send_focus);
             return c;
         }
     }
@@ -153,9 +164,13 @@ backup fallback though)
         */
         if (c->type == OB_CLIENT_TYPE_DESKTOP &&
             (allow_refocus || c != old) &&
-            client_focus(c))
+            /* if we're sending focus then try to */
+            ((send_focus && client_focus(c)) ||
+             /* if not just see if we could try, or it's already focused */
+             (!send_focus && (c == old || client_can_focus(c)))))
         {
-            ob_debug_type(OB_DEBUG_FOCUS, "found a desktop window\n");
+            ob_debug_type(OB_DEBUG_FOCUS, "found a desktop window (%d)\n",
+                          send_focus);
             return c;
         }
     }
@@ -168,12 +183,15 @@ {
     ObClient *new;
     ObClient *old = focus_client;
 
+    new = focus_fallback_target(allow_refocus, old, FALSE);
+    if (new == old) return;
+
     /* unfocus any focused clients.. they can be focused by Pointer events
        and such, and then when we try focus them, we won't get a FocusIn
        event at all for them. */
     focus_nothing();
 
-    new = focus_fallback_target(allow_refocus, old);
+    new = focus_fallback_target(allow_refocus, old, TRUE);
 
     return new;
 }