From e2d6911fb992b6a0323c6c8502bdf258bc52696b Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 10 Apr 2004 06:28:08 +0000 Subject: [PATCH] set SDL_VIDEODRIVER so SDL doesn't try to fire up aalib, etc --- .../LowLevelWindow/LowLevelWindow_SDL.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp index 9977a5c3cf..a2ca9a5a0e 100644 --- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp +++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp @@ -64,6 +64,25 @@ CString LowLevelWindow_SDL::TryVideoMode( RageDisplay::VideoModeParams p, bool & EventEnabled[i] = mySDL_EventState( (Uint8) i, SDL_QUERY ); SDL_QuitSubSystem(SDL_INIT_VIDEO); + +#if defined(LINUX) + static bool bSetVideoDriver = false; + if( !bSetVideoDriver ) + { + bSetVideoDriver = true; + + /* Most people don't have this set. SDL has a habit of trying to + * fall back on other drivers (svgalib, aalib), so set it to "x11". */ + const char *sVideoDriver = getenv("SDL_VIDEODRIVER"); + if( sVideoDriver == NULL ) + { + static char env[] = "SDL_VIDEODRIVER=x11"; + putenv( env ); + } else if( strcmp( sVideoDriver, "x11" ) ) + LOG->Info( "SDL_VIDEODRIVER has been set to %s", sVideoDriver ); + } +#endif + if( SDL_InitSubSystem(SDL_INIT_VIDEO) == -1 ) RageException::Throw( "SDL_INIT_VIDEO failed: %s", mySDL_GetError().c_str() );