Refactor out wlr_input_device_state

2 files changed, 7 insertions, 3 deletions

diff --git a/include/backend/libinput.h b/include/backend/libinput.h
index 3ff714c2..e0f762a7 100644
--- a/include/backend/libinput.h
+++ b/include/backend/libinput.h
@@ -2,6 +2,7 @@
 #define _WLR_BACKEND_LIBINPUT_INTERNAL_H
 #include <libinput.h>
 #include <wayland-server-core.h>
+#include <wlr/types/wlr_input_device.h>
 #include <wlr/backend/interface.h>
 #include <wlr/interfaces/wlr_input_device.h>
 #include <wlr/util/list.h>
@@ -22,7 +23,9 @@ struct wlr_libinput_backend {
 	list_t *wlr_device_lists;
 };
 
-struct wlr_input_device_state {
+struct wlr_libinput_input_device {
+	struct wlr_input_device wlr_input_device;
+
 	struct libinput_device *handle;
 };
 
diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index da4465fa..6d4b0138 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -41,9 +41,10 @@ struct wlr_wl_backend_output {
 	void *egl_surface;
 };
 
-struct wlr_input_device_state {
+struct wlr_wl_input_device {
+	struct wlr_input_device wlr_input_device;
+
 	struct wlr_wl_backend *backend;
-	struct wlr_input_device *wlr_device;
 	void *resource;
 };