From edfb332b24a2a1e014de10eba1c5bf2b84538d2f Mon Sep 17 00:00:00 2001 From: Simon Zeni Date: Tue, 1 Feb 2022 11:51:50 -0500 Subject: types/wlr_touch: add base wlr_input_device wlr_touch now owns its wlr_input_device. It will be initialized when the tablet tool is initialized, and finished when the touch is destroyed. --- include/backend/x11.h | 1 - include/wlr/interfaces/wlr_touch.h | 2 +- include/wlr/types/wlr_touch.h | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/backend/x11.h b/include/backend/x11.h index ee484654..2c039355 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -37,7 +37,6 @@ struct wlr_x11_output { struct wlr_pointer pointer; struct wlr_touch touch; - struct wlr_input_device touch_dev; struct wl_list touchpoints; // wlr_x11_touchpoint::link struct wl_list buffers; // wlr_x11_buffer::link diff --git a/include/wlr/interfaces/wlr_touch.h b/include/wlr/interfaces/wlr_touch.h index e4ea6a78..2b95d2bf 100644 --- a/include/wlr/interfaces/wlr_touch.h +++ b/include/wlr/interfaces/wlr_touch.h @@ -16,7 +16,7 @@ struct wlr_touch_impl { }; void wlr_touch_init(struct wlr_touch *touch, - const struct wlr_touch_impl *impl); + const struct wlr_touch_impl *impl, const char *name); void wlr_touch_destroy(struct wlr_touch *touch); #endif diff --git a/include/wlr/types/wlr_touch.h b/include/wlr/types/wlr_touch.h index ca7cf2a6..b2c097e8 100644 --- a/include/wlr/types/wlr_touch.h +++ b/include/wlr/types/wlr_touch.h @@ -10,11 +10,14 @@ #define WLR_TYPES_WLR_TOUCH_H #include +#include #include struct wlr_touch_impl; struct wlr_touch { + struct wlr_input_device base; + const struct wlr_touch_impl *impl; struct { -- cgit v1.2.3