compositor-wayland: Fix cursor coordinate transforms so it works on translated outputs
authorJason Ekstrand <jason@jlekstrand.net>
Fri, 8 Nov 2013 02:13:30 +0000 (20:13 -0600)
committerKristian Høgsberg <krh@bitplanet.net>
Mon, 11 Nov 2013 21:36:45 +0000 (13:36 -0800)
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
src/compositor-wayland.c

index 5f691a7..181d6bb 100644 (file)
@@ -862,8 +862,6 @@ input_handle_pointer_enter(void *data, struct wl_pointer *pointer,
                location = THEME_LOCATION_CLIENT_AREA;
        }
 
-       x += wl_fixed_from_int(input->output->base.x);
-       y += wl_fixed_from_int(input->output->base.y);
        weston_output_transform_coordinate(&input->output->base, x, y, &x, &y);
 
        if (location == THEME_LOCATION_CLIENT_AREA) {
@@ -918,8 +916,6 @@ input_handle_motion(void *data, struct wl_pointer *pointer,
                location = THEME_LOCATION_CLIENT_AREA;
        }
 
-       x += wl_fixed_from_int(input->output->base.x);
-       y += wl_fixed_from_int(input->output->base.y);
        weston_output_transform_coordinate(&input->output->base, x, y, &x, &y);
 
        if (input->focus && location != THEME_LOCATION_CLIENT_AREA) {