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

Bugfix: warp pointer during the EnterNotify-disabled phase 

Following bug:
1) Assign workspace 9 to output HDMI2
2) On HDMI2, be on workspace 1
3) Focus a different output, say LVDS1
4) Execute i3 'workspace 9'
5) Something happens, but you end up back on ws 1

(this is due to an EnterNotify being generated when warping)
This commit is contained in:
Michael Stapelberg 2011-10-27 22:29:47 +01:00
parent 4330c723ae
commit a4cb4a64d4
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/x.c
View File

@ -813,6 +813,22 @@ void x_push_changes(Con *con) {
DLOG("PUSHING CHANGES\n"); DLOG("PUSHING CHANGES\n");
x_push_node(con); x_push_node(con);
if (warp_to) {
xcb_query_pointer_reply_t *pointerreply = xcb_query_pointer_reply(conn, pointercookie, NULL);
if (!pointerreply) {
ELOG("Could not query pointer position, not warping pointer\n");
} else {
int mid_x = warp_to->x + (warp_to->width / 2);
int mid_y = warp_to->y + (warp_to->height / 2);
Output *current = get_output_containing(pointerreply->root_x, pointerreply->root_y);
Output *target = get_output_containing(mid_x, mid_y);
if (current != target)
xcb_warp_pointer(conn, XCB_NONE, root, 0, 0, 0, 0, mid_x, mid_y);
}
warp_to = NULL;
}
//DLOG("Re-enabling EnterNotify\n"); //DLOG("Re-enabling EnterNotify\n");
values[0] = FRAME_EVENT_MASK; values[0] = FRAME_EVENT_MASK;
CIRCLEQ_FOREACH_REVERSE(state, &state_head, state) { CIRCLEQ_FOREACH_REVERSE(state, &state_head, state) {
@ -863,22 +879,6 @@ void x_push_changes(Con *con) {
focused_id = root; focused_id = root;
} }
if (warp_to) {
xcb_query_pointer_reply_t *pointerreply = xcb_query_pointer_reply(conn, pointercookie, NULL);
if (!pointerreply) {
ELOG("Could not query pointer position, not warping pointer\n");
} else {
int mid_x = warp_to->x + (warp_to->width / 2);
int mid_y = warp_to->y + (warp_to->height / 2);
Output *current = get_output_containing(pointerreply->root_x, pointerreply->root_y);
Output *target = get_output_containing(mid_x, mid_y);
if (current != target)
xcb_warp_pointer(conn, XCB_NONE, root, 0, 0, 0, 0, mid_x, mid_y);
}
warp_to = NULL;
}
xcb_flush(conn); xcb_flush(conn);
DLOG("ENDING CHANGES\n"); DLOG("ENDING CHANGES\n");