backend/x11: correctly destroy input devices

5 files changed, 7 insertions, 5 deletions

diff --git a/include/backend/x11.h b/include/backend/x11.h
index 6ab1cec6..1d56fbe8 100644
--- a/include/backend/x11.h
+++ b/include/backend/x11.h
@@ -77,6 +77,8 @@ struct wlr_x11_output *get_x11_output_from_window_id(struct wlr_x11_backend *x11
 void get_x11_output_layout_box(struct wlr_x11_backend *backend,
 	struct wlr_box *box);
 
+extern const struct wlr_keyboard_impl keyboard_impl;
+extern const struct wlr_pointer_impl pointer_impl;
 extern const struct wlr_input_device_impl input_device_impl;
 
 void handle_x11_input_event(struct wlr_x11_backend *x11,
diff --git a/include/wlr/interfaces/wlr_keyboard.h b/include/wlr/interfaces/wlr_keyboard.h
index 6960ea87..c9a13fd7 100644
--- a/include/wlr/interfaces/wlr_keyboard.h
+++ b/include/wlr/interfaces/wlr_keyboard.h
@@ -9,7 +9,8 @@ struct wlr_keyboard_impl {
 	void (*led_update)(struct wlr_keyboard *keyboard, uint32_t leds);
 };
 
-void wlr_keyboard_init(struct wlr_keyboard *keyboard, struct wlr_keyboard_impl *impl);
+void wlr_keyboard_init(struct wlr_keyboard *keyboard,
+		const struct wlr_keyboard_impl *impl);
 void wlr_keyboard_destroy(struct wlr_keyboard *keyboard);
 void wlr_keyboard_notify_key(struct wlr_keyboard *keyboard,
 		struct wlr_event_keyboard_key *event);
diff --git a/include/wlr/interfaces/wlr_pointer.h b/include/wlr/interfaces/wlr_pointer.h
index af677b97..f0cf9081 100644
--- a/include/wlr/interfaces/wlr_pointer.h
+++ b/include/wlr/interfaces/wlr_pointer.h
@@ -8,7 +8,7 @@ struct wlr_pointer_impl {
 };
 
 void wlr_pointer_init(struct wlr_pointer *pointer,
-		struct wlr_pointer_impl *impl);
+		const struct wlr_pointer_impl *impl);
 void wlr_pointer_destroy(struct wlr_pointer *pointer);
 
 #endif
diff --git a/include/wlr/types/wlr_keyboard.h b/include/wlr/types/wlr_keyboard.h
index ed0427e8..bfb4e611 100644
--- a/include/wlr/types/wlr_keyboard.h
+++ b/include/wlr/types/wlr_keyboard.h
@@ -40,8 +40,7 @@ struct wlr_keyboard_modifiers {
 };
 
 struct wlr_keyboard {
-	struct wlr_keyboard_impl *impl;
-	// TODO: Should this store key repeat info too?
+	const struct wlr_keyboard_impl *impl;
 
 	int keymap_fd;
 	size_t keymap_size;
diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h
index a8969b9e..45619e0a 100644
--- a/include/wlr/types/wlr_pointer.h
+++ b/include/wlr/types/wlr_pointer.h
@@ -8,7 +8,7 @@
 struct wlr_pointer_impl;
 
 struct wlr_pointer {
-	struct wlr_pointer_impl *impl;
+	const struct wlr_pointer_impl *impl;
 
 	struct {
 		struct wl_signal motion;