diff options
| author | emersion <contact@emersion.fr> | 2017-11-18 22:18:25 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2017-11-18 22:18:25 +0100 |
| commit | 72d877658aaf309eb066e3b9825c5f59177b15c3 (patch) | |
| tree | 2f7123b9cc9f6a99c1d8351272d69572b7d1e811 /backend | |
| parent | 1523082d5d74ca40f468bec04c23ed47049bb4d7 (diff) | |
| parent | fa36ac90f70787176a5cfdb6fa6835aa1226f697 (diff) | |
Merge branch 'master' into seat-views
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/libinput/touch.c | 8 |
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); } |