fallback focus in superior fashion

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index a462915740c4e60df713021e5c2f38603eb43fe1..4df6662cccc4e95302712acfed3b46661b821c72 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -118,24 +118,23 @@ void focus_fallback(gboolean switching_desks)
 {
     ConfigValue focus_follow;
     GList *it;
-    gboolean fallback = TRUE;
+    gboolean under = TRUE;
 
     if (!switching_desks) {
         if (!config_get("focusFollowsMouse", Config_Bool, &focus_follow))
             g_assert_not_reached();
         if (focus_follow.bool)
-            fallback = !focus_under_pointer();
+            under = focus_under_pointer();
     }
 
-    if (fallback) {
+    if (!under) {
         for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
             if (it->data != focus_client && client_normal(it->data)) {
                 g_message("fallback trying %lx", ((Client*)it->data)->window);
                 if (client_focus(it->data))
                     break;
             }
+        if (it == NULL) /* nothing to focus */
+            focus_set_client(NULL);
     }
-
-    if (it == NULL) /* nothing to focus */
-        focus_set_client(NULL);
 }