Only warp pointer once during x_push_changes()

- Introduce warp_to static variable in x.c that stores the coordinates
  to warp to as a Rect.

- Add x_set_warp_to function to set this variable.  Use in _tree_next,
  workspace_show, and con_move_to_workspace.

- In x_push_chanages, if warp_to is set, then call xcb_warp_pointer_rect
  and then reset it to NULL.

This fixes all know bugs for pointer warping for me.
This commit is contained in:
Peter Bui
2011-08-11 21:54:59 -04:00
committed by Michael Stapelberg
parent 637d2a3d62
commit 36224f86d1
6 changed files with 41 additions and 5 deletions

18
src/x.c
View File

@ -12,6 +12,9 @@ xcb_window_t focused_id = XCB_NONE;
static xcb_window_t *btt_stack;
static int btt_stack_num;
/* Stores coordinates to warp mouse pointer to if set */
static Rect *warp_to;
/*
* Describes the X11 state we may modify (map state, position, window stack).
* There is one entry per container. The state represents the current situation
@ -862,6 +865,11 @@ void x_push_changes(Con *con) {
focused_id = root;
}
if (warp_to) {
xcb_warp_pointer_rect(conn, warp_to);
warp_to = NULL;
}
xcb_flush(conn);
DLOG("\n\n ENDING CHANGES\n\n");
@ -937,3 +945,13 @@ void x_set_i3_atoms() {
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_CONFIG_PATH, A_UTF8_STRING, 8,
strlen(current_configpath), current_configpath);
}
/*
* Set warp_to coordinates. This will trigger on the next call to
* x_push_changes().
*
*/
void x_set_warp_to(Rect *rect)
{
warp_to = rect;
}