OpenGL context is not made current on Win32 until fgSetWindow is called.
[freeglut] / src / freeglut_window.c
index 6125032..c92fbcb 100644 (file)
@@ -29,8 +29,6 @@
 #include "config.h"
 #endif
 
-#define  G_LOG_DOMAIN  "freeglut-window"
-
 #include "../include/GL/freeglut.h"
 #include "freeglut_internal.h"
 
@@ -68,7 +66,7 @@ XVisualInfo* fgChooseVisual( void )
 {
 #define BUFFER_SIZES 6
     int bufferSize[BUFFER_SIZES] = { 16, 12, 8, 4, 2, 1 };
-    GLboolean wantIndexedMode = FALSE;
+    GLboolean wantIndexedMode = GL_FALSE;
     int attributes[ 32 ];
     int where = 0;
 
@@ -85,7 +83,7 @@ XVisualInfo* fgChooseVisual( void )
     if( fgState.DisplayMode & GLUT_INDEX )
     {
         ATTRIB_VAL( GLX_BUFFER_SIZE, 8 );
-        wantIndexedMode = TRUE;
+        wantIndexedMode = GL_TRUE;
     }
     else
     {
@@ -123,7 +121,7 @@ XVisualInfo* fgChooseVisual( void )
      */
     ATTRIB( None );
 
-    if( wantIndexedMode == FALSE )
+    if( ! wantIndexedMode )
         return glXChooseVisual( fgDisplay.Display, fgDisplay.Screen,
                                 attributes );
     else
@@ -164,7 +162,9 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
     if( fgState.DisplayMode & GLUT_DOUBLE )
         flags |= PFD_DOUBLEBUFFER;
 
+#if defined(_MSC_VER)
 #pragma message( "fgSetupPixelFormat(): there is still some work to do here!" )
+#endif
 
     /*
      * Specify which pixel format do we opt for...
@@ -206,10 +206,10 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
     
     pixelformat = ChoosePixelFormat( window->Window.Device, ppfd );
     if( pixelformat == 0 )
-        return FALSE;
+        return GL_FALSE;
 
     if( checkOnly )
-        return TRUE;
+        return GL_TRUE;
     return SetPixelFormat( window->Window.Device, pixelformat, ppfd );
 }
 #endif
@@ -237,8 +237,8 @@ void fgSetWindow ( SFG_Window *window )
         window->Window.Device = GetDC( window->Window.Handle );
         wglMakeCurrent( 
             window->Window.Device, 
-            window->Window.Context 
-       );
+            window->Window.Context
+        );
     }
 #endif
     fgStructure.Window = window;
@@ -251,7 +251,7 @@ void fgSetWindow ( SFG_Window *window )
  */
 void fgOpenWindow( SFG_Window* window, const char* title,
                    int x, int y, int w, int h,
-                   GLboolean gameMode, int isSubWindow )
+                   GLboolean gameMode, GLboolean isSubWindow )
 {
 #if TARGET_HOST_UNIX_X11
     XSetWindowAttributes winAttr;
@@ -267,7 +267,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
      * XXX With a little thought, we should be able to greatly
      * XXX simplify this.
      */
-    if ( !fgState.BuildingAMenu )
+    if ( !window->IsMenu )
       window->Window.VisualInfo = fgChooseVisual();
     else if ( fgStructure.MenuContext )
         window->Window.VisualInfo = fgChooseVisual();
@@ -329,7 +329,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
 
     mask = CWBackPixmap | CWBorderPixel | CWColormap | CWEventMask;
 
-    if ( fgState.BuildingAMenu )
+    if ( window->IsMenu )
     {
         winAttr.override_redirect = True;
         mask |= CWOverrideRedirect;
@@ -349,7 +349,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
      * The GLX context creation, possibly trying the direct context rendering
      *  or else use the current context if the user has so specified
      */
-    if ( fgState.BuildingAMenu )
+    if ( window->IsMenu )
     {
         /*
          * If there isn't already an OpenGL rendering context for menu
@@ -372,7 +372,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
             NULL, fgState.ForceDirectContext | fgState.TryDirectContext
         );
     }
-    else if ( fgState.UseCurrentContext == TRUE )
+    else if ( fgState.UseCurrentContext )
     {
       window->Window.Context = glXGetCurrentContext();
 
@@ -403,12 +403,12 @@ void fgOpenWindow( SFG_Window* window, const char* title,
      * XXX Assume the new window is visible by default
      * XXX Is this a  safe assumption?
      */
-    window->State.Visible = TRUE;
+    window->State.Visible = GL_TRUE;
 
     sizeHints.flags = 0;
-    if (fgState.Position.Use == TRUE)
+    if ( fgState.Position.Use )
         sizeHints.flags |= USPosition;
-    if (fgState.Size.Use     == TRUE)
+    if ( fgState.Size.Use )
         sizeHints.flags |= USSize;
 
     /*
@@ -425,8 +425,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
     sizeHints.height = h;
 
     wmHints.flags = StateHint;
-    wmHints.initial_state =
-        (fgState.ForceIconic == FALSE) ? NormalState : IconicState;
+    wmHints.initial_state = fgState.ForceIconic ? IconicState : NormalState;
 
     /*
      * Prepare the window and iconified window names...
@@ -462,7 +461,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
     atom = GetClassInfo( fgDisplay.Instance, "FREEGLUT", &wc );
     assert( atom != 0 );
     
-    if( gameMode != FALSE )
+    if( gameMode )
     {
         assert( window->Parent == NULL );
 
@@ -474,7 +473,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
     }
     else
     {
-        if ( ( !isSubWindow ) && ( ! window->IsMenu ) )
+        if ( ( ! isSubWindow ) && ( ! window->IsMenu ) )
         {
             /*
              * Update the window dimensions, taking account of window
@@ -486,12 +485,12 @@ void fgOpenWindow( SFG_Window* window, const char* title,
                 GetSystemMetrics( SM_CYCAPTION );
         }
 
-        if( fgState.Position.Use == FALSE )
+        if( ! fgState.Position.Use )
         {
             x = CW_USEDEFAULT;
             y = CW_USEDEFAULT;
         }
-        if( fgState.Size.Use == FALSE )
+        if( ! fgState.Size.Use )
         {
             w = CW_USEDEFAULT;
             h = CW_USEDEFAULT;
@@ -524,33 +523,23 @@ void fgOpenWindow( SFG_Window* window, const char* title,
     if( !( window->Window.Handle ) )
         fgError( "Failed to create a window (%s)!", title );
 
-    /*
-     * Show and update the main window. Hide(???) the mouse cursor.
-     */
     ShowWindow( window->Window.Handle,
                 fgState.ForceIconic ? SW_SHOWMINIMIZED : SW_SHOW );
     UpdateWindow( window->Window.Handle );
-    ShowCursor( TRUE );
+    ShowCursor( TRUE );  /* XXX Old comments say "hide cusror"! */
 
 #endif
 
+    fgSetWindow( window );
+
     window->Window.DoubleBuffered =
-        ( fgState.DisplayMode & GLUT_DOUBLE ) ? 1 : 0 ;
+        ( fgState.DisplayMode & GLUT_DOUBLE ) ? 1 : 0;
 
-    /*
-     * If it's not double-buffered, make sure the rendering is done to the
-     * front buffer.
-     */
     if ( ! window->Window.DoubleBuffered )
     {
-        glDrawBuffer ( GL_FRONT ) ;
-        glReadBuffer ( GL_FRONT ) ;
+        glDrawBuffer ( GL_FRONT );
+        glReadBuffer ( GL_FRONT );
     }
-
-    /*
-     * Set the newly created window as the current one
-     */
-    fgSetWindow( window );
 }
 
 /*
@@ -564,17 +553,38 @@ void fgCloseWindow( SFG_Window* window )
 
     glXDestroyContext( fgDisplay.Display, window->Window.Context );
     XDestroyWindow( fgDisplay.Display, window->Window.Handle );
-    XFlush( fgDisplay.Display );
+    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
 
 #elif TARGET_HOST_WIN32
 
-    SendMessage( 
-        window->Window.Handle,
-        WM_CLOSE,
-        0,
-        0
-    );
+    /*
+     * Make sure we don't close a window with current context active
+     */
+    if( fgStructure.Window == window )
+        wglMakeCurrent( NULL, NULL );
+
+    /*
+     * Step through the list of windows.  If the rendering context
+     * is not being used by another window, then we delete it.
+     */
+    {
+        int used = FALSE ;
+        SFG_Window *iter ;
 
+        for( iter = (SFG_Window *)fgStructure.Windows.First;
+             iter;
+             iter = (SFG_Window *)iter->Node.Next )
+        {
+            if( ( iter->Window.Context == window->Window.Context ) &&
+                ( iter != window ) )
+                used = TRUE;
+        }
+
+        if( ! used )
+            wglDeleteContext( window->Window.Context );
+    }
+
+    DestroyWindow( window->Window.Handle );
 #endif
 }
 
@@ -586,11 +596,9 @@ void fgCloseWindow( SFG_Window* window )
  */
 int FGAPIENTRY glutCreateWindow( const char* title )
 {
-    /*
-     * Create a new window and return its unique ID number
-     */
-    return( fgCreateWindow( NULL, title, fgState.Position.X, fgState.Position.Y,
-                            fgState.Size.X, fgState.Size.Y, FALSE )->ID );
+    return fgCreateWindow( NULL, title, fgState.Position.X, fgState.Position.Y,
+                           fgState.Size.X, fgState.Size.Y, GL_FALSE,
+                           GL_FALSE )->ID;
 }
 
 /*
@@ -602,26 +610,10 @@ int FGAPIENTRY glutCreateSubWindow( int parentID, int x, int y, int w, int h )
     SFG_Window* parent = NULL;
 
     freeglut_assert_ready;
-
-    /*
-     * Find a parent to the newly created window...
-     */
     parent = fgWindowByID( parentID );
-
-    /*
-     * Fail if the parent has not been found
-     */
     freeglut_return_val_if_fail( parent != NULL, 0 );
-
-    /*
-     * Create the new window
-     */
-    window = fgCreateWindow( parent, "", x, y, w, h, FALSE );
-
-    /*
-     * Return the new window's ID
-     */
-    return( window->ID );
+    window = fgCreateWindow( parent, "", x, y, w, h, GL_FALSE, GL_FALSE );
+    return window->ID;
 }
 
 /*
@@ -629,25 +621,13 @@ int FGAPIENTRY glutCreateSubWindow( int parentID, int x, int y, int w, int h )
  */
 void FGAPIENTRY glutDestroyWindow( int windowID )
 {
-  fgExecutionState ExecState = fgState.ExecState ;
-
-  /*
-   * Grab the freeglut window pointer from the structure
-   */
-  SFG_Window* window = fgWindowByID( windowID );
-  freeglut_return_if_fail( window != NULL );
-
-  /*
-   * There is a function that performs all needed steps
-   * defined in freeglut_structure.c. Let's use it:
-   */
-  fgAddToWindowDestroyList( window, TRUE );
-
-  /*
-   * Since the "fgAddToWindowDestroyList" function could easily have set the "ExecState"
-   * to stop, let's set it back to what it was.
-   */
-  fgState.ExecState = ExecState ;
+    SFG_Window* window = fgWindowByID( windowID );
+    freeglut_return_if_fail( window != NULL );
+    {
+        fgExecutionState ExecState = fgState.ExecState;
+        fgAddToWindowDestroyList( window );
+        fgState.ExecState = ExecState;
+    }
 }
 
 /*
@@ -657,36 +637,19 @@ void FGAPIENTRY glutSetWindow( int ID )
 {
     SFG_Window* window = NULL;
 
-    /*
-     * Make sure we don't get called too early
-     */
     freeglut_assert_ready;
-
-    /*
-     * Be wise. Be wise. Be wise. Be quick.
-     */
     if( fgStructure.Window != NULL )
         if( fgStructure.Window->ID == ID )
             return;
 
-    /*
-     * Now we are sure there is sense in looking for the window
-     */
     window = fgWindowByID( ID );
-
-    /*
-     * In the case of an utter failure...
-     */
     if( window == NULL )
     {
-        /*
-         * ...issue a warning message and keep rolling on
-         */
         fgWarning( "glutSetWindow(): window ID %i not found!", ID );
         return;
     }
 
-    fgSetWindow ( window ) ;
+    fgSetWindow( window );
 }
 
 /*
@@ -695,22 +658,9 @@ void FGAPIENTRY glutSetWindow( int ID )
 int FGAPIENTRY glutGetWindow( void )
 {
     freeglut_assert_ready;
-
-    /*
-     * Do we have a current window selected?
-     */
     if( fgStructure.Window == NULL )
-    {
-        /*
-         * Nope. Return zero to mark the state.
-         */
-        return( 0 );
-    }
-
-    /*
-     * Otherwise, return the ID of the current window
-     */
-    return( fgStructure.Window->ID );
+        return 0;
+    return fgStructure.Window->ID;
 }
 
 /*
@@ -718,28 +668,21 @@ int FGAPIENTRY glutGetWindow( void )
  */
 void FGAPIENTRY glutShowWindow( void )
 {
-    freeglut_assert_ready; freeglut_assert_window;
+    freeglut_assert_ready;
+    freeglut_assert_window;
 
 #if TARGET_HOST_UNIX_X11
-    /*
-     * Showing the window is done via mapping under X
-     */
+
     XMapWindow( fgDisplay.Display, fgStructure.Window->Window.Handle );
-    XFlush( fgDisplay.Display );
+    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
 
 #elif TARGET_HOST_WIN32
-       /*
-        * Restore the window's originial position and size
-        */
-       ShowWindow( fgStructure.Window->Window.Handle, SW_SHOW );
 
-#endif
+    ShowWindow( fgStructure.Window->Window.Handle, SW_SHOW );
 
-  /*
-   * Since the window is visible, we need to redisplay it ...
-   */
-  fgStructure.Window->State.Redisplay = TRUE;
+#endif
 
+    fgStructure.Window->State.Redisplay = GL_TRUE;
 }
 
 /*
@@ -747,45 +690,25 @@ void FGAPIENTRY glutShowWindow( void )
  */
 void FGAPIENTRY glutHideWindow( void )
 {
-    freeglut_assert_ready; freeglut_assert_window;
+    freeglut_assert_ready;
+    freeglut_assert_window;
 
 #if TARGET_HOST_UNIX_X11
-    /*
-     * The way we hide a window depends on if we're dealing
-     * with a top-level or children one...
-     */
+
     if( fgStructure.Window->Parent == NULL )
-    {
-        /*
-         * This is a top-level window
-         */
-        XWithdrawWindow( fgDisplay.Display, fgStructure.Window->Window.Handle, fgDisplay.Screen );
-    }
+        XWithdrawWindow( fgDisplay.Display, fgStructure.Window->Window.Handle,
+                         fgDisplay.Screen );
     else
-    {
-        /*
-         * Nope, it's a child window
-         */
         XUnmapWindow( fgDisplay.Display, fgStructure.Window->Window.Handle );
-    }
-
-    /*
-     * Flush the X state now
-     */
-    XFlush( fgDisplay.Display );
+    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
 
 #elif TARGET_HOST_WIN32
-       /*
-        * Hide the window
-        */
-       ShowWindow( fgStructure.Window->Window.Handle, SW_HIDE );
+
+    ShowWindow( fgStructure.Window->Window.Handle, SW_HIDE );
 
 #endif
 
-  /*
-   * Since the window is hidden, we don't need to redisplay it ...
-   */
-  fgStructure.Window->State.Redisplay = FALSE;
+    fgStructure.Window->State.Redisplay = GL_FALSE;
 }
 
 /*
@@ -793,28 +716,22 @@ void FGAPIENTRY glutHideWindow( void )
  */
 void FGAPIENTRY glutIconifyWindow( void )
 {
-    freeglut_assert_ready; freeglut_assert_window;
+    freeglut_assert_ready;
+    freeglut_assert_window;
 
 #if TARGET_HOST_UNIX_X11
-    /*
-     * Iconify the window and flush the X state
-     */
-    XIconifyWindow( fgDisplay.Display, fgStructure.Window->Window.Handle, fgDisplay.Screen );
-    XFlush( fgDisplay.Display );
+
+    XIconifyWindow( fgDisplay.Display, fgStructure.Window->Window.Handle,
+                    fgDisplay.Screen );
+    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
 
 #elif TARGET_HOST_WIN32
-       /*
-        * Minimize the current window (this should be the same as X window iconifying)
-        */
-       ShowWindow( fgStructure.Window->Window.Handle, SW_MINIMIZE );
 
-#endif
+    ShowWindow( fgStructure.Window->Window.Handle, SW_MINIMIZE );
 
-  /*
-   * Since the window is just an icon, we don't need to redisplay it ...
-   */
-  fgStructure.Window->State.Redisplay = FALSE;
+#endif
 
+    fgStructure.Window->State.Redisplay = GL_FALSE;
 }
 
 /*
@@ -822,48 +739,36 @@ void FGAPIENTRY glutIconifyWindow( void )
  */
 void FGAPIENTRY glutSetWindowTitle( const char* title )
 {
-       freeglut_assert_ready; freeglut_assert_window;
-
-    /*
-     * Works only for top-level windows
-     */
+    freeglut_assert_ready;
+    freeglut_assert_window;
     if( fgStructure.Window->Parent != NULL )
         return;
 
 #if TARGET_HOST_UNIX_X11
-       {
-               XTextProperty text;
-
-               /*
-                * Prepare the text properties
-                */
-               text.value = (unsigned char *) title;
-               text.encoding = XA_STRING;
-               text.format = 8;
-               text.nitems = strlen( title );
-
-               /*
-                * Set the title now
-                */
-               XSetWMName(
-                       fgDisplay.Display,
-                       fgStructure.Window->Window.Handle,
-                       &text
-               );
-
-               /*
-                * Have the X display state flushed
-                */
-               XFlush( fgDisplay.Display );
-       }
+
+    {
+        XTextProperty text;
+        
+        text.value = (unsigned char *) title;
+        text.encoding = XA_STRING;
+        text.format = 8;
+        text.nitems = strlen( title );
+        
+        XSetWMName(
+            fgDisplay.Display,
+            fgStructure.Window->Window.Handle,
+            &text
+        );
+        
+        XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+    }
 
 #elif TARGET_HOST_WIN32
-       /*
-        * This seems to be a bit easier under Win32
-        */
-       SetWindowText( fgStructure.Window->Window.Handle, title );
+
+    SetWindowText( fgStructure.Window->Window.Handle, title );
 
 #endif
+
 }
 
 /*
@@ -871,48 +776,37 @@ void FGAPIENTRY glutSetWindowTitle( const char* title )
  */
 void FGAPIENTRY glutSetIconTitle( const char* title )
 {
-    freeglut_assert_ready; freeglut_assert_window;
+    freeglut_assert_ready;
+    freeglut_assert_window;
 
-    /*
-     * Works only for top-level windows
-     */
     if( fgStructure.Window->Parent != NULL )
         return;
 
 #if TARGET_HOST_UNIX_X11
-       {
-               XTextProperty text;
-
-               /*
-                * Prepare the text properties
-                */
-               text.value = (unsigned char *) title;
-               text.encoding = XA_STRING;
-               text.format = 8;
-               text.nitems = strlen( title );
-
-               /*
-                * Set the title now
-                */
-               XSetWMIconName(
-                       fgDisplay.Display,
-                       fgStructure.Window->Window.Handle,
-                       &text
-               );
-
-               /*
-                * Have the X display state flushed
-                */
-               XFlush( fgDisplay.Display );
-       }
+
+    {
+        XTextProperty text;
+        
+        text.value = (unsigned char *) title;
+        text.encoding = XA_STRING;
+        text.format = 8;
+        text.nitems = strlen( title );
+
+        XSetWMIconName(
+            fgDisplay.Display,
+            fgStructure.Window->Window.Handle,
+            &text
+        );
+
+        XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+    }
 
 #elif TARGET_HOST_WIN32
-       /*
-        * This seems to be a bit easier under Win32
-        */
-       SetWindowText( fgStructure.Window->Window.Handle, title );
+
+    SetWindowText( fgStructure.Window->Window.Handle, title );
 
 #endif
+
 }
 
 /*
@@ -920,58 +814,12 @@ void FGAPIENTRY glutSetIconTitle( const char* title )
  */
 void FGAPIENTRY glutReshapeWindow( int width, int height )
 {
-    freeglut_assert_ready; freeglut_assert_window;
-
-#if TARGET_HOST_UNIX_X11
-    /*
-     * Resize the window and flush the X state
-     */
-    XResizeWindow( fgDisplay.Display, fgStructure.Window->Window.Handle, width, height );
-    XFlush( fgDisplay.Display );
-
-#elif TARGET_HOST_WIN32
-       {
-               RECT winRect;
-    int x, y ;
-
-               /*
-                * First off, grab the current window's position
-                */
-               GetWindowRect( fgStructure.Window->Window.Handle, &winRect );
-    x = winRect.left ;
-    y = winRect.top ;
-
-    if ( fgStructure.Window->Parent == NULL )  /* If this is not a subwindow ... */
-    {
-      /*
-       * Adjust the size of the window to allow for the size of the frame, if we are not a menu
-       */
-      if ( ! fgStructure.Window->IsMenu )
-      {
-               width += GetSystemMetrics( SM_CXSIZEFRAME ) * 2;
-               height += GetSystemMetrics( SM_CYSIZEFRAME ) * 2 + GetSystemMetrics( SM_CYCAPTION );
-      }
-    }
-    else  /* This is a subwindow, get the parent window's position and subtract it off */
-    {
-      GetWindowRect ( fgStructure.Window->Parent->Window.Handle, &winRect ) ;
-      x -= winRect.left + GetSystemMetrics( SM_CXSIZEFRAME ) ;
-      y -= winRect.top + GetSystemMetrics( SM_CYSIZEFRAME ) + GetSystemMetrics( SM_CYCAPTION ) ;
-    }
+    freeglut_assert_ready;
+    freeglut_assert_window;
 
-               /*
-                * Resize the window, forcing a redraw to happen
-                */
-               MoveWindow(
-                       fgStructure.Window->Window.Handle,
-                       x,
-                       y,
-                       width,
-                       height,
-                       TRUE
-               );
-       }
-#endif
+    fgStructure.Window->State.NeedToResize = GL_TRUE;
+    fgStructure.Window->State.Width  = width ;
+    fgStructure.Window->State.Height = height;
 }
 
 /*
@@ -979,38 +827,32 @@ void FGAPIENTRY glutReshapeWindow( int width, int height )
  */
 void FGAPIENTRY glutPositionWindow( int x, int y )
 {
-    freeglut_assert_ready; freeglut_assert_window;
+    freeglut_assert_ready;
+    freeglut_assert_window;
 
 #if TARGET_HOST_UNIX_X11
-    /*
-     * Reposition the window and flush the X state
-     */
+
     XMoveWindow( fgDisplay.Display, fgStructure.Window->Window.Handle, x, y );
-    XFlush( fgDisplay.Display );
+    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
 
 #elif TARGET_HOST_WIN32
-       {
-               RECT winRect;
 
-               /*
-                * First off, grab the current window's position
-                */
-               GetWindowRect( fgStructure.Window->Window.Handle, &winRect );
-
-    /*
-                * Reposition the window, forcing a redraw to happen
-                */
-               MoveWindow(
-                       fgStructure.Window->Window.Handle,
-                       x,
-                       y,
-                       winRect.right - winRect.left,
-                       winRect.bottom - winRect.top,
-                       TRUE
-               );
-       }
+    {
+        RECT winRect;
+        
+        GetWindowRect( fgStructure.Window->Window.Handle, &winRect );
+        MoveWindow(
+            fgStructure.Window->Window.Handle,
+            x,
+            y,
+            winRect.right - winRect.left,
+            winRect.bottom - winRect.top,
+            TRUE
+        );
+    }
 
 #endif
+
 }
 
 /*
@@ -1018,26 +860,24 @@ void FGAPIENTRY glutPositionWindow( int x, int y )
  */
 void FGAPIENTRY glutPushWindow( void )
 {
-    freeglut_assert_ready; freeglut_assert_window;
+    freeglut_assert_ready;
+    freeglut_assert_window;
 
 #if TARGET_HOST_UNIX_X11
-    /*
-     * Lower the current window
-     */
+
     XLowerWindow( fgDisplay.Display, fgStructure.Window->Window.Handle );
 
 #elif TARGET_HOST_WIN32
-       /*
-        * Set the new window's Z position, not affecting the rest of the settings:
-        */
-       SetWindowPos(
-               fgStructure.Window->Window.Handle,
-               HWND_BOTTOM,
-               0, 0, 0, 0,
-               SWP_NOSIZE | SWP_NOMOVE
-       );
+
+    SetWindowPos(
+        fgStructure.Window->Window.Handle,
+        HWND_BOTTOM,
+        0, 0, 0, 0,
+        SWP_NOSIZE | SWP_NOMOVE
+    );
 
 #endif
+
 }
 
 /*
@@ -1045,26 +885,24 @@ void FGAPIENTRY glutPushWindow( void )
  */
 void FGAPIENTRY glutPopWindow( void )
 {
-    freeglut_assert_ready; freeglut_assert_window;
+    freeglut_assert_ready;
+    freeglut_assert_window;
 
 #if TARGET_HOST_UNIX_X11
-    /*
-     * Raise the current window
-     */
+
     XRaiseWindow( fgDisplay.Display, fgStructure.Window->Window.Handle );
 
 #elif TARGET_HOST_WIN32
-       /*
-        * Set the new window's Z position, not affecting the rest of the settings:
-        */
-       SetWindowPos(
-               fgStructure.Window->Window.Handle,
-               HWND_TOP,
-               0, 0, 0, 0,
-               SWP_NOSIZE | SWP_NOMOVE
-       );
+
+    SetWindowPos(
+        fgStructure.Window->Window.Handle,
+        HWND_TOP,
+        0, 0, 0, 0,
+        SWP_NOSIZE | SWP_NOMOVE
+    );
 
 #endif
+
 }
 
 /*
@@ -1072,7 +910,8 @@ void FGAPIENTRY glutPopWindow( void )
  */
 void FGAPIENTRY glutFullScreen( void )
 {
-    freeglut_assert_ready; freeglut_assert_window;
+    freeglut_assert_ready;
+    freeglut_assert_window;
 
 #if TARGET_HOST_UNIX_X11
     {
@@ -1086,7 +925,8 @@ void FGAPIENTRY glutFullScreen( void )
             fgDisplay.ScreenWidth,
             fgDisplay.ScreenHeight
         );
-        XFlush( fgDisplay.Display );
+
+        XFlush( fgDisplay.Display ); /* This is needed */
 
         XTranslateCoordinates(
             fgDisplay.Display,
@@ -1102,17 +942,43 @@ void FGAPIENTRY glutFullScreen( void )
                 fgStructure.Window->Window.Handle,
                 -x, -y
             );
-            XFlush( fgDisplay.Display );
+            XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
         }
     }
 #elif TARGET_HOST_WIN32
-    MoveWindow(
-        fgStructure.Window->Window.Handle,
-        0, 0,
-        fgDisplay.ScreenWidth,
-        fgDisplay.ScreenHeight,
-        TRUE
-    );
+    {
+        RECT rect;
+
+        /* For fullscreen mode, force the top-left corner to 0,0
+         * and adjust the window rectangle so that the client area
+         * covers the whole screen.
+         */
+
+        rect.left   = 0;
+        rect.top    = 0;
+        rect.right  = fgDisplay.ScreenWidth;
+        rect.bottom = fgDisplay.ScreenHeight;
+
+        AdjustWindowRect ( &rect, WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS |
+                                  WS_CLIPCHILDREN, FALSE );
+
+        /*
+         * SWP_NOACTIVATE     Do not activate the window
+         * SWP_NOOWNERZORDER  Do not change position in z-order
+         * SWP_NOSENDCHANGING Supress WM_WINDOWPOSCHANGING message
+         * SWP_NOZORDER       Retains the current Z order (ignore 2nd param)
+         */
+
+        SetWindowPos( fgStructure.Window->Window.Handle,
+                      HWND_TOP,
+                      rect.left,
+                      rect.top,
+                      rect.right  - rect.left,
+                      rect.bottom - rect.top,
+                      SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING |
+                      SWP_NOZORDER
+                    );
+    }
 #endif
 }
 
@@ -1121,12 +987,12 @@ void FGAPIENTRY glutFullScreen( void )
  */
 void* FGAPIENTRY glutGetWindowData( void )
 {
-   return(fgStructure.Window->UserData);
+    return fgStructure.Window->UserData;
 }
 
 void FGAPIENTRY glutSetWindowData(void* data)
 {
-  fgStructure.Window->UserData=data;
+    fgStructure.Window->UserData=data;
 }
 
 /*** END OF FILE ***/