blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make startup command no longer wait for xwayland

This commit is contained in:
Vincent Vanlaer 2018-05-06 22:51:32 +02:00
parent 31861b3a7a
commit dbf4f9a231
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/rootston/desktop.h
View File

@ -65,7 +65,6 @@ struct roots_desktop {
#ifdef WLR_HAS_XWAYLAND
struct wlr_xwayland *xwayland;
struct wl_listener xwayland_surface;
struct wl_listener xwayland_ready;
#endif
};

31
rootston/main.c
View File

@ -14,18 +14,6 @@
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) {
wlr_log_init(L_DEBUG, NULL);
server.config = roots_config_create_from_args(argc, argv);
@ -65,21 +53,24 @@ int main(int argc, char **argv) {
}
setenv("WAYLAND_DISPLAY", socket, true);
#ifndef WLR_HAS_XWAYLAND
ready(NULL, NULL);
#else
#ifdef WLR_HAS_XWAYLAND
if (server.desktop->xwayland != NULL) {
struct roots_seat *xwayland_seat =
input_get_seat(server.input, ROOTS_CONFIG_DEFAULT_SEAT_NAME);
wlr_xwayland_set_seat(server.desktop->xwayland, xwayland_seat->seat);
wl_signal_add(&server.desktop->xwayland->events.ready,
&server.desktop->xwayland_ready);
server.desktop->xwayland_ready.notify = ready;
} else {
ready(NULL, NULL);
}
#endif
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);
}
}
wl_display_run(server.wl_display);
wl_display_destroy(server.wl_display);
return 0;