From bd4b240d56df08bc255a09c9cb0d98b457c785dc Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 28 Nov 2011 23:26:45 +0000 Subject: [PATCH] Bugfix: Ignore EnterNotify events to prevent wrong focus in complex tabbed/stacked layouts (Thanks Phlogistique) Fixes #560 Finally we have a good explanation and example for why we need to ignore EnterNotify events which were caused by an Unmap :). --- src/handlers.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/handlers.c b/src/handlers.c index 7ef562e5..a11d24c7 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -452,10 +452,20 @@ static int handle_screen_change(xcb_generic_event_t *e) { * */ static int handle_unmap_notify_event(xcb_unmap_notify_event_t *event) { - // XXX: this is commented out because in src/x.c we disable EnterNotify events - /* we need to ignore EnterNotify events which will be generated because a - * different window is visible now */ - //add_ignore_event(event->sequence, XCB_ENTER_NOTIFY); + /* 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); -- 2.39.5