backend/libinput: rework pointer interface

The wlr_libinput_input_device now owns its wlr_pointer, instead of creating
a new wlr_libinput_input_device for it

1 files changed, 62 insertions, 129 deletions

diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c
index 706ace7b..0ac781d7 100644
--- a/backend/libinput/pointer.c
+++ b/backend/libinput/pointer.c
@@ -1,83 +1,70 @@
 #include <assert.h>
 #include <libinput.h>
-#include <stdlib.h>
-#include <wlr/backend/session.h>
-#include <wlr/types/wlr_input_device.h>
-#include <wlr/util/log.h>
+#include <wlr/interfaces/wlr_pointer.h>
 #include "backend/libinput.h"
 #include "util/signal.h"
 
-const struct wlr_pointer_impl libinput_pointer_impl = {0};
+static void pointer_destroy(struct wlr_pointer *pointer) {
+	/* wlr_pointer belongs to the wlr_libinput_input_device */
+}
 
-struct wlr_pointer *create_libinput_pointer(
-		struct libinput_device *libinput_dev) {
-	assert(libinput_dev);
-	struct wlr_pointer *wlr_pointer = calloc(1, sizeof(struct wlr_pointer));
-	if (!wlr_pointer) {
-		wlr_log(WLR_ERROR, "Unable to allocate wlr_pointer");
-		return NULL;
-	}
-	const char *name = libinput_device_get_name(libinput_dev);
+const struct wlr_pointer_impl libinput_pointer_impl = {
+	.destroy = pointer_destroy,
+};
+
+void init_device_pointer(struct wlr_libinput_input_device *dev) {
+	const char *name = libinput_device_get_name(dev->handle);
+	struct wlr_pointer *wlr_pointer = &dev->pointer;
 	wlr_pointer_init(wlr_pointer, &libinput_pointer_impl, 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;
+	wlr_pointer->base.vendor = libinput_device_get_id_vendor(dev->handle);
+	wlr_pointer->base.product = libinput_device_get_id_product(dev->handle);
+}
+
+struct wlr_libinput_input_device *device_from_pointer(
+		struct wlr_pointer *wlr_pointer) {
+	assert(wlr_pointer->impl == &libinput_pointer_impl);
+
+	struct wlr_libinput_input_device *dev =
+		wl_container_of(wlr_pointer, dev, pointer);
+	return dev;
 }
 
 void handle_pointer_motion(struct libinput_event *event,
-		struct libinput_device *libinput_dev) {
-	struct wlr_input_device *wlr_dev =
-		get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev);
-	if (!wlr_dev) {
-		wlr_log(WLR_DEBUG, "Got a pointer event for a device with no pointers?");
-		return;
-	}
+		struct wlr_pointer *pointer) {
 	struct libinput_event_pointer *pevent =
 		libinput_event_get_pointer_event(event);
 	struct wlr_event_pointer_motion wlr_event = { 0 };
-	wlr_event.device = wlr_dev;
+	wlr_event.device = &pointer->base;
 	wlr_event.time_msec =
 		usec_to_msec(libinput_event_pointer_get_time_usec(pevent));
 	wlr_event.delta_x = libinput_event_pointer_get_dx(pevent);
 	wlr_event.delta_y = libinput_event_pointer_get_dy(pevent);
 	wlr_event.unaccel_dx = libinput_event_pointer_get_dx_unaccelerated(pevent);
 	wlr_event.unaccel_dy = libinput_event_pointer_get_dy_unaccelerated(pevent);
-	wlr_signal_emit_safe(&wlr_dev->pointer->events.motion, &wlr_event);
-	wlr_signal_emit_safe(&wlr_dev->pointer->events.frame, wlr_dev->pointer);
+	wlr_signal_emit_safe(&pointer->events.motion, &wlr_event);
+	wlr_signal_emit_safe(&pointer->events.frame, pointer);
 }
 
 void handle_pointer_motion_abs(struct libinput_event *event,
-		struct libinput_device *libinput_dev) {
-	struct wlr_input_device *wlr_dev =
-		get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev);
-	if (!wlr_dev) {
-		wlr_log(WLR_DEBUG, "Got a pointer event for a device with no pointers?");
-		return;
-	}
+		struct wlr_pointer *pointer) {
 	struct libinput_event_pointer *pevent =
 		libinput_event_get_pointer_event(event);
 	struct wlr_event_pointer_motion_absolute wlr_event = { 0 };
-	wlr_event.device = wlr_dev;
+	wlr_event.device = &pointer->base;
 	wlr_event.time_msec =
 		usec_to_msec(libinput_event_pointer_get_time_usec(pevent));
 	wlr_event.x = libinput_event_pointer_get_absolute_x_transformed(pevent, 1);
 	wlr_event.y = libinput_event_pointer_get_absolute_y_transformed(pevent, 1);
-	wlr_signal_emit_safe(&wlr_dev->pointer->events.motion_absolute, &wlr_event);
-	wlr_signal_emit_safe(&wlr_dev->pointer->events.frame, wlr_dev->pointer);
+	wlr_signal_emit_safe(&pointer->events.motion_absolute, &wlr_event);
+	wlr_signal_emit_safe(&pointer->events.frame, pointer);
 }
 
 void handle_pointer_button(struct libinput_event *event,
-		struct libinput_device *libinput_dev) {
-	struct wlr_input_device *wlr_dev =
-		get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev);
-	if (!wlr_dev) {
-		wlr_log(WLR_DEBUG, "Got a pointer event for a device with no pointers?");
-		return;
-	}
+		struct wlr_pointer *pointer) {
 	struct libinput_event_pointer *pevent =
 		libinput_event_get_pointer_event(event);
 	struct wlr_event_pointer_button wlr_event = { 0 };
-	wlr_event.device = wlr_dev;
+	wlr_event.device = &pointer->base;
 	wlr_event.time_msec =
 		usec_to_msec(libinput_event_pointer_get_time_usec(pevent));
 	wlr_event.button = libinput_event_pointer_get_button(pevent);
@@ -89,22 +76,16 @@ void handle_pointer_button(struct libinput_event *event,
 		wlr_event.state = WLR_BUTTON_RELEASED;
 		break;
 	}
-	wlr_signal_emit_safe(&wlr_dev->pointer->events.button, &wlr_event);
-	wlr_signal_emit_safe(&wlr_dev->pointer->events.frame, wlr_dev->pointer);
+	wlr_signal_emit_safe(&pointer->events.button, &wlr_event);
+	wlr_signal_emit_safe(&pointer->events.frame, pointer);
 }
 
 void handle_pointer_axis(struct libinput_event *event,
-		struct libinput_device *libinput_dev) {
-	struct wlr_input_device *wlr_dev =
-		get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev);
-	if (!wlr_dev) {
-		wlr_log(WLR_DEBUG, "Got a pointer event for a device with no pointers?");
-		return;
-	}
+		struct wlr_pointer *pointer) {
 	struct libinput_event_pointer *pevent =
 		libinput_event_get_pointer_event(event);
 	struct wlr_event_pointer_axis wlr_event = { 0 };
-	wlr_event.device = wlr_dev;
+	wlr_event.device = &pointer->base;
 	wlr_event.time_msec =
 		usec_to_msec(libinput_event_pointer_get_time_usec(pevent));
 	switch (libinput_event_pointer_get_axis_source(pevent)) {
@@ -139,102 +120,72 @@ void handle_pointer_axis(struct libinput_event *event,
 				libinput_event_pointer_get_axis_value(pevent, axes[i]);
 			wlr_event.delta_discrete =
 				libinput_event_pointer_get_axis_value_discrete(pevent, axes[i]);
-			wlr_signal_emit_safe(&wlr_dev->pointer->events.axis, &wlr_event);
+			wlr_signal_emit_safe(&pointer->events.axis, &wlr_event);
 		}
 	}
-	wlr_signal_emit_safe(&wlr_dev->pointer->events.frame, wlr_dev->pointer);
+	wlr_signal_emit_safe(&pointer->events.frame, pointer);
 }
 
 void handle_pointer_swipe_begin(struct libinput_event *event,
-		struct libinput_device *libinput_dev) {
-	struct wlr_input_device *wlr_dev =
-		get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev);
-	if (!wlr_dev) {
-		wlr_log(WLR_DEBUG, "Got a pointer gesture event for a device with no pointers?");
-		return;
-	}
+		struct wlr_pointer *pointer) {
 	struct libinput_event_gesture *gevent =
 		libinput_event_get_gesture_event(event);
 	struct wlr_event_pointer_swipe_begin wlr_event = {
-		.device = wlr_dev,
+		.device = &pointer->base,
 		.time_msec =
 			usec_to_msec(libinput_event_gesture_get_time_usec(gevent)),
 		.fingers = libinput_event_gesture_get_finger_count(gevent),
 	};
-	wlr_signal_emit_safe(&wlr_dev->pointer->events.swipe_begin, &wlr_event);
+	wlr_signal_emit_safe(&pointer->events.swipe_begin, &wlr_event);
 }
 
 void handle_pointer_swipe_update(struct libinput_event *event,
-		struct libinput_device *libinput_dev) {
-	struct wlr_input_device *wlr_dev =
-		get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev);
-	if (!wlr_dev) {
-		wlr_log(WLR_DEBUG, "Got a pointer gesture event for a device with no pointers?");
-		return;
-	}
+		struct wlr_pointer *pointer) {
 	struct libinput_event_gesture *gevent =
 		libinput_event_get_gesture_event(event);
 	struct wlr_event_pointer_swipe_update wlr_event = {
-		.device = wlr_dev,
+		.device = &pointer->base,
 		.time_msec =
 			usec_to_msec(libinput_event_gesture_get_time_usec(gevent)),
 		.fingers = libinput_event_gesture_get_finger_count(gevent),
 		.dx = libinput_event_gesture_get_dx(gevent),
 		.dy = libinput_event_gesture_get_dy(gevent),
 	};
-	wlr_signal_emit_safe(&wlr_dev->pointer->events.swipe_update, &wlr_event);
+	wlr_signal_emit_safe(&pointer->events.swipe_update, &wlr_event);
 }
 
 void handle_pointer_swipe_end(struct libinput_event *event,
-		struct libinput_device *libinput_dev) {
-	struct wlr_input_device *wlr_dev =
-		get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev);
-	if (!wlr_dev) {
-		wlr_log(WLR_DEBUG, "Got a pointer gesture event for a device with no pointers?");
-		return;
-	}
+		struct wlr_pointer *pointer) {
 	struct libinput_event_gesture *gevent =
 		libinput_event_get_gesture_event(event);
 	struct wlr_event_pointer_swipe_end wlr_event = {
-		.device = wlr_dev,
+		.device = &pointer->base,
 		.time_msec =
 			usec_to_msec(libinput_event_gesture_get_time_usec(gevent)),
 		.cancelled = libinput_event_gesture_get_cancelled(gevent),
 	};
-	wlr_signal_emit_safe(&wlr_dev->pointer->events.swipe_end, &wlr_event);
+	wlr_signal_emit_safe(&pointer->events.swipe_end, &wlr_event);
 }
 
 void handle_pointer_pinch_begin(struct libinput_event *event,
-		struct libinput_device *libinput_dev) {
-	struct wlr_input_device *wlr_dev =
-		get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev);
-	if (!wlr_dev) {
-		wlr_log(WLR_DEBUG, "Got a pointer gesture event for a device with no pointers?");
-		return;
-	}
+		struct wlr_pointer *pointer) {
 	struct libinput_event_gesture *gevent =
 		libinput_event_get_gesture_event(event);
 	struct wlr_event_pointer_pinch_begin wlr_event = {
-		.device = wlr_dev,
+		.device = &pointer->base,
 		.time_msec =
 			usec_to_msec(libinput_event_gesture_get_time_usec(gevent)),
 		.fingers = libinput_event_gesture_get_finger_count(gevent),
 	};
-	wlr_signal_emit_safe(&wlr_dev->pointer->events.pinch_begin, &wlr_event);
+	wlr_signal_emit_safe(&pointer->events.pinch_begin, &wlr_event);
 }
 
 void handle_pointer_pinch_update(struct libinput_event *event,
-		struct libinput_device *libinput_dev) {
-	struct wlr_input_device *wlr_dev =
-		get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev);
-	if (!wlr_dev) {
-		wlr_log(WLR_DEBUG, "Got a pointer gesture event for a device with no pointers?");
-		return;
-	}
+		struct wlr_pointer *pointer) {
 	struct libinput_event_gesture *gevent =
 		libinput_event_get_gesture_event(event);
 	struct wlr_event_pointer_pinch_update wlr_event = {
-		.device = wlr_dev,
+		.device = &pointer->base,
 		.time_msec =
 			usec_to_msec(libinput_event_gesture_get_time_usec(gevent)),
 		.fingers = libinput_event_gesture_get_finger_count(gevent),
@@ -243,62 +194,44 @@ void handle_pointer_pinch_update(struct libinput_event *event,
 		.scale = libinput_event_gesture_get_scale(gevent),
 		.rotation = libinput_event_gesture_get_angle_delta(gevent),
 	};
-	wlr_signal_emit_safe(&wlr_dev->pointer->events.pinch_update, &wlr_event);
+	wlr_signal_emit_safe(&pointer->events.pinch_update, &wlr_event);
 }
 
 void handle_pointer_pinch_end(struct libinput_event *event,
-		struct libinput_device *libinput_dev) {
-	struct wlr_input_device *wlr_dev =
-		get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev);
-	if (!wlr_dev) {
-		wlr_log(WLR_DEBUG, "Got a pointer gesture event for a device with no pointers?");
-		return;
-	}
+		struct wlr_pointer *pointer) {
 	struct libinput_event_gesture *gevent =
 		libinput_event_get_gesture_event(event);
 	struct wlr_event_pointer_pinch_end wlr_event = {
-		.device = wlr_dev,
+		.device = &pointer->base,
 		.time_msec =
 			usec_to_msec(libinput_event_gesture_get_time_usec(gevent)),
 		.cancelled = libinput_event_gesture_get_cancelled(gevent),
 	};
-	wlr_signal_emit_safe(&wlr_dev->pointer->events.pinch_end, &wlr_event);
+	wlr_signal_emit_safe(&pointer->events.pinch_end, &wlr_event);
 }
 
 void handle_pointer_hold_begin(struct libinput_event *event,
-		struct libinput_device *libinput_dev) {
-	struct wlr_input_device *wlr_dev =
-		get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev);
-	if (!wlr_dev) {
-		wlr_log(WLR_DEBUG, "Got a pointer gesture event for a device with no pointers?");
-		return;
-	}
+		struct wlr_pointer *pointer) {
 	struct libinput_event_gesture *gevent =
 		libinput_event_get_gesture_event(event);
 	struct wlr_event_pointer_hold_begin wlr_event = {
-		.device = wlr_dev,
+		.device = &pointer->base,
 		.time_msec =
 			usec_to_msec(libinput_event_gesture_get_time_usec(gevent)),
 		.fingers = libinput_event_gesture_get_finger_count(gevent),
 	};
-	wlr_signal_emit_safe(&wlr_dev->pointer->events.hold_begin, &wlr_event);
+	wlr_signal_emit_safe(&pointer->events.hold_begin, &wlr_event);
 }
 
 void handle_pointer_hold_end(struct libinput_event *event,
-		struct libinput_device *libinput_dev) {
-	struct wlr_input_device *wlr_dev =
-		get_appropriate_device(WLR_INPUT_DEVICE_POINTER, libinput_dev);
-	if (!wlr_dev) {
-		wlr_log(WLR_DEBUG, "Got a pointer gesture event for a device with no pointers?");
-		return;
-	}
+		struct wlr_pointer *pointer) {
 	struct libinput_event_gesture *gevent =
 		libinput_event_get_gesture_event(event);
 	struct wlr_event_pointer_hold_end wlr_event = {
-		.device = wlr_dev,
+		.device = &pointer->base,
 		.time_msec =
 			usec_to_msec(libinput_event_gesture_get_time_usec(gevent)),
 		.cancelled = libinput_event_gesture_get_cancelled(gevent),
 	};
-	wlr_signal_emit_safe(&wlr_dev->pointer->events.hold_end, &wlr_event);
+	wlr_signal_emit_safe(&pointer->events.hold_end, &wlr_event);
 }