From 7a4d8ed6ed67c4d0d958458f58e4db1598c9cd75 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 21 Jan 2012 11:47:18 +0000 Subject: [PATCH] Bugfix: Force a new sequence number after UnmapNotify This should fix the problem where (legitimate) EnterNotifys arrived with the same sequence as the UnmapNotify and was ignored. Fixes: #609 --- src/handlers.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/handlers.c b/src/handlers.c index 6fd64a11..e2fa205c 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -459,6 +459,7 @@ static int handle_screen_change(xcb_generic_event_t *e) { */ static void handle_unmap_notify_event(xcb_unmap_notify_event_t *event) { DLOG("UnmapNotify for 0x%08x (received from 0x%08x), serial %d\n", event->window, event->event, event->sequence); + xcb_get_input_focus_cookie_t cookie; Con *con = con_by_window_id(event->window); if (con == NULL) { /* This could also be an UnmapNotify for the frame. We need to @@ -471,10 +472,15 @@ static void handle_unmap_notify_event(xcb_unmap_notify_event_t *event) { if (con->ignore_unmap > 0) con->ignore_unmap--; + /* See the end of this function. */ + cookie = xcb_get_input_focus(conn); DLOG("ignore_unmap = %d for frame of container %p\n", con->ignore_unmap, con); goto ignore_end; } + /* See the end of this function. */ + cookie = xcb_get_input_focus(conn); + if (con->ignore_unmap > 0) { DLOG("ignore_unmap = %d, dec\n", con->ignore_unmap); con->ignore_unmap--; @@ -500,6 +506,13 @@ ignore_end: * Therefore, we ignore all EnterNotify events which have the same sequence * as an UnmapNotify event. */ add_ignore_event(event->sequence, XCB_ENTER_NOTIFY); + + /* Since we just ignored the sequence of this UnmapNotify, we want to make + * sure that following events use a different sequence. When putting xterm + * into fullscreen and moving the pointer to a different window, without + * using GetInputFocus, subsequent (legitimate) EnterNotify events arrived + * with the same sequence and thus were ignored (see ticket #609). */ + free(xcb_get_input_focus_reply(conn, cookie, NULL)); } /*