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

diff --git a/plugins/focus.c b/plugins/focus.c
index 43f0ae8e..8528d68c 100644
--- a/plugins/focus.c
+++ b/plugins/focus.c
@@ -8,10 +8,10 @@
 
 /* config options */
 static gboolean follow_mouse = TRUE;
-static gboolean warp_on_desk_switch = TRUE;
-static gboolean focus_new = FALSE;
+static gboolean warp_on_desk_switch = FALSE;
+static gboolean focus_new = TRUE;
 
-static int skip_enter = 0;
+/*static int skip_enter = 0;*/
 
 static gboolean focus_under_pointer()
 {
@@ -42,30 +42,39 @@ static void focus_fallback(gboolean switching_desks)
 
     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) {
+            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);
+
+                /* 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;
+                    }*/
+
+                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);
                 }
-
-                /* 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);
-                ++skip_enter;
-                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:
@@ -76,7 +85,7 @@ static void events(ObEvent *e, void *foo)
     case Event_Client_Unmapped:
         if (ob_state == State_Exiting) break;
 
-        if (e->data.c.client->focused)
+        if (client_focused(e->data.c.client))
             if (!follow_mouse || !focus_under_pointer())
                 focus_fallback(FALSE);
         break;
@@ -93,9 +102,15 @@ static void events(ObEvent *e, void *foo)
         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;
 
@@ -110,10 +125,10 @@ void plugin_startup()
                       Event_Ob_Desktop | 
                       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);
 }