From 47fd15649ad63f3becef8870276e51c6214300fc Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Tue, 17 Jan 2012 20:37:36 +0000 Subject: [PATCH 1/3] Bugfix: Only ignore EnterNotify events after UnmapNotifies from managed windows This should fix (some?) focus follows mouse problems. Conflicts: src/handlers.c --- src/handlers.c | 96 +++++++++++++++----------------------------------- 1 file changed, 29 insertions(+), 67 deletions(-) diff --git a/src/handlers.c b/src/handlers.c index d835d367..09e9f11e 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -457,7 +457,35 @@ static int handle_screen_change(xcb_generic_event_t *e) { * now, so we better clean up before. * */ -static int handle_unmap_notify_event(xcb_unmap_notify_event_t *event) { +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); + Con *con = con_by_window_id(event->window); + if (con == NULL) { + /* This could also be an UnmapNotify for the frame. We need to + * decrement the ignore_unmap counter. */ + con = con_by_frame_id(event->window); + if (con == NULL) { + 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); + goto ignore_end; + } + + if (con->ignore_unmap > 0) { + DLOG("ignore_unmap = %d, dec\n", con->ignore_unmap); + con->ignore_unmap--; + goto ignore_end; + } + + tree_close(con, DONT_KILL_WINDOW, false, false); + tree_render(); + x_push_changes(croot); + +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 @@ -472,72 +500,6 @@ static int handle_unmap_notify_event(xcb_unmap_notify_event_t *event) { * 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) { - /* This could also be an UnmapNotify for the frame. We need to - * decrement the ignore_unmap counter. */ - con = con_by_frame_id(event->window); - if (con == NULL) { - LOG("Not a managed window, ignoring UnmapNotify event\n"); - return 1; - } - if (con->ignore_unmap > 0) - con->ignore_unmap--; - DLOG("ignore_unmap = %d for frame of container %p\n", con->ignore_unmap, con); - return 1; - } - - if (con->ignore_unmap > 0) { - DLOG("ignore_unmap = %d, dec\n", con->ignore_unmap); - con->ignore_unmap--; - return 1; - } - - tree_close(con, DONT_KILL_WINDOW, false, false); - tree_render(); - x_push_changes(croot); - return 1; - -#if 0 - if (client == NULL) { - DLOG("not a managed window. Ignoring.\n"); - - /* This was most likely the destroyed frame of a client which is - * currently being unmapped, so we add this sequence (again!) to - * the ignore list (enter_notify events will get sent for both, - * the child and its frame). */ - add_ignore_event(event->sequence); - - return 0; - } -#endif - - -#if 0 - /* Let’s see how many clients there are left on the workspace to delete it if it’s empty */ - bool workspace_empty = SLIST_EMPTY(&(client->workspace->focus_stack)); - bool workspace_focused = (c_ws == client->workspace); - Client *to_focus = (!workspace_empty ? SLIST_FIRST(&(client->workspace->focus_stack)) : NULL); - - /* If this workspace is currently visible, we don’t delete it */ - if (workspace_is_visible(client->workspace)) - workspace_empty = false; - - if (workspace_empty) { - client->workspace->output = NULL; - ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"empty\"}"); - } - - /* Remove the urgency flag if set */ - client->urgent = false; - workspace_update_urgent_flag(client->workspace); - - render_layout(conn); -#endif - - return 1; } /* From 27b089e430bd702c61e186f4db0bdf84eec12a81 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 21 Jan 2012 11:49:35 +0000 Subject: [PATCH 2/3] Fix prototype --- src/handlers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/handlers.c b/src/handlers.c index 09e9f11e..6fd64a11 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -511,7 +511,7 @@ ignore_end: * important fields in the event data structure). * */ -static int handle_destroy_notify_event(xcb_destroy_notify_event_t *event) { +static void handle_destroy_notify_event(xcb_destroy_notify_event_t *event) { DLOG("destroy notify for 0x%08x, 0x%08x\n", event->event, event->window); xcb_unmap_notify_event_t unmap; @@ -519,7 +519,7 @@ static int handle_destroy_notify_event(xcb_destroy_notify_event_t *event) { unmap.event = event->event; unmap.window = event->window; - return handle_unmap_notify_event(&unmap); + handle_unmap_notify_event(&unmap); } /* From 7a4d8ed6ed67c4d0d958458f58e4db1598c9cd75 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 21 Jan 2012 11:47:18 +0000 Subject: [PATCH 3/3] 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)); } /*