X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=5175cbfb70479ce899d511a1b2d9d0579afa95bc;hb=9752670920352bdd721d9958370edc569481d9e6;hp=fd70c972611e1ef06e95629f50ca0a06c475ce3b;hpb=ae269d77ca816dd6b05f20017dab012750636b90;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index fd70c972..5175cbfb 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -85,6 +85,7 @@ static void event_handle_dockapp(ObDockApp *app, XEvent *e);
 static void event_handle_client(ObClient *c, XEvent *e);
 static void event_handle_user_time_window_clients(GSList *l, XEvent *e);
 static void event_handle_user_input(ObClient *client, XEvent *e);
+static gboolean is_enter_focus_event_ignored(XEvent *e);
 
 static void focus_delay_dest(gpointer data);
 static gboolean focus_delay_cmp(gconstpointer d1, gconstpointer d2);
@@ -883,7 +884,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
                corresponding enter events. Pretend like the animating window
                doesn't even exist..! */
             if (frame_iconify_animating(client->frame))
-                event_ignore_queued_enters();
+                event_ignore_all_queued_enters();
 
             ob_debug_type(OB_DEBUG_FOCUS,
                           "%sNotify mode %d detail %d on %lx\n",
@@ -909,13 +910,6 @@ static void event_handle_client(ObClient *client, XEvent *e)
         break;
     case EnterNotify:
     {
-        gboolean nofocus = FALSE;
-
-        if (ignore_enter_focus) {
-            ignore_enter_focus--;
-            nofocus = TRUE;
-        }
-
         con = frame_context(client, e->xcrossing.window,
                             e->xcrossing.x, e->xcrossing.y);
         switch (con) {
@@ -945,22 +939,23 @@ static void event_handle_client(ObClient *client, XEvent *e)
             if (e->xcrossing.mode == NotifyGrab ||
                 e->xcrossing.mode == NotifyUngrab ||
                 /*ignore enters when we're already in the window */
-                e->xcrossing.detail == NotifyInferior)
+                e->xcrossing.detail == NotifyInferior ||
+                is_enter_focus_event_ignored(e))
             {
                 ob_debug_type(OB_DEBUG_FOCUS,
                               "%sNotify mode %d detail %d on %lx IGNORED\n",
                               (e->type == EnterNotify ? "Enter" : "Leave"),
                               e->xcrossing.mode,
                               e->xcrossing.detail, client?client->window:0);
-            } else {
+            }
+            else {
                 ob_debug_type(OB_DEBUG_FOCUS,
                               "%sNotify mode %d detail %d on %lx, "
-                              "focusing window: %d\n",
+                              "focusing window\n",
                               (e->type == EnterNotify ? "Enter" : "Leave"),
                               e->xcrossing.mode,
-                              e->xcrossing.detail, (client?client->window:0),
-                              !nofocus);
-                if (!nofocus && config_focus_follow)
+                              e->xcrossing.detail, (client?client->window:0));
+                if (config_focus_follow)
                     event_enter_client(client);
             }
             break;
@@ -1084,7 +1079,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
             client_configure(client, x, y, w, h, FALSE, TRUE);
 
             /* ignore enter events caused by these like ob actions do */
-            event_ignore_queued_enters();
+            event_ignore_all_queued_enters();
         }
         break;
     }
@@ -1180,7 +1175,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
                              e->xclient.data.l[1], e->xclient.data.l[2]);
 
             /* ignore enter events caused by these like ob actions do */
-            event_ignore_queued_enters();
+            event_ignore_all_queued_enters();
         } else if (msgtype == prop_atoms.net_close_window) {
             ob_debug("net_close_window for 0x%lx\n", client->window);
             client_close(client);
@@ -1268,7 +1263,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
             client_configure(client, x, y, w, h, FALSE, TRUE);
 
             /* ignore enter events caused by these like ob actions do */
-            event_ignore_queued_enters();
+            event_ignore_all_queued_enters();
         } else if (msgtype == prop_atoms.net_restack_window) {
             if (e->xclient.data.l[0] != 2) {
                 ob_debug_type(OB_DEBUG_APP_BUGS,
@@ -1719,27 +1714,49 @@ void event_halt_focus_delay()
 
 static Bool event_look_for_enters(Display *d, XEvent *e, XPointer arg)
 {
-    guint *count = (guint*)arg;
-    if (e->type == EnterNotify) {
+    if (e->type == EnterNotify &&
+        /* these types aren't used for focusing */
+        !(e->xcrossing.mode == NotifyGrab ||
+          e->xcrossing.mode == NotifyUngrab ||
+          e->xcrossing.detail == NotifyInferior))
+    {
         ObWindow *win;
-            
+
+        /* found an enter for that leave, ignore it if it's going to
+           another window */
         win = g_hash_table_lookup(window_map, &e->xany.window);
         if (win && WINDOW_IS_CLIENT(win))
-            ++(*count);
+            ++ignore_enter_focus;
     }
     return False; /* don't disrupt the queue order, just count them */
 }
 
-void event_ignore_queued_enters()
+void event_ignore_all_queued_enters()
 {
     XEvent e;
-                
+
     XSync(ob_display, FALSE);
 
     /* count the events without disrupting them */
-    XCheckIfEvent(ob_display, &e, event_look_for_enters,
-                  (XPointer)&ignore_enter_focus);
+    ignore_enter_focus = 0;
+    XCheckIfEvent(ob_display, &e, event_look_for_enters, NULL);
+}
+
+static gboolean is_enter_focus_event_ignored(XEvent *e)
+{
+    g_assert(e->type == EnterNotify &&
+             !(e->xcrossing.mode == NotifyGrab ||
+               e->xcrossing.mode == NotifyUngrab ||
+               e->xcrossing.detail == NotifyInferior));
 
+    ob_debug_type(OB_DEBUG_FOCUS, "# enters ignored: %d\n",
+                  ignore_enter_focus);
+
+    if (ignore_enter_focus) {
+        --ignore_enter_focus;
+        return TRUE;
+    }
+    return FALSE;
 }
 
 gboolean event_time_after(Time t1, Time t2)