Merge branch 'master' into next

2011-08-11 22:22:44 +02:00
parent 9ccb3987ad 79479617c7
commit d3efa73dd7
3 changed files with 25 additions and 0 deletions
--- a/src/workspace.c
+++ b/src/workspace.c
@ -216,10 +216,19 @@ void workspace_show(const char *num) {
        }
    }

+    /* Memorize current output */
+    Con *old_output = con_get_output(focused);
+
    con_focus(next);
    workspace->fullscreen_mode = CF_OUTPUT;
    LOG("focused now = %p / %s\n", focused, focused->name);

+    /* Set mouse pointer */
+    Con *new_output = con_get_output(focused);
+    if (old_output != new_output) {
+       xcb_warp_pointer_rect(conn, &next->rect);
+    }
+
    /* Update the EWMH hints */
    if (changed_num_workspaces)
        ewmh_update_workarea();