removing focusLast again..

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index b6d294bbd076096e107df463e908a02469cb0144..873ba0357c75e5115471341bcc718bccebc1d5c4 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -42,10 +42,10 @@ ObClient *focus_cycle_target;
 
 static ObIconPopup *focus_cycle_popup;
 
-static void focus_cycle_destructor(ObClient *c)
+static void focus_cycle_destructor(ObClient *client, gpointer data)
 {
     /* end cycling if the target disappears */
-    if (focus_cycle_target == c)
+    if (focus_cycle_target == client)
         focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE);
 }
 
@@ -54,7 +54,7 @@ void focus_startup(gboolean reconfig)
     focus_cycle_popup = icon_popup_new(TRUE);
 
     if (!reconfig) {
-        client_add_destructor((GDestroyNotify) focus_cycle_destructor);
+        client_add_destructor(focus_cycle_destructor, NULL);
 
         /* start with nothing focused */
         focus_set_client(NULL);
@@ -68,7 +68,7 @@ void focus_shutdown(gboolean reconfig)
     icon_popup_free(focus_cycle_popup);
 
     if (!reconfig) {
-        client_remove_destructor((GDestroyNotify) focus_cycle_destructor);
+        client_remove_destructor(focus_cycle_destructor);
 
         for (i = 0; i < screen_num_desktops; ++i)
             g_list_free(focus_order[i]);
@@ -180,24 +180,42 @@ 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_follow)
+                trans = TRUE;
+            else {
+                ObClient *c;
+
+                if ((c = client_under_pointer()) &&
+                    client_search_transient(client_search_top_transient(c),
+                                            old))
+                    trans = TRUE;
+            }
+
+            g_message("trans %d", trans);
+
+            /* 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 (config_focus_follow)
         if (focus_under_pointer())
             return;
 
@@ -217,7 +235,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)
@@ -276,7 +293,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 == client_focus_target(ft) && client_normal(ft) &&
+    return (!ft->transients && client_normal(ft) &&
             ((ft->can_focus || ft->focus_notify) &&
              !ft->skip_taskbar &&
              (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)));