X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_window.c;h=fc9fc55d0055dabe666329941c7dc149579bdef4;hb=d4846df601fa224353c65fa332f603a85735b5d8;hp=c7a07c6ab084cbb1eef7514df31354ea7902e80c;hpb=a1ff6aa662af045fc32c9241ef48a6ff019e0018;p=freeglut

diff --git a/src/freeglut_window.c b/src/freeglut_window.c
index c7a07c6..fc9fc55 100644
--- a/src/freeglut_window.c
+++ b/src/freeglut_window.c
@@ -31,6 +31,7 @@
 
 #if TARGET_HOST_POSIX_X11
 #include <limits.h>  /* LONG_MAX */
+#include <unistd.h>  /* usleep */
 #endif
 
 #if defined(_WIN32_WCE)
@@ -679,7 +680,7 @@ static void fghFillPFD( PIXELFORMATDESCRIPTOR *ppfd, HDC hdc, unsigned char laye
   ppfd->cGreenShift = 0;
   ppfd->cBlueShift = 0;
   ppfd->cAlphaShift = 0;
-  ppfd->cAccumBits = 0;
+  ppfd->cAccumBits = ( fgState.DisplayMode & GLUT_ACCUM ) ? 1 : 0;
   ppfd->cAccumRedBits = 0;
   ppfd->cAccumGreenBits = 0;
   ppfd->cAccumBlueBits = 0;
@@ -905,6 +906,14 @@ static void get_display_origin(int *xp,int *yp)
 #endif
 
 
+#if TARGET_HOST_POSIX_X11
+static Bool fghWindowIsVisible( Display *display, XEvent *event, XPointer arg)
+{
+    Window window = arg;
+    return (event->type == MapNotify) && (event->xmap.window == window);
+}
+#endif
+
 
 /*
  * Opens a window. Requires a SFG_Window object created and attached
@@ -921,6 +930,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
     XTextProperty textProperty;
     XSizeHints sizeHints;
     XWMHints wmHints;
+    XEvent eventReturnBuffer; /* return buffer required for a call */
     unsigned long mask;
     int num_FBConfigs, i;
     unsigned int current_DisplayMode = fgState.DisplayMode ;
@@ -1114,6 +1124,9 @@ void fgOpenWindow( SFG_Window* window, const char* title,
 
     XFree(visualInfo);
 
+    if( !isSubWindow)
+        XPeekIfEvent( fgDisplay.Display, &eventReturnBuffer, &fghWindowIsVisible, window->Window.Handle );
+
 #elif TARGET_HOST_MS_WINDOWS
 
     WNDCLASS wc;
@@ -1303,6 +1316,12 @@ void fgOpenWindow( SFG_Window* window, const char* title,
  */
 void fgCloseWindow( SFG_Window* window )
 {
+    /* if we're in gamemode, call glutLeaveGameMode first to make sure the
+     * gamemode is properly closed before closing the window
+     */
+    if (fgStructure.GameModeWindow != NULL)
+        glutLeaveGameMode();
+
 #if TARGET_HOST_POSIX_X11
 
     if( window->Window.Context )