X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=9d4f2e6e5afc51acbf99d7a59d9e331031a64427;hb=a116f2c6310db702e377e9cd1a95c9a980aba5ae;hp=a462915740c4e60df713021e5c2f38603eb43fe1;hpb=eee483bb472b0d3e95dd2470aa49656653dd13d6;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index a4629157..9d4f2e6e 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -28,8 +28,9 @@ void focus_startup()
 
     attrib.override_redirect = TRUE;
     focus_backup = XCreateWindow(ob_display, ob_root,
-				 -100, -100, 1, 1, 0, 0, InputOnly,
-				 CopyFromParent, CWOverrideRedirect, &attrib);
+				 -100, -100, 1, 1, 0,
+                                 CopyFromParent, InputOutput, CopyFromParent,
+                                 CWOverrideRedirect, &attrib);
     XMapRaised(ob_display, focus_backup);
 
     /* start with nothing focused */
@@ -58,8 +59,6 @@ void focus_set_client(Client *client)
     Client *old;
     guint desktop;
 
-    if (client == focus_client) return;
-
     /* uninstall the old colormap, and install the new one */
     screen_install_colormap(focus_client, FALSE);
     screen_install_colormap(client, TRUE);
@@ -68,6 +67,7 @@ void focus_set_client(Client *client)
 	/* when nothing will be focused, send focus to the backup target */
 	XSetInputFocus(ob_display, focus_backup, RevertToPointerRoot,
                        event_lasttime);
+        XSync(ob_display, FALSE);
     }
 
     old = focus_client;
@@ -98,18 +98,15 @@ static gboolean focus_under_pointer()
     guint u;
     GList *it;
 
-    if (XQueryPointer(ob_display, ob_root, &w, &w, &x, &y, &i, &i, &u))
-    {
+    if (XQueryPointer(ob_display, ob_root, &w, &w, &x, &y, &i, &i, &u)) {
         for (it = stacking_list; it != NULL; it = it->next) {
             Client *c = it->data;
             if (c->desktop == screen_desktop &&
                 RECT_CONTAINS(c->frame->area, x, y))
                 break;
         }
-        if (it != NULL) {
-            g_message("fallback (pointer) trying %lx", ((Client*)it->data)->window);
+        if (it != NULL)
             return client_normal(it->data) && client_focus(it->data);
-        }
     }
     return FALSE;
 }
@@ -118,24 +115,34 @@ void focus_fallback(gboolean switching_desks)
 {
     ConfigValue focus_follow;
     GList *it;
-    gboolean fallback = TRUE;
-
-    if (!switching_desks) {
+    gboolean under = FALSE;
+    Client *old = NULL;
+
+    if (switching_desks) {
+        /* don't skip any windows when switching desktops */
+        old = focus_client;
+        focus_client = NULL;
+    } else {
         if (!config_get("focusFollowsMouse", Config_Bool, &focus_follow))
             g_assert_not_reached();
         if (focus_follow.bool)
-            fallback = !focus_under_pointer();
+            under = focus_under_pointer();
     }
 
-    if (fallback) {
-        for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
+    if (!under) {
+        for (it = focus_order[screen_desktop]; it != NULL; it = it->next) {
             if (it->data != focus_client && client_normal(it->data)) {
-                g_message("fallback trying %lx", ((Client*)it->data)->window);
-                if (client_focus(it->data))
+                /* if we're switching desktops, and we get the already focused
+                   window, then we wont get a FocusIn for it, so just restore
+                   the focus_client so that we know it is focused */
+                if (it->data == old) {
+                    focus_client = old;
+                    break;
+                } else if (client_focus(it->data))
                     break;
             }
+        }
+        if (it == NULL) /* nothing to focus */
+            focus_set_client(NULL);
     }
-
-    if (it == NULL) /* nothing to focus */
-        focus_set_client(NULL);
 }