oops prioritize wayland
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
c4f6d1eb14
commit
0ab497ca88
3 changed files with 5 additions and 13 deletions
|
|
@ -2575,7 +2575,6 @@ static int MwLLWaylandCallInitImpl(void) {
|
|||
/*
|
||||
* Order of precedence:
|
||||
* - MILSKO_BACKEND
|
||||
* - XDG_SESSION_TYPE
|
||||
* - manually checking environment variables
|
||||
*/
|
||||
#ifdef __linux__
|
||||
|
|
@ -2583,11 +2582,7 @@ static int MwLLWaylandCallInitImpl(void) {
|
|||
if(getenv("MILSKO_BACKEND")) {
|
||||
loadWayland |=
|
||||
(strcmp(getenv("MILSKO_BACKEND"), "wayland") == 0);
|
||||
}
|
||||
if(getenv("XDG_SESSION_TYPE")) {
|
||||
loadWayland |= (strcmp(getenv("XDG_SESSION_TYPE"), "wayland") == 0);
|
||||
}
|
||||
if(getenv("WAYLAND_DISPLAY")) {
|
||||
} else if(getenv("WAYLAND_DISPLAY")) {
|
||||
loadWayland |= (getenv("WAYLAND_DISPLAY") != NULL);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1281,9 +1281,6 @@ static int MwLLX11CallInitImpl(void) {
|
|||
loadX11 |=
|
||||
(strcmp(getenv("MILSKO_BACKEND"), "x11") == 0);
|
||||
}
|
||||
if(getenv("XDG_SESSION_TYPE")) {
|
||||
loadX11 |= (strcmp(getenv("XDG_SESSION_TYPE"), "x11") == 0);
|
||||
}
|
||||
if(getenv("DISPLAY")) {
|
||||
loadX11 |= (getenv("DISPLAY") != NULL);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -856,16 +856,16 @@ MwWidget MwGetParent(MwWidget handle) {
|
|||
typedef int (*call_t)(void);
|
||||
int MwLibraryInit(void) {
|
||||
call_t calls[] = {
|
||||
/* x11 has higher priority then cocoa until it works */
|
||||
#ifdef USE_WAYLAND
|
||||
MwLLWaylandCallInit,
|
||||
#endif
|
||||
/* x11 has higher priority then cocoa until it works */
|
||||
#ifdef USE_X11
|
||||
MwLLX11CallInit,
|
||||
#endif
|
||||
#ifdef USE_COCOA
|
||||
MwLLCocoaCallInit,
|
||||
#endif
|
||||
#ifdef USE_WAYLAND
|
||||
MwLLWaylandCallInit,
|
||||
#endif
|
||||
#ifdef USE_GDI
|
||||
MwLLGDICallInit,
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue