aboutsummaryrefslogtreecommitdiff
path: root/backend/libinput
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-03-28 11:40:35 -0400
committerDrew DeVault <sir@cmpwn.com>2018-03-28 12:05:37 -0400
commitac219cbda6dc3122fcc7f1bfa89b7e8fbb03b8ce (patch)
treea67f7b0fb4f8a2b4abf3b05c944486f154c38dbc /backend/libinput
parent324b9d910dc237151fd71c01bef015d0080be191 (diff)
Remove width_mm from tablet events
Diffstat (limited to 'backend/libinput')
-rw-r--r--backend/libinput/events.c2
-rw-r--r--backend/libinput/tablet_tool.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/backend/libinput/events.c b/backend/libinput/events.c
index d92de830..da7b2be4 100644
--- a/backend/libinput/events.c
+++ b/backend/libinput/events.c
@@ -46,6 +46,8 @@ static struct wlr_input_device *allocate_device(
return NULL;
}
struct wlr_input_device *wlr_dev = &wlr_libinput_dev->wlr_input_device;
+ libinput_device_get_size(libinput_dev,
+ &wlr_dev->width_mm, &wlr_dev->height_mm);
wl_list_insert(wlr_devices, &wlr_dev->link);
wlr_libinput_dev->handle = libinput_dev;
libinput_device_ref(libinput_dev);
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c
index 27cf7c81..815c4daf 100644
--- a/backend/libinput/tablet_tool.c
+++ b/backend/libinput/tablet_tool.c
@@ -34,14 +34,13 @@ void handle_tablet_tool_axis(struct libinput_event *event,
wlr_event.device = wlr_dev;
wlr_event.time_msec =
usec_to_msec(libinput_event_tablet_tool_get_time_usec(tevent));
- libinput_device_get_size(libinput_dev, &wlr_event.width_mm, &wlr_event.height_mm);
if (libinput_event_tablet_tool_x_has_changed(tevent)) {
wlr_event.updated_axes |= WLR_TABLET_TOOL_AXIS_X;
- wlr_event.x_mm = libinput_event_tablet_tool_get_x(tevent);
+ wlr_event.x = libinput_event_tablet_tool_get_x_transformed(tevent, 1);
}
if (libinput_event_tablet_tool_y_has_changed(tevent)) {
wlr_event.updated_axes |= WLR_TABLET_TOOL_AXIS_Y;
- wlr_event.y_mm = libinput_event_tablet_tool_get_y(tevent);
+ wlr_event.y = libinput_event_tablet_tool_get_y_transformed(tevent, 1);
}
if (libinput_event_tablet_tool_pressure_has_changed(tevent)) {
wlr_event.updated_axes |= WLR_TABLET_TOOL_AXIS_PRESSURE;