From 1b27e8c8fdc413a061e8b003bcabfb7b789c6a90 Mon Sep 17 00:00:00 2001 From: Ronan Pigott Date: Thu, 9 Feb 2023 11:39:46 -0700 Subject: [PATCH] xdg-activation: fix urgency when the client does not specify a seat xdg-activation is now too strict in only allowing tokens with a seat to activate a surface. Clients may rely on this behavior for urgency hints. The seat argument is still useful in case the client does provide a seat so we can activate it on the desired seat. Fixes: 842609da6432 (view: make request_activate take a seat, 2022-11-30) --- sway/xdg_activation_v1.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sway/xdg_activation_v1.c b/sway/xdg_activation_v1.c index 614f51cd..e97989c8 100644 --- a/sway/xdg_activation_v1.c +++ b/sway/xdg_activation_v1.c @@ -33,11 +33,8 @@ void xdg_activation_v1_handle_request_activate(struct wl_listener *listener, } struct wlr_seat *wlr_seat = event->token->seat; - // The requesting seat may have been destroyed. - if (wlr_seat) { - struct sway_seat *seat = wlr_seat->data; - view_request_activate(view, seat); - } + struct sway_seat *seat = wlr_seat ? wlr_seat->data : NULL; + view_request_activate(view, seat); } void xdg_activation_v1_handle_new_token(struct wl_listener *listener, void *data) {