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.

4 files changed, 19 insertions, 13 deletions

diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c
index 520f98dc..305c43d9 100644
--- a/backend/libinput/pointer.c
+++ b/backend/libinput/pointer.c
@@ -16,7 +16,10 @@ struct wlr_pointer *create_libinput_pointer(
 		wlr_log(WLR_ERROR, "Unable to allocate wlr_pointer");
 		return NULL;
 	}
-	wlr_pointer_init(wlr_pointer, NULL);
+	const char *name = libinput_device_get_name(libinput_dev);
+	wlr_pointer_init(wlr_pointer, NULL, name);
+	wlr_pointer->base.vendor = libinput_device_get_id_vendor(libinput_dev);
+	wlr_pointer->base.product = libinput_device_get_id_product(libinput_dev);
 	return wlr_pointer;
 }
 
diff --git a/backend/wayland/seat.c b/backend/wayland/seat.c
index 90a99950..633e585a 100644
--- a/backend/wayland/seat.c
+++ b/backend/wayland/seat.c
@@ -532,6 +532,10 @@ static void pointer_destroy(struct wlr_pointer *wlr_pointer) {
 		zwp_relative_pointer_v1_destroy(pointer->relative_pointer);
 	}
 
+	wlr_input_device_finish(&pointer->input_device->wlr_input_device);
+	wl_list_remove(&pointer->input_device->link);
+	free(pointer->input_device);
+
 	wl_list_remove(&pointer->output_destroy.link);
 	free(pointer);
 }
@@ -705,7 +709,7 @@ static void pointer_handle_output_destroy(struct wl_listener *listener,
 		void *data) {
 	struct wlr_wl_pointer *pointer =
 		wl_container_of(listener, pointer, output_destroy);
-	wlr_input_device_destroy(&pointer->input_device->wlr_input_device);
+	wlr_pointer_destroy(&pointer->wlr_pointer);
 }
 
 void create_wl_pointer(struct wlr_wl_seat *seat, struct wlr_wl_output *output) {
@@ -743,7 +747,7 @@ void create_wl_pointer(struct wlr_wl_seat *seat, struct wlr_wl_output *output) {
 	struct wlr_input_device *wlr_dev = &dev->wlr_input_device;
 	wlr_dev->pointer = &pointer->wlr_pointer;
 	wlr_dev->output_name = strdup(output->wlr_output.name);
-	wlr_pointer_init(wlr_dev->pointer, &pointer_impl);
+	wlr_pointer_init(wlr_dev->pointer, &pointer_impl, wlr_dev->name);
 
 	if (backend->zwp_pointer_gestures_v1) {
 		uint32_t version = zwp_pointer_gestures_v1_get_version(
diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c
index 94b70524..5ca3e956 100644
--- a/backend/x11/input_device.c
+++ b/backend/x11/input_device.c
@@ -33,7 +33,7 @@ static void send_key_event(struct wlr_x11_backend *x11, uint32_t key,
 static void send_button_event(struct wlr_x11_output *output, uint32_t key,
 		enum wlr_button_state st, xcb_timestamp_t time) {
 	struct wlr_event_pointer_button ev = {
-		.device = &output->pointer_dev,
+		.device = &output->pointer.base,
 		.time_msec = time,
 		.button = key,
 		.state = st,
@@ -45,7 +45,7 @@ static void send_button_event(struct wlr_x11_output *output, uint32_t key,
 static void send_axis_event(struct wlr_x11_output *output, int32_t delta,
 		xcb_timestamp_t time) {
 	struct wlr_event_pointer_axis ev = {
-		.device = &output->pointer_dev,
+		.device = &output->pointer.base,
 		.time_msec = time,
 		.source = WLR_AXIS_SOURCE_WHEEL,
 		.orientation = WLR_AXIS_ORIENTATION_VERTICAL,
@@ -60,7 +60,7 @@ static void send_axis_event(struct wlr_x11_output *output, int32_t delta,
 static void send_pointer_position_event(struct wlr_x11_output *output,
 		int16_t x, int16_t y, xcb_timestamp_t time) {
 	struct wlr_event_pointer_motion_absolute ev = {
-		.device = &output->pointer_dev,
+		.device = &output->pointer.base,
 		.time_msec = time,
 		.x = (double)x / output->wlr_output.width,
 		.y = (double)y / output->wlr_output.height,
@@ -339,6 +339,8 @@ bool wlr_input_device_is_x11(struct wlr_input_device *wlr_dev) {
 	switch (wlr_dev->type) {
 	case WLR_INPUT_DEVICE_KEYBOARD:
 		return wlr_dev->keyboard->impl == &keyboard_impl;
+	case WLR_INPUT_DEVICE_POINTER:
+		return wlr_dev->pointer->impl == &pointer_impl;
 	default:
 		return wlr_dev->impl == &input_device_impl;
 	}
diff --git a/backend/x11/output.c b/backend/x11/output.c
index d500795f..19eb5d55 100644
--- a/backend/x11/output.c
+++ b/backend/x11/output.c
@@ -76,7 +76,7 @@ static void output_destroy(struct wlr_output *wlr_output) {
 
 	pixman_region32_fini(&output->exposed);
 
-	wlr_input_device_destroy(&output->pointer_dev);
+	wlr_pointer_destroy(&output->pointer);
 	wlr_input_device_destroy(&output->touch_dev);
 
 	struct wlr_x11_buffer *buffer, *buffer_tmp;
@@ -573,11 +573,8 @@ struct wlr_output *wlr_x11_output_create(struct wlr_backend *backend) {
 
 	wlr_output_update_enabled(wlr_output, true);
 
-	wlr_input_device_init(&output->pointer_dev, WLR_INPUT_DEVICE_POINTER,
-		&input_device_impl, "X11 pointer");
-	wlr_pointer_init(&output->pointer, &pointer_impl);
-	output->pointer_dev.pointer = &output->pointer;
-	output->pointer_dev.output_name = strdup(wlr_output->name);
+	wlr_pointer_init(&output->pointer, &pointer_impl, "x11-pointer");
+	output->pointer.base.output_name = strdup(wlr_output->name);
 
 	wlr_input_device_init(&output->touch_dev, WLR_INPUT_DEVICE_TOUCH,
 		&input_device_impl, "X11 touch");
@@ -587,7 +584,7 @@ struct wlr_output *wlr_x11_output_create(struct wlr_backend *backend) {
 	wl_list_init(&output->touchpoints);
 
 	wlr_signal_emit_safe(&x11->backend.events.new_output, wlr_output);
-	wlr_signal_emit_safe(&x11->backend.events.new_input, &output->pointer_dev);
+	wlr_signal_emit_safe(&x11->backend.events.new_input, &output->pointer.base);
 	wlr_signal_emit_safe(&x11->backend.events.new_input, &output->touch_dev);
 
 	// Start the rendering loop by requesting the compositor to render a frame