mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

types/wlr_input_device: call the specialized input device destroy function on destroy

Browse source 
In case the `wlr_input_device` is not owned by a specialized input device, the
function will finish the wlr_input_device and call it's implementation destroy
function if an implementation has been supplied, or simply free it.
This commit is contained in:
Simon Zeni 2022-02-11 09:06:26 -05:00 • committed by Kirill Primak
parent fd80329c53
commit 130c3bcf63
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/wlr/interfaces/wlr_input_device.h
View file

@ -25,6 +25,12 @@ void wlr_input_device_init(struct wlr_input_device *wlr_device,
*/ */
void wlr_input_device_finish(struct wlr_input_device *wlr_device); void wlr_input_device_finish(struct wlr_input_device *wlr_device);
/**
* Calls the specialized input device destroy function.
* If the wlr_input_device is not owned by a specialized input device, the
* function will finish the wlr_input_device, and either call its implementation
* destroy function if one has been given, or free the wlr_input_device.
*/
void wlr_input_device_destroy(struct wlr_input_device *dev); void wlr_input_device_destroy(struct wlr_input_device *dev);
#endif #endif

12
types/wlr_input_device.c
View file

@ -41,8 +41,6 @@ void wlr_input_device_destroy(struct wlr_input_device *dev) {
return; return;
} }
wlr_signal_emit_safe(&dev->events.destroy, dev);
if (dev->_device) { if (dev->_device) {
switch (dev->type) { switch (dev->type) {
case WLR_INPUT_DEVICE_KEYBOARD: case WLR_INPUT_DEVICE_KEYBOARD:
@ -63,17 +61,13 @@ void wlr_input_device_destroy(struct wlr_input_device *dev) {
case WLR_INPUT_DEVICE_TABLET_PAD: case WLR_INPUT_DEVICE_TABLET_PAD:
wlr_tablet_pad_destroy(dev->tablet_pad); wlr_tablet_pad_destroy(dev->tablet_pad);
break; break;
default:
wlr_log(WLR_DEBUG, "Warning: leaking memory %p %p %d",
dev->_device, dev, dev->type);
break;
} }
} } else {
free(dev->name); wlr_input_device_finish(dev);
free(dev->output_name);
if (dev->impl && dev->impl->destroy) { if (dev->impl && dev->impl->destroy) {
dev->impl->destroy(dev); dev->impl->destroy(dev);
} else { } else {
free(dev); free(dev);
} }
}
} }