mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-18 06:46:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

input/seatop_down: Pass seat_client to notify_cancel

Browse source 
The signature for wlr_seat_touch_notify_cancel has changed, taking a
wlr_seat_client instead of a wlr_surface, as the surface was only used
to find the wlr_seat_client.

Store the wlr_seat_client when the seatop starts and pass that instead.

References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4613
This commit is contained in:
Kenny Levinsen 2024-03-28 11:43:35 +01:00
parent a4ef37752f
commit 2d6c39ce5c
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
sway/input/seatop_down.c
View file

@ -20,6 +20,7 @@ struct seatop_down_event {
struct sway_seat *seat; struct sway_seat *seat;
struct wl_listener surface_destroy; struct wl_listener surface_destroy;
struct wlr_surface *surface; struct wlr_surface *surface;
struct wlr_seat_client *seat_client;
double ref_lx, ref_ly; // cursor's x/y at start of op double ref_lx, ref_ly; // cursor's x/y at start of op
double ref_con_lx, ref_con_ly; // container's x/y at start of op double ref_con_lx, ref_con_ly; // container's x/y at start of op
struct wl_list point_events; // seatop_touch_point_event::link struct wl_list point_events; // seatop_touch_point_event::link
@ -116,8 +117,8 @@ static void handle_touch_cancel(struct sway_seat *seat,
} }
} }
if (e->surface) { if (e->seat_client) {
wlr_seat_touch_notify_cancel(seat->wlr_seat, e->surface); wlr_seat_touch_notify_cancel(seat->wlr_seat, e->seat_client);
} }
if (wl_list_empty(&e->point_events)) { if (wl_list_empty(&e->point_events)) {
@ -256,4 +257,10 @@ void seatop_begin_down_on_surface(struct sway_seat *seat,
seat->seatop_impl = &seatop_impl; seat->seatop_impl = &seatop_impl;
seat->seatop_data = e; seat->seatop_data = e;
if (surface) {
struct wl_client *client = wl_resource_get_client(surface->resource);
e->seat_client = wlr_seat_client_for_wl_client(
seat->wlr_seat, client);
}
} }