# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1255187164 0
# Node ID 34a0a589b9c4904432e3d00748f94e0ce73e98a6
# Parent  719faf118c38dcfc7fe9254f1a2d4b47a9115691
Added SDL_VIDEO_FULLSCREEN_DISPLAY as a preferred synonym for SDL_VIDEO_FULLSCREEN_HEAD on X11.

diff -r 719faf118c38 -r 34a0a589b9c4 WhatsNew
--- a/WhatsNew	Sat Oct 10 14:59:32 2009 +0000
+++ b/WhatsNew	Sat Oct 10 15:06:04 2009 +0000
@@ -8,6 +8,9 @@
 		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 -r 719faf118c38 -r 34a0a589b9c4 docs.html
--- a/docs.html	Sat Oct 10 14:59:32 2009 +0000
+++ b/docs.html	Sat Oct 10 15:06:04 2009 +0000
@@ -93,7 +93,10 @@
 	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 -r 719faf118c38 -r 34a0a589b9c4 src/video/x11/SDL_x11modes.c
--- a/src/video/x11/SDL_x11modes.c	Sat Oct 10 14:59:32 2009 +0000
+++ b/src/video/x11/SDL_x11modes.c	Sat Oct 10 15:06:04 2009 +0000
@@ -548,7 +548,10 @@
         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);
         }