X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=84bd7b09a02f4de7941046ec1eef0090e489f9d0;hb=bc1148f0b304dc74736d124696cdede969c3b739;hp=b6d294bbd076096e107df463e908a02469cb0144;hpb=ad29434250f6c34ed2af8f99bed7a4e8d6b5053b;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index b6d294bb..84bd7b09 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -180,22 +180,38 @@ void focus_fallback(ObFocusFallbackType type)
     focus_set_client(NULL);
 
     if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) {
-        /* try for transient relations */
         if (old->transient_for) {
-            if (old->transient_for == OB_TRAN_GROUP) {
-                for (it = focus_order[screen_desktop]; it; it = it->next) {
-                    GSList *sit;
+            gboolean trans = FALSE;
 
-                    for (sit = old->group->members; sit; sit = sit->next)
-                        if (sit->data == it->data)
-                            if (focus_fallback_transient(sit->data, old))
-                                return;
+            if (config_focus_last || !config_focus_follow)
+                trans = TRUE;
+            else {
+                ObClient *c;
+
+                if ((c = client_under_pointer()) &&
+                    client_search_transient(client_search_top_transient(c),
+                                            old))
+                    trans = TRUE;
+            }
+
+            /* try for transient relations */
+            if (trans) {
+                if (old->transient_for == OB_TRAN_GROUP) {
+                    for (it = focus_order[screen_desktop]; it; it = it->next) {
+                        GSList *sit;
+
+                        for (sit = old->group->members; sit; sit = sit->next)
+                            if (sit->data == it->data)
+                                if (focus_fallback_transient(sit->data, old))
+                                    return;
+                    }
+                } else {
+                    if (focus_fallback_transient(old->transient_for, old))
+                        return;
                 }
-            } else {
-                if (focus_fallback_transient(old->transient_for, old))
-                    return;
             }
         }
+    }
 
     if (!config_focus_last && config_focus_follow)
         if (focus_under_pointer())
@@ -217,7 +233,6 @@ void focus_fallback(ObFocusFallbackType type)
                             }
         }
 #endif
-    }
 
     for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
         if (type != OB_FOCUS_FALLBACK_UNFOCUSING || it->data != old)