Merge.

configure.in

@@ -1039,6 +1039,8 @@ AC_HELP_STRING([--enable-x11-shared], [dynamically load X11 support [[default=ma
                     xrandr_lib='/usr/X11R6/lib/libXrandr.2.dylib'
                     xinput_lib='/usr/X11R6/lib/libXi.6.dylib'
                     xss_lib='/usr/X11R6/lib/libXss.6.dylib'
+                    xdamage_lib='/usr/X11R6/lib/libXdamage.1.dylib'
+                    xfixes_lib='/usr/X11R6/lib/libXfixes.3.dylib'
                     ;;
                 *-*-osf*)
                     x11_lib='libX11.so'

include/SDL.h

@@ -139,16 +139,16 @@ extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags);
 extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);
 
 /**
- *  This function returns mask of the specified subsystems which have
+ *  This function returns a mask of the specified subsystems which have
- *  been initialized.
+ *  previously been initialized.
  *  
  *  If \c flags is 0, it returns a mask of all initialized subsystems.
  */
 extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags);
 
 /**
- *  This function cleans up all initialized subsystems and unloads the
+ *  This function cleans up all initialized subsystems. You should
- *  dynamically linked library.  You should call it upon all exit conditions.
+ *  call it upon all exit conditions.
  */
 extern DECLSPEC void SDLCALL SDL_Quit(void);
 

include/SDL_version.h

@@ -112,12 +112,11 @@ typedef struct SDL_version
 
 /**
  *  \brief Get the version of SDL that is linked against your program.
- *  
- *  If you are using a shared library (DLL) version of SDL, then it is
- *  possible that it will be different than the version you compiled against.
  *
- *  This is a real function; the macro SDL_VERSION() tells you what version
+ *  If you are linking to SDL dynamically, then it is possible that the
- *  of SDL you compiled against:
+ *  current version will be different than the version you compiled against.
+ *  This function returns the current version, while SDL_VERSION() is a
+ *  macro that tells you what version you compiled with.
  *  
  *  \code
  *  SDL_version compiled;
@@ -140,8 +139,9 @@ extern DECLSPEC void SDLCALL SDL_GetVersion(SDL_version * ver);
 /**
  *  \brief Get the code revision of SDL that is linked against your program.
  *
- *  This is an arbitrary string (a hash value, actually), and is only useful
+ *  Returns an arbitrary string (a hash value) uniquely identifying the
- *  in comparing against other revisions. It is NOT an incrementing number.
+ *  exact revision of the SDL library in use, and is only useful in comparing
+ *  against other revisions. It is NOT an incrementing number.
  */
 extern DECLSPEC const char *SDLCALL SDL_GetRevision(void);
 

src/SDL_error.c

@@ -30,8 +30,7 @@
 
 /* Routine to get the thread-specific error variable */
 #if SDL_THREADS_DISABLED
-/* !!! FIXME: what does this comment mean? Victim of Search and Replace? */
+/* The default (non-thread-safe) global error variable */
-/* The  SDL_arraysize(The ),default (non-thread-safe) global error variable */
 static SDL_error SDL_global_error;
 #define SDL_GetErrBuf()	(&SDL_global_error)
 #else

src/video/x11/SDL_x11window.c

@@ -94,9 +94,15 @@ X11_GetDisplaySize(_THIS, SDL_Window * window, int *w, int *h)
         (SDL_DisplayData *) window->display->driverdata;
     XWindowAttributes attr;
 
-    XGetWindowAttributes(data->display, RootWindow(data->display,
+    XGetWindowAttributes(data->display, RootWindow(data->display, displaydata->screen), &attr);
-                                                   displaydata->screen),
+    if (window->flags & SDL_WINDOW_FULLSCREEN) {
-                         &attr);
+        /* The bounds when this window is visible is the fullscreen mode */
+        SDL_DisplayMode fullscreen_mode;
+        if (SDL_GetWindowDisplayMode(window, &fullscreen_mode) == 0) {
+            attr.width = fullscreen_mode.w;
+            attr.height = fullscreen_mode.h;
+        }
+    }
     if (w) {
         *w = attr.width;
     }