aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/backend/x11.h1
-rw-r--r--include/wlr/interfaces/wlr_touch.h2
-rw-r--r--include/wlr/types/wlr_touch.h3
3 files changed, 4 insertions, 2 deletions
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 <stdint.h>
+#include <wlr/types/wlr_input_device.h>
#include <wayland-server-core.h>
struct wlr_touch_impl;
struct wlr_touch {
+ struct wlr_input_device base;
+
const struct wlr_touch_impl *impl;
struct {