zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash with GTK+SDL2 on startup and use windowed fullscreen instead of

Browse source 
exclusive fullscreen.

git-svn-id: https://svn.eduke32.com/eduke32@4447 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
Plagman 2014-04-19 02:51:33 +00:00
parent 974fd50052
commit dccf7ebadc
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
polymer/eduke32/build/src/sdlayer.c
View file

@ -261,6 +261,12 @@ int32_t main(int32_t argc, char *argv[])
buildkeytranslationtable(); buildkeytranslationtable();
#ifdef HAVE_GTK2
// Pre-initialize SDL video system in order to make sure XInitThreads() is called
// before GTK starts talking to X11.
SDL_Init(SDL_INIT_VIDEO);
#endif
#ifdef _WIN32 #ifdef _WIN32
if (!CheckWinVersion()) if (!CheckWinVersion())
{ {
@ -1483,7 +1489,7 @@ int32_t setvideomode(int32_t x, int32_t y, int32_t c, int32_t fs)
} }
# else # else
sdl_window = SDL_CreateWindow("", windowpos ? windowx : SDL_WINDOWPOS_CENTERED ,windowpos ? windowy : SDL_WINDOWPOS_CENTERED, sdl_window = SDL_CreateWindow("", windowpos ? windowx : SDL_WINDOWPOS_CENTERED ,windowpos ? windowy : SDL_WINDOWPOS_CENTERED,
x,y, ((fs&1)?SDL_WINDOW_FULLSCREEN:0) | SDL_WINDOW_OPENGL); x,y, ((fs&1)?SDL_WINDOW_FULLSCREEN_DESKTOP:0) | SDL_WINDOW_OPENGL);
if (!sdl_window) if (!sdl_window)
{ {
initprintf("Unable to set video mode: SDL_CreateWindow failed: %s\n", initprintf("Unable to set video mode: SDL_CreateWindow failed: %s\n",
@ -1536,7 +1542,7 @@ int32_t setvideomode(int32_t x, int32_t y, int32_t c, int32_t fs)
// init // init
sdl_window = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, sdl_window = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
x, y, ((fs&1) ? SDL_WINDOW_FULLSCREEN : 0)); x, y, ((fs&1) ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0));
if (!sdl_window) if (!sdl_window)
SDL2_VIDEO_ERR("SDL_CreateWindow"); SDL2_VIDEO_ERR("SDL_CreateWindow");