mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-24 08:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

launcher: initialize launcher_ctxs once on startup

Browse source 
(cherry picked from commit 66568508c0)
This commit is contained in:
Ronan Pigott 2022-11-16 15:50:34 -07:00 committed by Simon Ser
parent 5794a223ce
commit 66be031f6c
5 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/desktop/launcher.h
View file

@ -23,6 +23,6 @@ void launcher_ctx_consume(struct launcher_ctx *ctx);
void launcher_ctx_destroy(struct launcher_ctx *ctx); void launcher_ctx_destroy(struct launcher_ctx *ctx);
void launcher_ctx_create(pid_t pid); struct launcher_ctx *launcher_ctx_create(pid_t pid);
#endif #endif

2
include/sway/server.h
View file

@ -114,6 +114,8 @@ struct sway_server {
struct wlr_xdg_activation_v1 *xdg_activation_v1; struct wlr_xdg_activation_v1 *xdg_activation_v1;
struct wl_listener xdg_activation_v1_request_activate; struct wl_listener xdg_activation_v1_request_activate;
struct wl_list pending_launcher_ctxs; // launcher_ctx::link
// The timeout for transactions, after which a transaction is applied // The timeout for transactions, after which a transaction is applied
// regardless of readiness. // regardless of readiness.
size_t txn_timeout_ms; size_t txn_timeout_ms;

1
sway/commands/exec_always.c
View file

@ -9,6 +9,7 @@
#include "sway/config.h" #include "sway/config.h"
#include "sway/server.h" #include "sway/server.h"
#include "sway/desktop/launcher.h" #include "sway/desktop/launcher.h"
#include "sway/server.h"
#include "sway/tree/container.h" #include "sway/tree/container.h"
#include "sway/tree/root.h" #include "sway/tree/root.h"
#include "sway/tree/workspace.h" #include "sway/tree/workspace.h"

18
sway/desktop/launcher.c
View file

@ -11,8 +11,6 @@
#include "sway/tree/root.h" #include "sway/tree/root.h"
#include "log.h" #include "log.h"
static struct wl_list launcher_ctxs;
/** /**
* Get the pid of a parent process given the pid of a child process. * Get the pid of a parent process given the pid of a child process.
* *
@ -73,8 +71,7 @@ void launcher_ctx_destroy(struct launcher_ctx *ctx) {
} }
struct launcher_ctx *launcher_ctx_find_pid(pid_t pid) { struct launcher_ctx *launcher_ctx_find_pid(pid_t pid) {
if (!launcher_ctxs.prev && !launcher_ctxs.next) { if (wl_list_empty(&server.pending_launcher_ctxs)) {
wl_list_init(&launcher_ctxs);
return NULL; return NULL;
} }
@ -83,7 +80,7 @@ struct launcher_ctx *launcher_ctx_find_pid(pid_t pid) {
do { do {
struct launcher_ctx *_ctx = NULL; struct launcher_ctx *_ctx = NULL;
wl_list_for_each(_ctx, &launcher_ctxs, link) { wl_list_for_each(_ctx, &server.pending_launcher_ctxs, link) {
if (pid == _ctx->pid) { if (pid == _ctx->pid) {
ctx = _ctx; ctx = _ctx;
sway_log(SWAY_DEBUG, sway_log(SWAY_DEBUG,
@ -178,17 +175,14 @@ static void token_handle_destroy(struct wl_listener *listener, void *data) {
launcher_ctx_destroy(ctx); launcher_ctx_destroy(ctx);
} }
void launcher_ctx_create(pid_t pid) { struct launcher_ctx *launcher_ctx_create(pid_t pid) {
sway_log(SWAY_DEBUG, "Recording workspace for process %d", pid); sway_log(SWAY_DEBUG, "Recording workspace for process %d", pid);
if (!launcher_ctxs.prev && !launcher_ctxs.next) {
wl_list_init(&launcher_ctxs);
}
struct sway_seat *seat = input_manager_current_seat(); struct sway_seat *seat = input_manager_current_seat();
struct sway_workspace *ws = seat_get_focused_workspace(seat); struct sway_workspace *ws = seat_get_focused_workspace(seat);
if (!ws) { if (!ws) {
sway_log(SWAY_DEBUG, "Bailing out, no workspace"); sway_log(SWAY_DEBUG, "Bailing out, no workspace");
return; return NULL;
} }
struct launcher_ctx *ctx = calloc(1, sizeof(struct launcher_ctx)); struct launcher_ctx *ctx = calloc(1, sizeof(struct launcher_ctx));
@ -206,5 +200,7 @@ void launcher_ctx_create(pid_t pid) {
ctx->token_destroy.notify = token_handle_destroy; ctx->token_destroy.notify = token_handle_destroy;
wl_signal_add(&token->events.destroy, &ctx->token_destroy); wl_signal_add(&token->events.destroy, &ctx->token_destroy);
wl_list_insert(&launcher_ctxs, &ctx->link); wl_list_init(&ctx->link);
wl_list_insert(&server.pending_launcher_ctxs, &ctx->link);
return ctx;
} }

2
sway/server.c
View file

@ -215,6 +215,8 @@ bool server_init(struct sway_server *server) {
wl_signal_add(&server->xdg_activation_v1->events.request_activate, wl_signal_add(&server->xdg_activation_v1->events.request_activate,
&server->xdg_activation_v1_request_activate); &server->xdg_activation_v1_request_activate);
wl_list_init(&server->pending_launcher_ctxs);
// Avoid using "wayland-0" as display socket // Avoid using "wayland-0" as display socket
char name_candidate[16]; char name_candidate[16];
for (unsigned int i = 1; i <= 32; ++i) { for (unsigned int i = 1; i <= 32; ++i) {