mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/main: delay startup of applications until event loop is ready

Browse source 
This mostly allows for using scripts that trigger a labwc SIGHUP
to work as expected. Before this patch, there was a race between
the event loop starting up and the autostart scripts executing.

One example of such a use-case is dynamically setting the keyboard
layout or cursor theme via environment variable based on feedback
from a dbus service like discussed in #1588.
This commit is contained in:
Consolatis 2024-05-04 22:17:24 +02:00 • committed by Johan Malm
parent 89589f17c4
commit 941290fb4b
1 changed files with 36 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/main.c
View file

@ -80,6 +80,35 @@ send_signal_to_labwc_pid(int signal)
kill(pid, signal); kill(pid, signal);
} }
struct idle_ctx {
struct server *server;
const char *primary_client;
const char *startup_cmd;
};
static void
idle_callback(void *data)
{
/* Idle callbacks destroy automatically once triggerd */
struct idle_ctx *ctx = data;
/* Start session-manager if one is specified by -S|--session */
if (ctx->primary_client) {
ctx->server->primary_client_pid = spawn_primary_client(ctx->primary_client);
if (ctx->server->primary_client_pid < 0) {
wlr_log(WLR_ERROR, "fatal error starting primary client: %s",
ctx->primary_client);
wl_display_terminate(ctx->server->wl_display);
return;
}
}
session_autostart_init(ctx->server);
if (ctx->startup_cmd) {
spawn_async_no_shell(ctx->startup_cmd);
}
}
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
@ -177,24 +206,16 @@ main(int argc, char *argv[])
menu_init(&server); menu_init(&server);
/* Start session-manager if one is specified by -S|--session */ /* Delay startup of applications until the event loop is ready */
if (primary_client) { struct idle_ctx idle_ctx = {
server.primary_client_pid = spawn_primary_client(primary_client); .server = &server,
if (server.primary_client_pid < 0) { .primary_client = primary_client,
wlr_log(WLR_ERROR, "fatal error starting primary client: %s", .startup_cmd = startup_cmd
primary_client); };
goto out; wl_event_loop_add_idle(server.wl_event_loop, idle_callback, &idle_ctx);
}
}
session_autostart_init(&server);
if (startup_cmd) {
spawn_async_no_shell(startup_cmd);
}
wl_display_run(server.wl_display); wl_display_run(server.wl_display);
out:
session_shutdown(&server); session_shutdown(&server);
server_finish(&server); server_finish(&server);