aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-03-28 11:04:40 -0400
committerDrew DeVault <sir@cmpwn.com>2018-03-28 11:04:40 -0400
commit324b9d910dc237151fd71c01bef015d0080be191 (patch)
tree22f412fd0aee7f41ffe5282d2834adb0f4aeb1fb /backend
parenta35a5786b0e40cb1ffa87344d3cb21dff9fd99f4 (diff)
Remove width_mm from wlr_touch events
Diffstat (limited to 'backend')
-rw-r--r--backend/drm/legacy.c2
-rw-r--r--backend/libinput/touch.c10
2 files changed, 5 insertions, 7 deletions
diff --git a/backend/drm/legacy.c b/backend/drm/legacy.c
index 88a01b89..7c45ae21 100644
--- a/backend/drm/legacy.c
+++ b/backend/drm/legacy.c
@@ -47,7 +47,7 @@ bool legacy_crtc_set_cursor(struct wlr_drm_backend *drm,
if (drmModeSetCursor(drm->fd, crtc->id, gbm_bo_get_handle(bo).u32,
plane->surf.width, plane->surf.height)) {
- wlr_log_errno(L_ERROR, "Failed to set hardware cursor");
+ wlr_log_errno(L_DEBUG, "Failed to set hardware cursor");
return false;
}
diff --git a/backend/libinput/touch.c b/backend/libinput/touch.c
index 2b87f9cd..419c11ea 100644
--- a/backend/libinput/touch.c
+++ b/backend/libinput/touch.c
@@ -35,9 +35,8 @@ void handle_touch_down(struct libinput_event *event,
wlr_event.time_msec =
usec_to_msec(libinput_event_touch_get_time_usec(tevent));
wlr_event.touch_id = libinput_event_touch_get_slot(tevent);
- wlr_event.x_mm = libinput_event_touch_get_x(tevent);
- wlr_event.y_mm = libinput_event_touch_get_y(tevent);
- libinput_device_get_size(libinput_dev, &wlr_event.width_mm, &wlr_event.height_mm);
+ wlr_event.x = libinput_event_touch_get_x_transformed(tevent, 1);
+ wlr_event.y = libinput_event_touch_get_y_transformed(tevent, 1);
wlr_signal_emit_safe(&wlr_dev->touch->events.down, &wlr_event);
}
@@ -74,9 +73,8 @@ void handle_touch_motion(struct libinput_event *event,
wlr_event.time_msec =
usec_to_msec(libinput_event_touch_get_time_usec(tevent));
wlr_event.touch_id = libinput_event_touch_get_slot(tevent);
- wlr_event.x_mm = libinput_event_touch_get_x(tevent);
- wlr_event.y_mm = libinput_event_touch_get_y(tevent);
- libinput_device_get_size(libinput_dev, &wlr_event.width_mm, &wlr_event.height_mm);
+ wlr_event.x = libinput_event_touch_get_x_transformed(tevent, 1);
+ wlr_event.y = libinput_event_touch_get_y_transformed(tevent, 1);
wlr_signal_emit_safe(&wlr_dev->touch->events.motion, &wlr_event);
}