hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-12-23 02:19:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

xwayland: introduce WLR_XWAYLAND for specifying which Xwayland to use

Browse source 
When debugging Xwayland-related issues, a common first step in debugging
has been to ask the reporter to move their real Xwayland to
/usr/bin/Xwayland.bin, and create a shell script starting Xwayland with
extra arguments under the original /usr/bin/Xwayland location.

Introducing a `WLR_XWAYLAND` environment variable makes this less
invasive, by allowing the user to swap out Xwayland without resorting to
global system changes (or source patches).
This commit is contained in:
Tudor Brindus 2020-10-03 14:16:54 -04:00 committed by Simon Ser
parent feb0e1c74d
commit 1b0e4c7e6e
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/env_vars.md
View file

@ -9,6 +9,8 @@ wlroots reads these environment variables
* *WLR_SESSION*: specifies the wlr\_session to be used (available sessions:
logind/systemd, direct)
* *WLR_DIRECT_TTY*: specifies the tty to be used (instead of using /dev/tty)
* *WLR_XWAYLAND*: specifies the path to an Xwayland binary to be used (instead
of following shell search semantics for "Xwayland")
## DRM backend

10
xwayland/server.c
View file

@ -107,8 +107,16 @@ noreturn static void exec_xwayland(struct wlr_xwayland_server *server) {
dup2(devnull, STDERR_FILENO);
}
const char *xwayland_path = getenv("WLR_XWAYLAND");
if (xwayland_path) {
wlr_log(WLR_INFO, "Using Xwayland binary to '%s' due to WLR_XWAYLAND",
xwayland_path);
} else {
xwayland_path = "Xwayland";
}
// This returns if and only if the call fails
execvp("Xwayland", argv);
execvp(xwayland_path, argv);
wlr_log_errno(WLR_ERROR, "failed to exec Xwayland");
close(devnull);