From e19f48d1e4cea6bbb8998466553fffda4bd13251 Mon Sep 17 00:00:00 2001 From: Andri Yngvason Date: Mon, 19 Aug 2019 14:13:52 +0000 Subject: [PATCH] backend: touch: Fixup incomplete patch for single touch devices. All instances of libinput_event_touch_get_slot need to be converted to libinput_event_touch_get_seat_slot for things to work. --- backend/libinput/touch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/libinput/touch.c b/backend/libinput/touch.c index e1c2fca4..f69bba75 100644 --- a/backend/libinput/touch.c +++ b/backend/libinput/touch.c @@ -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.touch_id = libinput_event_touch_get_slot(tevent); + wlr_event.touch_id = libinput_event_touch_get_seat_slot(tevent); wlr_signal_emit_safe(&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.touch_id = libinput_event_touch_get_slot(tevent); + wlr_event.touch_id = libinput_event_touch_get_seat_slot(tevent); 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); @@ -92,6 +92,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.touch_id = libinput_event_touch_get_slot(tevent); + wlr_event.touch_id = libinput_event_touch_get_seat_slot(tevent); wlr_signal_emit_safe(&wlr_dev->touch->events.cancel, &wlr_event); }