Move coordinate transformation to pick_surface().
diff --git a/wayland-system-compositor.c b/wayland-system-compositor.c
index e54b01f..a394893 100644
--- a/wayland-system-compositor.c
+++ b/wayland-system-compositor.c
@@ -567,7 +567,7 @@
};
static struct egl_surface *
-pick_surface(struct wlsc_input_device *device)
+pick_surface(struct wlsc_input_device *device, int32_t *sx, int32_t *sy)
{
struct egl_compositor *ec = device->ec;
struct egl_surface *es;
@@ -586,6 +586,10 @@
es = container_of(es->link.prev,
struct egl_surface, link);
+
+ /* Transform to surface coordinates. */
+ *sx = (x - es->map.x) * es->width / es->map.width;
+ *sy = (y - es->map.y) * es->height / es->map.height;
}
return NULL;
@@ -611,14 +615,10 @@
if (y >= ec->height)
y = ec->height - 1;
- es = pick_surface(device);
-
- if (es) {
- sx = (x - es->map.x) * es->width / es->map.width;
- sy = (y - es->map.y) * es->height / es->map.height;
+ es = pick_surface(device, &sx, &sy);
+ if (es)
wl_surface_post_event(&es->base, &device->base,
WL_INPUT_MOTION, x, y, sx, sy);
- }
device->x = x;
device->y = y;
@@ -639,7 +639,7 @@
if (!ec->vt_active)
return;
- es = pick_surface(device);
+ es = pick_surface(device, &sx, &sy);
if (es) {
wl_list_remove(&es->link);
wl_list_insert(device->ec->surface_list.prev, &es->link);
@@ -654,9 +654,6 @@
device->grab--;
}
- sx = (device->x - es->map.x) * es->width / es->map.width;
- sy = (device->y - es->map.y) * es->height / es->map.height;
-
/* FIXME: Swallow click on raise? */
wl_surface_post_event(&es->base, &device->base,
WL_INPUT_BUTTON, button, state,