Added SDL_VIDEO_FULLSCREEN_DISPLAY as a preferred synonym for SDL_VID…

…EO_FULLSCREEN_HEAD on X11.
libsdl-org · Oct 10, 2009 · 2d91b7a · 2d91b7a
1 parent c84fb6f
commit 2d91b7a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/WhatsNew b/WhatsNew
@@ -8,6 +8,9 @@ Version 1.0:
 		SDL_reinterpret_cast(type, expression)
 		SDL_static_cast(type, expression)
 
+	Added SDL_VIDEO_FULLSCREEN_DISPLAY as a preferred synonym for 
+	SDL_VIDEO_FULLSCREEN_HEAD on X11.
+
 	Added SDL_DISABLE_LOCK_KEYS environment variable to enable normal
 	up/down events for Caps-Lock and Num-Lock keys.
 

diff --git a/docs.html b/docs.html
@@ -93,7 +93,10 @@ <H3> Unix Notes </H3>
 	SDL_GL_GetAttribute(SDL_GL_SWAP_CONTROL) returns the correct value with GLX_SGI_swap_control.
 </P>
 <P>
-	The SDL_VIDEO_FULLSCREEN_HEAD environment variable can be set to 0 to place fullscreen SDL windows on the first Xinerama screen.
+	Added SDL_VIDEO_FULLSCREEN_DISPLAY as a preferred synonym for SDL_VIDEO_FULLSCREEN_HEAD on X11.
+</P>
+<P>
+	The SDL_VIDEO_FULLSCREEN_DISPLAY environment variable can be set to 0 to place fullscreen SDL windows on the first Xinerama screen.
 </P>
 <P>
 	Added the SDL_VIDEO_FBCON_ROTATION environment variable to control output orientation on the framebuffer console.

diff --git a/src/video/x11/SDL_x11modes.c b/src/video/x11/SDL_x11modes.c
@@ -548,7 +548,10 @@ int X11_GetVideoModes(_THIS)
         int w, h;
         SDL_NAME(XineramaScreenInfo) *xinerama;
 
-        const char *variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_HEAD");
+        const char *variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_DISPLAY");
+	if ( !variable ) {
+        	variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_HEAD");
+	}
         if ( variable ) {
                 desired = SDL_atoi(variable);
         }