mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

launcher: track the seat in the launcher ctx 

This is a more suitable place to track the requesting seat, since we are
able to respond appropriately to destroy notifications.
This commit is contained in:
Ronan Pigott 2024-02-07 16:13:25 -07:00
parent 541e6e260c
commit f6d22f8e68
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sway/desktop/launcher.h
View File

@ -3,12 +3,15 @@
#include <stdlib.h> #include <stdlib.h>
#include <wayland-server-core.h> #include <wayland-server-core.h>
#include "sway/input/seat.h"
struct launcher_ctx { struct launcher_ctx {
pid_t pid; pid_t pid;
char *fallback_name; char *fallback_name;
struct wlr_xdg_activation_token_v1 *token; struct wlr_xdg_activation_token_v1 *token;
struct wl_listener token_destroy; struct wl_listener token_destroy;
struct sway_seat *seat;
struct wl_listener seat_destroy;
bool activated; bool activated;

13
sway/desktop/launcher.c
View File

@ -67,6 +67,9 @@ void launcher_ctx_destroy(struct launcher_ctx *ctx) {
} }
wl_list_remove(&ctx->node_destroy.link); wl_list_remove(&ctx->node_destroy.link);
wl_list_remove(&ctx->token_destroy.link); wl_list_remove(&ctx->token_destroy.link);
if (ctx->seat) {
wl_list_remove(&ctx->seat_destroy.link);
}
wl_list_remove(&ctx->link); wl_list_remove(&ctx->link);
wlr_xdg_activation_token_v1_destroy(ctx->token); wlr_xdg_activation_token_v1_destroy(ctx->token);
free(ctx->fallback_name); free(ctx->fallback_name);
@ -227,6 +230,12 @@ struct launcher_ctx *launcher_ctx_create(struct wlr_xdg_activation_token_v1 *tok
return ctx; return ctx;
} }
static void launch_ctx_handle_seat_destroy(struct wl_listener *listener, void *data) {
struct launcher_ctx *ctx = wl_container_of(listener, ctx, seat_destroy);
ctx->seat = NULL;
wl_list_remove(&ctx->seat_destroy.link);
}
// Creates a context with a new token for the internal launcher // Creates a context with a new token for the internal launcher
struct launcher_ctx *launcher_ctx_create_internal(void) { struct launcher_ctx *launcher_ctx_create_internal(void) {
struct sway_seat *seat = input_manager_current_seat(); struct sway_seat *seat = input_manager_current_seat();
@ -238,13 +247,15 @@ struct launcher_ctx *launcher_ctx_create_internal(void) {
struct wlr_xdg_activation_token_v1 *token = struct wlr_xdg_activation_token_v1 *token =
wlr_xdg_activation_token_v1_create(server.xdg_activation_v1); wlr_xdg_activation_token_v1_create(server.xdg_activation_v1);
token->seat = seat->wlr_seat;
struct launcher_ctx *ctx = launcher_ctx_create(token, &ws->node); struct launcher_ctx *ctx = launcher_ctx_create(token, &ws->node);
if (!ctx) { if (!ctx) {
wlr_xdg_activation_token_v1_destroy(token); wlr_xdg_activation_token_v1_destroy(token);
return NULL; return NULL;
} }
ctx->seat = seat;
ctx->seat_destroy.notify = launch_ctx_handle_seat_destroy;
wl_signal_add(&seat->wlr_seat->events.destroy, &ctx->seat_destroy);
return ctx; return ctx;
} }

21
sway/xdg_activation_v1.c
View File

@ -18,11 +18,15 @@ void xdg_activation_v1_handle_request_activate(struct wl_listener *listener,
return; return;
} }
struct launcher_ctx *ctx = event->token->data;
if (ctx == NULL) {
return;
}
if (!xdg_surface->surface->mapped) { if (!xdg_surface->surface->mapped) {
// This is a startup notification. If we are tracking it, the data // This is a startup notification. If we are tracking it, the data
// field is a launcher_ctx. // field is a launcher_ctx.
struct launcher_ctx *ctx = event->token->data; if (ctx->activated) {
if (!ctx || ctx->activated) {
// This ctx has already been activated and cannot be used again // This ctx has already been activated and cannot be used again
// for a startup notification. It will be destroyed // for a startup notification. It will be destroyed
return; return;
@ -33,9 +37,16 @@ void xdg_activation_v1_handle_request_activate(struct wl_listener *listener,
return; return;
} }
struct wlr_seat *wlr_seat = event->token->seat; // This is an activation request. If this context is internal we have ctx->seat.
struct sway_seat *seat = wlr_seat ? wlr_seat->data : NULL; struct sway_seat *seat = ctx->seat;
view_request_activate(view, 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 (seat) {
view_request_activate(view, seat);
}
} }
void xdg_activation_v1_handle_new_token(struct wl_listener *listener, void *data) { void xdg_activation_v1_handle_new_token(struct wl_listener *listener, void *data) {