X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=9d4f2e6e5afc51acbf99d7a59d9e331031a64427;hb=f154f7b548e1c3ec668d07940905b37a4938bb09;hp=eaaba4ab6c521cda3d432c73477736fe6abd9bb0;hpb=152c638ef10ba2aa062f46ff8b05eb7cbaad66ea;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index eaaba4ab..9d4f2e6e 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -1,8 +1,12 @@
+#include "event.h"
+#include "config.h"
 #include "openbox.h"
 #include "client.h"
+#include "frame.h"
 #include "screen.h"
 #include "prop.h"
 #include "dispatch.h"
+#include "focus.h"
 
 #include <X11/Xlib.h>
 #include <glib.h>
@@ -13,8 +17,6 @@ GList **focus_order = NULL; /* these lists are created when screen_startup
 
 Window focus_backup = None;
 
-void focus_set_client(Client *client);
-
 void focus_startup()
 {
     /* create the window which gets focus when no clients get it. Have to
@@ -22,10 +24,13 @@ void focus_startup()
        mapped. */
     XSetWindowAttributes attrib;
 
+    focus_client = NULL;
+
     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 */
@@ -39,11 +44,13 @@ void focus_shutdown()
     for (i = 0; i < screen_num_desktops; ++i)
         g_list_free(focus_order[i]);
     g_free(focus_order);
+    focus_order = NULL;
 
-    XDestroyWindow(focus_backup);
+    XDestroyWindow(ob_display, focus_backup);
 
     /* reset focus to root */
-    XSetInputFocus(ob_display, PointerRoot, RevertToNone, CurrentTime);
+    XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot,
+                   event_lasttime);
 }
 
 void focus_set_client(Client *client)
@@ -56,10 +63,11 @@ void focus_set_client(Client *client)
     screen_install_colormap(focus_client, FALSE);
     screen_install_colormap(client, TRUE);
 
-
     if (client == NULL) {
 	/* when nothing will be focused, send focus to the backup target */
-	XSetInputFocus(ob_display, focus_backup, RevertToNone, CurrentTime);
+	XSetInputFocus(ob_display, focus_backup, RevertToPointerRoot,
+                       event_lasttime);
+        XSync(ob_display, FALSE);
     }
 
     old = focus_client;
@@ -82,3 +90,59 @@ void focus_set_client(Client *client)
     if (old != NULL)
         dispatch_client(Event_Client_Unfocus, old, 0, 0);
 }
+
+static gboolean focus_under_pointer()
+{
+    Window w;
+    int i, x, y;
+    guint u;
+    GList *it;
+
+    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)
+            return client_normal(it->data) && client_focus(it->data);
+    }
+    return FALSE;
+}
+
+void focus_fallback(gboolean switching_desks)
+{
+    ConfigValue focus_follow;
+    GList *it;
+    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)
+            under = focus_under_pointer();
+    }
+
+    if (!under) {
+        for (it = focus_order[screen_desktop]; it != NULL; it = it->next) {
+            if (it->data != focus_client && client_normal(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);
+    }
+}