diff options
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/wayland/wl_seat.c | 18 | ||||
| -rw-r--r-- | backend/x11/input_device.c | 14 |
2 files changed, 4 insertions, 28 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); } 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); |