nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Set input focus with last timestamp 

Setting input focus with the last event timestamp prevents race
conditions when setting focus.

fixes #1127
This commit is contained in:
Tony Crisci 2014-06-12 01:33:33 -04:00 committed by Michael Stapelberg
parent 0552fd5666
commit 9cee8dac5e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/x.c
View File

@ -1026,7 +1026,7 @@ void x_push_changes(Con *con) {
values[0] = CHILD_EVENT_MASK & ~(XCB_EVENT_MASK_FOCUS_CHANGE); values[0] = CHILD_EVENT_MASK & ~(XCB_EVENT_MASK_FOCUS_CHANGE);
xcb_change_window_attributes(conn, focused->window->id, XCB_CW_EVENT_MASK, values); xcb_change_window_attributes(conn, focused->window->id, XCB_CW_EVENT_MASK, values);
} }
xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, to_focus, XCB_CURRENT_TIME); xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, to_focus, last_timestamp);
if (focused->window != NULL) { if (focused->window != NULL) {
values[0] = CHILD_EVENT_MASK; values[0] = CHILD_EVENT_MASK;
xcb_change_window_attributes(conn, focused->window->id, XCB_CW_EVENT_MASK, values); xcb_change_window_attributes(conn, focused->window->id, XCB_CW_EVENT_MASK, values);
@ -1044,7 +1044,7 @@ void x_push_changes(Con *con) {
if (focused_id == XCB_NONE) { if (focused_id == XCB_NONE) {
DLOG("Still no window focused, better set focus to the root window\n"); DLOG("Still no window focused, better set focus to the root window\n");
xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, root, XCB_CURRENT_TIME); xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, root, last_timestamp);
ewmh_update_active_window(XCB_WINDOW_NONE); ewmh_update_active_window(XCB_WINDOW_NONE);
focused_id = root; focused_id = root;
} }