From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 17 Jan 2012 20:37:36 +0000 (+0000)
Subject: Bugfix: Only ignore EnterNotify events after UnmapNotifies from managed windows
X-Git-Tag: 4.2~141
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=62cde927a5b50b287b7383eee99effa9650f2423;p=i3%2Fi3

Bugfix: Only ignore EnterNotify events after UnmapNotifies from managed windows

This should fix (some?) focus follows mouse problems.
---

diff --git a/src/handlers.c b/src/handlers.c
index cb75af4d..b78089db 100644
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -460,21 +460,6 @@ static void handle_screen_change(xcb_generic_event_t *e) {
  *
  */
 static void handle_unmap_notify_event(xcb_unmap_notify_event_t *event) {
-    /* If the client (as opposed to i3) destroyed or unmapped a window, an
-     * EnterNotify event will follow (indistinguishable from an EnterNotify
-     * event caused by moving your mouse), causing i3 to set focus to whichever
-     * window is now visible.
-     *
-     * In a complex stacked or tabbed layout (take two v-split containers in a
-     * tabbed container), when the bottom window in tab2 is closed, the bottom
-     * window of tab1 is visible instead. X11 will thus send an EnterNotify
-     * event for the bottom window of tab1, while the focus should be set to
-     * the remaining window of tab2.
-     *
-     * Therefore, we ignore all EnterNotify events which have the same sequence
-     * as an UnmapNotify event. */
-    add_ignore_event(event->sequence, XCB_ENTER_NOTIFY);
-
     DLOG("UnmapNotify for 0x%08x (received from 0x%08x), serial %d\n", event->window, event->event, event->sequence);
     Con *con = con_by_window_id(event->window);
     if (con == NULL) {
@@ -485,22 +470,38 @@ static void handle_unmap_notify_event(xcb_unmap_notify_event_t *event) {
             LOG("Not a managed window, ignoring UnmapNotify event\n");
             return;
         }
+
         if (con->ignore_unmap > 0)
             con->ignore_unmap--;
         DLOG("ignore_unmap = %d for frame of container %p\n", con->ignore_unmap, con);
-        return;
+        goto ignore_end;
     }
 
     if (con->ignore_unmap > 0) {
         DLOG("ignore_unmap = %d, dec\n", con->ignore_unmap);
         con->ignore_unmap--;
-        return;
+        goto ignore_end;
     }
 
     tree_close(con, DONT_KILL_WINDOW, false, false);
     tree_render();
     x_push_changes(croot);
-    return;
+
+ignore_end:
+    /* If the client (as opposed to i3) destroyed or unmapped a window, an
+     * EnterNotify event will follow (indistinguishable from an EnterNotify
+     * event caused by moving your mouse), causing i3 to set focus to whichever
+     * window is now visible.
+     *
+     * In a complex stacked or tabbed layout (take two v-split containers in a
+     * tabbed container), when the bottom window in tab2 is closed, the bottom
+     * window of tab1 is visible instead. X11 will thus send an EnterNotify
+     * event for the bottom window of tab1, while the focus should be set to
+     * the remaining window of tab2.
+     *
+     * Therefore, we ignore all EnterNotify events which have the same sequence
+     * as an UnmapNotify event. */
+    add_ignore_event(event->sequence, XCB_ENTER_NOTIFY);
 }
 
 /*