diff options
| author | Simon Zeni <simon@bl4ckb0ne.ca> | 2022-02-28 15:23:56 -0500 |
|---|---|---|
| committer | Kirill Primak <vyivel@eclair.cafe> | 2022-02-28 22:02:57 +0000 |
| commit | c84744321edf3e5f083feb01addd82eae0969e31 (patch) | |
| tree | e7152139aa359fcd365072c645b6b7f3ea7265dd | |
| parent | cdb3e80b3934d740d4702a062bc5e10a67d21f57 (diff) | |
types/wlr_virtual_pointer_v1: fix wlr_pointer destroy sequence
| -rw-r--r-- | types/wlr_virtual_pointer_v1.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/types/wlr_virtual_pointer_v1.c b/types/wlr_virtual_pointer_v1.c index 6215bbff..8c232c81 100644 --- a/types/wlr_virtual_pointer_v1.c +++ b/types/wlr_virtual_pointer_v1.c @@ -9,13 +9,7 @@ #include "wlr-virtual-pointer-unstable-v1-protocol.h" static void pointer_destroy(struct wlr_pointer *pointer) { - struct wlr_virtual_pointer_v1 *virtual_pointer = - (struct wlr_virtual_pointer_v1 *)pointer; - - wl_resource_set_user_data(virtual_pointer->resource, NULL); - wlr_signal_emit_safe(&virtual_pointer->events.destroy, virtual_pointer); - wl_list_remove(&virtual_pointer->link); - free(virtual_pointer); + /* no-op, pointer belongs to the wlr_virtual_pointer_v1 */ } static const struct wlr_pointer_impl pointer_impl = { @@ -205,9 +199,16 @@ static void virtual_pointer_axis_discrete(struct wl_client *client, static void virtual_pointer_destroy_resource(struct wl_resource *resource) { struct wlr_virtual_pointer_v1 *pointer = virtual_pointer_from_resource(resource); - if (pointer != NULL) { - wlr_pointer_destroy(&pointer->pointer); + if (pointer == NULL) { + return; } + + /* TODO: rework wlr_pointer device destruction */ + wlr_signal_emit_safe(&pointer->events.destroy, pointer); + wlr_pointer_destroy(&pointer->pointer); + wl_resource_set_user_data(pointer->resource, NULL); + wl_list_remove(&pointer->link); + free(pointer); } static void virtual_pointer_destroy(struct wl_client *client, |