Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

SDL: initialize after wayland.

Browse source 
Otherwise the input thread can start doing wayland stuff before it's safe.
This commit is contained in:
Pierre-Loup A. Griffais 2020-01-26 17:51:27 -08:00
parent b4893840eb
commit 2b111b43dd
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main.cpp
View file

@ -101,10 +101,15 @@ int main(int argc, char **argv)
XInitThreads();
initOutput();
if ( getenv("DISPLAY") != NULL )
{
g_bIsNested = true;
}
wlserver_init(argc, argv, g_bIsNested == true );
initOutput();
wlserver_run();
}
@ -123,11 +128,6 @@ void startSteamCompMgr(void)
void initOutput(void)
{
if ( getenv("DISPLAY") != NULL )
{
g_bIsNested = true;
}
if ( g_bIsNested == true )
{
inputsdl_init();

4
src/wlserver.c
View file

@ -112,6 +112,8 @@ const struct wlr_surface_role xwayland_surface_role = {
static void xwayland_ready(struct wl_listener *listener, void *data)
{
setenv("DISPLAY", wlserver.wlr.xwayland->display_name, true);
startSteamCompMgr();
}
@ -406,8 +408,6 @@ int wlserver_init(int argc, char **argv, bool bIsNested) {
wlserver.wlr.xwayland = wlr_xwayland_create(wlserver.wl_display, wlserver.wlr.compositor, False);
setenv("DISPLAY", wlserver.wlr.xwayland->display_name, true);
const char *socket = wl_display_add_socket_auto(wlserver.wl_display);
if (!socket)
{