Making the "AT_EXIT" hack look a bit less like a copy-and-paste

[freeglut] / src / freeglut_window.c

diff --git a/src/freeglut_window.c b/src/freeglut_window.c
index b474bf9..7b73146 100644 (file)
--- a/src/freeglut_window.c
+++ b/src/freeglut_window.c
@@ -25,6 +25,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
@@ -132,14 +133,22 @@ GLXFBConfig* fgChooseFBConfig( void )
             ATTRIB_VAL( GLX_ACCUM_ALPHA_SIZE, 1 );
     }
 
-    if ((fgState.DisplayMode & GLUT_AUX)
-     || (fgState.DisplayMode & GLUT_AUX1)
-     || (fgState.DisplayMode & GLUT_AUX2)
-     || (fgState.DisplayMode & GLUT_AUX3)
-     || (fgState.DisplayMode & GLUT_AUX4))
-      {
-        ATTRIB_VAL(GLX_AUX_BUFFERS, fgState.AuxiliaryBufferNumber)
-      }
+    if( fgState.DisplayMode & GLUT_AUX4 )
+    {
+        ATTRIB_VAL(GLX_AUX_BUFFERS, 4);
+    }
+    else if( fgState.DisplayMode & GLUT_AUX3 )
+    {
+        ATTRIB_VAL(GLX_AUX_BUFFERS, 3);
+    }
+    else if( fgState.DisplayMode & GLUT_AUX2 )
+    {
+        ATTRIB_VAL(GLX_AUX_BUFFERS, 2);
+    }
+    else if( fgState.DisplayMode & GLUT_AUX1 ) /* NOTE: Same as GLUT_AUX! */
+    {
+        ATTRIB_VAL(GLX_AUX_BUFFERS, fgState.AuxiliaryBufferNumber);
+    }
 
     if (fgState.DisplayMode & GLUT_MULTISAMPLE)
       {
@@ -300,63 +309,61 @@ typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShar
 #endif
 
 
-GLboolean fgNewWGLCreateContext( SFG_Window* window )
+void fgNewWGLCreateContext( SFG_Window* window )
 {
-    if( (fgState.ContextFlags & GLUT_FORWARD_COMPATIBLE) &&
-        (fgState.MajorVersion > 2) )
+    PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetEntensionsStringARB;
+    HGLRC context;
+    int attribs[7];
+    PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB;
+    const char * pWglExtString;
+
+    /* If nothing fancy has been required, leave the context as it is */
+    if ( fgState.MajorVersion == 1 && fgState.MinorVersion == 0 && fgState.ContextFlags == 0 )
     {
-        PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetEntensionsStringARB=NULL;
+        return;
+    }
 
-        wglMakeCurrent( window->Window.Device,
-                        window->Window.Context );
+    wglMakeCurrent( window->Window.Device,
+                    window->Window.Context );
 
-        wglGetEntensionsStringARB=(PFNWGLGETEXTENSIONSSTRINGARBPROC)wglGetProcAddress("wglGetExtensionsStringARB");
-        if (wglGetEntensionsStringARB)
-        {
-            const char * pWglExtString=wglGetEntensionsStringARB(window->Window.Device);
-            if (pWglExtString)
-            {
-                if (strstr(pWglExtString, "WGL_ARB_create_context"))
-                {
-                    /* new context creation */
-                    HGLRC context;
-                    int attribs[7];
-                    PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB;
-
-                    attribs[0] = WGL_CONTEXT_MAJOR_VERSION_ARB;
-                    attribs[1] = fgState.MajorVersion;
-                    attribs[2] = WGL_CONTEXT_MINOR_VERSION_ARB;
-                    attribs[3] = fgState.MinorVersion;
-                    attribs[4] = WGL_CONTEXT_FLAGS_ARB;
-                    attribs[5] = ((fgState.ContextFlags & GLUT_DEBUG) ? WGL_CONTEXT_DEBUG_BIT_ARB : 0) |
-                        ((fgState.ContextFlags & GLUT_FORWARD_COMPATIBLE) ? WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB : 0);
-                    attribs[6] = 0;
-
-                    wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC) wglGetProcAddress( "wglCreateContextAttribsARB" );
-                    if ( wglCreateContextAttribsARB == NULL )
-                    {
-                        fgError( "wglCreateContextAttribsARB not found" );
-                    }
+    wglGetEntensionsStringARB=(PFNWGLGETEXTENSIONSSTRINGARBPROC)wglGetProcAddress("wglGetExtensionsStringARB");
+    if ( wglGetEntensionsStringARB == NULL )
+    {
+        return;
+    }
 
-                    context = wglCreateContextAttribsARB( window->Window.Device, 0, attribs );
-                    if ( context == NULL )
-                    {
-                        fgError( "Unable to create OpenGL %d.%d context (flags %x)",
-                            fgState.MajorVersion, fgState.MinorVersion, fgState.ContextFlags );
-                    }
-                    else
-                    {
-                        fgWarning( "Success 3.0" );
-                        wglMakeCurrent( NULL, NULL );
-                        wglDeleteContext( window->Window.Context );
-                        window->Window.Context = context;
-                    }
-                }
-            }
-        }
+    pWglExtString=wglGetEntensionsStringARB(window->Window.Device);
+    if (( pWglExtString == NULL ) || ( strstr(pWglExtString, "WGL_ARB_create_context") == NULL ))
+    {
+        return;
     }
 
-    return GL_TRUE;
+    /* new context creation */
+    attribs[0] = WGL_CONTEXT_MAJOR_VERSION_ARB;
+    attribs[1] = fgState.MajorVersion;
+    attribs[2] = WGL_CONTEXT_MINOR_VERSION_ARB;
+    attribs[3] = fgState.MinorVersion;
+    attribs[4] = WGL_CONTEXT_FLAGS_ARB;
+    attribs[5] = ((fgState.ContextFlags & GLUT_DEBUG) ? WGL_CONTEXT_DEBUG_BIT_ARB : 0) |
+        ((fgState.ContextFlags & GLUT_FORWARD_COMPATIBLE) ? WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB : 0);
+    attribs[6] = 0;
+
+    wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC) wglGetProcAddress( "wglCreateContextAttribsARB" );
+    if ( wglCreateContextAttribsARB == NULL )
+    {
+        fgError( "wglCreateContextAttribsARB not found" );
+    }
+
+    context = wglCreateContextAttribsARB( window->Window.Device, 0, attribs );
+    if ( context == NULL )
+    {
+        fgError( "Unable to create OpenGL %d.%d context (flags %x)",
+            fgState.MajorVersion, fgState.MinorVersion, fgState.ContextFlags );
+    }
+
+    wglMakeCurrent( NULL, NULL );
+    wglDeleteContext( window->Window.Context );
+    window->Window.Context = context;
 }
 
 
@@ -429,8 +436,8 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
         pfd.cAuxBuffers = 3;
     else if( fgState.DisplayMode & GLUT_AUX2 )
         pfd.cAuxBuffers = 2;
-    else if( fgState.DisplayMode & GLUT_AUX1 )
-        pfd.cAuxBuffers = 1;
+    else if( fgState.DisplayMode & GLUT_AUX1 ) /* NOTE: Same as GLUT_AUX! */
+        pfd.cAuxBuffers = fgState.AuxiliaryBufferNumber;
     else
         pfd.cAuxBuffers = 0;
 
@@ -499,7 +506,7 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
 
                         pAttributes[iCounter++]=WGL_DOUBLE_BUFFER_ARB;        pAttributes[iCounter++]=(fgState.DisplayMode & GLUT_DOUBLE)!=0;
                         pAttributes[iCounter++]=WGL_SAMPLE_BUFFERS_ARB;        pAttributes[iCounter++]=GL_TRUE;
-                        pAttributes[iCounter++]=WGL_SAMPLES_ARB;            pAttributes[iCounter++]=4;
+                        pAttributes[iCounter++]=WGL_SAMPLES_ARB;            pAttributes[iCounter++]=fgState.SampleNumber;
                         pAttributes[iCounter++]=0;                            pAttributes[iCounter++]=0;    /* terminator */
 
                         bValid = wglChoosePixelFormatARBProc(window->Window.Device,pAttributes,fAttributes,1,&iPixelFormat,&numFormats);
@@ -1027,7 +1034,8 @@ void fgCloseWindow( SFG_Window* window )
 {
 #if TARGET_HOST_POSIX_X11
 
-    glXDestroyContext( fgDisplay.Display, window->Window.Context );
+    if( window->Window.Context )
+        glXDestroyContext( fgDisplay.Display, window->Window.Context );
     XFree( window->Window.FBConfig );
     XDestroyWindow( fgDisplay.Display, window->Window.Handle );
     /* XFlush( fgDisplay.Display ); */ /* XXX Shouldn't need this */
@@ -1085,6 +1093,14 @@ int FGAPIENTRY glutCreateWindow( const char* title )
                            GL_FALSE, GL_FALSE )->ID;
 }
 
+#ifdef _WIN32
+int FGAPIENTRY __glutCreateWindowWithExit( const char *title, void (__cdecl *exit_function)(int) )
+{
+  __glutExitFunc = exit_function;
+  return glutCreateWindow( title );
+}
+#endif
+
 /*
  * This function creates a sub window.
  */