X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Ffocus.c;h=7275b3fd6e90dbb7f6b52c3d0f177f247af2fb33;hb=f76b26e4ad3b8a1e13478e855b1f8b286df7e83d;hp=d4ce4b9b5c3fa850cfc82d55dda227b5fae8af08;hpb=648c55b829e09c66222a9bbf08d10434622feae2;p=chaz%2Fopenbox

diff --git a/plugins/focus.c b/plugins/focus.c
index d4ce4b9b..7275b3fd 100644
--- a/plugins/focus.c
+++ b/plugins/focus.c
@@ -1,17 +1,18 @@
 #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;
 
-static void focus_fallback(guint desk, gboolean warp)
+static void focus_fallback(gboolean warp)
 {
     GList *it;
 
-    for (it = focus_order[desk]; it != NULL; it = it->next)
+    for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
         if (client_focus(it->data)) {
             if (warp) { /* XXX make this configurable */
                 XEvent e;
@@ -21,9 +22,13 @@ 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;
                 }
 
+                /* 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,
@@ -33,6 +38,29 @@ static void focus_fallback(guint desk, gboolean warp)
         }
 }
 
+static void 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;
+        }
+    }
+    focus_fallback(FALSE);
+}
+
 static void events(ObEvent *e, void *foo)
 {
     switch (e->type) {
@@ -42,28 +70,31 @@ static void events(ObEvent *e, void *foo)
             client_focus(e->data.c.client);
         break;
 
-    case Event_Ob_Desktop:
-        g_message("Desktop Switch");
-        /* focus the next available target */
-        focus_fallback(e->data.o.num[0], TRUE);
-        break;
+    case Event_Client_Unmapped:
+        if (ob_state == State_Exiting) 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);
-        */
+        if (e->data.c.client->focused) {
+            /* if sloppy focus... */
+            focus_under_pointer();
+
+            /* otherwise... */
+            /*
+              /\* nothing is left with focus! *\/
+              if (focus_client == NULL) 
+              /\* focus the next available target *\/
+              focus_fallback(screen_desktop, FALSE);
+            */
+        }
         break;
 
-    case Event_X_LeaveNotify:
-        g_message("Leave: %lx", e->data.x.client ? e->data.x.client->window : 0);
+    case Event_Ob_Desktop:
+        /* focus the next available target if moving from the current
+           desktop. */
+        if ((unsigned)e->data.o.num[1] == screen_desktop)
+            focus_fallback(TRUE);
         break;
 
     case Event_X_EnterNotify:
-        g_message("Enter: %lx", e->data.x.client ? e->data.x.client->window : 0);
         if (skip_enter)
             --skip_enter;
         else if (e->data.x.client && client_normal(e->data.x.client))
@@ -79,9 +110,8 @@ void plugin_startup()
 {
     dispatch_register(Event_Client_Mapped | 
                       Event_Ob_Desktop | 
-                      Event_Client_Unfocus |
-                      Event_X_EnterNotify |
-                      Event_X_LeaveNotify,
+                      Event_Client_Unmapped |
+                      Event_X_EnterNotify,
                       (EventHandler)events, NULL);
 }