unfocus before unlinking the client from the transient tree

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index 22036917a85a2719fc9de5701db976b8c7599af5..b6d294bbd076096e107df463e908a02469cb0144 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -42,13 +42,23 @@ ObClient *focus_cycle_target;
 
 static ObIconPopup *focus_cycle_popup;
 
+static void focus_cycle_destructor(ObClient *c)
+{
+    /* end cycling if the target disappears */
+    if (focus_cycle_target == c)
+        focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE);
+}
+
 void focus_startup(gboolean reconfig)
 {
     focus_cycle_popup = icon_popup_new(TRUE);
 
-    if (!reconfig)
+    if (!reconfig) {
+        client_add_destructor((GDestroyNotify) focus_cycle_destructor);
+
         /* start with nothing focused */
         focus_set_client(NULL);
+    }
 }
 
 void focus_shutdown(gboolean reconfig)
@@ -58,6 +68,8 @@ void focus_shutdown(gboolean reconfig)
     icon_popup_free(focus_cycle_popup);
 
     if (!reconfig) {
+        client_remove_destructor((GDestroyNotify) focus_cycle_destructor);
+
         for (i = 0; i < screen_num_desktops; ++i)
             g_list_free(focus_order[i]);
         g_free(focus_order);
@@ -167,9 +179,6 @@ void focus_fallback(ObFocusFallbackType type)
     */
     focus_set_client(NULL);
 
-    if (config_focus_follow && focus_under_pointer())
-        return;
-
     if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) {
         /* try for transient relations */
         if (old->transient_for) {
@@ -188,6 +197,10 @@ void focus_fallback(ObFocusFallbackType type)
             }
         }
 
+    if (!config_focus_last && config_focus_follow)
+        if (focus_under_pointer())
+            return;
+
 #if 0
         /* try for group relations */
         if (old->group) {
@@ -208,12 +221,7 @@ void focus_fallback(ObFocusFallbackType type)
 
     for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
         if (type != OB_FOCUS_FALLBACK_UNFOCUSING || it->data != old)
-            if (client_normal(it->data) &&
-                /* dont fall back to 'anonymous' fullscreen windows. theres no
-                   checks for this is in transient/group fallbacks, so they can
-                   be fallback targets there. */
-                !((ObClient*)it->data)->fullscreen &&
-                client_can_focus(it->data)) {
+            if (client_normal(it->data) && client_can_focus(it->data)) {
                 gboolean r = client_focus(it->data);
                 assert(r);
                 return;
@@ -268,7 +276,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)));
@@ -281,7 +289,7 @@ void focus_cycle(gboolean forward, gboolean linear,
     static ObClient *t = NULL;
     static GList *order = NULL;
     GList *it, *start, *list;
-    ObClient *ft;
+    ObClient *ft = NULL;
 
     if (cancel) {
         if (focus_cycle_target)
@@ -316,7 +324,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 */