Merge branch 'master' into next

2011-08-17 12:14:17 +02:00
parent 2abe23d6ff 336ce56cf3
commit 7a22bd1cf3
6 changed files with 41 additions and 5 deletions
--- a/src/workspace.c
+++ b/src/workspace.c
@ -226,7 +226,7 @@ void workspace_show(const char *num) {
    /* Set mouse pointer */
    Con *new_output = con_get_output(focused);
    if (old_output != new_output) {
-       xcb_warp_pointer_rect(conn, &next->rect);
+        x_set_warp_to(&next->rect);
    }

    /* Update the EWMH hints */