From d5480efc7a03641600df411dea93308e5edc8b27 Mon Sep 17 00:00:00 2001
From: Simon Zeni <simon@bl4ckb0ne.ca>
Date: Mon, 31 Jan 2022 10:20:01 -0500
Subject: types/wlr_pointer: add base wlr_input_device

wlr_pointer owns its wlr_input_device. It will be initialized when the
pointer is initialized, and finished when the pointer is destroyed.
---
 include/backend/x11.h                      | 3 +--
 include/wlr/interfaces/wlr_pointer.h       | 2 +-
 include/wlr/types/wlr_pointer.h            | 2 ++
 include/wlr/types/wlr_virtual_pointer_v1.h | 3 +--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/backend/x11.h b/include/backend/x11.h
index b5c430fb..ee484654 100644
--- a/include/backend/x11.h
+++ b/include/backend/x11.h
@@ -18,8 +18,8 @@
 #include <wlr/interfaces/wlr_input_device.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_output.h>
-#include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/interfaces/wlr_touch.h>
+#include <wlr/types/wlr_pointer.h>
 #include <wlr/render/drm_format_set.h>
 
 #define XCB_EVENT_RESPONSE_TYPE_MASK 0x7f
@@ -35,7 +35,6 @@ struct wlr_x11_output {
 	xcb_present_event_t present_event_id;
 
 	struct wlr_pointer pointer;
-	struct wlr_input_device pointer_dev;
 
 	struct wlr_touch touch;
 	struct wlr_input_device touch_dev;
diff --git a/include/wlr/interfaces/wlr_pointer.h b/include/wlr/interfaces/wlr_pointer.h
index fd3ab102..e3950017 100644
--- a/include/wlr/interfaces/wlr_pointer.h
+++ b/include/wlr/interfaces/wlr_pointer.h
@@ -16,7 +16,7 @@ struct wlr_pointer_impl {
 };
 
 void wlr_pointer_init(struct wlr_pointer *pointer,
-		const struct wlr_pointer_impl *impl);
+		const struct wlr_pointer_impl *impl, const char *name);
 void wlr_pointer_destroy(struct wlr_pointer *pointer);
 
 #endif
diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h
index bcfb2ad3..a5850718 100644
--- a/include/wlr/types/wlr_pointer.h
+++ b/include/wlr/types/wlr_pointer.h
@@ -17,6 +17,8 @@
 struct wlr_pointer_impl;
 
 struct wlr_pointer {
+	struct wlr_input_device base;
+
 	const struct wlr_pointer_impl *impl;
 
 	struct {
diff --git a/include/wlr/types/wlr_virtual_pointer_v1.h b/include/wlr/types/wlr_virtual_pointer_v1.h
index ede9bebf..307d6158 100644
--- a/include/wlr/types/wlr_virtual_pointer_v1.h
+++ b/include/wlr/types/wlr_virtual_pointer_v1.h
@@ -11,7 +11,6 @@
 
 #include <wayland-server-core.h>
 #include <wayland-server-protocol.h>
-#include <wlr/interfaces/wlr_input_device.h>
 #include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/interfaces/wlr_output.h>
 
@@ -28,7 +27,7 @@ struct wlr_virtual_pointer_manager_v1 {
 };
 
 struct wlr_virtual_pointer_v1 {
-	struct wlr_input_device input_device;
+	struct wlr_pointer pointer;
 	struct wl_resource *resource;
 	/* Vertical and horizontal */
 	struct wlr_event_pointer_axis axis_event[2];
-- 
cgit v1.2.3