diff options
author | emersion <contact@emersion.fr> | 2018-03-28 14:11:39 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-28 14:11:39 -0400 |
commit | 5dd022da1300185780ddf4b70014a6f8f306de85 (patch) | |
tree | 331f0e5f7b748387a338b678b625bf5a1ae7f693 /backend/x11 | |
parent | 52d621e0979c3b393753d1c67b2b0fd23212ca41 (diff) | |
parent | 3813121fefb1734ed2c2537759e6eead1c0d9a74 (diff) |
Merge pull request #765 from swaywm/transformed-events
Use libinput transformed events instead of width_mm/height_mm
Diffstat (limited to 'backend/x11')
-rw-r--r-- | backend/x11/backend.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 7d560d97..8abc5d84 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -112,10 +112,8 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e struct wlr_event_pointer_motion_absolute abs = { .device = &x11->pointer_dev, .time_msec = ev->time, - .x_mm = ev->event_x, - .y_mm = ev->event_y, - .width_mm = output->wlr_output.width, - .height_mm = output->wlr_output.height, + .x = (double)ev->event_x / output->wlr_output.width, + .y = (double)ev->event_y / output->wlr_output.height, }; wlr_signal_emit_safe(&x11->pointer.events.motion_absolute, &abs); @@ -140,10 +138,8 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e struct wlr_event_pointer_motion_absolute abs = { .device = &x11->pointer_dev, .time_msec = x11->time, - .x_mm = pointer->root_x, - .y_mm = pointer->root_y, - .width_mm = output->wlr_output.width, - .height_mm = output->wlr_output.height, + .x = (double)pointer->root_x / output->wlr_output.width, + .y = (double)pointer->root_y / output->wlr_output.height, }; wlr_signal_emit_safe(&x11->pointer.events.motion_absolute, &abs); |