From 99588a8072e71be6b58a8e80b424535dd67fc5d3 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Sat, 10 Oct 2009 15:06:04 +0000
Subject: [PATCH] Added SDL_VIDEO_FULLSCREEN_DISPLAY as a preferred synonym for
 SDL_VIDEO_FULLSCREEN_HEAD on X11.

--HG--
branch : SDL-1.2
---
 WhatsNew                     | 3 +++
 docs.html                    | 5 ++++-
 src/video/x11/SDL_x11modes.c | 5 ++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/WhatsNew b/WhatsNew
index 537f9e780..927fdd264 100644
--- 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
index 95daeb567..66ca9235a 100644
--- a/docs.html
+++ b/docs.html
@@ -93,7 +93,10 @@ SDL 1.2.14 is a significant bug fix release and a recommended update.
 	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
index 070455a85..c78269947 100644
--- 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);
         }