xdg-activation: launcher tokens are activation requests

If the launched client decides to pass it's token along as an activation
request, allow that. This will make the behavior match tokens provided by
an external launcher client.
This commit is contained in:
Ronan Pigott 2024-02-28 14:22:09 -07:00 committed by Simon Ser
parent 3d00552035
commit 28fd73589d

View file

@ -38,14 +38,14 @@ void xdg_activation_v1_handle_request_activate(struct wl_listener *listener,
}
// This is an activation request. If this context is internal we have ctx->seat.
struct sway_seat *seat = ctx->seat;
if (!seat) {
// Otherwise, use the seat indicated by the launcher client in set_serial
seat = ctx->token->seat ? ctx->token->seat->data : NULL;
if (ctx->seat) {
view_request_activate(view, ctx->seat);
return;
}
if (seat && ctx->had_focused_surface) {
view_request_activate(view, seat);
// Otherwise, activate if passed from another focused client
if (ctx->token->seat && ctx->had_focused_surface) {
view_request_activate(view, ctx->token->seat->data);
} else {
// The token is valid, but cannot be used to activate a window
view_request_urgent(view);