hyprwm
/
wlroots-hyprland
mirror of https://github.com/hyprwm/wlroots-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
Show Stats 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);
/**
* 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);
#endif

20
types/wlr_input_device.c
View File

@ -41,8 +41,6 @@ void wlr_input_device_destroy(struct wlr_input_device *dev) {
return;
}
wlr_signal_emit_safe(&dev->events.destroy, dev);
if (dev->_device) {
switch (dev->type) {
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:
wlr_tablet_pad_destroy(dev->tablet_pad);
break;
default:
wlr_log(WLR_DEBUG, "Warning: leaking memory %p %p %d",
dev->_device, dev, dev->type);
break;
}
} else {
wlr_input_device_finish(dev);
if (dev->impl && dev->impl->destroy) {
dev->impl->destroy(dev);
} else {
free(dev);
}
}
free(dev->name);
free(dev->output_name);
if (dev->impl && dev->impl->destroy) {
dev->impl->destroy(dev);
} else {
free(dev);
}
}