diff options
| -rw-r--r-- | backend/libinput/events.c | 2 | ||||
| -rw-r--r-- | backend/libinput/switch.c | 6 | ||||
| -rw-r--r-- | backend/wayland/seat.c | 4 | ||||
| -rw-r--r-- | include/wlr/interfaces/wlr_switch.h | 4 | ||||
| -rw-r--r-- | types/wlr_input_device.c | 3 | ||||
| -rw-r--r-- | types/wlr_switch.c | 10 |
6 files changed, 10 insertions, 19 deletions
diff --git a/backend/libinput/events.c b/backend/libinput/events.c index 22fdab55..dcf46bee 100644 --- a/backend/libinput/events.c +++ b/backend/libinput/events.c @@ -21,7 +21,7 @@ void destroy_libinput_input_device(struct wlr_libinput_input_device *dev) { wlr_pointer_finish(&dev->pointer); } if (dev->switch_device.impl) { - wlr_switch_destroy(&dev->switch_device); + wlr_switch_finish(&dev->switch_device); } if (dev->touch.impl) { wlr_touch_destroy(&dev->touch); diff --git a/backend/libinput/switch.c b/backend/libinput/switch.c index f2d5409b..586ec0c8 100644 --- a/backend/libinput/switch.c +++ b/backend/libinput/switch.c @@ -4,12 +4,8 @@ #include "backend/libinput.h" #include "util/signal.h" -static void switch_destroy(struct wlr_switch *wlr_switch) { - /* wlr_switch belongs to the wlr_libinput_input_device */ -} - const struct wlr_switch_impl libinput_switch_impl = { - .destroy = switch_destroy, + .name = "libinput-switch", }; void init_device_switch(struct wlr_libinput_input_device *dev) { diff --git a/backend/wayland/seat.c b/backend/wayland/seat.c index 1edd0f2c..02d4d874 100644 --- a/backend/wayland/seat.c +++ b/backend/wayland/seat.c @@ -12,6 +12,7 @@ #include <wlr/interfaces/wlr_keyboard.h> #include <wlr/interfaces/wlr_output.h> #include <wlr/interfaces/wlr_pointer.h> +#include <wlr/interfaces/wlr_switch.h> #include <wlr/interfaces/wlr_touch.h> #include <wlr/interfaces/wlr_tablet_tool.h> #include <wlr/interfaces/wlr_tablet_pad.h> @@ -555,6 +556,9 @@ void destroy_wl_input_device(struct wlr_wl_input_device *dev) { /* Owned by wlr_wl_pointer */ pointer_destroy(wlr_dev->pointer); break; + case WLR_INPUT_DEVICE_SWITCH: + wlr_switch_finish(wlr_dev->switch_device); + break; default: wlr_input_device_destroy(wlr_dev); break; diff --git a/include/wlr/interfaces/wlr_switch.h b/include/wlr/interfaces/wlr_switch.h index fbf5e6cb..793ed25c 100644 --- a/include/wlr/interfaces/wlr_switch.h +++ b/include/wlr/interfaces/wlr_switch.h @@ -12,11 +12,11 @@ #include <wlr/types/wlr_switch.h> struct wlr_switch_impl { - void (*destroy)(struct wlr_switch *switch_device); + const char *name; }; void wlr_switch_init(struct wlr_switch *switch_device, const struct wlr_switch_impl *impl, const char *name); -void wlr_switch_destroy(struct wlr_switch *switch_device); +void wlr_switch_finish(struct wlr_switch *switch_device); #endif diff --git a/types/wlr_input_device.c b/types/wlr_input_device.c index 6bf42de9..7a323df3 100644 --- a/types/wlr_input_device.c +++ b/types/wlr_input_device.c @@ -2,7 +2,6 @@ #include <stdlib.h> #include <string.h> #include <wayland-server-core.h> -#include <wlr/interfaces/wlr_switch.h> #include <wlr/interfaces/wlr_tablet_pad.h> #include <wlr/interfaces/wlr_tablet_tool.h> #include <wlr/interfaces/wlr_touch.h> @@ -45,7 +44,7 @@ void wlr_input_device_destroy(struct wlr_input_device *dev) { wlr_log(WLR_ERROR, "wlr_pointer will not be destroyed"); break; case WLR_INPUT_DEVICE_SWITCH: - wlr_switch_destroy(dev->switch_device); + wlr_log(WLR_ERROR, "wlr_switch will not be destroyed"); break; case WLR_INPUT_DEVICE_TOUCH: wlr_touch_destroy(dev->touch); diff --git a/types/wlr_switch.c b/types/wlr_switch.c index 42611da9..b6972eea 100644 --- a/types/wlr_switch.c +++ b/types/wlr_switch.c @@ -13,14 +13,6 @@ void wlr_switch_init(struct wlr_switch *switch_device, wl_signal_init(&switch_device->events.toggle); } -void wlr_switch_destroy(struct wlr_switch *switch_device) { - if (!switch_device) { - return; - } +void wlr_switch_finish(struct wlr_switch *switch_device) { wlr_input_device_finish(&switch_device->base); - if (switch_device->impl && switch_device->impl->destroy) { - switch_device->impl->destroy(switch_device); - } else { - free(switch_device); - } } |