diff --git a/clients/simple-touch.c b/clients/simple-touch.c
index c1a0899f..b45cba53 100644
--- a/clients/simple-touch.c
+++ b/clients/simple-touch.c
@@ -100,8 +100,7 @@ struct wl_shm_listener shm_listenter = {
 
 static void
 input_device_handle_motion(void *data, struct wl_input_device *input_device,
-			   uint32_t time,
-			   int32_t x, int32_t y, int32_t sx, int32_t sy)
+			   uint32_t time, int32_t sx, int32_t sy)
 {
 }
 
@@ -122,7 +121,7 @@ static void
 input_device_handle_pointer_focus(void *data,
 				  struct wl_input_device *input_device,
 				  uint32_t time, struct wl_surface *surface,
-				  int32_t x, int32_t y, int32_t sx, int32_t sy)
+				  int32_t sx, int32_t sy)
 {
 }
 
diff --git a/clients/window.c b/clients/window.c
index e7feb85b..052fefb8 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -1474,8 +1474,7 @@ input_set_focus_widget(struct input *input, struct widget *focus,
 
 static void
 input_handle_motion(void *data, struct wl_input_device *input_device,
-		    uint32_t time,
-		    int32_t x, int32_t y, int32_t sx, int32_t sy)
+		    uint32_t time, int32_t sx, int32_t sy)
 {
 	struct input *input = data;
 	struct window *window = input->pointer_focus;
@@ -1598,7 +1597,7 @@ static void
 input_handle_pointer_focus(void *data,
 			   struct wl_input_device *input_device,
 			   uint32_t time, struct wl_surface *surface,
-			   int32_t x, int32_t y, int32_t sx, int32_t sy)
+			   int32_t sx, int32_t sy)
 {
 	struct input *input = data;
 	struct window *window;
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 5199622b..d6757f0c 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -500,8 +500,7 @@ static const struct wl_output_listener output_listener = {
 /* parent input interface */
 static void
 input_handle_motion(void *data, struct wl_input_device *input_device,
-		     uint32_t time,
-		     int32_t x, int32_t y, int32_t sx, int32_t sy)
+		    uint32_t time, int32_t sx, int32_t sy)
 {
 	struct wayland_input *input = data;
 	struct wayland_compositor *c = input->compositor;
@@ -533,9 +532,9 @@ input_handle_key(void *data, struct wl_input_device *input_device,
 
 static void
 input_handle_pointer_focus(void *data,
-			    struct wl_input_device *input_device,
-			    uint32_t time, struct wl_surface *surface,
-			    int32_t x, int32_t y, int32_t sx, int32_t sy)
+			   struct wl_input_device *input_device,
+			   uint32_t time, struct wl_surface *surface,
+			   int32_t sx, int32_t sy)
 {
 	struct wayland_input *input = data;
 	struct wayland_output *output;
diff --git a/src/shell.c b/src/shell.c
index b84e1048..d5da6649 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -208,8 +208,7 @@ weston_surface_move(struct weston_surface *es,
 
 	wl_input_device_start_grab(&wd->input_device, &move->grab, time);
 
-	wl_input_device_set_pointer_focus(&wd->input_device,
-					  NULL, time, 0, 0, 0, 0);
+	wl_input_device_set_pointer_focus(&wd->input_device, NULL, time, 0, 0);
 
 	return 0;
 }
@@ -317,8 +316,7 @@ weston_surface_resize(struct shell_surface *shsurf,
 
 	wl_input_device_start_grab(&wd->input_device, &resize->grab, time);
 
-	wl_input_device_set_pointer_focus(&wd->input_device,
-					  NULL, time, 0, 0, 0, 0);
+	wl_input_device_set_pointer_focus(&wd->input_device, NULL, time, 0, 0);
 
 	return 0;
 }
@@ -522,27 +520,24 @@ popup_grab_focus(struct wl_grab *grab, uint32_t time,
 	struct wl_client *client = priv->surface->surface.resource.client;
 
 	if (surface && surface->resource.client == client) {
-		wl_input_device_set_pointer_focus(device, surface, time,
-						  device->x, device->y, x, y);
+		wl_input_device_set_pointer_focus(device, surface, time, x, y);
 		grab->focus = surface;
 	} else {
-		wl_input_device_set_pointer_focus(device, NULL,
-						  time, 0, 0, 0, 0);
+		wl_input_device_set_pointer_focus(device, NULL, time, 0, 0);
 		grab->focus = NULL;
 	}
 }
 
 static void
 popup_grab_motion(struct wl_grab *grab,
-		  uint32_t time, int32_t x, int32_t y)
+		  uint32_t time, int32_t sx, int32_t sy)
 {
-	struct wl_input_device *device = grab->input_device;
 	struct wl_resource *resource;
 
 	resource = grab->input_device->pointer_focus_resource;
 	if (resource)
 		wl_resource_post_event(resource, WL_INPUT_DEVICE_MOTION,
-				       time, device->x, device->y, x, y);
+				       time, sx, sy);
 }
 
 static void
@@ -1178,7 +1173,7 @@ rotate_binding(struct wl_input_device *device, uint32_t time,
 		weston_matrix_init(&rotate->rotation);
 	}
 
-	wl_input_device_set_pointer_focus(device, NULL, time, 0, 0, 0, 0);
+	wl_input_device_set_pointer_focus(device, NULL, time, 0, 0);
 }
 
 static void