1.1 --- a/WhatsNew	Sat Oct 10 14:59:32 2009 +0000
     1.2 +++ b/WhatsNew	Sat Oct 10 15:06:04 2009 +0000
     1.3 @@ -8,6 +8,9 @@
     1.4  		SDL_reinterpret_cast(type, expression)
     1.5  		SDL_static_cast(type, expression)
     1.6  
     1.7 +	Added SDL_VIDEO_FULLSCREEN_DISPLAY as a preferred synonym for 
     1.8 +	SDL_VIDEO_FULLSCREEN_HEAD on X11.
     1.9 +
    1.10  	Added SDL_DISABLE_LOCK_KEYS environment variable to enable normal
    1.11  	up/down events for Caps-Lock and Num-Lock keys.
    1.12  

     2.1 --- a/docs.html	Sat Oct 10 14:59:32 2009 +0000
     2.2 +++ b/docs.html	Sat Oct 10 15:06:04 2009 +0000
     2.3 @@ -93,7 +93,10 @@
     2.4  	SDL_GL_GetAttribute(SDL_GL_SWAP_CONTROL) returns the correct value with GLX_SGI_swap_control.
     2.5  </P>
     2.6  <P>
     2.7 -	The SDL_VIDEO_FULLSCREEN_HEAD environment variable can be set to 0 to place fullscreen SDL windows on the first Xinerama screen.
     2.8 +	Added SDL_VIDEO_FULLSCREEN_DISPLAY as a preferred synonym for SDL_VIDEO_FULLSCREEN_HEAD on X11.
     2.9 +</P>
    2.10 +<P>
    2.11 +	The SDL_VIDEO_FULLSCREEN_DISPLAY environment variable can be set to 0 to place fullscreen SDL windows on the first Xinerama screen.
    2.12  </P>
    2.13  <P>
    2.14  	Added the SDL_VIDEO_FBCON_ROTATION environment variable to control output orientation on the framebuffer console.

     3.1 --- a/src/video/x11/SDL_x11modes.c	Sat Oct 10 14:59:32 2009 +0000
     3.2 +++ b/src/video/x11/SDL_x11modes.c	Sat Oct 10 15:06:04 2009 +0000
     3.3 @@ -548,7 +548,10 @@
     3.4          int w, h;
     3.5          SDL_NAME(XineramaScreenInfo) *xinerama;
     3.6  
     3.7 -        const char *variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_HEAD");
     3.8 +        const char *variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_DISPLAY");
     3.9 +	if ( !variable ) {
    3.10 +        	variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_HEAD");
    3.11 +	}
    3.12          if ( variable ) {
    3.13                  desired = SDL_atoi(variable);
    3.14          }