mirror of
https://github.com/gnif/LookingGlass.git
synced 2024-11-22 13:37:22 +00:00
[client] Adds back support for wayland
* Since LG is now using SDL2, the SDL_VIDEODRIVER must be set. * This fixes SDL error 'Couldn't find matching GLX visual' when creating the window.
This commit is contained in:
parent
83592f7e4a
commit
29f1d6cd42
@ -732,6 +732,17 @@ int run()
|
|||||||
state.scaleY = 1.0f;
|
state.scaleY = 1.0f;
|
||||||
state.fpsSleep = 1000000 / params.fpsLimit;
|
state.fpsSleep = 1000000 / params.fpsLimit;
|
||||||
|
|
||||||
|
char* XDG_SESSION_TYPE = getenv("XDG_SESSION_TYPE");
|
||||||
|
if (strcmp(XDG_SESSION_TYPE, "wayland") == 0) {
|
||||||
|
DEBUG_INFO("Wayland detected");
|
||||||
|
int err = setenv("SDL_VIDEODRIVER", "wayland", 1);
|
||||||
|
if (err < 0) {
|
||||||
|
DEBUG_ERROR("Unable to set the env variable SDL_VIDEODRIVER: %d", errno);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
DEBUG_INFO("SDL_VIDEODRIVER has been set to wayland");
|
||||||
|
}
|
||||||
|
|
||||||
if (SDL_Init(SDL_INIT_VIDEO) < 0)
|
if (SDL_Init(SDL_INIT_VIDEO) < 0)
|
||||||
{
|
{
|
||||||
DEBUG_ERROR("SDL_Init Failed");
|
DEBUG_ERROR("SDL_Init Failed");
|
||||||
@ -838,6 +849,11 @@ int run()
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (state.window == NULL) {
|
||||||
|
DEBUG_ERROR("Could not create an SDL window: %s\n", SDL_GetError());
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
if (params.fullscreen)
|
if (params.fullscreen)
|
||||||
SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0");
|
SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0");
|
||||||
|
|
||||||
@ -868,6 +884,9 @@ int run()
|
|||||||
1
|
1
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
DEBUG_ERROR("Could not get SDL window information %s", SDL_GetError());
|
||||||
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!state.window)
|
if (!state.window)
|
||||||
|
Loading…
Reference in New Issue
Block a user