input: pass wlr_seat_client to wlr_seat_touch_notify_cancel()

emersion · kennylevinsen · commit 9e1465107788 · 2024-03-28T11:49:20.000+01:00
References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4613
diff --git a/sway/input/seatop_down.c b/sway/input/seatop_down.c
@@ -117,7 +117,11 @@ static void handle_touch_cancel(struct sway_seat *seat,
 	}
 
 	if (e->surface) {
-		wlr_seat_touch_notify_cancel(seat->wlr_seat, e->surface);
+		struct wl_client *client = wl_resource_get_client(e->surface->resource);
+		struct wlr_seat_client *seat_client = wlr_seat_client_for_wl_client(seat->wlr_seat, client);
+		if (seat_client != NULL) {
+			wlr_seat_touch_notify_cancel(seat->wlr_seat, seat_client);
+		}
 	}
 
 	if (wl_list_empty(&e->point_events)) {

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,11 @@ static void handle_touch_cancel(struct sway_seat *seat,`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`if (e->surface) {`
`120`		`- wlr_seat_touch_notify_cancel(seat->wlr_seat, e->surface);`
	`120`	`+ struct wl_client *client = wl_resource_get_client(e->surface->resource);`
	`121`	`+ struct wlr_seat_client *seat_client = wlr_seat_client_for_wl_client(seat->wlr_seat, client);`
	`122`	`+ if (seat_client != NULL) {`
	`123`	`+ wlr_seat_touch_notify_cancel(seat->wlr_seat, seat_client);`
	`124`	`+ }`
`121`	`125`	`}`
`122`	`126`
`123`	`127`	`if (wl_list_empty(&e->point_events)) {`