aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2021-07-13 11:59:25 +0200
committerSimon Zeni <simon@bl4ckb0ne.ca>2021-07-13 09:20:25 -0400
commita47f89cf7c198153c153c53f52d42810e1c73ed5 (patch)
tree4ed6ccc13cb5b33b54a59c91f7e005707a589500 /backend
parentbcd5d8504c4370134d5fb3c1c324fcab49fecbb8 (diff)
backend/wayland: properly cleanup wlr_wl_pointer
We were missing destroy calls for gestures, and we were only destroying the relative pointer on output destroy.
Diffstat (limited to 'backend')
-rw-r--r--backend/wayland/seat.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/backend/wayland/seat.c b/backend/wayland/seat.c
index 039c524b..05524a7e 100644
--- a/backend/wayland/seat.c
+++ b/backend/wayland/seat.c
@@ -496,6 +496,18 @@ static void pointer_destroy(struct wlr_pointer *wlr_pointer) {
seat->active_pointer = NULL;
}
+ // pointer->wl_pointer belongs to the wlr_wl_seat
+
+ if (pointer->gesture_swipe != NULL) {
+ zwp_pointer_gesture_swipe_v1_destroy(pointer->gesture_swipe);
+ }
+ if (pointer->gesture_pinch != NULL) {
+ zwp_pointer_gesture_pinch_v1_destroy(pointer->gesture_pinch);
+ }
+ if (pointer->relative_pointer != NULL) {
+ zwp_relative_pointer_v1_destroy(pointer->relative_pointer);
+ }
+
wl_list_remove(&pointer->output_destroy.link);
free(pointer);
}
@@ -637,9 +649,6 @@ static void pointer_handle_output_destroy(struct wl_listener *listener,
void *data) {
struct wlr_wl_pointer *pointer =
wl_container_of(listener, pointer, output_destroy);
- if (pointer->relative_pointer) {
- zwp_relative_pointer_v1_destroy(pointer->relative_pointer);
- }
wlr_input_device_destroy(&pointer->input_device->wlr_input_device);
}