add device to touch events

This commit is contained in:
Tony Crisci 2017-08-27 11:44:55 -04:00
parent ed126b0881
commit c914697676
2 changed files with 8 additions and 0 deletions

View file

@ -30,6 +30,7 @@ void handle_touch_down(struct libinput_event *event,
struct libinput_event_touch *tevent = struct libinput_event_touch *tevent =
libinput_event_get_touch_event(event); libinput_event_get_touch_event(event);
struct wlr_event_touch_down wlr_event = { 0 }; struct wlr_event_touch_down wlr_event = { 0 };
wlr_event.device = wlr_dev;
wlr_event.time_sec = libinput_event_touch_get_time(tevent); wlr_event.time_sec = libinput_event_touch_get_time(tevent);
wlr_event.time_usec = libinput_event_touch_get_time_usec(tevent); wlr_event.time_usec = libinput_event_touch_get_time_usec(tevent);
wlr_event.slot = libinput_event_touch_get_slot(tevent); wlr_event.slot = libinput_event_touch_get_slot(tevent);
@ -50,6 +51,7 @@ void handle_touch_up(struct libinput_event *event,
struct libinput_event_touch *tevent = struct libinput_event_touch *tevent =
libinput_event_get_touch_event(event); libinput_event_get_touch_event(event);
struct wlr_event_touch_up wlr_event = { 0 }; struct wlr_event_touch_up wlr_event = { 0 };
wlr_event.device = wlr_dev;
wlr_event.time_sec = libinput_event_touch_get_time(tevent); wlr_event.time_sec = libinput_event_touch_get_time(tevent);
wlr_event.time_usec = libinput_event_touch_get_time_usec(tevent); wlr_event.time_usec = libinput_event_touch_get_time_usec(tevent);
wlr_event.slot = libinput_event_touch_get_slot(tevent); wlr_event.slot = libinput_event_touch_get_slot(tevent);
@ -67,6 +69,7 @@ void handle_touch_motion(struct libinput_event *event,
struct libinput_event_touch *tevent = struct libinput_event_touch *tevent =
libinput_event_get_touch_event(event); libinput_event_get_touch_event(event);
struct wlr_event_touch_motion wlr_event = { 0 }; struct wlr_event_touch_motion wlr_event = { 0 };
wlr_event.device = wlr_dev;
wlr_event.time_sec = libinput_event_touch_get_time(tevent); wlr_event.time_sec = libinput_event_touch_get_time(tevent);
wlr_event.time_usec = libinput_event_touch_get_time_usec(tevent); wlr_event.time_usec = libinput_event_touch_get_time_usec(tevent);
wlr_event.slot = libinput_event_touch_get_slot(tevent); wlr_event.slot = libinput_event_touch_get_slot(tevent);
@ -87,6 +90,7 @@ void handle_touch_cancel(struct libinput_event *event,
struct libinput_event_touch *tevent = struct libinput_event_touch *tevent =
libinput_event_get_touch_event(event); libinput_event_get_touch_event(event);
struct wlr_event_touch_cancel wlr_event = { 0 }; struct wlr_event_touch_cancel wlr_event = { 0 };
wlr_event.device = wlr_dev;
wlr_event.time_sec = libinput_event_touch_get_time(tevent); wlr_event.time_sec = libinput_event_touch_get_time(tevent);
wlr_event.time_usec = libinput_event_touch_get_time_usec(tevent); wlr_event.time_usec = libinput_event_touch_get_time_usec(tevent);
wlr_event.slot = libinput_event_touch_get_slot(tevent); wlr_event.slot = libinput_event_touch_get_slot(tevent);

View file

@ -19,6 +19,7 @@ struct wlr_touch {
}; };
struct wlr_event_touch_down { struct wlr_event_touch_down {
struct wlr_input_device *device;
uint32_t time_sec; uint32_t time_sec;
uint64_t time_usec; uint64_t time_usec;
int32_t slot; int32_t slot;
@ -27,12 +28,14 @@ struct wlr_event_touch_down {
}; };
struct wlr_event_touch_up { struct wlr_event_touch_up {
struct wlr_input_device *device;
uint32_t time_sec; uint32_t time_sec;
uint64_t time_usec; uint64_t time_usec;
int32_t slot; int32_t slot;
}; };
struct wlr_event_touch_motion { struct wlr_event_touch_motion {
struct wlr_input_device *device;
uint32_t time_sec; uint32_t time_sec;
uint64_t time_usec; uint64_t time_usec;
int32_t slot; int32_t slot;
@ -41,6 +44,7 @@ struct wlr_event_touch_motion {
}; };
struct wlr_event_touch_cancel { struct wlr_event_touch_cancel {
struct wlr_input_device *device;
uint32_t time_sec; uint32_t time_sec;
uint64_t time_usec; uint64_t time_usec;
int32_t slot; int32_t slot;