allow focus to fallback to omnipresent windows, except during desktop switching which...

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index 73099a4bcc688bef43411875de4d9626f4939641..303388bec210d146accfe5cdf10585f96bc83ebb 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -75,7 +75,8 @@ void focus_set_client(ObClient *client)
     screen_install_colormap(client, TRUE);
 
     /* in the middle of cycling..? kill it. */
-    focus_cycle_stop();
+    focus_cycle_stop(focus_client);
+    focus_cycle_stop(client);
 
     focus_client = client;
 
@@ -94,15 +95,18 @@ void focus_set_client(ObClient *client)
     }
 }
 
-static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
+static ObClient* focus_fallback_target(gboolean allow_refocus,
+                                       gboolean allow_pointer,
+                                       gboolean allow_omnipresent,
+                                       ObClient *old)
 {
     GList *it;
     ObClient *c;
 
     ob_debug_type(OB_DEBUG_FOCUS, "trying pointer stuff\n");
-    if (config_focus_follow && !config_focus_last)
+    if (allow_pointer && config_focus_follow)
         if ((c = client_under_pointer()) &&
-            (allow_refocus || c != old) &&
+            (allow_refocus || client_focus_target(c) != old) &&
             (client_normal(c) &&
              client_focus(c)))
         {
@@ -115,14 +119,15 @@ static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
         c = it->data;
         /* fallback focus to a window if:
            1. it is on the current desktop. this ignores omnipresent
-           windows, which are problematic in their own rite.
+           windows, which are problematic in their own rite, unless they are
+           specifically allowed
            2. it is a normal type window, don't fall back onto a dock or
            a splashscreen or a desktop window (save the desktop as a
            backup fallback though)
         */
-        if (c->desktop == screen_desktop &&
+        if ((allow_omnipresent || c->desktop == screen_desktop) &&
             client_normal(c) &&
-            (allow_refocus || c != old) &&
+            (allow_refocus || client_focus_target(c) != old) &&
             client_focus(c))
         {
             ob_debug_type(OB_DEBUG_FOCUS, "found in focus order\n");
@@ -141,7 +146,7 @@ static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
            backup fallback though)
         */
         if (c->type == OB_CLIENT_TYPE_DESKTOP &&
-            (allow_refocus || c != old) &&
+            (allow_refocus || client_focus_target(c) != old) &&
             client_focus(c))
         {
             ob_debug_type(OB_DEBUG_FOCUS, "found a desktop window\n");
@@ -152,7 +157,8 @@ static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
     return NULL;
 }
 
-ObClient* focus_fallback(gboolean allow_refocus)
+ObClient* focus_fallback(gboolean allow_refocus, gboolean allow_pointer,
+                         gboolean allow_omnipresent)
 {
     ObClient *new;
     ObClient *old = focus_client;
@@ -162,7 +168,10 @@ ObClient* focus_fallback(gboolean allow_refocus)
        event at all for them. */
     focus_nothing();
 
-    new = focus_fallback_target(allow_refocus, old);
+    new = focus_fallback_target(allow_refocus, allow_pointer,
+                                allow_omnipresent, old);
+    /* get what was really focused */
+    if (new) new = client_focus_target(new);
 
     return new;
 }
@@ -185,8 +194,7 @@ void focus_nothing()
        actions should not rely on being able to move focus during an
        interactive grab.
     */
-    if (keyboard_interactively_grabbed())
-        keyboard_interactive_cancel();
+    event_cancel_all_key_grabs();
 
     /* when nothing will be focused, send focus to the backup target */
     XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot,
@@ -208,7 +216,7 @@ void focus_order_add_new(ObClient *c)
     }
 
     /* in the middle of cycling..? kill it. */
-    focus_cycle_stop();
+    focus_cycle_stop(c);
 }
 
 void focus_order_remove(ObClient *c)
@@ -216,7 +224,7 @@ void focus_order_remove(ObClient *c)
     focus_order = g_list_remove(focus_order, c);
 
     /* in the middle of cycling..? kill it. */
-    focus_cycle_stop();
+    focus_cycle_stop(c);
 }
 
 void focus_order_to_top(ObClient *c)