diff options
| author | Simon Zeni <simon@bl4ckb0ne.ca> | 2022-03-02 13:57:28 -0500 |
|---|---|---|
| committer | Kirill Primak <vyivel@eclair.cafe> | 2022-03-07 16:37:41 +0000 |
| commit | 51cd3c07264e1c4967c5baea3f6629ac01334e97 (patch) | |
| tree | 980d44bb7028c34524c5e4c54f94c9f50d4f58d2 /backend/libinput | |
| parent | 7dc4a3ecd71cf41dd1800c6afd3b16c83a90f031 (diff) | |
interface/wlr_pointer: rework destroy sequence
The destroy callback in wlr_pointer_impl has been removed. The function
`wlr_pointer_finish` has been introduced to clean up the resources owned by a
wlr_pointer.
`wlr_input_device_destroy` no longer destroys the wlr_pointer, attempting to
destroy a wlr_pointer will result in a no-op.
The field `name` has been added to the wlr_pointer_impl to be able to identify
a given wlr_pointer device.
Diffstat (limited to 'backend/libinput')
| -rw-r--r-- | backend/libinput/events.c | 2 | ||||
| -rw-r--r-- | backend/libinput/pointer.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/backend/libinput/events.c b/backend/libinput/events.c index af54177c..22fdab55 100644 --- a/backend/libinput/events.c +++ b/backend/libinput/events.c @@ -18,7 +18,7 @@ void destroy_libinput_input_device(struct wlr_libinput_input_device *dev) { wlr_keyboard_finish(&dev->keyboard); } if (dev->pointer.impl) { - wlr_pointer_destroy(&dev->pointer); + wlr_pointer_finish(&dev->pointer); } if (dev->switch_device.impl) { wlr_switch_destroy(&dev->switch_device); diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c index 0ac781d7..8daf2005 100644 --- a/backend/libinput/pointer.c +++ b/backend/libinput/pointer.c @@ -4,12 +4,8 @@ #include "backend/libinput.h" #include "util/signal.h" -static void pointer_destroy(struct wlr_pointer *pointer) { - /* wlr_pointer belongs to the wlr_libinput_input_device */ -} - const struct wlr_pointer_impl libinput_pointer_impl = { - .destroy = pointer_destroy, + .name = "libinput-pointer", }; void init_device_pointer(struct wlr_libinput_input_device *dev) { |