From 51cd3c07264e1c4967c5baea3f6629ac01334e97 Mon Sep 17 00:00:00 2001 From: Simon Zeni Date: Wed, 2 Mar 2022 13:57:28 -0500 Subject: interface/wlr_pointer: rework destroy sequence The destroy callback in wlr_pointer_impl has been removed. The function `wlr_pointer_finish` has been introduced to clean up the resources owned by a wlr_pointer. `wlr_input_device_destroy` no longer destroys the wlr_pointer, attempting to destroy a wlr_pointer will result in a no-op. The field `name` has been added to the wlr_pointer_impl to be able to identify a given wlr_pointer device. --- backend/libinput/events.c | 2 +- backend/libinput/pointer.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'backend/libinput') diff --git a/backend/libinput/events.c b/backend/libinput/events.c index af54177c..22fdab55 100644 --- a/backend/libinput/events.c +++ b/backend/libinput/events.c @@ -18,7 +18,7 @@ void destroy_libinput_input_device(struct wlr_libinput_input_device *dev) { wlr_keyboard_finish(&dev->keyboard); } if (dev->pointer.impl) { - wlr_pointer_destroy(&dev->pointer); + wlr_pointer_finish(&dev->pointer); } if (dev->switch_device.impl) { wlr_switch_destroy(&dev->switch_device); diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c index 0ac781d7..8daf2005 100644 --- a/backend/libinput/pointer.c +++ b/backend/libinput/pointer.c @@ -4,12 +4,8 @@ #include "backend/libinput.h" #include "util/signal.h" -static void pointer_destroy(struct wlr_pointer *pointer) { - /* wlr_pointer belongs to the wlr_libinput_input_device */ -} - const struct wlr_pointer_impl libinput_pointer_impl = { - .destroy = pointer_destroy, + .name = "libinput-pointer", }; void init_device_pointer(struct wlr_libinput_input_device *dev) { -- cgit v1.2.3