X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=4df6662cccc4e95302712acfed3b46661b821c72;hb=fe2ec0951215f651818efefa2ca27e23e9c30d72;hp=551959f4538261e05534f3d27c9fcef7e0456218;hpb=a3c9271ca2f7c48ab75398bb434f4c1ee705866a;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 551959f4..4df6662c 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
@@ -41,11 +43,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(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)
@@ -54,14 +58,16 @@ 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);
 
-
     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);
     }
 
     old = focus_client;
@@ -84,3 +90,51 @@ 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) {
+            g_message("fallback (pointer) trying %lx", ((Client*)it->data)->window);
+            return client_normal(it->data) && client_focus(it->data);
+        }
+    }
+    return FALSE;
+}
+
+void focus_fallback(gboolean switching_desks)
+{
+    ConfigValue focus_follow;
+    GList *it;
+    gboolean under = TRUE;
+
+    if (!switching_desks) {
+        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)) {
+                g_message("fallback trying %lx", ((Client*)it->data)->window);
+                if (client_focus(it->data))
+                    break;
+            }
+        if (it == NULL) /* nothing to focus */
+            focus_set_client(NULL);
+    }
+}