From 7dc4a3ecd71cf41dd1800c6afd3b16c83a90f031 Mon Sep 17 00:00:00 2001 From: Simon Zeni Date: Tue, 1 Mar 2022 14:49:30 -0500 Subject: interface/wlr_keyboard: rework destroy sequence The destroy member in wlr_keyboard_impl has been removed. The function `wlr_keyboard_finish` has been introduce to clean up the resources owned by a wlr_keyboard. `wlr_input_device_destroy` no longer destroys the wlr_keyboard, attempting to destroy a wlr_keyboard will result in a no-op. The field `name` has been added to the wlr_keyboard_impl to be able to identify a given wlr_keyboard device. --- backend/libinput/events.c | 2 +- backend/libinput/keyboard.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 af5bb184..af54177c 100644 --- a/backend/libinput/events.c +++ b/backend/libinput/events.c @@ -15,7 +15,7 @@ void destroy_libinput_input_device(struct wlr_libinput_input_device *dev) { if (dev->keyboard.impl) { - wlr_keyboard_destroy(&dev->keyboard); + wlr_keyboard_finish(&dev->keyboard); } if (dev->pointer.impl) { wlr_pointer_destroy(&dev->pointer); diff --git a/backend/libinput/keyboard.c b/backend/libinput/keyboard.c index cf6b9836..210fd450 100644 --- a/backend/libinput/keyboard.c +++ b/backend/libinput/keyboard.c @@ -17,12 +17,8 @@ static void keyboard_set_leds(struct wlr_keyboard *wlr_kb, uint32_t leds) { libinput_device_led_update(dev->handle, leds); } -static void keyboard_destroy(struct wlr_keyboard *wlr_kb) { - /* wlr_keyboard belongs to the wlr_libinput_input_device */ -} - const struct wlr_keyboard_impl libinput_keyboard_impl = { - .destroy = keyboard_destroy, + .name = "libinput-keyboard", .led_update = keyboard_set_leds }; -- cgit v1.2.3