mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-22 04:45:58 +01:00
types/wlr_input_device: remove wlr_input_device_destroy
This commit is contained in:
parent
9d8dc026e5
commit
1bb2631c5c
3 changed files with 3 additions and 44 deletions
|
@ -571,9 +571,6 @@ void destroy_wl_input_device(struct wlr_wl_input_device *dev) {
|
|||
wlr_touch_finish(wlr_dev->touch);
|
||||
free(wlr_dev->touch);
|
||||
break;
|
||||
default:
|
||||
wlr_input_device_destroy(wlr_dev);
|
||||
break;
|
||||
}
|
||||
}
|
||||
wl_list_remove(&dev->link);
|
||||
|
|
|
@ -61,11 +61,4 @@ 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 free it.
|
||||
*/
|
||||
void wlr_input_device_destroy(struct wlr_input_device *dev);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
#define _POSIX_C_SOURCE 200809L
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <wayland-server-core.h>
|
||||
#include <wlr/types/wlr_input_device.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include "util/signal.h"
|
||||
|
||||
void wlr_input_device_init(struct wlr_input_device *dev,
|
||||
|
@ -23,38 +22,8 @@ void wlr_input_device_finish(struct wlr_input_device *wlr_device) {
|
|||
|
||||
wlr_signal_emit_safe(&wlr_device->events.destroy, wlr_device);
|
||||
|
||||
wl_list_remove(&wlr_device->events.destroy.listener_list);
|
||||
|
||||
free(wlr_device->name);
|
||||
free(wlr_device->output_name);
|
||||
}
|
||||
|
||||
void wlr_input_device_destroy(struct wlr_input_device *dev) {
|
||||
if (!dev) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (dev->_device) {
|
||||
switch (dev->type) {
|
||||
case WLR_INPUT_DEVICE_KEYBOARD:
|
||||
wlr_log(WLR_ERROR, "wlr_keyboard will not be destroyed");
|
||||
break;
|
||||
case WLR_INPUT_DEVICE_POINTER:
|
||||
wlr_log(WLR_ERROR, "wlr_pointer will not be destroyed");
|
||||
break;
|
||||
case WLR_INPUT_DEVICE_SWITCH:
|
||||
wlr_log(WLR_ERROR, "wlr_switch will not be destroyed");
|
||||
break;
|
||||
case WLR_INPUT_DEVICE_TOUCH:
|
||||
wlr_log(WLR_ERROR, "wlr_touch will not be destroyed");
|
||||
break;
|
||||
case WLR_INPUT_DEVICE_TABLET_TOOL:
|
||||
wlr_log(WLR_ERROR, "wlr_tablet_tool will not be destroyed");
|
||||
break;
|
||||
case WLR_INPUT_DEVICE_TABLET_PAD:
|
||||
wlr_log(WLR_ERROR, "wlr_tablet_pad will not be destroyed");
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
wlr_input_device_finish(dev);
|
||||
free(dev);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue