X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=93058d555fe7bcf0f4b73eaa510522e86ffffb19;hb=467b7f4d4d52b8e1cefade20ddf13e65aae314ce;hp=80f15217da66f58b1735baa920a72ed773f268e1;hpb=718adbae6534cc5976ac2e3c2f26c22402b27472;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 80f15217..93058d55 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -74,10 +74,9 @@ void focus_set_client(ObClient *client)
     screen_install_colormap(focus_client, FALSE);
     screen_install_colormap(client, TRUE);
 
-    /* in the middle of cycling..? kill it. CurrentTime is fine, time won't
-       be used.
-    */
-    focus_cycle_stop();
+    /* in the middle of cycling..? kill it. */
+    focus_cycle_stop(focus_client);
+    focus_cycle_stop(client);
 
     focus_client = client;
 
@@ -96,16 +95,17 @@ void focus_set_client(ObClient *client)
     }
 }
 
-static ObClient* focus_fallback_target(gboolean allow_refocus)
+static ObClient* focus_fallback_target(gboolean allow_refocus,
+                                       gboolean allow_pointer,
+                                       ObClient *old)
 {
     GList *it;
     ObClient *c;
-    ObClient *old = focus_client;
 
     ob_debug_type(OB_DEBUG_FOCUS, "trying pointer stuff\n");
-    if (config_focus_follow && !config_focus_last)
+    if (allow_pointer && config_focus_follow)
         if ((c = client_under_pointer()) &&
-            (allow_refocus || c != old) &&
+            (allow_refocus || client_focus_target(c) != old) &&
             (client_normal(c) &&
              client_focus(c)))
         {
@@ -113,17 +113,6 @@ static ObClient* focus_fallback_target(gboolean allow_refocus)
             return c;
         }
 
-    ob_debug_type(OB_DEBUG_FOCUS, "trying omnipresentness\n");
-    if (allow_refocus && old &&
-        old->desktop == DESKTOP_ALL &&
-        client_normal(old) &&
-        client_focus(old))
-    {
-        ob_debug_type(OB_DEBUG_FOCUS, "found in omnipresentness\n");
-        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;
@@ -136,7 +125,7 @@ static ObClient* focus_fallback_target(gboolean allow_refocus)
         */
         if (c->desktop == screen_desktop &&
             client_normal(c) &&
-            (allow_refocus || c != old) &&
+            (allow_refocus || client_focus_target(c) != old) &&
             client_focus(c))
         {
             ob_debug_type(OB_DEBUG_FOCUS, "found in focus order\n");
@@ -155,7 +144,7 @@ static ObClient* focus_fallback_target(gboolean allow_refocus)
            backup fallback though)
         */
         if (c->type == OB_CLIENT_TYPE_DESKTOP &&
-            (allow_refocus || c != old) &&
+            (allow_refocus || client_focus_target(c) != old) &&
             client_focus(c))
         {
             ob_debug_type(OB_DEBUG_FOCUS, "found a desktop window\n");
@@ -166,16 +155,19 @@ static ObClient* focus_fallback_target(gboolean allow_refocus)
     return NULL;
 }
 
-ObClient* focus_fallback(gboolean allow_refocus)
+ObClient* focus_fallback(gboolean allow_refocus, gboolean allow_pointer)
 {
     ObClient *new;
+    ObClient *old = focus_client;
 
     /* 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);
+    new = focus_fallback_target(allow_refocus, allow_pointer, old);
+    /* get what was really focused */
+    if (new) new = client_focus_target(new);
 
     return new;
 }
@@ -188,12 +180,8 @@ void focus_nothing()
         screen_install_colormap(NULL, TRUE);
     }
 
-    /* Don't set focus_client to NULL here. It will be set to NULL when the
-       FocusOut event comes. Otherwise, if we focus nothing and then focus the
-       same window again, The focus code says nothing changed, but focus_client
-       ends up being NULL anyways.
-    focus_client = NULL;
-    */
+    /* nothing is focused, update the colormap and _the root property_ */
+    focus_set_client(NULL);
 
     /* if there is a grab going on, then we need to cancel it. if we move
        focus during the grab, applications will get NotifyWhileGrabbed events
@@ -202,17 +190,37 @@ void focus_nothing()
        actions should not rely on being able to move focus during an
        interactive grab.
     */
-    if (keyboard_interactively_grabbed())
-        keyboard_interactive_cancel();
+    event_cancel_all_key_grabs();
 
     /* when nothing will be focused, send focus to the backup target */
     XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot,
                    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)