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. --- include/wlr/interfaces/wlr_touch.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/wlr/interfaces') diff --git a/include/wlr/interfaces/wlr_touch.h b/include/wlr/interfaces/wlr_touch.h index 2b95d2bf..e48a92f2 100644 --- a/include/wlr/interfaces/wlr_touch.h +++ b/include/wlr/interfaces/wlr_touch.h @@ -12,11 +12,11 @@ #include struct wlr_touch_impl { - void (*destroy)(struct wlr_touch *touch); + const char *name; }; void wlr_touch_init(struct wlr_touch *touch, const struct wlr_touch_impl *impl, const char *name); -void wlr_touch_destroy(struct wlr_touch *touch); +void wlr_touch_finish(struct wlr_touch *touch); #endif -- cgit v1.2.3