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

Merge pull request #959 from VincentVanlaer/xwayland-lazy

Browse source 
Add the option to start Xwayland only when a client connects
This commit is contained in:
emersion 2018-05-08 23:04:26 +01:00 • committed by GitHub
commit 8e831cd416
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 146 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rootston/config.c
View file

@ -240,6 +240,9 @@ static int config_ini_handler(void *user, const char *section, const char *name,
if (strcmp(name, "xwayland") == 0) {
if (strcasecmp(value, "true") == 0) {
config->xwayland = true;
} else if (strcasecmp(value, "immediate") == 0) {
config->xwayland = true;
config->xwayland_lazy = false;
} else if (strcasecmp(value, "false") == 0) {
config->xwayland = false;
} else {
@ -389,6 +392,7 @@ struct roots_config *roots_config_create_from_args(int argc, char *argv[]) {
}
config->xwayland = true;
config->xwayland_lazy = true;
wl_list_init(&config->outputs);
wl_list_init(&config->devices);
wl_list_init(&config->keyboards);

2
rootston/desktop.c
View file

@ -822,7 +822,7 @@ struct roots_desktop *desktop_create(struct roots_server *server,
if (config->xwayland) {
desktop->xwayland = wlr_xwayland_create(server->wl_display,
desktop->compositor);
desktop->compositor, config->xwayland_lazy);
wl_signal_add(&desktop->xwayland->events.new_surface,
&desktop->xwayland_surface);
desktop->xwayland_surface.notify = handle_xwayland_surface;

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;

5
rootston/rootston.ini.example
View file

@ -1,5 +1,8 @@
[core]
# Disable X11 support. Enabled by default.
# X11 support
# - true: enables X11, xwayland is started only when an X11 client connects
# - immediate: enables X11, xwayland is started immediately
# - false: disables xwayland
xwayland=false
# Single output configuration. String after colon must match output's name.