only kill focus cycling when the window being destroyed was in the list of targets

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index ae0294af53bb20ca8107d8eb42db59b4d10019d2..6713d98dd7566535fe8d81cb5d4d0e0a502af652 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -75,7 +75,8 @@ void focus_set_client(ObClient *client)
     screen_install_colormap(client, TRUE);
 
     /* in the middle of cycling..? kill it. */
-    focus_cycle_stop();
+    focus_cycle_stop(focus_client);
+    focus_cycle_stop(client);
 
     focus_client = client;
 
@@ -94,8 +95,7 @@ void focus_set_client(ObClient *client)
     }
 }
 
-static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old,
-                                       gboolean send_focus)
+static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
 {
     GList *it;
     ObClient *c;
@@ -104,30 +104,13 @@ static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old,
     if (config_focus_follow && !config_focus_last)
         if ((c = client_under_pointer()) &&
             (allow_refocus || c != old) &&
-            client_normal(c) &&
-            /* if we're sending focus then try to */
-            ((send_focus && client_focus(c)) ||
-             /* if not just see if we could try, or it's already focused */
-             (!send_focus && (c == old || client_can_focus(c)))))
+            (client_normal(c) &&
+             client_focus(c)))
         {
-            ob_debug_type(OB_DEBUG_FOCUS, "found in pointer stuff (%d)\n",
-                          send_focus);
+            ob_debug_type(OB_DEBUG_FOCUS, "found in pointer stuff\n");
             return c;
         }
 
-    ob_debug_type(OB_DEBUG_FOCUS, "trying omnipresentness\n");
-    if (allow_refocus && old &&
-        old->desktop == DESKTOP_ALL &&
-        client_normal(old) &&
-        /* this one is only for when not sending focus, to keep it there */
-        !send_focus)
-    {
-        ob_debug_type(OB_DEBUG_FOCUS, "found in omnipresentness (%d)\n",
-                      send_focus);
-        return old;
-    }
-
-
     ob_debug_type(OB_DEBUG_FOCUS, "trying the focus order\n");
     for (it = focus_order; it; it = g_list_next(it)) {
         c = it->data;
@@ -141,13 +124,9 @@ static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old,
         if (c->desktop == screen_desktop &&
             client_normal(c) &&
             (allow_refocus || c != old) &&
-            /* if we're sending focus then try to */
-            ((send_focus && client_focus(c)) ||
-             /* if not just see if we could try, or it's already focused */
-             (!send_focus && (c == old || client_can_focus(c)))))
+            client_focus(c))
         {
-            ob_debug_type(OB_DEBUG_FOCUS, "found in focus order (%d)\n",
-                          send_focus);
+            ob_debug_type(OB_DEBUG_FOCUS, "found in focus order\n");
             return c;
         }
     }
@@ -164,13 +143,9 @@ static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old,
         */
         if (c->type == OB_CLIENT_TYPE_DESKTOP &&
             (allow_refocus || c != old) &&
-            /* if we're sending focus then try to */
-            ((send_focus && client_focus(c)) ||
-             /* if not just see if we could try, or it's already focused */
-             (!send_focus && (c == old || client_can_focus(c)))))
+            client_focus(c))
         {
-            ob_debug_type(OB_DEBUG_FOCUS, "found a desktop window (%d)\n",
-                          send_focus);
+            ob_debug_type(OB_DEBUG_FOCUS, "found a desktop window\n");
             return c;
         }
     }
@@ -183,15 +158,12 @@ ObClient* focus_fallback(gboolean allow_refocus)
     ObClient *new;
     ObClient *old = focus_client;
 
-    new = focus_fallback_target(allow_refocus, old, FALSE);
-    if (new == old) return;
-
     /* unfocus any focused clients.. they can be focused by Pointer events
        and such, and then when we try focus them, we won't get a FocusIn
        event at all for them. */
     focus_nothing();
 
-    new = focus_fallback_target(allow_refocus, old, TRUE);
+    new = focus_fallback_target(allow_refocus, old);
 
     return new;
 }
@@ -222,9 +194,30 @@ void focus_nothing()
                    event_curtime);
 }
 
+void focus_order_add_new(ObClient *c)
+{
+    if (c->iconic)
+        focus_order_to_top(c);
+    else {
+        g_assert(!g_list_find(focus_order, c));
+        /* if there are any iconic windows, put this above them in the order,
+           but if there are not, then put it under the currently focused one */
+        if (focus_order && ((ObClient*)focus_order->data)->iconic)
+            focus_order = g_list_insert(focus_order, c, 0);
+        else
+            focus_order = g_list_insert(focus_order, c, 1);
+    }
+
+    /* in the middle of cycling..? kill it. */
+    focus_cycle_stop(c);
+}
+
 void focus_order_remove(ObClient *c)
 {
     focus_order = g_list_remove(focus_order, c);
+
+    /* in the middle of cycling..? kill it. */
+    focus_cycle_stop(c);
 }
 
 void focus_order_to_top(ObClient *c)