X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Ffocus.c;h=8528d68c5e9676ba2ae59362a0681cb4e7a5e560;hb=c95102751953d4c2800747b0ae12601ee6f414b6;hp=8a43c75993d64e0bee85409f8157c7ab2e619acd;hpb=a7705024c6a9934123e8249143671b08483f47cd;p=chaz%2Fopenbox

diff --git a/plugins/focus.c b/plugins/focus.c
index 8a43c759..8528d68c 100644
--- a/plugins/focus.c
+++ b/plugins/focus.c
@@ -1,70 +1,116 @@
 #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"
 
-static int skip_enter = 0;
+/* config options */
+static gboolean follow_mouse = TRUE;
+static gboolean warp_on_desk_switch = FALSE;
+static gboolean focus_new = TRUE;
 
-static void focus_fallback(guint desk, gboolean warp)
+/*static int skip_enter = 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) {
+            client_focus(it->data);
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+static void focus_fallback(gboolean switching_desks)
 {
     GList *it;
 
-    for (it = focus_order[desk]; it != NULL; it = it->next)
-        if (client_focus(it->data)) {
-            if (warp) { /* XXX make this configurable */
+    for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
+        if (client_normal(it->data) && client_focus(it->data)) {
+            if (switching_desks) {
                 XEvent e;
                 Client *c = it->data;
 
-                /* skip the next enter event from the desktop switch so focus
+                /* XXX... not anymore
+                   skip the next enter event from the desktop switch so focus
                    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");
+
+                /* kill all enter events from prior to the desktop switch, we
+                   aren't interested in them if we have found our own target
+                   to focus.
+                   XXX this is rude to other plugins...can this be done
+                   better? count the events in the queue? */
+                while (XCheckTypedEvent(ob_display, EnterNotify, &e));
+/*                    XPutBackEvent(ob_display, &e);
+                    g_message("skip");
                     ++skip_enter;
-                }
+                    }*/
 
-                /* I have to do this warp twice! Otherwise windows dont get
-                   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);
-                XWarpPointer(ob_display, None, c->window, 0, 0, 0, 0,
-                             c->area.width / 2, c->area.height / 2);
+                if (warp_on_desk_switch) {
+                    /* I have to do this warp twice! Otherwise windows dont get
+                       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);
+                    XWarpPointer(ob_display, None, c->window, 0, 0, 0, 0,
+                                 c->area.width / 2, c->area.height / 2);
+                }
             }
             break;
         }
 }
 
-static void events(ObEvent *e, void *foo)
+static void event(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 (client_focused(e->data.c.client))
+            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:
-        if (skip_enter)
+/*        if (skip_enter) {
+            if (e->data.x.client != NULL)
+                g_message("skipped enter %lx", e->data.x.client->window);
+            else
+                g_message("skipped enter 'root'");
             --skip_enter;
-        else if (e->data.x.client && client_normal(e->data.x.client))
+        }
+        else*/
+        if (e->data.x.client != NULL && client_normal(e->data.x.client))
             client_focus(e->data.x.client);
         break;
 
@@ -77,12 +123,12 @@ void plugin_startup()
 {
     dispatch_register(Event_Client_Mapped | 
                       Event_Ob_Desktop | 
-                      Event_Client_Unfocus |
+                      Event_Client_Unmapped |
                       Event_X_EnterNotify,
-                      (EventHandler)events, NULL);
+                      (EventHandler)event, NULL);
 }
 
 void plugin_shutdown()
 {
-    dispatch_register(0, (EventHandler)events, NULL);
+    dispatch_register(0, (EventHandler)event, NULL);
 }