From 10cbb9fbe141ee8f5c766783bde645ae19998d22 Mon Sep 17 00:00:00 2001 From: Simon Zeni Date: Wed, 2 Mar 2022 16:07:40 -0500 Subject: interface/wlr_touch: rework destroy sequence The destroy callback in wlr_touch_impl has been removed. The function `wlr_touch_finish` has been introduced to clean up the resources owned by a wlr_touch. `wlr_input_device_destroy` no longer destroys the wlr_touch, attempting to destroy a wlr_touch will result in a no-op. The field `name` has been added to the wlr_touch_impl to be able to identify a given wlr_touch device. --- backend/x11/input_device.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'backend/x11/input_device.c') diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c index 9182ba8e..77edf8ad 100644 --- a/backend/x11/input_device.c +++ b/backend/x11/input_device.c @@ -293,12 +293,8 @@ const struct wlr_pointer_impl x11_pointer_impl = { .name = "x11-pointer", }; -static void touch_destroy(struct wlr_touch *wlr_touch) { - // Don't free the touch, it's on the stack -} - const struct wlr_touch_impl x11_touch_impl = { - .destroy = touch_destroy, + .name = "x11-touch", }; void update_x11_pointer_position(struct wlr_x11_output *output, -- cgit v1.2.3