change the env vars that wayland/x11 check for
All checks were successful
pyrite-dev/milsko/pipeline/head This commit looks good
All checks were successful
pyrite-dev/milsko/pipeline/head This commit looks good
This commit is contained in:
parent
84ad1b0d6b
commit
e9ea675ae6
2 changed files with 31 additions and 1 deletions
|
|
@ -2570,8 +2570,24 @@ static void MwLLEndStateChangeImpl(MwLL handle) {
|
|||
}
|
||||
|
||||
static int MwLLWaylandCallInitImpl(void) {
|
||||
/*
|
||||
* Order of precedence:
|
||||
* - MILSKO_BACKEND
|
||||
* - XDG_SESSION_TYPE
|
||||
* - manually checking environment variables
|
||||
*/
|
||||
#ifdef __linux__
|
||||
if(strcmp(getenv("XDG_SESSION_TYPE"), "wayland") == 0) {
|
||||
MwBool loadWayland;
|
||||
if(getenv("MILSKO_BACKEND")) {
|
||||
loadWayland |=
|
||||
(strcmp(getenv("MILSKO_BACKEND"), "wayland") == 0);
|
||||
} else if(getenv("XDG_SESSION_TYPE")) {
|
||||
loadWayland |= (strcmp(getenv("XDG_SESSION_TYPE"), "wayland") == 0);
|
||||
} else if(getenv("WAYLAND_DISPLAY")) {
|
||||
loadWayland |= (getenv("WAYLAND_DISPLAY") != NULL);
|
||||
}
|
||||
|
||||
if(loadWayland) {
|
||||
if(wayland_load_funcs()) {
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1276,6 +1276,20 @@ static void MwLLEndStateChangeImpl(MwLL handle) {
|
|||
}
|
||||
|
||||
static int MwLLX11CallInitImpl(void) {
|
||||
MwBool loadX11;
|
||||
if(getenv("MILSKO_BACKEND")) {
|
||||
loadX11 |=
|
||||
(strcmp(getenv("MILSKO_BACKEND"), "x11") == 0);
|
||||
} else if(getenv("XDG_SESSION_TYPE")) {
|
||||
loadX11 |= (strcmp(getenv("XDG_SESSION_TYPE"), "x11") == 0);
|
||||
} else if(getenv("DISPLAY")) {
|
||||
loadX11 |= (getenv("DISPLAY") != NULL);
|
||||
}
|
||||
|
||||
if(!loadX11) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
xsymtbl.lib_xlib = MwDynamicOpen("libX11.so");
|
||||
if(!xsymtbl.lib_xlib) {
|
||||
return 1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue