mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-05 13:29:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Run startup command after xwayland is ready

Browse source
This commit is contained in:
Drew DeVault 2017-11-12 16:01:31 -05:00
parent 51ef12f128
commit a317ecdab8
3 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
rootston/main.c
View file

@ -12,6 +12,18 @@
struct roots_server server = { 0 };
static void ready(struct wl_listener *listener, void *data) {
if (server.config->startup_cmd != NULL) {
const char *cmd = server.config->startup_cmd;
pid_t pid = fork();
if (pid < 0) {
wlr_log(L_ERROR, "cannot execute binding command: fork() failed");
} else if (pid == 0) {
execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL);
}
}
}
int main(int argc, char **argv) {
assert(server.config = roots_config_create_from_args(argc, argv));
assert(server.wl_display = wl_display_create());
@ -43,17 +55,12 @@ int main(int argc, char **argv) {
}
setenv("WAYLAND_DISPLAY", socket, true);
if (server.config->startup_cmd != NULL) {
const char *cmd = server.config->startup_cmd;
pid_t pid = fork();
if (pid < 0) {
wlr_log(L_ERROR, "cannot execute binding command: fork() failed");
return 1;
} else if (pid == 0) {
execl("/bin/sh", "/bin/sh", "-c", cmd, (void *)NULL);
}
}
#ifndef HAS_XWAYLAND
ready(NULL, NULL);
#else
struct wl_listener xwayland_ready = { .notify = ready };
wl_signal_add(&server.desktop->xwayland->events.ready, &xwayland_ready);
#endif
wl_display_run(server.wl_display);
wlr_backend_destroy(server.backend);