fix cancelling desktordir actions

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index dd83061f2dd83feb0002a1f4d67661c2ae635daa..84bd7b09a02f4de7941046ec1eef0090e489f9d0 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -179,27 +179,43 @@ void focus_fallback(ObFocusFallbackType type)
     */
     focus_set_client(NULL);
 
-    if (!config_focus_last && config_focus_follow)
-        if (focus_under_pointer())
-            return;
-
     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())
+            return;
 
 #if 0
         /* try for group relations */
@@ -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)
@@ -232,7 +247,7 @@ void focus_fallback(ObFocusFallbackType type)
 
 static void popup_cycle(ObClient *c, gboolean show)
 {
-    if (!show || !config_dialog_focus) {
+    if (!show) {
         icon_popup_hide(focus_cycle_popup);
     } else {
         Rect *a;
@@ -276,7 +291,7 @@ static gboolean valid_focus_target(ObClient *ft)
        focus an iconic window, but we want to be able to, so we just check
        if the focus flags on the window allow it, and its on the current
        desktop */
-    return (ft->transients == NULL && client_normal(ft) &&
+    return (ft == client_focus_target(ft) && client_normal(ft) &&
             ((ft->can_focus || ft->focus_notify) &&
              !ft->skip_taskbar &&
              (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)));
@@ -324,7 +339,6 @@ void focus_cycle(gboolean forward, gboolean linear,
             it = it->prev;
             if (it == NULL) it = g_list_last(list);
         }
-        /*ft = client_focus_target(it->data);*/
         ft = it->data;
         if (valid_focus_target(ft)) {
             if (ft != focus_cycle_target) { /* prevents flicker */