X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=inline;f=plugins%2Ffocus.c;h=43f0ae8e976583b0ab9ba5315046715cf4237ef4;hb=d2b4e7ddca275b5be50db0365aba734c0fb28b1e;hp=8a43c75993d64e0bee85409f8157c7ab2e619acd;hpb=a7705024c6a9934123e8249143671b08483f47cd;p=chaz%2Fopenbox

diff --git a/plugins/focus.c b/plugins/focus.c
index 8a43c759..43f0ae8e 100644
--- a/plugins/focus.c
+++ b/plugins/focus.c
@@ -1,19 +1,48 @@
 #include "../kernel/dispatch.h"
 #include "../kernel/screen.h"
 #include "../kernel/client.h"
+#include "../kernel/frame.h"
 #include "../kernel/focus.h"
 #include "../kernel/stacking.h"
 #include "../kernel/openbox.h"
 
+/* config options */
+static gboolean follow_mouse = TRUE;
+static gboolean warp_on_desk_switch = TRUE;
+static gboolean focus_new = FALSE;
+
 static int skip_enter = 0;
 
-static void focus_fallback(guint desk, gboolean warp)
+static gboolean focus_under_pointer()
 {
+    Window w;
+    int i, x, y;
+    guint u;
     GList *it;
 
-    for (it = focus_order[desk]; it != NULL; it = it->next)
-        if (client_focus(it->data)) {
-            if (warp) { /* XXX make this configurable */
+    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) {
+            client_focus(it->data);
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+static void focus_fallback(gboolean switching_desks)
+{
+    GList *it;
+
+    for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
+        if (client_normal(it->data) && client_focus(it->data)) {
+            if (switching_desks && warp_on_desk_switch) {
                 XEvent e;
                 Client *c = it->data;
 
@@ -21,8 +50,6 @@ static void focus_fallback(guint desk, gboolean warp)
                    doesn't skip briefly to what was under the pointer */
                 if (XCheckTypedEvent(ob_display, EnterNotify, &e)) {
                     XPutBackEvent(ob_display, &e);
-                    /* XXX WERE NOT SKIPPING THEM ALL@&*)! */
-                    g_message("Skip");
                     ++skip_enter;
                 }
 
@@ -30,6 +57,7 @@ static void focus_fallback(guint desk, gboolean warp)
                    Enter/Leave events when i warp on a desktop switch! */
                 XWarpPointer(ob_display, None, c->window, 0, 0, 0, 0,
                              c->area.width / 2, c->area.height / 2);
+                ++skip_enter;
                 XWarpPointer(ob_display, None, c->window, 0, 0, 0, 0,
                              c->area.width / 2, c->area.height / 2);
             }
@@ -41,24 +69,27 @@ static void events(ObEvent *e, void *foo)
 {
     switch (e->type) {
     case Event_Client_Mapped:
-        /* focus new normal windows */
-        if (client_normal(e->data.c.client))
+        if (focus_new && client_normal(e->data.c.client))
             client_focus(e->data.c.client);
         break;
 
-    case Event_Ob_Desktop:
-        /* focus the next available target */
-        focus_fallback(e->data.o.num[0], TRUE);
+    case Event_Client_Unmapped:
+        if (ob_state == State_Exiting) break;
+
+        if (e->data.c.client->focused)
+            if (!follow_mouse || !focus_under_pointer())
+                focus_fallback(FALSE);
         break;
 
-    case Event_Client_Unfocus:
-        /* dont do this shit with sloppy focus... */
-        /*
-        /\* nothing is left with focus! *\/
-        if (focus_client == NULL) 
-            /\* focus the next available target *\/
-            focus_fallback(screen_desktop, FALSE);
-        */
+    case Event_Client_Desktop:
+        /* focus the next available target if moving from the current
+           desktop. */
+        if ((unsigned)e->data.c.num[1] == screen_desktop)
+            if (!follow_mouse || !focus_under_pointer())
+                focus_fallback(FALSE);
+
+    case Event_Ob_Desktop:
+        focus_fallback(TRUE);
         break;
 
     case Event_X_EnterNotify:
@@ -77,7 +108,7 @@ void plugin_startup()
 {
     dispatch_register(Event_Client_Mapped | 
                       Event_Ob_Desktop | 
-                      Event_Client_Unfocus |
+                      Event_Client_Unmapped |
                       Event_X_EnterNotify,
                       (EventHandler)events, NULL);
 }