From 4efae8c177f9d4e4c242229416bd9ecb2f034a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Mon, 30 Apr 2018 16:08:35 +0200 Subject: [PATCH 1/3] wlr_cursor: transform absolute coordinates Honor output rotation when processing absolute coordinates. This fixes touch events on rotated outputs. Fixes #928 --- types/wlr_cursor.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/types/wlr_cursor.c b/types/wlr_cursor.c index aec7b013..d8a7fa08 100644 --- a/types/wlr_cursor.c +++ b/types/wlr_cursor.c @@ -330,11 +330,75 @@ static void handle_pointer_motion(struct wl_listener *listener, void *data) { wlr_signal_emit_safe(&device->cursor->events.motion, event); } +static void apply_output_transform(double *x, double *y, + enum wl_output_transform transform) { + double dx, dy; + double width = 1.0, height = 1.0; + + switch (transform) { + case WL_OUTPUT_TRANSFORM_NORMAL: + dx = *x; + dy = *y; + break; + case WL_OUTPUT_TRANSFORM_90: + dx = *y; + dy = width - *x; + break; + case WL_OUTPUT_TRANSFORM_180: + dx = width - *x; + dy = height - *y; + break; + case WL_OUTPUT_TRANSFORM_270: + dx = height - *y; + dy = *x; + break; + case WL_OUTPUT_TRANSFORM_FLIPPED: + dx = width - *x; + dy = *y; + break; + case WL_OUTPUT_TRANSFORM_FLIPPED_90: + dx = height - *y; + dy = width - *x; + break; + case WL_OUTPUT_TRANSFORM_FLIPPED_180: + dx = *x; + dy = height - *y; + break; + case WL_OUTPUT_TRANSFORM_FLIPPED_270: + dx = *y; + dy = *x; + break; + } + *x = dx; + *y = dy; +} + + +static struct wlr_output *get_mapped_output(struct wlr_cursor_device *cursor_device) { + if (cursor_device->mapped_output) { + return cursor_device->mapped_output; + } + + struct wlr_cursor *cursor = cursor_device->cursor; + assert(cursor); + if (cursor->state->mapped_output) { + return cursor->state->mapped_output; + } + return NULL; +} + + static void handle_pointer_motion_absolute(struct wl_listener *listener, void *data) { struct wlr_event_pointer_motion_absolute *event = data; struct wlr_cursor_device *device = wl_container_of(listener, device, motion_absolute); + + struct wlr_output *output = + get_mapped_output(device); + if (output) { + apply_output_transform(&event->x, &event->y, output->transform); + } wlr_signal_emit_safe(&device->cursor->events.motion_absolute, event); } @@ -362,6 +426,12 @@ static void handle_touch_down(struct wl_listener *listener, void *data) { struct wlr_event_touch_down *event = data; struct wlr_cursor_device *device; device = wl_container_of(listener, device, touch_down); + + struct wlr_output *output = + get_mapped_output(device); + if (output) { + apply_output_transform(&event->x, &event->y, output->transform); + } wlr_signal_emit_safe(&device->cursor->events.touch_down, event); } @@ -369,6 +439,12 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) { struct wlr_event_touch_motion *event = data; struct wlr_cursor_device *device; device = wl_container_of(listener, device, touch_motion); + + struct wlr_output *output = + get_mapped_output(device); + if (output) { + apply_output_transform(&event->x, &event->y, output->transform); + } wlr_signal_emit_safe(&device->cursor->events.touch_motion, event); } @@ -383,6 +459,12 @@ static void handle_tablet_tool_tip(struct wl_listener *listener, void *data) { struct wlr_event_tablet_tool_tip *event = data; struct wlr_cursor_device *device; device = wl_container_of(listener, device, tablet_tool_tip); + + struct wlr_output *output = + get_mapped_output(device); + if (output) { + apply_output_transform(&event->x, &event->y, output->transform); + } wlr_signal_emit_safe(&device->cursor->events.tablet_tool_tip, event); } @@ -390,6 +472,12 @@ static void handle_tablet_tool_axis(struct wl_listener *listener, void *data) { struct wlr_event_tablet_tool_axis *event = data; struct wlr_cursor_device *device; device = wl_container_of(listener, device, tablet_tool_axis); + + struct wlr_output *output = + get_mapped_output(device); + if (output) { + apply_output_transform(&event->x, &event->y, output->transform); + } wlr_signal_emit_safe(&device->cursor->events.tablet_tool_axis, event); } @@ -406,6 +494,12 @@ static void handle_tablet_tool_proximity(struct wl_listener *listener, struct wlr_event_tablet_tool_proximity *event = data; struct wlr_cursor_device *device; device = wl_container_of(listener, device, tablet_tool_proximity); + + struct wlr_output *output = + get_mapped_output(device); + if (output) { + apply_output_transform(&event->x, &event->y, output->transform); + } wlr_signal_emit_safe(&device->cursor->events.tablet_tool_proximity, event); } From 6f01c12b403915f20fb82b7fdeb3ff2b0b6d5a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Mon, 30 Apr 2018 16:08:35 +0200 Subject: [PATCH 2/3] backend/x11: don't transform pointer events We do this in a backend independent way in wlr_cursor now. --- backend/x11/input_device.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c index f8b87630..75cfa76e 100644 --- a/backend/x11/input_device.c +++ b/backend/x11/input_device.c @@ -32,21 +32,11 @@ static void x11_handle_pointer_position(struct wlr_x11_output *output, int16_t x, int16_t y, xcb_timestamp_t time) { struct wlr_x11_backend *x11 = output->x11; struct wlr_output *wlr_output = &output->wlr_output; - - struct wlr_box box = { .x = x, .y = y }; - wlr_box_transform(&box, wlr_output->transform, wlr_output->width, - wlr_output->height, &box); - box.x /= wlr_output->scale; - box.y /= wlr_output->scale; - - int output_width, output_height; - wlr_output_effective_resolution(wlr_output, &output_width, &output_height); - struct wlr_event_pointer_motion_absolute event = { .device = &output->pointer_dev, .time_msec = time, - .x = (double)box.x / output_width, - .y = (double)box.y / output_height, + .x = (double)x / wlr_output->width, + .y = (double)y / wlr_output->height, }; wlr_signal_emit_safe(&output->pointer.events.motion_absolute, &event); From 545d54439d8085d75e484079ee4e7ea6c9b892bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Mon, 30 Apr 2018 16:08:35 +0200 Subject: [PATCH 3/3] backend/wayland: don't transform pointer events We do this in a backend independent way in wlr_cursor now. --- backend/wayland/wl_seat.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c index 454a2bb0..8191cb80 100644 --- a/backend/wayland/wl_seat.c +++ b/backend/wayland/wl_seat.c @@ -74,25 +74,11 @@ static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer, } struct wlr_output *wlr_output = &pointer->output->wlr_output; - - struct wlr_box box = { - .x = wl_fixed_to_int(sx), - .y = wl_fixed_to_int(sy), - }; - wlr_box_transform(&box, wlr_output->transform, wlr_output->width, - wlr_output->height, &box); - box.x /= wlr_output->scale; - box.y /= wlr_output->scale; - - int output_width, output_height; - wlr_output_effective_resolution(&pointer->output->wlr_output, - &output_width, &output_height); - struct wlr_event_pointer_motion_absolute event = { .device = &pointer->input_device->wlr_input_device, .time_msec = time, - .x = (double)box.x / output_width, - .y = (double)box.y / output_height, + .x = wl_fixed_to_double(sx) / wlr_output->width, + .y = wl_fixed_to_double(sy) / wlr_output->height, }; wlr_signal_emit_safe(&pointer->wlr_pointer.events.motion_absolute, &event); }