X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_window.c;h=5a570b7f6a1b17bc7d47341e83eedee058a65a3e;hb=fc3fee8fa830aaba7aaa585cb021d5867c89385d;hp=8933a3003812695427e51e465f84aad0dca308a5;hpb=d67937396dc33c86017012859b2d9ed010fc6c88;p=freeglut

diff --git a/src/freeglut_window.c b/src/freeglut_window.c
index 8933a30..5a570b7 100644
--- a/src/freeglut_window.c
+++ b/src/freeglut_window.c
@@ -43,11 +43,11 @@ wchar_t* wstr_from_str(const char* str)
     for(i=0; i<len; i++)
         wstr[i] = str[i];
     wstr[len] = 0;
-	return wstr;
+    return wstr;
 }
 
 
-#endif //TARGET_HOST_WINCE
+#endif /* TARGET_HOST_WINCE */
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
@@ -91,8 +91,8 @@ XVisualInfo* fgChooseVisual( void )
      * First we have to process the display mode settings...
      */
 /*
- * Why is there a semi-colon in this #define?  The code
- * that uses the macro seems to always add more semicolons...
+ * XXX Why is there a semi-colon in this #define?  The code
+ * XXX that uses the macro seems to always add more semicolons...
  */
 #define ATTRIB(a) attributes[where++]=a;
 #define ATTRIB_VAL(a,v) {ATTRIB(a); ATTRIB(v);}
@@ -172,7 +172,7 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
                               unsigned char layer_type )
 {
 #if TARGET_HOST_WINCE
-	return GL_TRUE;
+    return GL_TRUE;
 #else
     PIXELFORMATDESCRIPTOR* ppfd, pfd;
     int flags, pixelformat;
@@ -231,7 +231,7 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
     if( checkOnly )
         return GL_TRUE;
     return SetPixelFormat( window->Window.Device, pixelformat, ppfd );
-#endif //TARGET_HOST_WINCE
+#endif /* TARGET_HOST_WINCE */
 }
 #endif
 
@@ -389,14 +389,14 @@ void fgOpenWindow( SFG_Window* window, const char* title,
             fgStructure.MenuContext->VisualInfo = window->Window.VisualInfo;
             fgStructure.MenuContext->Context = glXCreateContext(
                 fgDisplay.Display, fgStructure.MenuContext->VisualInfo,
-                NULL, fgState.ForceDirectContext | fgState.TryDirectContext
+                NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
             );
         }
 
         /* window->Window.Context = fgStructure.MenuContext->Context; */
         window->Window.Context = glXCreateContext(
             fgDisplay.Display, window->Window.VisualInfo,
-            NULL, fgState.ForceDirectContext | fgState.TryDirectContext
+            NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
         );
     }
     else if( fgState.UseCurrentContext )
@@ -406,19 +406,26 @@ void fgOpenWindow( SFG_Window* window, const char* title,
         if( ! window->Window.Context )
             window->Window.Context = glXCreateContext(
                 fgDisplay.Display, window->Window.VisualInfo,
-                NULL, fgState.ForceDirectContext | fgState.TryDirectContext
+                NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
             );
     }
     else
         window->Window.Context = glXCreateContext(
             fgDisplay.Display, window->Window.VisualInfo,
-            NULL, fgState.ForceDirectContext | fgState.TryDirectContext
+            NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
         );
 
-    if( fgState.ForceDirectContext &&
-        !glXIsDirect( fgDisplay.Display, window->Window.Context ) )
-        fgError( "unable to force direct context rendering for window '%s'",
+#if !defined( __FreeBSD__ ) && !defined( __NetBSD__ )
+    if(  !glXIsDirect( fgDisplay.Display, window->Window.Context ) )
+    {
+      if( fgState.DirectContext == GLUT_FORCE_DIRECT_CONTEXT )
+        fgError( "Unable to force direct context rendering for window '%s'",
+                 title );
+      else if( fgState.DirectContext == GLUT_TRY_DIRECT_CONTEXT )
+        fgWarning( "Unable to create direct context rendering for window '%s'\nThis may hurt performance.",
                  title );
+    }
+#endif
 
     glXMakeCurrent(
         fgDisplay.Display,
@@ -440,13 +447,13 @@ void fgOpenWindow( SFG_Window* window, const char* title,
 
     /*
      * Fill in the size hints values now (the x, y, width and height
-     * settings are obsolote, are there any more WMs that support them?)
+     * settings are obsolete, are there any more WMs that support them?)
      * Unless the X servers actually stop supporting these, we should
      * continue to fill them in.  It is *not* our place to tell the user
      * that they should replace a window manager that they like, and which
      * works, just because *we* think that it's not "modern" enough.
      */
-#if TARGET_HOST_WINCE
+#if TARGET_HOST_WINCE /* Since this is in the X11 branch, it's pretty dumb */
     sizeHints.x      = 0;
     sizeHints.y      = 0;
     sizeHints.width  = 320;
@@ -456,13 +463,11 @@ void fgOpenWindow( SFG_Window* window, const char* title,
     sizeHints.y      = y;
     sizeHints.width  = w;
     sizeHints.height = h;
-#endif //TARGET_HOST_WINCE
+#endif /* TARGET_HOST_WINCE */
 
     wmHints.flags = StateHint;
     wmHints.initial_state = fgState.ForceIconic ? IconicState : NormalState;
-    /*
-     * Prepare the window and iconified window names...
-     */
+    /* Prepare the window and iconified window names... */
     XStringListToTextProperty( (char **) &title, 1, &textProperty );
 
     XSetWMProperties(
@@ -491,9 +496,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
 
     freeglut_assert_ready;
 
-    /*
-     * Grab the window class we have registered on glutInit():
-     */
+    /* Grab the window class we have registered on glutInit(): */
     atom = GetClassInfo( fgDisplay.Instance, _T("FREEGLUT"), &wc );
     assert( atom != 0 );
 
@@ -521,7 +524,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
             h += (GetSystemMetrics( SM_CYSIZEFRAME ) )*2 +
                 GetSystemMetrics( SM_CYCAPTION );
         }
-#endif //TARGET_HOST_WINCE
+#endif /* TARGET_HOST_WINCE */
 
         if( ! fgState.Position.Use )
         {
@@ -554,29 +557,29 @@ void fgOpenWindow( SFG_Window* window, const char* title,
     }
 
 #if TARGET_HOST_WINCE
-	{
-		wchar_t* wstr = wstr_from_str(title);
-
-		window->Window.Handle = CreateWindow( 
-			_T("FREEGLUT"),
-			wstr,
-			WS_VISIBLE | WS_POPUP,
-			0,0, 240,320,
-			NULL,
-			NULL,
-			fgDisplay.Instance,
-			(LPVOID) window
-		);
-
-		free(wstr);
-
-		SHFullScreen(window->Window.Handle, SHFS_HIDESTARTICON);
-		SHFullScreen(window->Window.Handle, SHFS_HIDESIPBUTTON);
-		SHFullScreen(window->Window.Handle, SHFS_HIDETASKBAR);
-		MoveWindow(window->Window.Handle, 0, 0, 240, 320, TRUE);
-		ShowWindow(window->Window.Handle, SW_SHOW);
-		UpdateWindow(window->Window.Handle);
-	}
+    {
+        wchar_t* wstr = wstr_from_str(title);
+
+        window->Window.Handle = CreateWindow(
+            _T("FREEGLUT"),
+            wstr,
+            WS_VISIBLE | WS_POPUP,
+            0,0, 240,320,
+            NULL,
+            NULL,
+            fgDisplay.Instance,
+            (LPVOID) window
+        );
+
+        free(wstr);
+
+        SHFullScreen(window->Window.Handle, SHFS_HIDESTARTICON);
+        SHFullScreen(window->Window.Handle, SHFS_HIDESIPBUTTON);
+        SHFullScreen(window->Window.Handle, SHFS_HIDETASKBAR);
+        MoveWindow(window->Window.Handle, 0, 0, 240, 320, TRUE);
+        ShowWindow(window->Window.Handle, SW_SHOW);
+        UpdateWindow(window->Window.Handle);
+    }
 #else
     window->Window.Handle = CreateWindowEx(
         exFlags,
@@ -589,7 +592,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
         fgDisplay.Instance,
         (LPVOID) window
     );
-#endif TARGET_HOST_WINCE
+#endif /* TARGET_HOST_WINCE */
 
     if( !( window->Window.Handle ) )
         fgError( "Failed to create a window (%s)!", title );
@@ -599,7 +602,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
 #else
     ShowWindow( window->Window.Handle,
                 fgState.ForceIconic ? SW_SHOWMINIMIZED : SW_SHOW );
-#endif //TARGET_HOST_WINCE
+#endif /* TARGET_HOST_WINCE */
 
     UpdateWindow( window->Window.Handle );
     ShowCursor( TRUE );  /* XXX Old comments say "hide cusror"! */
@@ -628,16 +631,12 @@ void fgCloseWindow( SFG_Window* window )
 #if TARGET_HOST_UNIX_X11
 
     glXDestroyContext( fgDisplay.Display, window->Window.Context );
-    glXDestroyGLXPixmap( fgDisplay.Display, window->Window.Handle );
-    XFreePixmap( fgDisplay.Display, window->Window.Pixmap );
-
+    XDestroyWindow( fgDisplay.Display, window->Window.Handle );
     XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
 
 #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
 
-    /*
-     * Make sure we don't close a window with current context active
-     */
+    /* Make sure we don't close a window with current context active */
     if( fgStructure.Window == window )
         wglMakeCurrent( NULL, NULL );
 
@@ -685,7 +684,6 @@ int FGAPIENTRY glutCreateWindow( const char* title )
 int FGAPIENTRY glutCreateSubWindow( int parentID, int x, int y, int w, int h )
 {
     int ret = 0;
-
     SFG_Window* window = NULL;
     SFG_Window* parent = NULL;
 
@@ -850,13 +848,13 @@ void FGAPIENTRY glutSetWindowTitle( const char* title )
         SetWindowText( fgStructure.Window->Window.Handle, title );
 
 #elif TARGET_HOST_WINCE
-		{
-			wchar_t* wstr = wstr_from_str(title);
+        {
+            wchar_t* wstr = wstr_from_str(title);
 
-			SetWindowText( fgStructure.Window->Window.Handle, wstr );
+            SetWindowText( fgStructure.Window->Window.Handle, wstr );
 
-			free(wstr);
-		}
+            free(wstr);
+        }
 #endif
     }
 }
@@ -893,13 +891,13 @@ void FGAPIENTRY glutSetIconTitle( const char* title )
         SetWindowText( fgStructure.Window->Window.Handle, title );
 
 #elif TARGET_HOST_WINCE
-		{
-			wchar_t* wstr = wstr_from_str(title);
+        {
+            wchar_t* wstr = wstr_from_str(title);
 
-			SetWindowText( fgStructure.Window->Window.Handle, wstr );
+            SetWindowText( fgStructure.Window->Window.Handle, wstr );
 
-			free(wstr);
-		}
+            free(wstr);
+        }
 #endif
     }
 }
@@ -932,10 +930,11 @@ void FGAPIENTRY glutPositionWindow( int x, int y )
     XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
 
 #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
-    
+
     {
         RECT winRect;
 
+        /* "GetWindowRect" returns the pixel coordinates of the outside of the window */
         GetWindowRect( fgStructure.Window->Window.Handle, &winRect );
         MoveWindow(
             fgStructure.Window->Window.Handle,