Merge branch 'master' into next

diff --combined src/workspace.c
index c3d2ba16eec904c1757ff254359c34c181053589,cf1b40705167a35791ce1e3d087c4a81505b420e..c71fa5112f55ad9fa5760990b1f2c8eec8f79e61
--- 1/src/workspace.c
--- 2/src/workspace.c
+++ b/src/workspace.c
@@@ -49,11 -49,12 +49,11 @@@ Con *workspace_get(const char *num, boo
          workspace->name = sstrdup(num);
          /* We set ->num to the number if this workspace’s name consists only of
           * a positive number. Otherwise it’s a named ws and num will be -1. */
 -        char *end;
 -        long parsed_num = strtol(num, &end, 10);
 +
 +        long parsed_num = strtol(num, NULL, 10);
          if (parsed_num == LONG_MIN ||
              parsed_num == LONG_MAX ||
 -            parsed_num < 0 ||
 -            (end && *end != '\0'))
 +            parsed_num <= 0)
              workspace->num = -1;
          else workspace->num = parsed_num;
          LOG("num = %d\n", workspace->num);
@@@ -226,7 -227,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 */