Merge branch 'fix-tab-focus'

This commit is contained in:
Michael Stapelberg 2011-11-28 23:27:46 +00:00
commit 2fb06e612f
1 changed files with 14 additions and 4 deletions

View File

@ -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) { 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 /* If the client (as opposed to i3) destroyed or unmapped a window, an
/* we need to ignore EnterNotify events which will be generated because a * EnterNotify event will follow (indistinguishable from an EnterNotify
* different window is visible now */ * event caused by moving your mouse), causing i3 to set focus to whichever
//add_ignore_event(event->sequence, XCB_ENTER_NOTIFY); * 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); 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); Con *con = con_by_window_id(event->window);