Fix to glutInit() command-line argument compaction - Patch #1027724 from takeshi2

[freeglut] / src / freeglut_window.c

diff --git a/src/freeglut_window.c b/src/freeglut_window.c
index ddbe695..a92eafd 100644 (file)
--- a/src/freeglut_window.c
+++ b/src/freeglut_window.c
@@ -36,7 +36,7 @@
 #include <aygshell.h>
 #pragma comment( lib, "Aygshell.lib" )
 
-wchar_t* wstr_from_str(const char* str)
+static wchar_t* fghWstrFromStr(const char* str)
 {
     int i,len=strlen(str);
     wchar_t* wstr = (wchar_t*)malloc(2*len+2);
@@ -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);}
@@ -415,6 +415,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
             NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
         );
 
+#if !defined( __FreeBSD__ ) && !defined( __NetBSD__ )
     if(  !glXIsDirect( fgDisplay.Display, window->Window.Context ) )
     {
       if( fgState.DirectContext == GLUT_FORCE_DIRECT_CONTEXT )
@@ -424,6 +425,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
         fgWarning( "Unable to create direct context rendering for window '%s'\nThis may hurt performance.",
                  title );
     }
+#endif
 
     glXMakeCurrent(
         fgDisplay.Display,
@@ -445,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;
@@ -465,9 +467,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
 
     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(
@@ -496,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 );
 
@@ -560,7 +558,7 @@ void fgOpenWindow( SFG_Window* window, const char* title,
 
 #if TARGET_HOST_WINCE
     {
-        wchar_t* wstr = wstr_from_str(title);
+        wchar_t* wstr = fghWstrFromStr(title);
 
         window->Window.Handle = CreateWindow(
             _T("FREEGLUT"),
@@ -638,9 +636,7 @@ void fgCloseWindow( SFG_Window* window )
 
 #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 );
 
@@ -688,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;
 
@@ -730,7 +725,7 @@ void FGAPIENTRY glutSetWindow( int ID )
     window = fgWindowByID( ID );
     if( window == NULL )
     {
-        fgWarning( "glutSetWindow(): window ID %i not found!", ID );
+        fgWarning( "glutSetWindow(): window ID %d not found!", ID );
         return;
     }
 
@@ -854,7 +849,7 @@ void FGAPIENTRY glutSetWindowTitle( const char* title )
 
 #elif TARGET_HOST_WINCE
         {
-            wchar_t* wstr = wstr_from_str(title);
+            wchar_t* wstr = fghWstrFromStr(title);
 
             SetWindowText( fgStructure.Window->Window.Handle, wstr );
 
@@ -897,7 +892,7 @@ void FGAPIENTRY glutSetIconTitle( const char* title )
 
 #elif TARGET_HOST_WINCE
         {
-            wchar_t* wstr = wstr_from_str(title);
+            wchar_t* wstr = fghWstrFromStr(title);
 
             SetWindowText( fgStructure.Window->Window.Handle, wstr );
 
@@ -939,6 +934,7 @@ void FGAPIENTRY glutPositionWindow( int x, int y )
     {
         RECT winRect;
 
+        /* "GetWindowRect" returns the pixel coordinates of the outside of the window */
         GetWindowRect( fgStructure.Window->Window.Handle, &winRect );
         MoveWindow(
             fgStructure.Window->Window.Handle,