From 6c9c8f8923926bf0bf270c0ecf21eae8371d4778 Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Tue, 10 Feb 2009 18:29:24 -0500 Subject: Fix surface coordinate transformation. --- wayland-system-compositor.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/wayland-system-compositor.c b/wayland-system-compositor.c index 2aaa774..a0ab5f9 100644 --- a/wayland-system-compositor.c +++ b/wayland-system-compositor.c @@ -861,15 +861,17 @@ pick_surface(struct wlsc_input_device *device, int32_t *sx, int32_t *sy) if (es->map.x <= device->x && device->x < es->map.x + es->map.width && es->map.y <= device->y && - device->y < es->map.y + es->map.height) + device->y < es->map.y + es->map.height) { + /* Transform to surface coordinates. */ + *sx = (device->x - es->map.x) * es->width / es->map.width; + *sy = (device->y - es->map.y) * es->height / es->map.height; + return es; + } es = container_of(es->link.prev, struct wlsc_surface, link); - /* Transform to surface coordinates. */ - *sx = (device->x - es->map.x) * es->width / es->map.width; - *sy = (device->y - es->map.y) * es->height / es->map.height; } return NULL; -- cgit v1.2.3