aboutsummaryrefslogtreecommitdiff
path: root/backend/libinput/touch.c
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-11-18 14:14:03 -0500
committerGitHub <noreply@github.com>2017-11-18 14:14:03 -0500
commitfa36ac90f70787176a5cfdb6fa6835aa1226f697 (patch)
tree5023bac3638960ef0eda89554865e2a612804486 /backend/libinput/touch.c
parent9f552d896f7639fca7914a9313ccb244688349e4 (diff)
parent458fe633df7827f5b74c034026b6b67045c1e610 (diff)
Merge pull request #418 from acrisci/feature/wlr-seat-touch
wlr-seat: touch
Diffstat (limited to 'backend/libinput/touch.c')
-rw-r--r--backend/libinput/touch.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/backend/libinput/touch.c b/backend/libinput/touch.c
index f133b678..0ba6ec86 100644
--- a/backend/libinput/touch.c
+++ b/backend/libinput/touch.c
@@ -33,7 +33,7 @@ void handle_touch_down(struct libinput_event *event,
wlr_event.device = wlr_dev;
wlr_event.time_msec =
usec_to_msec(libinput_event_touch_get_time_usec(tevent));
- wlr_event.slot = libinput_event_touch_get_slot(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);
@@ -54,7 +54,7 @@ void handle_touch_up(struct libinput_event *event,
wlr_event.device = wlr_dev;
wlr_event.time_msec =
usec_to_msec(libinput_event_touch_get_time_usec(tevent));
- wlr_event.slot = libinput_event_touch_get_slot(tevent);
+ wlr_event.touch_id = libinput_event_touch_get_slot(tevent);
wl_signal_emit(&wlr_dev->touch->events.up, &wlr_event);
}
@@ -72,7 +72,7 @@ void handle_touch_motion(struct libinput_event *event,
wlr_event.device = wlr_dev;
wlr_event.time_msec =
usec_to_msec(libinput_event_touch_get_time_usec(tevent));
- wlr_event.slot = libinput_event_touch_get_slot(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);
@@ -93,6 +93,6 @@ void handle_touch_cancel(struct libinput_event *event,
wlr_event.device = wlr_dev;
wlr_event.time_msec =
usec_to_msec(libinput_event_touch_get_time_usec(tevent));
- wlr_event.slot = libinput_event_touch_get_slot(tevent);
+ wlr_event.touch_id = libinput_event_touch_get_slot(tevent);
wl_signal_emit(&wlr_dev->touch->events.cancel, &wlr_event);
}