aboutsummaryrefslogtreecommitdiffstats
path: root/sway/desktop/launcher.c
diff options
context:
space:
mode:
authorLibravatar Ronan Pigott <ronan@rjp.ie>2022-11-16 15:50:34 -0700
committerLibravatar Simon Ser <contact@emersion.fr>2022-11-26 09:48:58 +0100
commitbdeb9f95651f6c99cc2f4cfb59020ddee202cf36 (patch)
treea3c27179887ff4a8b88e08b65e55e8fd838f46f7 /sway/desktop/launcher.c
parentlauncher: initialize launcher_ctxs once on startup (diff)
downloadsway-bdeb9f95651f6c99cc2f4cfb59020ddee202cf36.tar.gz
sway-bdeb9f95651f6c99cc2f4cfb59020ddee202cf36.tar.zst
sway-bdeb9f95651f6c99cc2f4cfb59020ddee202cf36.zip
launcher: fudge the interface a bit
We want to create a context before knowing the pid it will match with.
Diffstat (limited to 'sway/desktop/launcher.c')
-rw-r--r--sway/desktop/launcher.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sway/desktop/launcher.c b/sway/desktop/launcher.c
index 89a93384..b983dcb0 100644
--- a/sway/desktop/launcher.c
+++ b/sway/desktop/launcher.c
@@ -175,13 +175,11 @@ static void token_handle_destroy(struct wl_listener *listener, void *data) {
175 launcher_ctx_destroy(ctx); 175 launcher_ctx_destroy(ctx);
176} 176}
177 177
178struct launcher_ctx *launcher_ctx_create(pid_t pid) { 178struct launcher_ctx *launcher_ctx_create() {
179 sway_log(SWAY_DEBUG, "Recording workspace for process %d", pid);
180
181 struct sway_seat *seat = input_manager_current_seat(); 179 struct sway_seat *seat = input_manager_current_seat();
182 struct sway_workspace *ws = seat_get_focused_workspace(seat); 180 struct sway_workspace *ws = seat_get_focused_workspace(seat);
183 if (!ws) { 181 if (!ws) {
184 sway_log(SWAY_DEBUG, "Bailing out, no workspace"); 182 sway_log(SWAY_DEBUG, "Failed to create launch context. No workspace.");
185 return NULL; 183 return NULL;
186 } 184 }
187 185
@@ -192,7 +190,6 @@ struct launcher_ctx *launcher_ctx_create(pid_t pid) {
192 ctx->name = strdup(ws->name); 190 ctx->name = strdup(ws->name);
193 ctx->token = token; 191 ctx->token = token;
194 ctx->node = &ws->node; 192 ctx->node = &ws->node;
195 ctx->pid = pid;
196 193
197 ctx->node_destroy.notify = ctx_handle_node_destroy; 194 ctx->node_destroy.notify = ctx_handle_node_destroy;
198 wl_signal_add(&ctx->node->events.destroy, &ctx->node_destroy); 195 wl_signal_add(&ctx->node->events.destroy, &ctx->node_destroy);