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 59dd0d0d4f8eccbb230cdeb9ff53781e36493fe5..303388bec210d146accfe5cdf10585f96bc83ebb 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -97,6 +97,7 @@ void focus_set_client(ObClient *client)
 
 static ObClient* focus_fallback_target(gboolean allow_refocus,
                                        gboolean allow_pointer,
+                                       gboolean allow_omnipresent,
                                        ObClient *old)
 {
     GList *it;
@@ -105,7 +106,7 @@ static ObClient* focus_fallback_target(gboolean allow_refocus,
     ob_debug_type(OB_DEBUG_FOCUS, "trying pointer stuff\n");
     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)))
         {
@@ -118,14 +119,15 @@ static ObClient* focus_fallback_target(gboolean allow_refocus,
         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");
@@ -144,7 +146,7 @@ static ObClient* focus_fallback_target(gboolean allow_refocus,
            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");
@@ -155,7 +157,8 @@ static ObClient* focus_fallback_target(gboolean allow_refocus,
     return NULL;
 }
 
-ObClient* focus_fallback(gboolean allow_refocus, gboolean allow_pointer)
+ObClient* focus_fallback(gboolean allow_refocus, gboolean allow_pointer,
+                         gboolean allow_omnipresent)
 {
     ObClient *new;
     ObClient *old = focus_client;
@@ -165,7 +168,10 @@ ObClient* focus_fallback(gboolean allow_refocus, gboolean allow_pointer)
        event at all for them. */
     focus_nothing();
 
-    new = focus_fallback_target(allow_refocus, allow_pointer, 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;
 }
@@ -188,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,