freeglut

Revision: 754
          http://freeglut.svn.sourceforge.net/freeglut/?rev=754&view=rev
Author:   spanne
Date:     2008-11-05 18:45:36 +0000 (Wed, 05 Nov 2008)

Log Message:
-----------
freeglut_internal.h needs some GL types, but it is not self-contained.
TODO: Move freeglut.h #include into freeglut_internal.h itself?

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_glutfont_definitions.c
    trunk/freeglut/freeglut/src/freeglut_stroke_mono_roman.c
    trunk/freeglut/freeglut/src/freeglut_stroke_roman.c

Modified: trunk/freeglut/freeglut/src/freeglut_glutfont_definitions.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_glutfont_definitions.c	2008-11-05 18:24:43 UTC (rev 753)
+++ trunk/freeglut/freeglut/src/freeglut_glutfont_definitions.c	2008-11-05 18:45:36 UTC (rev 754)
@@ -40,6 +40,7 @@
  * structure to match GLUT.
  */
 
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 #if TARGET_HOST_POSIX_X11

Modified: trunk/freeglut/freeglut/src/freeglut_stroke_mono_roman.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_stroke_mono_roman.c	2008-11-05 18:24:43 UTC (rev 753)
+++ trunk/freeglut/freeglut/src/freeglut_stroke_mono_roman.c	2008-11-05 18:45:36 UTC (rev 754)
@@ -28,6 +28,7 @@
 
 /* This file has been automatically generated by the genstroke utility. */
 
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /* char: 0x20 */

Modified: trunk/freeglut/freeglut/src/freeglut_stroke_roman.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_stroke_roman.c	2008-11-05 18:24:43 UTC (rev 753)
+++ trunk/freeglut/freeglut/src/freeglut_stroke_roman.c	2008-11-05 18:45:36 UTC (rev 754)
@@ -28,6 +28,7 @@
 
 /* This file has been automatically generated by the genstroke utility. */
 
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /* char: 0x20 */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 760
          http://freeglut.svn.sourceforge.net/freeglut/?rev=760&view=rev
Author:   fayjf
Date:     2008-11-17 14:50:08 +0000 (Mon, 17 Nov 2008)

Log Message:
-----------
Allowing "freeglut" to compile without errors under *nix.  Before this, there were problems with conflicting definitions of the GLUT font definitions.

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_glutfont_definitions.c
    trunk/freeglut/freeglut/src/freeglut_internal.h

Modified: trunk/freeglut/freeglut/src/freeglut_glutfont_definitions.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_glutfont_definitions.c	2008-11-06 19:17:13 UTC (rev 759)
+++ trunk/freeglut/freeglut/src/freeglut_glutfont_definitions.c	2008-11-17 14:50:08 UTC (rev 760)
@@ -54,15 +54,6 @@
   float bottom ;
 };
 
-struct freeglutBitmapFont
-{
-  const char *name ;
-  const int num_chars ;
-  const int first ;
-  const void *ch ;
-};
-
-
 struct freeglutStrokeFont glutStrokeRoman ;
 struct freeglutStrokeFont glutStrokeMonoRoman ;
 

Modified: trunk/freeglut/freeglut/src/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_internal.h	2008-11-06 19:17:13 UTC (rev 759)
+++ trunk/freeglut/freeglut/src/freeglut_internal.h	2008-11-17 14:50:08 UTC (rev 760)
@@ -687,6 +687,18 @@
     float           xorig, yorig; /* Relative origin of the character */
 };
 
+#if TARGET_HOST_POSIX_X11
+
+struct freeglutBitmapFont
+{
+  const char *name ;
+  const int num_chars ;
+  const int first ;
+  const void *ch ;
+};
+
+#endif
+
 /* The stroke font structures */
 
 typedef struct tagSFG_StrokeVertex SFG_StrokeVertex;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 761
          http://freeglut.svn.sourceforge.net/freeglut/?rev=761&view=rev
Author:   spanne
Date:     2008-11-20 11:59:29 +0000 (Thu, 20 Nov 2008)

Log Message:
-----------
Yet another try to make the font definitions compile on all platforms.

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_glutfont_definitions.c
    trunk/freeglut/freeglut/src/freeglut_internal.h

Modified: trunk/freeglut/freeglut/src/freeglut_glutfont_definitions.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_glutfont_definitions.c	2008-11-17 14:50:08 UTC (rev 760)
+++ trunk/freeglut/freeglut/src/freeglut_glutfont_definitions.c	2008-11-20 11:59:29 UTC (rev 761)
@@ -40,7 +40,37 @@
  * structure to match GLUT.
  */
 
-#include <GL/freeglut.h>
+/*
+ * freeglut_internal.h uses some GL types, but including the GL header portably
+ * is a bit tricky, so we include freeglut_std.h here, which contains the
+ * necessary machinery. But this poses another problem, caused by the ugly
+ * original defintion of the font constants in "classic" GLUT: They are defined
+ * as void* externally, so we move them temporarily out of the way by AN EXTREME
+ * CPP HACK.
+ */
+
+#define glutStrokeRoman glutStrokeRomanIGNOREME
+#define glutStrokeMonoRoman glutStrokeMonoRomanIGNOREME
+#define glutBitmap9By15 glutBitmap9By15IGNOREME
+#define glutBitmap8By13 glutBitmap8By13IGNOREME
+#define glutBitmapTimesRoman10 glutBitmapTimesRoman10IGNOREME
+#define glutBitmapTimesRoman24 glutBitmapTimesRoman24IGNOREME
+#define glutBitmapHelvetica10 glutBitmapHelvetica10IGNOREME
+#define glutBitmapHelvetica12 glutBitmapHelvetica12IGNOREME
+#define glutBitmapHelvetica18 glutBitmapHelvetica18IGNOREME
+
+#include <GL/freeglut_std.h>
+
+#undef glutStrokeRoman
+#undef glutStrokeMonoRoman
+#undef glutBitmap9By15
+#undef glutBitmap8By13
+#undef glutBitmapTimesRoman10
+#undef glutBitmapTimesRoman24
+#undef glutBitmapHelvetica10
+#undef glutBitmapHelvetica12
+#undef glutBitmapHelvetica18
+
 #include "freeglut_internal.h"
 
 #if TARGET_HOST_POSIX_X11
@@ -54,6 +84,15 @@
   float bottom ;
 };
 
+struct freeglutBitmapFont
+{
+  const char *name ;
+  const int num_chars ;
+  const int first ;
+  const void *ch ;
+};
+
+
 struct freeglutStrokeFont glutStrokeRoman ;
 struct freeglutStrokeFont glutStrokeMonoRoman ;
 

Modified: trunk/freeglut/freeglut/src/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_internal.h	2008-11-17 14:50:08 UTC (rev 760)
+++ trunk/freeglut/freeglut/src/freeglut_internal.h	2008-11-20 11:59:29 UTC (rev 761)
@@ -687,18 +687,6 @@
     float           xorig, yorig; /* Relative origin of the character */
 };
 
-#if TARGET_HOST_POSIX_X11
-
-struct freeglutBitmapFont
-{
-  const char *name ;
-  const int num_chars ;
-  const int first ;
-  const void *ch ;
-};
-
-#endif
-
 /* The stroke font structures */
 
 typedef struct tagSFG_StrokeVertex SFG_StrokeVertex;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 762
          http://freeglut.svn.sourceforge.net/freeglut/?rev=762&view=rev
Author:   fayjf
Date:     2009-02-02 22:43:50 +0000 (Mon, 02 Feb 2009)

Log Message:
-----------
Fixing bug [ 1804696 ] Warnings when building on OpenSolaris as updated 2/2/09 by Nigel Stewart

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_internal.h
    trunk/freeglut/freeglut/src/freeglut_joystick.c

Modified: trunk/freeglut/freeglut/src/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_internal.h	2008-11-20 11:59:29 UTC (rev 761)
+++ trunk/freeglut/freeglut/src/freeglut_internal.h	2009-02-02 22:43:50 UTC (rev 762)
@@ -57,6 +57,11 @@
 */
 #endif
 
+/* Detect both SunPro and gcc compilers on Sun Solaris */
+#if defined (__SVR4) && defined (__sun)
+#   define TARGET_HOST_SOLARIS 1
+#endif
+
 #ifndef TARGET_HOST_MS_WINDOWS
 #   define  TARGET_HOST_MS_WINDOWS 0
 #endif
@@ -69,6 +74,10 @@
 #   define  TARGET_HOST_MAC_OSX    0
 #endif
 
+#ifndef  TARGET_HOST_SOLARIS
+#   define  TARGET_HOST_SOLARIS    0
+#endif
+
 /* -- FIXED CONFIGURATION LIMITS ------------------------------------------- */
 
 #define  FREEGLUT_MAX_MENUS         3

Modified: trunk/freeglut/freeglut/src/freeglut_joystick.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_joystick.c	2008-11-20 11:59:29 UTC (rev 761)
+++ trunk/freeglut/freeglut/src/freeglut_joystick.c	2009-02-02 22:43:50 UTC (rev 762)
@@ -1394,7 +1394,7 @@
 #    endif
 #endif
 
-#if defined( __linux__ )
+#if defined( __linux__ ) || TARGET_HOST_SOLARIS
     /* Default for older Linux systems. */
     joy->num_axes    =  2;
     joy->num_buttons = 32;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 763
          http://freeglut.svn.sourceforge.net/freeglut/?rev=763&view=rev
Author:   fayjf
Date:     2009-02-03 14:31:36 +0000 (Tue, 03 Feb 2009)

Log Message:
-----------
A further response to bug [ 1804696 ] Warnings when building on OpenSolaris -- per comment by Nigel Stewart on that bug report

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_joystick.c
    trunk/freeglut/freeglut/src/freeglut_main.c

Modified: trunk/freeglut/freeglut/src/freeglut_joystick.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_joystick.c	2009-02-02 22:43:50 UTC (rev 762)
+++ trunk/freeglut/freeglut/src/freeglut_joystick.c	2009-02-03 14:31:36 UTC (rev 763)
@@ -1060,7 +1060,7 @@
 #    ifdef JS_NEW
        unsigned char u;
 #    else
-#      if defined( __linux__ )
+#      if defined( __linux__ ) || TARGET_HOST_SOLARIS
          int counter = 0;
 #      endif
 #    endif

Modified: trunk/freeglut/freeglut/src/freeglut_main.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_main.c	2009-02-02 22:43:50 UTC (rev 762)
+++ trunk/freeglut/freeglut/src/freeglut_main.c	2009-02-03 14:31:36 UTC (rev 763)
@@ -308,7 +308,7 @@
  * 32-bit, where the GLUT API return value is also overflowed.
  */  
 unsigned long fgSystemTime(void) {
-#if HAVE_GETTIMEOFDAY
+#if TARGET_HOST_SOLARIS || HAVE_GETTIMEOFDAY
     struct timeval now;
     gettimeofday( &now, NULL );
     return now.tv_usec/1000 + now.tv_sec*1000;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 766
          http://freeglut.svn.sourceforge.net/freeglut/?rev=766&view=rev
Author:   fayjf
Date:     2009-02-13 03:22:17 +0000 (Fri, 13 Feb 2009)

Log Message:
-----------
Adding OpenGL 3.0 context detection for Windows per e-mail from Paul Martz dated Thu 2/12/2009 9:03 AM (more or less)

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_internal.h
    trunk/freeglut/freeglut/src/freeglut_main.c
    trunk/freeglut/freeglut/src/freeglut_window.c

Modified: trunk/freeglut/freeglut/src/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_internal.h	2009-02-03 21:22:08 UTC (rev 765)
+++ trunk/freeglut/freeglut/src/freeglut_internal.h	2009-02-13 03:22:17 UTC (rev 766)
@@ -813,6 +813,7 @@
 #if TARGET_HOST_MS_WINDOWS
 LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg,
                                WPARAM wParam, LPARAM lParam );
+GLboolean fgNewWGLCreateContext( SFG_Window* window );
 GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
                               unsigned char layer_type );
 #endif

Modified: trunk/freeglut/freeglut/src/freeglut_main.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_main.c	2009-02-03 21:22:08 UTC (rev 765)
+++ trunk/freeglut/freeglut/src/freeglut_main.c	2009-02-13 03:22:17 UTC (rev 766)
@@ -1621,6 +1621,10 @@
                     window->Window.Context =
                         wglCreateContext( window->Window.Device );
             }
+
+#if !defined(_WIN32_WCE)
+            fgNewWGLCreateContext( window );
+#endif
         }
 
         window->State.NeedToResize = GL_TRUE;

Modified: trunk/freeglut/freeglut/src/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_window.c	2009-02-03 21:22:08 UTC (rev 765)
+++ trunk/freeglut/freeglut/src/freeglut_window.c	2009-02-13 03:22:17 UTC (rev 766)
@@ -283,6 +283,83 @@
 #define WGL_SAMPLES_ARB                0x2042
 
 
+#ifndef WGL_ARB_create_context
+#define WGL_ARB_create_context 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern HGLRC WINAPI wglCreateContextAttribsARB (HDC, HGLRC, const int *);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int *attribList);
+
+#define WGL_CONTEXT_DEBUG_BIT_ARB      0x0001
+#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
+#define WGL_CONTEXT_MAJOR_VERSION_ARB  0x2091
+#define WGL_CONTEXT_MINOR_VERSION_ARB  0x2092
+#define WGL_CONTEXT_LAYER_PLANE_ARB    0x2093
+#define WGL_CONTEXT_FLAGS_ARB          0x2094
+#define ERROR_INVALID_VERSION_ARB      0x2095
+#endif
+
+
+GLboolean fgNewWGLCreateContext( SFG_Window* window )
+{
+    if( (fgState.ContextFlags & GLUT_FORWARD_COMPATIBLE) &&
+        (fgState.MajorVersion > 2) )
+    {
+        PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetEntensionsStringARB=NULL;
+
+        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" );
+                    }
+
+                    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;
+                    }
+                }
+            }
+        }
+    }
+
+    return GL_TRUE;
+}
+
+
 GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
                               unsigned char layer_type )
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 771
          http://freeglut.svn.sourceforge.net/freeglut/?rev=771&view=rev
Author:   spanne
Date:     2009-02-13 18:24:46 +0000 (Fri, 13 Feb 2009)

Log Message:
-----------
More refactorings: Removed useless return value. Simplified control structures even more.

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_internal.h
    trunk/freeglut/freeglut/src/freeglut_window.c

Modified: trunk/freeglut/freeglut/src/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_internal.h	2009-02-13 18:16:41 UTC (rev 770)
+++ trunk/freeglut/freeglut/src/freeglut_internal.h	2009-02-13 18:24:46 UTC (rev 771)
@@ -813,7 +813,7 @@
 #if TARGET_HOST_MS_WINDOWS
 LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg,
                                WPARAM wParam, LPARAM lParam );
-GLboolean fgNewWGLCreateContext( SFG_Window* window );
+void fgNewWGLCreateContext( SFG_Window* window );
 GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
                               unsigned char layer_type );
 #endif

Modified: trunk/freeglut/freeglut/src/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_window.c	2009-02-13 18:16:41 UTC (rev 770)
+++ trunk/freeglut/freeglut/src/freeglut_window.c	2009-02-13 18:24:46 UTC (rev 771)
@@ -300,14 +300,17 @@
 #endif
 
 
-GLboolean fgNewWGLCreateContext( SFG_Window* window )
+void fgNewWGLCreateContext( SFG_Window* window )
 {
     PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetEntensionsStringARB;
+    HGLRC context;
+    int attribs[7];
+    PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB;
 
     if( (fgState.ContextFlags & GLUT_FORWARD_COMPATIBLE) &&
         (fgState.MajorVersion > 2) )
     {
-        return GL_TRUE;
+        return;
     }
 
     wglMakeCurrent( window->Window.Device,
@@ -316,25 +319,16 @@
     wglGetEntensionsStringARB=(PFNWGLGETEXTENSIONSSTRINGARBPROC)wglGetProcAddress("wglGetExtensionsStringARB");
     if ( wglGetEntensionsStringARB == NULL )
     {
-        return GL_TRUE;
+        return;
     }
 
     const char * pWglExtString=wglGetEntensionsStringARB(window->Window.Device);
-    if ( pWglExtString == NULL )
+    if (( pWglExtString == NULL ) || ( strstr(pWglExtString, "WGL_ARB_create_context") == NULL ))
     {
-        return GL_TRUE;
+        return;
     }
 
-    if ( strstr(pWglExtString, "WGL_ARB_create_context") == NULL )
-    {
-        return GL_TRUE;
-    }
-
     /* 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;
@@ -356,15 +350,10 @@
         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;
-    }
 
-    return GL_TRUE;
+    wglMakeCurrent( NULL, NULL );
+    wglDeleteContext( window->Window.Context );
+    window->Window.Context = context;
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 804
          http://freeglut.svn.sourceforge.net/freeglut/?rev=804&view=rev
Author:   fayjf
Date:     2009-03-17 17:19:05 +0000 (Tue, 17 Mar 2009)

Log Message:
-----------
Removing some build warnings from deprecated functions for VS2008 per e-mail from Diederick Niehorster dated Tue 3/10/2009

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_init.c
    trunk/freeglut/freeglut/src/freeglut_input_devices.c

Modified: trunk/freeglut/freeglut/src/freeglut_init.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_init.c	2009-03-17 15:43:25 UTC (rev 803)
+++ trunk/freeglut/freeglut/src/freeglut_init.c	2009-03-17 17:19:05 UTC (rev 804)
@@ -677,6 +677,11 @@
     char* geometry = NULL;
     int i, j, argc = *pargc;
 
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+    size_t sLen;
+    errno_t err;
+#endif
+
     if( fgState.Initialised )
         fgError( "illegal glutInit() reinitialization attempt" );
 
@@ -696,7 +701,14 @@
     /* check if GLUT_FPS env var is set */
 #ifndef _WIN32_WCE
     {
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+        char* fps = NULL;
+        err = _dupenv_s( &fps, &sLen, "GLUT_FPS" );
+        if (err)
+            fgError("Error getting GLUT_FPS environment variable"); 
+#else
         const char *fps = getenv( "GLUT_FPS" );
+#endif
         if( fps )
         {
             int interval;
@@ -707,9 +719,18 @@
             else
                 fgState.FPSInterval = interval;
         }
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+        free ( fps );  fps = NULL;  /* dupenv_s allocates a string that we must free */
+#endif
     }
 
-    displayName = getenv( "DISPLAY");
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+    err = _dupenv_s( &displayName, &sLen, "DISPLAY" );
+    if (err)
+        fgError("Error getting DISPLAY environment variable");
+#else
+    displayName = getenv( "DISPLAY" );
+#endif
 
     for( i = 1; i < argc; i++ )
     {
@@ -794,6 +815,9 @@
      * variable for opening the X display (see code above):
      */
     fghInitialize( displayName );
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+    free ( displayName );  displayName = NULL;  /* dupenv_s allocates a string that we must free */
+#endif
 
     /*
      * Geometry parsing deffered until here because we may need the screen
@@ -892,12 +916,19 @@
      * delimited by blanks or tabs.
      */
     char *token ;
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+    char *next_token = NULL;
+#endif
     size_t len = strlen ( displayMode );
     char *buffer = (char *)malloc ( (len+1) * sizeof(char) );
     memcpy ( buffer, displayMode, len );
     buffer[len] = '\0';
 
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+    token = strtok_s ( buffer, " \t", &next_token );
+#else
     token = strtok ( buffer, " \t" );
+#endif
     while ( token )
     {
         /* Process this token */
@@ -1074,7 +1105,11 @@
             break ;
         }
 
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+        token = strtok_s ( NULL, " \t", &next_token );
+#else
         token = strtok ( NULL, " \t" );
+#endif
     }
 
     free ( buffer );

Modified: trunk/freeglut/freeglut/src/freeglut_input_devices.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_input_devices.c	2009-03-17 15:43:25 UTC (rev 803)
+++ trunk/freeglut/freeglut/src/freeglut_input_devices.c	2009-03-17 17:19:05 UTC (rev 804)
@@ -139,7 +139,14 @@
     const char *dial_device=NULL;
     if( !fgState.InputDevsInitialised )
     {
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+        size_t sLen;
+        errno_t err = _dupenv_s( &dial_device, &sLen, "GLUT_DIALS_SERIAL" );
+        if (err)
+            fgError("Error getting GLUT_DIALS_SERIAL environment variable");
+#else
         dial_device = getenv ( "GLUT_DIALS_SERIAL" );
+#endif
 #if TARGET_HOST_MS_WINDOWS
         if (!dial_device){
             static char devname[256];
@@ -156,6 +163,9 @@
 #endif
         if ( !dial_device ) return;
         if ( !( dialbox_port = serial_open ( dial_device ) ) ) return;
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+        free ( dial_device );  dial_device = NULL;  /* dupenv_s allocates a string that we must free */
+#endif
         serial_putchar(dialbox_port,DIAL_INITIALIZE);
         glutTimerFunc ( 10, poll_dials, 0 );
         fgState.InputDevsInitialised = GL_TRUE;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 806
          http://freeglut.svn.sourceforge.net/freeglut/?rev=806&view=rev
Author:   spanne
Date:     2009-03-26 16:12:42 +0000 (Thu, 26 Mar 2009)

Log Message:
-----------
Unbreak the build: C++ style comments are not allowed in ISO C90

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_init.c
    trunk/freeglut/freeglut/src/freeglut_input_devices.c

Modified: trunk/freeglut/freeglut/src/freeglut_init.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_init.c	2009-03-19 14:55:14 UTC (rev 805)
+++ trunk/freeglut/freeglut/src/freeglut_init.c	2009-03-26 16:12:42 UTC (rev 806)
@@ -677,7 +677,8 @@
     char* geometry = NULL;
     int i, j, argc = *pargc;
 
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+    /* will return true for VC8 (VC2005) and higher */
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
     size_t sLen;
     errno_t err;
 #endif
@@ -701,7 +702,8 @@
     /* check if GLUT_FPS env var is set */
 #ifndef _WIN32_WCE
     {
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+    /* will return true for VC8 (VC2005) and higher */
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
         char* fps = NULL;
         err = _dupenv_s( &fps, &sLen, "GLUT_FPS" );
         if (err)
@@ -719,12 +721,14 @@
             else
                 fgState.FPSInterval = interval;
         }
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+    /* will return true for VC8 (VC2005) and higher */
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
         free ( fps );  fps = NULL;  /* dupenv_s allocates a string that we must free */
 #endif
     }
 
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+    /* will return true for VC8 (VC2005) and higher */
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
     err = _dupenv_s( &displayName, &sLen, "DISPLAY" );
     if (err)
         fgError("Error getting DISPLAY environment variable");
@@ -815,7 +819,8 @@
      * variable for opening the X display (see code above):
      */
     fghInitialize( displayName );
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+    /* will return true for VC8 (VC2005) and higher */
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
     free ( displayName );  displayName = NULL;  /* dupenv_s allocates a string that we must free */
 #endif
 
@@ -916,7 +921,8 @@
      * delimited by blanks or tabs.
      */
     char *token ;
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+    /* will return true for VC8 (VC2005) and higher */
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
     char *next_token = NULL;
 #endif
     size_t len = strlen ( displayMode );
@@ -924,7 +930,8 @@
     memcpy ( buffer, displayMode, len );
     buffer[len] = '\0';
 
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+    /* will return true for VC8 (VC2005) and higher */
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
     token = strtok_s ( buffer, " \t", &next_token );
 #else
     token = strtok ( buffer, " \t" );
@@ -1105,7 +1112,8 @@
             break ;
         }
 
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+    /* will return true for VC8 (VC2005) and higher */
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
         token = strtok_s ( NULL, " \t", &next_token );
 #else
         token = strtok ( NULL, " \t" );

Modified: trunk/freeglut/freeglut/src/freeglut_input_devices.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_input_devices.c	2009-03-19 14:55:14 UTC (rev 805)
+++ trunk/freeglut/freeglut/src/freeglut_input_devices.c	2009-03-26 16:12:42 UTC (rev 806)
@@ -138,7 +138,8 @@
 {
     if( !fgState.InputDevsInitialised )
     {
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+      /* will return true for VC8 (VC2005) and higher */
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
         char *dial_device=NULL;
         size_t sLen;
         errno_t err = _dupenv_s( &dial_device, &sLen, "GLUT_DIALS_SERIAL" );
@@ -164,7 +165,8 @@
 #endif
         if ( !dial_device ) return;
         if ( !( dialbox_port = serial_open ( dial_device ) ) ) return;
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) // will return true for VC8 (VC2005) and higher
+      /* will return true for VC8 (VC2005) and higher */
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
         free ( dial_device );  dial_device = NULL;  /* dupenv_s allocates a string that we must free */
 #endif
         serial_putchar(dialbox_port,DIAL_INITIALIZE);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 828
          http://freeglut.svn.sourceforge.net/freeglut/?rev=828&view=rev
Author:   fayjf
Date:     2009-07-10 16:18:06 +0000 (Fri, 10 Jul 2009)

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

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_init.c
    trunk/freeglut/freeglut/src/freeglut_internal.h
    trunk/freeglut/freeglut/src/freeglut_menu.c
    trunk/freeglut/freeglut/src/freeglut_window.c

Modified: trunk/freeglut/freeglut/src/freeglut_init.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_init.c	2009-06-22 18:54:41 UTC (rev 827)
+++ trunk/freeglut/freeglut/src/freeglut_init.c	2009-07-10 16:18:06 UTC (rev 828)
@@ -854,13 +854,13 @@
     }
 }
 
-#ifdef _WIN32
-void (__cdecl *__glutExitFunc)( int retval ) = NULL;
+#ifdef TARGET_HOST_MS_WINDOWS
+void (__cdecl *__glutExitFunc)( int return_value ) = NULL;
 
-void FGAPIENTRY __glutInitWithExit( int *argcp, char **argv, void (__cdecl *exitfunc)(int) )
+void FGAPIENTRY __glutInitWithExit( int *pargc, char **argv, void (__cdecl *exit_function)(int) )
 {
-  __glutExitFunc = exitfunc;
-  glutInit(argcp, argv);
+  __glutExitFunc = exit_function;
+  glutInit(pargc, argv);
 }
 #endif
 

Modified: trunk/freeglut/freeglut/src/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_internal.h	2009-06-22 18:54:41 UTC (rev 827)
+++ trunk/freeglut/freeglut/src/freeglut_internal.h	2009-07-10 16:18:06 UTC (rev 828)
@@ -934,7 +934,7 @@
 SFG_Proc fghGetProcAddress( const char *procName );
 
 #ifdef _WIN32
-extern void (__cdecl *__glutExitFunc)( int retval );
+extern void (__cdecl *__glutExitFunc)( int return_value );
 #endif
 
 #endif /* FREEGLUT_INTERNAL_H */

Modified: trunk/freeglut/freeglut/src/freeglut_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_menu.c	2009-06-22 18:54:41 UTC (rev 827)
+++ trunk/freeglut/freeglut/src/freeglut_menu.c	2009-07-10 16:18:06 UTC (rev 828)
@@ -779,10 +779,10 @@
     return fgCreateMenu( callback )->ID;
 }
 
-#ifdef _WIN32
-int FGAPIENTRY __glutCreateMenuWithExit( void(* callback)( int ), void (__cdecl *exitfunc)(int) )
+#ifdef TARGET_HOST_MS_WINDOWS
+int FGAPIENTRY __glutCreateMenuWithExit( void(* callback)( int ), void (__cdecl *exit_function)(int) )
 {
-  __glutExitFunc = exitfunc;
+  __glutExitFunc = exit_function;
   return glutCreateMenu( callback );
 }
 #endif

Modified: trunk/freeglut/freeglut/src/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_window.c	2009-06-22 18:54:41 UTC (rev 827)
+++ trunk/freeglut/freeglut/src/freeglut_window.c	2009-07-10 16:18:06 UTC (rev 828)
@@ -1094,9 +1094,9 @@
 }
 
 #ifdef _WIN32
-int FGAPIENTRY __glutCreateWindowWithExit( const char *title, void (__cdecl *exitfunc)(int) )
+int FGAPIENTRY __glutCreateWindowWithExit( const char *title, void (__cdecl *exit_function)(int) )
 {
-  __glutExitFunc = exitfunc;
+  __glutExitFunc = exit_function;
   return glutCreateWindow( title );
 }
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 830
          http://freeglut.svn.sourceforge.net/freeglut/?rev=830&view=rev
Author:   fayjf
Date:     2009-07-12 14:29:16 +0000 (Sun, 12 Jul 2009)

Log Message:
-----------
Making the #ifdef's around "__glutExitFunc" consistent so Cygwin will build

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_internal.h
    trunk/freeglut/freeglut/src/freeglut_window.c

Modified: trunk/freeglut/freeglut/src/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_internal.h	2009-07-12 14:07:19 UTC (rev 829)
+++ trunk/freeglut/freeglut/src/freeglut_internal.h	2009-07-12 14:29:16 UTC (rev 830)
@@ -933,7 +933,7 @@
 
 SFG_Proc fghGetProcAddress( const char *procName );
 
-#ifdef _WIN32
+#ifdef TARGET_HOST_MS_WINDOWS
 extern void (__cdecl *__glutExitFunc)( int return_value );
 #endif
 

Modified: trunk/freeglut/freeglut/src/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_window.c	2009-07-12 14:07:19 UTC (rev 829)
+++ trunk/freeglut/freeglut/src/freeglut_window.c	2009-07-12 14:29:16 UTC (rev 830)
@@ -1093,7 +1093,7 @@
                            GL_FALSE, GL_FALSE )->ID;
 }
 
-#ifdef _WIN32
+#ifdef TARGET_HOST_MS_WINDOWS
 int FGAPIENTRY __glutCreateWindowWithExit( const char *title, void (__cdecl *exit_function)(int) )
 {
   __glutExitFunc = exit_function;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 831
          http://freeglut.svn.sourceforge.net/freeglut/?rev=831&view=rev
Author:   spanne
Date:     2009-07-23 19:07:34 +0000 (Thu, 23 Jul 2009)

Log Message:
-----------
Unbreak the build for non-Windows platforms, fixing obviously untested
recent commits.

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_init.c
    trunk/freeglut/freeglut/src/freeglut_internal.h
    trunk/freeglut/freeglut/src/freeglut_menu.c
    trunk/freeglut/freeglut/src/freeglut_window.c

Modified: trunk/freeglut/freeglut/src/freeglut_init.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_init.c	2009-07-12 14:29:16 UTC (rev 830)
+++ trunk/freeglut/freeglut/src/freeglut_init.c	2009-07-23 19:07:34 UTC (rev 831)
@@ -854,7 +854,7 @@
     }
 }
 
-#ifdef TARGET_HOST_MS_WINDOWS
+#if TARGET_HOST_MS_WINDOWS
 void (__cdecl *__glutExitFunc)( int return_value ) = NULL;
 
 void FGAPIENTRY __glutInitWithExit( int *pargc, char **argv, void (__cdecl *exit_function)(int) )

Modified: trunk/freeglut/freeglut/src/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_internal.h	2009-07-12 14:29:16 UTC (rev 830)
+++ trunk/freeglut/freeglut/src/freeglut_internal.h	2009-07-23 19:07:34 UTC (rev 831)
@@ -933,7 +933,7 @@
 
 SFG_Proc fghGetProcAddress( const char *procName );
 
-#ifdef TARGET_HOST_MS_WINDOWS
+#if TARGET_HOST_MS_WINDOWS
 extern void (__cdecl *__glutExitFunc)( int return_value );
 #endif
 

Modified: trunk/freeglut/freeglut/src/freeglut_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_menu.c	2009-07-12 14:29:16 UTC (rev 830)
+++ trunk/freeglut/freeglut/src/freeglut_menu.c	2009-07-23 19:07:34 UTC (rev 831)
@@ -779,7 +779,7 @@
     return fgCreateMenu( callback )->ID;
 }
 
-#ifdef TARGET_HOST_MS_WINDOWS
+#if TARGET_HOST_MS_WINDOWS
 int FGAPIENTRY __glutCreateMenuWithExit( void(* callback)( int ), void (__cdecl *exit_function)(int) )
 {
   __glutExitFunc = exit_function;

Modified: trunk/freeglut/freeglut/src/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_window.c	2009-07-12 14:29:16 UTC (rev 830)
+++ trunk/freeglut/freeglut/src/freeglut_window.c	2009-07-23 19:07:34 UTC (rev 831)
@@ -1093,7 +1093,7 @@
                            GL_FALSE, GL_FALSE )->ID;
 }
 
-#ifdef TARGET_HOST_MS_WINDOWS
+#if TARGET_HOST_MS_WINDOWS
 int FGAPIENTRY __glutCreateWindowWithExit( const char *title, void (__cdecl *exit_function)(int) )
 {
   __glutExitFunc = exit_function;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 833
          http://freeglut.svn.sourceforge.net/freeglut/?rev=833&view=rev
Author:   fayjf
Date:     2009-11-02 13:42:23 +0000 (Mon, 02 Nov 2009)

Log Message:
-----------
Protecting some preprocessor symbols that are not defined in OpenGL-ES per e-mail from Vincent R dated 5:37 AM, October 3, 2009.

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_main.c
    trunk/freeglut/freeglut/src/freeglut_state.c

Modified: trunk/freeglut/freeglut/src/freeglut_main.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_main.c	2009-08-10 18:39:58 UTC (rev 832)
+++ trunk/freeglut/freeglut/src/freeglut_main.c	2009-11-02 13:42:23 UTC (rev 833)
@@ -1735,7 +1735,7 @@
      * XXX WM_MOUSELEAVE code set it to false.  Then when we get a WM_MOUSEMOVE event,
      * XXX if the flag is false we invoke the Entry callback and set the flag to true.
      */
-    case 0x02a2:  /* This is the message we get when the mouse is leaving the window */
+    case 0x02a3:  /* This is the message we get when the mouse is leaving the window */
         if( window->IsMenu &&
             window->ActiveMenu && window->ActiveMenu->IsActive )
             fgUpdateMenuHighlight( window->ActiveMenu );

Modified: trunk/freeglut/freeglut/src/freeglut_state.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_state.c	2009-08-10 18:39:58 UTC (rev 832)
+++ trunk/freeglut/freeglut/src/freeglut_state.c	2009-11-02 13:42:23 UTC (rev 833)
@@ -364,16 +364,28 @@
 
     /* Handle the OpenGL inquiries */
     case GLUT_WINDOW_RGBA:
+#if defined(_WIN32_WCE)
+      boolValue = (GLboolean)0;  /* WinCE doesn't support this feature */
+#else
       glGetBooleanv ( GL_RGBA_MODE, &boolValue );
       returnValue = boolValue ? 1 : 0;
+#endif
       return returnValue;
     case GLUT_WINDOW_DOUBLEBUFFER:
+#if defined(_WIN32_WCE)
+      boolValue = (GLboolean)0;  /* WinCE doesn't support this feature */
+#else
       glGetBooleanv ( GL_DOUBLEBUFFER, &boolValue );
       returnValue = boolValue ? 1 : 0;
+#endif
       return returnValue;
     case GLUT_WINDOW_STEREO:
+#if defined(_WIN32_WCE)
+      boolValue = (GLboolean)0;  /* WinCE doesn't support this feature */
+#else
       glGetBooleanv ( GL_STEREO, &boolValue );
       returnValue = boolValue ? 1 : 0;
+#endif
       return returnValue;
 
     case GLUT_WINDOW_RED_SIZE:
@@ -389,16 +401,32 @@
       glGetIntegerv ( GL_ALPHA_BITS, &returnValue );
       return returnValue;
     case GLUT_WINDOW_ACCUM_RED_SIZE:
+#if defined(_WIN32_WCE)
+      returnValue = 0;  /* WinCE doesn't support this feature */
+#else
       glGetIntegerv ( GL_ACCUM_RED_BITS, &returnValue );
+#endif
       return returnValue;
     case GLUT_WINDOW_ACCUM_GREEN_SIZE:
+#if defined(_WIN32_WCE)
+      returnValue = 0;  /* WinCE doesn't support this feature */
+#else
       glGetIntegerv ( GL_ACCUM_GREEN_BITS, &returnValue );
+#endif
       return returnValue;
     case GLUT_WINDOW_ACCUM_BLUE_SIZE:
+#if defined(_WIN32_WCE)
+      returnValue = 0;  /* WinCE doesn't support this feature */
+#else
       glGetIntegerv ( GL_ACCUM_BLUE_BITS, &returnValue );
+#endif
       return returnValue;
     case GLUT_WINDOW_ACCUM_ALPHA_SIZE:
+#if defined(_WIN32_WCE)
+      returnValue = 0;  /* WinCE doesn't support this feature */
+#else
       glGetIntegerv ( GL_ACCUM_ALPHA_BITS, &returnValue );
+#endif
       return returnValue;
     case GLUT_WINDOW_DEPTH_SIZE:
       glGetIntegerv ( GL_DEPTH_BITS, &returnValue );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 834
          http://freeglut.svn.sourceforge.net/freeglut/?rev=834&view=rev
Author:   fayjf
Date:     2009-11-03 13:45:32 +0000 (Tue, 03 Nov 2009)

Log Message:
-----------
Protecting "errno" in case it is not defined per e-mail from Vincent R dated 5:37 AM, October 3, 2009.

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_init.c
    trunk/freeglut/freeglut/src/freeglut_input_devices.c
    trunk/freeglut/freeglut/src/freeglut_joystick.c
    trunk/freeglut/freeglut/src/freeglut_main.c

Modified: trunk/freeglut/freeglut/src/freeglut_init.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_init.c	2009-11-02 13:42:23 UTC (rev 833)
+++ trunk/freeglut/freeglut/src/freeglut_init.c	2009-11-03 13:45:32 UTC (rev 834)
@@ -683,8 +683,10 @@
     /* will return true for VC8 (VC2005) and higher */
 #if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
     size_t sLen;
+#if HAVE_ERRNO
     errno_t err;
 #endif
+#endif
 
     if( fgState.Initialised )
         fgError( "illegal glutInit() reinitialization attempt" );
@@ -706,7 +708,7 @@
 #ifndef _WIN32_WCE
     {
     /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) && HAVE_ERRNO
         char* fps = NULL;
         err = _dupenv_s( &fps, &sLen, "GLUT_FPS" );
         if (err)
@@ -725,13 +727,13 @@
                 fgState.FPSInterval = interval;
         }
     /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) && HAVE_ERRNO
         free ( fps );  fps = NULL;  /* dupenv_s allocates a string that we must free */
 #endif
     }
 
     /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) && HAVE_ERRNO
     err = _dupenv_s( &displayName, &sLen, "DISPLAY" );
     if (err)
         fgError("Error getting DISPLAY environment variable");
@@ -823,7 +825,7 @@
      */
     fghInitialize( displayName );
     /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) && HAVE_ERRNO
     free ( displayName );  displayName = NULL;  /* dupenv_s allocates a string that we must free */
 #endif
 

Modified: trunk/freeglut/freeglut/src/freeglut_input_devices.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_input_devices.c	2009-11-02 13:42:23 UTC (rev 833)
+++ trunk/freeglut/freeglut/src/freeglut_input_devices.c	2009-11-03 13:45:32 UTC (rev 834)
@@ -36,7 +36,9 @@
 #include "freeglut_internal.h"
 
 #if TARGET_HOST_POSIX_X11
+#if HAVE_ERRNO
 #include <errno.h>
+#endif
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <time.h>
@@ -139,7 +141,7 @@
     if( !fgState.InputDevsInitialised )
     {
       /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) && HAVE_ERRNO
         char *dial_device=NULL;
         size_t sLen;
         errno_t err = _dupenv_s( &dial_device, &sLen, "GLUT_DIALS_SERIAL" );
@@ -166,7 +168,7 @@
         if ( !dial_device ) return;
         if ( !( dialbox_port = serial_open ( dial_device ) ) ) return;
       /* will return true for VC8 (VC2005) and higher */
-#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 )
+#if TARGET_HOST_MS_WINDOWS && ( _MSC_VER >= 1400 ) && HAVE_ERRNO
         free ( dial_device );  dial_device = NULL;  /* dupenv_s allocates a string that we must free */
 #endif
         serial_putchar(dialbox_port,DIAL_INITIALIZE);

Modified: trunk/freeglut/freeglut/src/freeglut_joystick.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_joystick.c	2009-11-02 13:42:23 UTC (rev 833)
+++ trunk/freeglut/freeglut/src/freeglut_joystick.c	2009-11-03 13:45:32 UTC (rev 834)
@@ -75,7 +75,9 @@
 #    if HAVE_FCNTL_H
 #        include <fcntl.h>
 #    endif
-#    include <errno.h>
+#    if HAVE_ERRNO
+#        include <errno.h>
+#    endif
 #    if defined(__FreeBSD__) || defined(__NetBSD__)
 /* XXX The below hack is done until freeglut's autoconf is updated. */
 #        define HAVE_USB_JS    1
@@ -237,12 +239,15 @@
       close(f);
       if (cp)
         return 1;
-    } else if (errno == EACCES) {
+    }
+#if HAVE_ERRNO
+    else if (errno == EACCES) {
       if (!protection_warned) {
         fgWarning ( "Can't open %s for read!", buf );
         protection_warned = 1;
       }
     }
+#endif
   }
   return 0;
 }
@@ -260,7 +265,11 @@
 
     if ( ( rd = hid_get_report_desc( os->fd ) ) == 0 )
     {
+#if HAVE_ERRNO
         fgWarning ( "error: %s: %s", os->fname, strerror( errno ) );
+#else
+        fgWarning ( "error: %s", os->fname );
+#endif
         return FALSE;
     }
 
@@ -270,7 +279,11 @@
         if( ioctl( os->fd, USB_GET_REPORT_ID, &report_id ) < 0)
         {
             /*** XXX {report_id} may not be the right variable? ***/
+#if HAVE_ERRNO
             fgWarning ( "error: %s%d: %s", UHIDDEV, report_id, strerror( errno ) );
+#else
+            fgWarning ( "error: %s%d", UHIDDEV, report_id );
+#endif
             return FALSE;
         }
 
@@ -663,7 +676,11 @@
             }
         }
     }
+#if HAVE_ERRNO
     if ( len < 0 && errno != EAGAIN )
+#else
+    if ( len < 0 )
+#endif
     {
         perror( joy->os->fname );
         joy->error = 1;
@@ -682,6 +699,7 @@
 
         if ( status != sizeof( struct js_event ) )
         {
+#if HAVE_ERRNO
             if ( errno == EAGAIN )
             {
                 /* Use the old values */
@@ -692,6 +710,7 @@
                             sizeof( float ) * joy->num_axes );
                 return;
             }
+#endif
 
             fgWarning ( "%s", joy->fname );
             joy->error = GL_TRUE;
@@ -1298,8 +1317,10 @@
 
     joy->os->fd = open( joy->os->fname, O_RDONLY | O_NONBLOCK);
 
+#if HAVE_ERRNO
     if( joy->os->fd < 0 && errno == EACCES )
         fgWarning ( "%s exists but is not readable by you", joy->os->fname );
+#endif
 
     joy->error =( joy->os->fd < 0 );
 

Modified: trunk/freeglut/freeglut/src/freeglut_main.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_main.c	2009-11-02 13:42:23 UTC (rev 833)
+++ trunk/freeglut/freeglut/src/freeglut_main.c	2009-11-03 13:45:32 UTC (rev 834)
@@ -27,7 +27,9 @@
 
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
-#include <errno.h>
+#if HAVE_ERRNO
+#    include <errno.h>
+#endif
 #include <stdarg.h>
 #if  HAVE_VPRINTF
 #    define VFPRINTF(s,f,a) vfprintf((s),(f),(a))
@@ -471,8 +473,10 @@
         wait.tv_usec = (msec % 1000) * 1000;
         err = select( socket+1, &fdset, NULL, NULL, &wait );
 
+#if HAVE_ERRNO
         if( ( -1 == err ) && ( errno != EINTR ) )
             fgWarning ( "freeglut select() error: %d", errno );
+#endif
     }
 #elif TARGET_HOST_MS_WINDOWS
     MsgWaitForMultipleObjects( 0, NULL, FALSE, msec, QS_ALLINPUT );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 849
          http://freeglut.svn.sourceforge.net/freeglut/?rev=849&view=rev
Author:   fayjf
Date:     2009-11-18 01:52:13 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
Putting in the "glutFullScreen" support for Gnome and other X window managers per e-mail with patch file from John Tsiombikas dated 2:14 AM, 11/16/09

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_internal.h
    trunk/freeglut/freeglut/src/freeglut_state.c
    trunk/freeglut/freeglut/src/freeglut_structure.c
    trunk/freeglut/freeglut/src/freeglut_window.c

Modified: trunk/freeglut/freeglut/src/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_internal.h	2009-11-14 19:11:21 UTC (rev 848)
+++ trunk/freeglut/freeglut/src/freeglut_internal.h	2009-11-18 01:52:13 UTC (rev 849)
@@ -436,6 +436,8 @@
     GLboolean       KeyRepeating;       /* Currently in repeat mode          */
 
     GLboolean       NeedToResize;       /* Do we need to resize the window?  */
+
+    GLboolean       IsFullscreen;       /* is the window fullscreen? */
 };
 
 

Modified: trunk/freeglut/freeglut/src/freeglut_state.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_state.c	2009-11-14 19:11:21 UTC (rev 848)
+++ trunk/freeglut/freeglut/src/freeglut_state.c	2009-11-18 01:52:13 UTC (rev 849)
@@ -68,23 +68,9 @@
 static int fghCheckFullScreen(void)
 {
 #if TARGET_HOST_POSIX_X11
-
-  int result;
-
-  result = 0;
-  if (fgDisplay.StateFullScreen != None)
-    {
-      result = fgHintPresent(fgStructure.CurrentWindow->Window.Handle,
-			     fgDisplay.State,
-			     fgDisplay.StateFullScreen);
-    }
-
-  return result;
-
+    return fgStructure.CurrentWindow->State.IsFullscreen;
 #else
-
-  return 0;
-
+    return 0;
 #endif
 }
 

Modified: trunk/freeglut/freeglut/src/freeglut_structure.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_structure.c	2009-11-14 19:11:21 UTC (rev 848)
+++ trunk/freeglut/freeglut/src/freeglut_structure.c	2009-11-18 01:52:13 UTC (rev 849)
@@ -97,6 +97,7 @@
 
     window->State.IgnoreKeyRepeat = GL_FALSE;
     window->State.KeyRepeating    = GL_FALSE;
+    window->State.IsFullscreen    = GL_FALSE;
 
     /*
      * Open the window now. The fgOpenWindow() function is system

Modified: trunk/freeglut/freeglut/src/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_window.c	2009-11-14 19:11:21 UTC (rev 848)
+++ trunk/freeglut/freeglut/src/freeglut_window.c	2009-11-18 01:52:13 UTC (rev 849)
@@ -1559,41 +1559,111 @@
 #endif
 }
 
+#if TARGET_HOST_POSIX_X11
+static int ewmh_fullscr_toggle(void);
+static int resize_fullscr_toogle(void);
+
+static int toggle_fullscreen(void)
+{
+    /* first try the EWMH (_NET_WM_STATE) method ... */
+    if(ewmh_fullscr_toggle() != -1) {
+        return 0;
+    }
+
+    /* fall back to resizing the window */
+    if(resize_fullscr_toogle() != -1) {
+        return 0;
+    }
+    return -1;
+}
+
+#define _NET_WM_STATE_TOGGLE    2
+static int ewmh_fullscr_toggle(void)
+{
+    XEvent xev;
+    long evmask = SubstructureRedirectMask | SubstructureNotifyMask;
+
+    if(!fgDisplay.State || !fgDisplay.StateFullScreen) {
+        return -1;
+    }
+
+    xev.type = ClientMessage;
+    xev.xclient.window = fgStructure.CurrentWindow->Window.Handle;
+    xev.xclient.message_type = fgDisplay.State;
+    xev.xclient.format = 32;
+    xev.xclient.data.l[0] = _NET_WM_STATE_TOGGLE;
+    xev.xclient.data.l[1] = fgDisplay.StateFullScreen;
+    xev.xclient.data.l[2] = 0;	/* no second property to toggle */
+    xev.xclient.data.l[3] = 1;	/* source indication: application */
+    xev.xclient.data.l[4] = 0;	/* unused */
+
+    if(!XSendEvent(fgDisplay.Display, fgDisplay.RootWindow, 0, evmask, &xev)) {
+        return -1;
+    }
+    return 0;
+}
+
+static int resize_fullscr_toogle(void)
+{
+    XWindowAttributes attributes;
+
+    if(glutGet(GLUT_FULL_SCREEN)) {
+        /* restore original window size */
+        SFG_Window *win = fgStructure.CurrentWindow;
+        fgStructure.CurrentWindow->State.NeedToResize = GL_TRUE;
+        fgStructure.CurrentWindow->State.Width  = win->State.OldWidth;
+        fgStructure.CurrentWindow->State.Height = win->State.OldHeight;
+
+    } else {
+        /* resize the window to cover the entire screen */
+        XGetWindowAttributes(fgDisplay.Display,
+                fgStructure.CurrentWindow->Window.Handle,
+                &attributes);
+        
+        /*
+         * The "x" and "y" members of "attributes" are the window's coordinates
+         * relative to its parent, i.e. to the decoration window.
+         */
+        XMoveResizeWindow(fgDisplay.Display,
+                fgStructure.CurrentWindow->Window.Handle,
+                -attributes.x,
+                -attributes.y,
+                fgDisplay.ScreenWidth,
+                fgDisplay.ScreenHeight);
+    }
+    return 0;
+}
+#endif	/* TARGET_HOST_POSIX_X11 */
+
+
 /*
  * Resize the current window so that it fits the whole screen
  */
 void FGAPIENTRY glutFullScreen( void )
 {
+    SFG_Window *win;
+
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutFullScreen" );
     FREEGLUT_EXIT_IF_NO_WINDOW ( "glutFullScreen" );
 
+    win = fgStructure.CurrentWindow;
+
+#if TARGET_HOST_POSIX_X11
+    if(!glutGet(GLUT_FULL_SCREEN)) {
+        if(toggle_fullscreen() != -1) {
+            win->State.IsFullscreen = GL_TRUE;
+        }
+    }
+
+#elif TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE) /* FIXME: what about WinCE */
+
     if (glutGet(GLUT_FULL_SCREEN))
     {
-      /*  Leave full screen state before resizing. */
-      glutFullScreenToggle();
+        /*  Leave full screen state before resizing. */
+        glutFullScreenToggle();
     }
 
     {
-#if TARGET_HOST_POSIX_X11
-
-        Status status;  /* Returned by XGetWindowAttributes(), not checked. */
-        XWindowAttributes attributes;
-
-        status = XGetWindowAttributes(fgDisplay.Display,
-                                      fgStructure.CurrentWindow->Window.Handle,
-                                      &attributes);
-        /*
-         * The "x" and "y" members of "attributes" are the window's coordinates
-         * relative to its parent, i.e. to the decoration window.
-         */
-        XMoveResizeWindow(fgDisplay.Display,
-                          fgStructure.CurrentWindow->Window.Handle,
-                          -attributes.x,
-                          -attributes.y,
-                          fgDisplay.ScreenWidth,
-                          fgDisplay.ScreenHeight);
-
-#elif TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE) /* FIXME: what about WinCE */
         RECT rect;
 
         /* For fullscreen mode, force the top-left corner to 0,0
@@ -1625,8 +1695,10 @@
                       SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING |
                       SWP_NOZORDER
                     );
+        
+        win->State.IsFullscreen = GL_TRUE;
+    }
 #endif
-    }
 }
 
 /*
@@ -1634,54 +1706,21 @@
  */
 void FGAPIENTRY glutFullScreenToggle( void )
 {
+    SFG_Window *win;
+
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutFullScreenToggle" );
     FREEGLUT_EXIT_IF_NO_WINDOW ( "glutFullScreenToggle" );
 
-    {
+    win = fgStructure.CurrentWindow;
+
 #if TARGET_HOST_POSIX_X11
-
-      if (fgDisplay.StateFullScreen != None)
-      {
-        XEvent xevent;
-        long event_mask;
-        int status;
-
-        xevent.type = ClientMessage;
-        xevent.xclient.type = ClientMessage;
-        xevent.xclient.serial = 0;
-        xevent.xclient.send_event = True;
-        xevent.xclient.display = fgDisplay.Display;
-        xevent.xclient.window = fgStructure.CurrentWindow->Window.Handle;
-        xevent.xclient.message_type = fgDisplay.State;
-        xevent.xclient.format = 32;
-        xevent.xclient.data.l[0] = 2;  /* _NET_WM_STATE_TOGGLE */
-        xevent.xclient.data.l[1] = fgDisplay.StateFullScreen;
-        xevent.xclient.data.l[2] = 0;
-        xevent.xclient.data.l[3] = 0;
-        xevent.xclient.data.l[4] = 0;
-
-        /*** Don't really understand how event masks work... ***/
-        event_mask = SubstructureRedirectMask | SubstructureNotifyMask;
-
-        status = XSendEvent(fgDisplay.Display,
-          fgDisplay.RootWindow,
-          False,
-          event_mask,
-          &xevent);
-        FREEGLUT_INTERNAL_ERROR_EXIT(status != 0,
-          "XSendEvent failed",
-          "glutFullScreenToggle");
-      }
-      else
+    if(toggle_fullscreen() != -1) {
+        win->State.IsFullscreen = !win->State.IsFullscreen;
+    }
+#elif TARGET_HOST_MS_WINDOWS
+    glutFullScreen();
+    win->State.IsFullscreen = !win->State.IsFullscreen;
 #endif
-      {
-        /*
-         * If the window manager is not Net WM compliant, fall back to legacy
-         * behaviour.
-         */
-        glutFullScreen();
-      }
-    }
 }
 
 /*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 856
          http://freeglut.svn.sourceforge.net/freeglut/?rev=856&view=rev
Author:   fayjf
Date:     2009-12-03 03:21:12 +0000 (Thu, 03 Dec 2009)

Log Message:
-----------
Uploading spaceball/set-window patch per e-mail from John Tsiombikas dated 1:34 PM, 12/2/09

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_spaceball.c
    trunk/freeglut/freeglut/src/freeglut_window.c

Modified: trunk/freeglut/freeglut/src/freeglut_spaceball.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_spaceball.c	2009-12-02 12:08:37 UTC (rev 855)
+++ trunk/freeglut/freeglut/src/freeglut_spaceball.c	2009-12-03 03:21:12 UTC (rev 856)
@@ -143,11 +143,13 @@
 {
     spnav_event sev;
 
+    if(spnav_win != fgStructure.CurrentWindow) {
+        /* this will also initialize spaceball if needed (first call) */
+        fgSpaceballSetWindow(fgStructure.CurrentWindow);
+    }
+
     if(!sball_initialized) {
-        fgInitialiseSpaceball();
-        if(!sball_initialized) {
-            return 0;
-        }
+        return 0;
     }
 
     return spnav_x11_event(xev, &sev);

Modified: trunk/freeglut/freeglut/src/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_window.c	2009-12-02 12:08:37 UTC (rev 855)
+++ trunk/freeglut/freeglut/src/freeglut_window.c	2009-12-03 03:21:12 UTC (rev 856)
@@ -600,9 +600,6 @@
             window->Window.Handle,
             window->Window.Context
         );
-
-        /* also register this window to receive spaceball events */
-        fgSpaceballSetWindow(window);
     }
 #elif TARGET_HOST_MS_WINDOWS
     if( fgStructure.CurrentWindow )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 861
          http://freeglut.svn.sourceforge.net/freeglut/?rev=861&view=rev
Author:   fayjf
Date:     2009-12-13 05:06:44 +0000 (Sun, 13 Dec 2009)

Log Message:
-----------
Checking in the 'build patch' from Jeremy Huddleston vintage 11/19/09 -- everything except the 'configure.ac' changes which break my Cygwin build

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Makefile.am
    trunk/freeglut/freeglut/src/freeglut_input_devices.c
    trunk/freeglut/freeglut/src/freeglut_internal.h
    trunk/freeglut/freeglut/src/freeglut_joystick.c
    trunk/freeglut/freeglut/src/freeglut_main.c

Modified: trunk/freeglut/freeglut/src/Makefile.am
===================================================================
--- trunk/freeglut/freeglut/src/Makefile.am	2009-12-12 13:37:57 UTC (rev 860)
+++ trunk/freeglut/freeglut/src/Makefile.am	2009-12-13 05:06:44 UTC (rev 861)
@@ -43,9 +43,9 @@
 #
 # Additional linker flags
 #	 
-lib@...  = $(LIBM) $(X_LIBS) $(GL_LIBS) $(LIBXXF86VM) $(LIBXI)
+lib@...  = $(GL_LIBS) $(X_LIBS) $(LIBM)
 lib@... = $(VERSION_INFO) -no-undefined
-lib@...  = $(X_CFLAGS) $(EXPORT_FLAGS)
+lib@...  = $(GL_FLAGS) $(X_CFLAGS) $(EXPORT_FLAGS)
 lib@...= -I$(top_srcdir)/include
 
 #

Modified: trunk/freeglut/freeglut/src/freeglut_input_devices.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_input_devices.c	2009-12-12 13:37:57 UTC (rev 860)
+++ trunk/freeglut/freeglut/src/freeglut_input_devices.c	2009-12-13 05:06:44 UTC (rev 861)
@@ -36,19 +36,15 @@
 #include "freeglut_internal.h"
 
 #if TARGET_HOST_POSIX_X11
-#if HAVE_ERRNO_H
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
 #include <sys/ioctl.h>
-#include <sys/time.h>
-#include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
 #include <termios.h>
 #include <fcntl.h>
-#include <sys/types.h>
 
 typedef struct {
    int fd;

Modified: trunk/freeglut/freeglut/src/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_internal.h	2009-12-12 13:37:57 UTC (rev 860)
+++ trunk/freeglut/freeglut/src/freeglut_internal.h	2009-12-13 05:06:44 UTC (rev 861)
@@ -28,7 +28,7 @@
 #ifndef  FREEGLUT_INTERNAL_H
 #define  FREEGLUT_INTERNAL_H
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #    include "config.h"
 #endif
 
@@ -41,6 +41,7 @@
 /* XXX: Don't all MS-Windows compilers (except Cygwin) have _WIN32 defined?
  * XXX: If so, remove the first set of defined()'s below.
  */
+#if !defined(TARGET_HOST_POSIX_X11) && !defined(TARGET_HOST_MS_WINDOWS) && !defined(TARGET_HOST_MAC_OSX)
 #if defined(_MSC_VER) || defined(__WATCOMC__) || defined(__MINGW32__) \
     || defined(_WIN32) || defined(_WIN32_WCE) \
     || ( defined(__CYGWIN__) && defined(X_DISPLAY_MISSING) )
@@ -58,6 +59,7 @@
 #   error "Unrecognized target host!"
 */
 #endif
+#endif
 
 /* Detect both SunPro and gcc compilers on Sun Solaris */
 #if defined (__SVR4) && defined (__sun)
@@ -109,7 +111,7 @@
 #    include <X11/Xatom.h>
 #    include <X11/keysym.h>
 #    include <X11/extensions/XInput.h>
-#    ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
+#    ifdef HAVE_XXF86VM
 #        include <X11/extensions/xf86vmode.h>
 #    endif
 /* If GLX is too old, we will fail during runtime when multisampling
@@ -130,16 +132,16 @@
 #include <stdlib.h>
 
 /* These are included based on autoconf directives. */
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 #    include <sys/types.h>
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 #    include <unistd.h>
 #endif
-#if TIME_WITH_SYS_TIME
+#ifdef TIME_WITH_SYS_TIME
 #    include <sys/time.h>
 #    include <time.h>
-#elif HAVE_SYS_TIME_H
+#elif defined(HAVE_SYS_TIME_H)
 #    include <sys/time.h>
 #else
 #    include <time.h>
@@ -159,15 +161,6 @@
 #    endif
 #endif
 
-#if TARGET_HOST_MS_WINDOWS
-#    define  HAVE_VPRINTF 1
-#endif
-
-#if !defined(HAVE_VPRINTF) && !defined(HAVE_DOPRNT)
-/* XXX warning directive here? */
-#    define  HAVE_VPRINTF 1
-#endif
-
 /* MinGW may lack a prototype for ChangeDisplaySettingsEx() (depending on the version?) */
 #if TARGET_HOST_MS_WINDOWS && !defined(ChangeDisplaySettingsEx)
 LONG WINAPI ChangeDisplaySettingsExA(LPCSTR,LPDEVMODEA,HWND,DWORD,LPVOID);
@@ -189,14 +182,23 @@
 #    define  M_PI  3.14159265358979323846
 #endif
 
-#ifndef TRUE
-#    define  TRUE  1
+#ifdef HAVE_STDBOOL_H
+#    include <stdbool.h>
+#    ifndef TRUE
+#        define TRUE true
+#    endif
+#    ifndef FALSE
+#        define FALSE false
+#    endif
+#else
+#    ifndef TRUE
+#        define  TRUE  1
+#    endif
+#    ifndef FALSE
+#        define  FALSE  0
+#    endif
 #endif
 
-#ifndef FALSE
-#    define  FALSE  0
-#endif
-
 /* General defines */
 
 #define INVALID_MODIFIERS 0xffffffff

Modified: trunk/freeglut/freeglut/src/freeglut_joystick.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_joystick.c	2009-12-12 13:37:57 UTC (rev 860)
+++ trunk/freeglut/freeglut/src/freeglut_joystick.c	2009-12-13 05:06:44 UTC (rev 861)
@@ -33,7 +33,7 @@
 
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
-#if HAVE_SYS_PARAM_H
+#ifdef HAVE_SYS_PARAM_H
 #    include <sys/param.h>
 #endif
 
@@ -69,14 +69,15 @@
 
 #if TARGET_HOST_POSIX_X11
 #    define _JS_MAX_AXES 16
-#    if HAVE_SYS_IOCTL_H
+#    ifdef HAVE_SYS_IOCTL_H
 #        include <sys/ioctl.h>
 #    endif
-#    if HAVE_FCNTL_H
+#    ifdef HAVE_FCNTL_H
 #        include <fcntl.h>
 #    endif
-#    if HAVE_ERRNO_H
+#    ifdef HAVE_ERRNO_H
 #        include <errno.h>
+#        include <string.h>
 #    endif
 #    if defined(__FreeBSD__) || defined(__NetBSD__)
 /* XXX The below hack is done until freeglut's autoconf is updated. */
@@ -240,7 +241,7 @@
       if (cp)
         return 1;
     }
-#if HAVE_ERRNO_H
+#ifdef HAVE_ERRNO_H
     else if (errno == EACCES) {
       if (!protection_warned) {
         fgWarning ( "Can't open %s for read!", buf );
@@ -265,7 +266,7 @@
 
     if ( ( rd = hid_get_report_desc( os->fd ) ) == 0 )
     {
-#if HAVE_ERRNO_H
+#ifdef HAVE_ERRNO_H
         fgWarning ( "error: %s: %s", os->fname, strerror( errno ) );
 #else
         fgWarning ( "error: %s", os->fname );
@@ -279,7 +280,7 @@
         if( ioctl( os->fd, USB_GET_REPORT_ID, &report_id ) < 0)
         {
             /*** XXX {report_id} may not be the right variable? ***/
-#if HAVE_ERRNO_H
+#ifdef HAVE_ERRNO_H
             fgWarning ( "error: %s%d: %s", UHIDDEV, report_id, strerror( errno ) );
 #else
             fgWarning ( "error: %s%d", UHIDDEV, report_id );
@@ -676,7 +677,7 @@
             }
         }
     }
-#if HAVE_ERRNO_H
+#ifdef HAVE_ERRNO_H
     if ( len < 0 && errno != EAGAIN )
 #else
     if ( len < 0 )
@@ -699,7 +700,7 @@
 
         if ( status != sizeof( struct js_event ) )
         {
-#if HAVE_ERRNO_H
+#ifdef HAVE_ERRNO_H
             if ( errno == EAGAIN )
             {
                 /* Use the old values */
@@ -1317,7 +1318,7 @@
 
     joy->os->fd = open( joy->os->fname, O_RDONLY | O_NONBLOCK);
 
-#if HAVE_ERRNO_H
+#ifdef HAVE_ERRNO_H
     if( joy->os->fd < 0 && errno == EACCES )
         fgWarning ( "%s exists but is not readable by you", joy->os->fname );
 #endif

Modified: trunk/freeglut/freeglut/src/freeglut_main.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_main.c	2009-12-12 13:37:57 UTC (rev 860)
+++ trunk/freeglut/freeglut/src/freeglut_main.c	2009-12-13 05:06:44 UTC (rev 861)
@@ -27,13 +27,13 @@
 
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
-#if HAVE_ERRNO_H
+#ifdef HAVE_ERRNO_H
 #    include <errno.h>
 #endif
 #include <stdarg.h>
-#if  HAVE_VPRINTF
+#ifdef  HAVE_VFPRINTF
 #    define VFPRINTF(s,f,a) vfprintf((s),(f),(a))
-#elif HAVE_DOPRNT
+#elif defined(HAVE__DOPRNT)
 #    define VFPRINTF(s,f,a) _doprnt((f),(a),(s))
 #else
 #    define VFPRINTF(s,f,a)
@@ -59,7 +59,7 @@
  * Try to get the maximum value allowed for ints, falling back to the minimum
  * guaranteed by ISO C99 if there is no suitable header.
  */
-#if HAVE_LIMITS_H
+#ifdef HAVE_LIMITS_H
 #    include <limits.h>
 #endif
 #ifndef INT_MAX
@@ -473,7 +473,7 @@
         wait.tv_usec = (msec % 1000) * 1000;
         err = select( socket+1, &fdset, NULL, NULL, &wait );
 
-#if HAVE_ERRNO_H
+#ifdef HAVE_ERRNO_H
         if( ( -1 == err ) && ( errno != EINTR ) )
             fgWarning ( "freeglut select() error: %d", errno );
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 863
          http://freeglut.svn.sourceforge.net/freeglut/?rev=863&view=rev
Author:   fayjf
Date:     2009-12-13 13:47:20 +0000 (Sun, 13 Dec 2009)

Log Message:
-----------
Having the library poll joysticks only if there is an active joystick callback enabled per e-mail exchange titled "overjoyed" on December 10-13, 2009

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_callbacks.c
    trunk/freeglut/freeglut/src/freeglut_init.c
    trunk/freeglut/freeglut/src/freeglut_internal.h

Modified: trunk/freeglut/freeglut/src/freeglut_callbacks.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_callbacks.c	2009-12-13 13:46:20 UTC (rev 862)
+++ trunk/freeglut/freeglut/src/freeglut_callbacks.c	2009-12-13 13:47:20 UTC (rev 863)
@@ -179,6 +179,15 @@
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutJoystickFunc" );
     fgInitialiseJoysticks ();
 
+    if ( ( ( fgStructure.CurrentWindow->State.JoystickPollRate < 0 ) ||
+           !FETCH_WCB(*fgStructure.CurrentWindow,Joystick) ) &&  /* Joystick callback was disabled */
+         ( callback && ( pollInterval >= 0 ) ) )               /* but is now enabled */
+        ++fgState.NumActiveJoysticks;
+    else if ( ( ( fgStructure.CurrentWindow->State.JoystickPollRate >= 0 ) &&
+                FETCH_WCB(*fgStructure.CurrentWindow,Joystick) ) &&  /* Joystick callback was enabled */
+              ( !callback || ( pollInterval < 0 ) ) )              /* but is now disabled */
+        --fgState.NumActiveJoysticks;
+
     SET_CALLBACK( Joystick );
     fgStructure.CurrentWindow->State.JoystickPollRate = pollInterval;
 

Modified: trunk/freeglut/freeglut/src/freeglut_init.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_init.c	2009-12-13 13:46:20 UTC (rev 862)
+++ trunk/freeglut/freeglut/src/freeglut_init.c	2009-12-13 13:47:20 UTC (rev 863)
@@ -84,6 +84,7 @@
                       GLUT_EXEC_STATE_INIT,   /* ExecState */
                       NULL,                   /* ProgramName */
                       GL_FALSE,               /* JoysticksInitialised */
+                      0,                      /* NumActiveJoysticks */
                       GL_FALSE,               /* InputDevsInitialised */
                       1,                      /* AuxiliaryBufferNumber */
                       4,                      /* SampleNumber */

Modified: trunk/freeglut/freeglut/src/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_internal.h	2009-12-13 13:46:20 UTC (rev 862)
+++ trunk/freeglut/freeglut/src/freeglut_internal.h	2009-12-13 13:47:20 UTC (rev 863)
@@ -57,7 +57,7 @@
 
 #else
 #   error "Unrecognized target host!"
-*/
+
 #endif
 #endif
 
@@ -320,6 +320,7 @@
     fgExecutionState ExecState;           /* Used for GLUT termination       */
     char            *ProgramName;         /* Name of the invoking program    */
     GLboolean        JoysticksInitialised;  /* Only initialize if application calls for them */
+    int              NumActiveJoysticks;    /* Number of active joysticks -- if zero, don't poll joysticks */
     GLboolean        InputDevsInitialised;  /* Only initialize if application calls for them */
 
     int              AuxiliaryBufferNumber;  /* Number of auxiliary buffers */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 865
          http://freeglut.svn.sourceforge.net/freeglut/?rev=865&view=rev
Author:   fayjf
Date:     2009-12-24 03:06:22 +0000 (Thu, 24 Dec 2009)

Log Message:
-----------
Adding Solaris and OSX to the *nix/X11 cursor support and adding a comment to the spaceball file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_cursor.c
    trunk/freeglut/freeglut/src/freeglut_spaceball.c

Modified: trunk/freeglut/freeglut/src/freeglut_cursor.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_cursor.c	2009-12-21 01:50:35 UTC (rev 864)
+++ trunk/freeglut/freeglut/src/freeglut_cursor.c	2009-12-24 03:06:22 UTC (rev 865)
@@ -39,7 +39,7 @@
 
 /* -- PRIVATE FUNCTIONS --------------------------------------------------- */
 
-#if TARGET_HOST_POSIX_X11
+#if TARGET_HOST_POSIX_X11 || TARGET_HOST_MAC_OSX || TARGET_HOST_SOLARIS
   #include <X11/cursorfont.h>
 
 /*

Modified: trunk/freeglut/freeglut/src/freeglut_spaceball.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_spaceball.c	2009-12-21 01:50:35 UTC (rev 864)
+++ trunk/freeglut/freeglut/src/freeglut_spaceball.c	2009-12-24 03:06:22 UTC (rev 865)
@@ -10,6 +10,8 @@
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
+/* -- PRIVATE FUNCTIONS --------------------------------------------------- */
+
 #if TARGET_HOST_POSIX_X11
 #include <X11/Xlib.h>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 872
          http://freeglut.svn.sourceforge.net/freeglut/?rev=872&view=rev
Author:   fayjf
Date:     2010-01-29 05:05:14 +0000 (Fri, 29 Jan 2010)

Log Message:
-----------
Implementing Windows multiple-display patch per e-mail from Eero Paharre dated 1/25/10, 11:54 AM

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_gamemode.c
    trunk/freeglut/freeglut/src/freeglut_init.c
    trunk/freeglut/freeglut/src/freeglut_internal.h
    trunk/freeglut/freeglut/src/freeglut_window.c

Modified: trunk/freeglut/freeglut/src/freeglut_gamemode.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_gamemode.c	2010-01-25 03:57:50 UTC (rev 871)
+++ trunk/freeglut/freeglut/src/freeglut_gamemode.c	2010-01-29 05:05:14 UTC (rev 872)
@@ -110,7 +110,7 @@
 /* hack to get around my stupid cross-gcc headers */
 #define FREEGLUT_ENUM_CURRENT_SETTINGS -1
 
-    EnumDisplaySettings( NULL, FREEGLUT_ENUM_CURRENT_SETTINGS,
+    EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS,
                          &fgDisplay.DisplayMode );
 
     /* Make sure we will be restoring all settings needed */
@@ -205,7 +205,7 @@
 #elif TARGET_HOST_MS_WINDOWS
 
     /* Restore the previously rememebered desktop display settings */
-    ChangeDisplaySettings( &fgDisplay.DisplayMode, 0 );
+    ChangeDisplaySettingsEx( fgDisplay.DisplayName,&fgDisplay.DisplayMode, 0,0,0 );
 
 #endif
 }
@@ -323,7 +323,7 @@
 
     success = GL_FALSE;
 
-    EnumDisplaySettings( NULL, -1, &devMode ); 
+    EnumDisplaySettings( fgDisplay.DisplayName, -1, &devMode ); 
     devMode.dmFields |= DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY;
 
     devMode.dmPelsWidth  = fgState.GameModeSize.X;
@@ -332,13 +332,13 @@
     devMode.dmDisplayFrequency = fgState.GameModeRefresh;
     devMode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY;
 
-    switch ( ChangeDisplaySettingsEx(NULL, &devMode, NULL, haveToTest ? CDS_TEST : CDS_FULLSCREEN , NULL) )
+    switch ( ChangeDisplaySettingsEx(fgDisplay.DisplayName, &devMode, NULL, haveToTest ? CDS_TEST : CDS_FULLSCREEN , NULL) )
     {
     case DISP_CHANGE_SUCCESSFUL:
         success = GL_TRUE;
 
         /* update vars in case if windows switched to proper mode */
-        EnumDisplaySettings( NULL, FREEGLUT_ENUM_CURRENT_SETTINGS, &devMode );
+        EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS, &devMode );
         fgState.GameModeSize.X  = devMode.dmPelsWidth;        
         fgState.GameModeSize.Y  = devMode.dmPelsHeight;
         fgState.GameModeDepth   = devMode.dmBitsPerPel;
@@ -410,6 +410,8 @@
     fgState.GameModeRefresh = refresh;
 }
 
+
+
 /*
  * Enters the game mode
  */

Modified: trunk/freeglut/freeglut/src/freeglut_init.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_init.c	2010-01-25 03:57:50 UTC (rev 871)
+++ trunk/freeglut/freeglut/src/freeglut_init.c	2010-01-29 05:05:14 UTC (rev 872)
@@ -311,7 +311,7 @@
 
     /* What we need to do is to initialize the fgDisplay global structure here. */
     fgDisplay.Instance = GetModuleHandle( NULL );
-
+    fgDisplay.DisplayName=strdup(displayName);
     atom = GetClassInfo( fgDisplay.Instance, _T("FREEGLUT"), &wc );
 
     if( atom == 0 )
@@ -363,7 +363,23 @@
 
         ReleaseDC( desktop, context );
     }
-
+    /* If we have a DisplayName try to use it for metrics */
+    if( fgDisplay.DisplayName )
+    {
+        HDC context = CreateDC(fgDisplay.DisplayName,0,0,0);
+        if( context )
+        {
+	    fgDisplay.ScreenWidth  = GetDeviceCaps( context, HORZRES );
+	    fgDisplay.ScreenHeight = GetDeviceCaps( context, VERTRES );
+	    fgDisplay.ScreenWidthMM  = GetDeviceCaps( context, HORZSIZE );
+	    fgDisplay.ScreenHeightMM = GetDeviceCaps( context, VERTSIZE );
+	    DeleteDC(context);
+        }
+        else
+	    fgWarning("fghInitialize: "
+		      "CreateDC failed, Screen size info may be incorrect");
+      
+    }
     /* Set the timer granularity to 1 ms */
     timeBeginPeriod ( 1 );
 
@@ -489,6 +505,11 @@
     XCloseDisplay( fgDisplay.Display );
 
 #elif TARGET_HOST_MS_WINDOWS
+    if( fgDisplay.DisplayName )
+    {
+        free( fgDisplay.DisplayName );
+        fgDisplay.DisplayName = NULL;
+    }
 
     /* Reset the timer granularity */
     timeEndPeriod ( 1 );

Modified: trunk/freeglut/freeglut/src/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_internal.h	2010-01-25 03:57:50 UTC (rev 871)
+++ trunk/freeglut/freeglut/src/freeglut_internal.h	2010-01-29 05:05:14 UTC (rev 872)
@@ -362,6 +362,7 @@
 #elif TARGET_HOST_MS_WINDOWS
     HINSTANCE        Instance;          /* The application's instance        */
     DEVMODE         DisplayMode;        /* Desktop's display settings        */
+    char           *DisplayName;        /* Display name for multi display support*/ 
 
 #endif
 

Modified: trunk/freeglut/freeglut/src/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_window.c	2010-01-25 03:57:50 UTC (rev 871)
+++ trunk/freeglut/freeglut/src/freeglut_window.c	2010-01-29 05:05:14 UTC (rev 872)
@@ -825,8 +825,57 @@
     fgStructure.CurrentWindow = window;
 }
 
+#if TARGET_HOST_MS_WINDOWS
 
+typedef struct {
+      int *x;
+      int *y;
+      const char *name;
+}m_proc_t ;
 
+static BOOL CALLBACK m_proc(HMONITOR mon,
+			    HDC hdc,
+			    LPRECT rect,
+			    LPARAM data)
+{
+      m_proc_t *dp=(m_proc_t *)data;
+      MONITORINFOEX info;
+      BOOL res;
+      info.cbSize=sizeof(info);
+      res=GetMonitorInfo(mon,(LPMONITORINFO)&info);
+      if( res )
+      {
+          if( !strcmp(dp->name,info.szDevice) )
+          {
+              *(dp->x)=info.rcMonitor.left;
+              *(dp->y)=info.rcMonitor.top;
+              return FALSE;
+          }
+      }
+      return TRUE;
+}
+
+/* 
+ * this function is only used in fgOpenWindow. Currently it only sets 
+ * its output parameters, if the DisplayName is set in fgDisplay 
+ * (and if it is able to recognize the display)
+*/
+
+static void get_display_origin(int *xp,int *yp)
+{
+    if( fgDisplay.DisplayName )
+    {
+        m_proc_t st;
+        st.x=xp;
+        st.y=yp;
+        st.name=fgDisplay.DisplayName;
+        EnumDisplayMonitors(0,0,m_proc,(LPARAM)&st);
+     }
+}
+#endif
+
+
+
 /*
  * Opens a window. Requires a SFG_Window object created and attached
  * to the freeglut structure. OpenGL context is created here.
@@ -1137,17 +1186,24 @@
         UpdateWindow(window->Window.Handle);
     }
 #else
-    window->Window.Handle = CreateWindowEx(
-        exFlags,
-        _T("FREEGLUT"),
-        title,
-        flags,
-        x, y, w, h,
-        (HWND) window->Parent == NULL ? NULL : window->Parent->Window.Handle,
-        (HMENU) NULL,
-        fgDisplay.Instance,
-        (LPVOID) window
-    );
+    {
+      /* xoff and yoff are used to place window relative to current display */
+      /* The operation of gamemode also depends on this */
+        int xoff=0,yoff=0;
+        get_display_origin(&xoff,&yoff);
+
+        window->Window.Handle = CreateWindowEx(
+            exFlags,
+            _T("FREEGLUT"),
+            title,
+            flags,
+            x+xoff, y+yoff, w, h,
+            (HWND) window->Parent == NULL ? NULL : window->Parent->Window.Handle,
+            (HMENU) NULL,
+            fgDisplay.Instance,
+            (LPVOID) window
+        );
+    }
 #endif /* defined(_WIN32_WCE) */
 
     if( !( window->Window.Handle ) )
@@ -1680,8 +1736,9 @@
 
         rect.left   = 0;
         rect.top    = 0;
-        rect.right  = fgDisplay.ScreenWidth;
-        rect.bottom = fgDisplay.ScreenHeight;
+	get_display_origin(&rect.left,&rect.top);
+        rect.right  = fgDisplay.ScreenWidth+rect.left;
+        rect.bottom = fgDisplay.ScreenHeight+rect.top;
 
         AdjustWindowRect ( &rect, WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS |
                                   WS_CLIPCHILDREN, FALSE );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 884
          http://freeglut.svn.sourceforge.net/freeglut/?rev=884&view=rev
Author:   fayjf
Date:     2011-01-23 18:58:54 +0000 (Sun, 23 Jan 2011)

Log Message:
-----------
Part one of fixing bug 3058987 -- the 'freeglut_patch_visual_info.diff' changes

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_internal.h
    trunk/freeglut/freeglut/src/freeglut_state.c
    trunk/freeglut/freeglut/src/freeglut_window.c

Modified: trunk/freeglut/freeglut/src/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_internal.h	2011-01-23 14:29:47 UTC (rev 883)
+++ trunk/freeglut/freeglut/src/freeglut_internal.h	2011-01-23 18:58:54 UTC (rev 884)
@@ -825,7 +825,7 @@
 
 /* A helper function to check if a display mode is possible to use */
 #if TARGET_HOST_POSIX_X11
-GLXFBConfig* fgChooseFBConfig( void );
+GLXFBConfig* fgChooseFBConfig( int* numcfgs );
 #endif
 
 /* The window procedure for Win32 events handling */

Modified: trunk/freeglut/freeglut/src/freeglut_state.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_state.c	2011-01-23 14:29:47 UTC (rev 883)
+++ trunk/freeglut/freeglut/src/freeglut_state.c	2011-01-23 18:58:54 UTC (rev 884)
@@ -320,7 +320,7 @@
         GLXFBConfig * fbconfig;
         int isPossible;
 
-        fbconfig = fgChooseFBConfig();
+        fbconfig = fgChooseFBConfig(NULL);
 
         if (fbconfig == NULL)
         {

Modified: trunk/freeglut/freeglut/src/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_window.c	2011-01-23 14:29:47 UTC (rev 883)
+++ trunk/freeglut/freeglut/src/freeglut_window.c	2011-01-23 18:58:54 UTC (rev 884)
@@ -220,7 +220,7 @@
  * Chooses a visual basing on the current display mode settings
  */
 
-GLXFBConfig* fgChooseFBConfig( void )
+GLXFBConfig* fgChooseFBConfig( int *numcfgs )
 {
   GLboolean wantIndexedMode = GL_FALSE;
   int attributes[ 100 ];
@@ -385,6 +385,9 @@
            fbconfig = NULL;
         }
 
+	if (numcfgs)
+		*numcfgs = fbconfigArraySize;
+
         return fbconfig;
     }
 }
@@ -904,13 +907,14 @@
     XSizeHints sizeHints;
     XWMHints wmHints;
     unsigned long mask;
+    int num_FBConfigs, i;
     unsigned int current_DisplayMode = fgState.DisplayMode ;
 
     /* Save the display mode if we are creating a menu window */
     if( window->IsMenu && ( ! fgStructure.MenuContext ) )
         fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB ;
 
-    window->Window.FBConfig = fgChooseFBConfig( );
+    window->Window.FBConfig = fgChooseFBConfig( &num_FBConfigs );
 
     if( window->IsMenu && ( ! fgStructure.MenuContext ) )
         fgState.DisplayMode = current_DisplayMode ;
@@ -925,14 +929,14 @@
         if( !( fgState.DisplayMode & GLUT_DOUBLE ) )
         {
             fgState.DisplayMode |= GLUT_DOUBLE ;
-            window->Window.FBConfig = fgChooseFBConfig( );
+            window->Window.FBConfig = fgChooseFBConfig( &num_FBConfigs );
             fgState.DisplayMode &= ~GLUT_DOUBLE;
         }
 
         if( fgState.DisplayMode & GLUT_MULTISAMPLE )
         {
             fgState.DisplayMode &= ~GLUT_MULTISAMPLE ;
-            window->Window.FBConfig = fgChooseFBConfig( );
+            window->Window.FBConfig = fgChooseFBConfig( &num_FBConfigs );
             fgState.DisplayMode |= GLUT_MULTISAMPLE;
         }
     }
@@ -941,9 +945,16 @@
                                   "FBConfig with necessary capabilities not found", "fgOpenWindow" );
 
     /*  Get the X visual.  */
-    visualInfo = glXGetVisualFromFBConfig( fgDisplay.Display,
-                                           *(window->Window.FBConfig) );
+    for (i = 0; i < num_FBConfigs; i++) {
+	    visualInfo = glXGetVisualFromFBConfig( fgDisplay.Display,
+						   window->Window.FBConfig[i] );
+	    if (visualInfo)
+		break;
+    }
 
+    FREEGLUT_INTERNAL_ERROR_EXIT( visualInfo != NULL,
+                                  "visualInfo could not be retrieved from FBConfig", "fgOpenWindow" );
+
     /*
      * XXX HINT: the masks should be updated when adding/removing callbacks.
      * XXX       This might speed up message processing. Is that true?


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 908
          http://freeglut.svn.sourceforge.net/freeglut/?rev=908&view=rev
Author:   fayjf
Date:     2011-03-22 11:51:00 +0000 (Tue, 22 Mar 2011)

Log Message:
-----------
More game mode patches from John Tsiombikas, from an e-mail vintage 3/18/11 1:24 AM

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_gamemode.c
    trunk/freeglut/freeglut/src/freeglut_internal.h

Modified: trunk/freeglut/freeglut/src/freeglut_gamemode.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_gamemode.c	2011-03-22 11:44:31 UTC (rev 907)
+++ trunk/freeglut/freeglut/src/freeglut_gamemode.c	2011-03-22 11:51:00 UTC (rev 908)
@@ -40,65 +40,123 @@
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
-static int xrandr_resize(int xsz, int ysz, int just_checking)
+#if TARGET_HOST_POSIX_X11
+static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)
 {
-    int res = -1;
-
 #ifdef HAVE_X11_EXTENSIONS_XRANDR_H
-    int event_base, error_base;
-    Status st;
-    XRRScreenConfiguration *xrr_config;
-    XRRScreenSize *ssizes;
-    Rotation rot;
-    int i, ssizes_count, curr;
-    Time timestamp, cfg_timestamp;
+    int event_base, error_base, ver_major, ver_minor, use_rate;
+    XRRScreenConfiguration *xrr_config = 0;
+    Status result = -1;
 
     /* must check at runtime for the availability of the extension */
     if(!XRRQueryExtension(fgDisplay.Display, &event_base, &error_base)) {
         return -1;
     }
 
-    if(!(xrr_config = XRRGetScreenInfo(fgDisplay.Display, fgDisplay.RootWindow))) {
-        fgWarning("XRRGetScreenInfo failed");
-        return -1;
-    }
-    ssizes = XRRConfigSizes(xrr_config, &ssizes_count);
-    curr = XRRConfigCurrentConfiguration(xrr_config, &rot);
-    timestamp = XRRConfigTimes(xrr_config, &cfg_timestamp);
+    XRRQueryVersion(fgDisplay.Display, &ver_major, &ver_minor);
 
-    if(xsz == ssizes[curr].width && ysz == ssizes[curr].height) {
-        /* no need to switch, we're already in the requested mode */
-        res = 0;
-        goto done;
-    }
+    /* we only heed the rate if we CAN actually use it (Xrandr >= 1.1) and
+     * the user actually cares about it (rate > 0)
+     */
+    use_rate = rate > 0 && ver_major >= 1 && ver_minor >= 1;
 
-    for(i=0; i<ssizes_count; i++) {
-        if(ssizes[i].width == xsz && ssizes[i].height == ysz) {
-            break;  /* found it */
+    /* this loop is only so that the whole thing will be repeated if someone
+     * else changes video mode between our query the current information and
+     * the attempt to change it.
+     */
+    do {
+        XRRScreenSize *ssizes;
+        short *rates;
+        Rotation rot;
+        int i, ssizes_count, rates_count, curr, res_idx = -1;
+        Time timestamp, cfg_timestamp;
+
+        if(xrr_config) {
+            XRRFreeScreenConfigInfo(xrr_config);
         }
-    }
-    if(i == ssizes_count)
-        goto done;
 
-    if(just_checking) {
-        res = 0;
-        goto done;
+        if(!(xrr_config = XRRGetScreenInfo(fgDisplay.Display, fgDisplay.RootWindow))) {
+            fgWarning("XRRGetScreenInfo failed");
+            break;
+        }
+        ssizes = XRRConfigSizes(xrr_config, &ssizes_count);
+        curr = XRRConfigCurrentConfiguration(xrr_config, &rot);
+        timestamp = XRRConfigTimes(xrr_config, &cfg_timestamp);
+
+        /* if either of xsz or ysz are unspecified, use the current values */
+        if(xsz <= 0)
+            xsz = fgState.GameModeSize.X = ssizes[curr].width;
+        if(ysz <= 0)
+            ysz = fgState.GameModeSize.Y = ssizes[curr].height;
+
+
+        if(xsz == ssizes[curr].width && ysz == ssizes[curr].height) {
+            /* no need to switch, we're already in the requested resolution */
+            res_idx = curr;
+        } else {
+            for(i=0; i<ssizes_count; i++) {
+                if(ssizes[i].width == xsz && ssizes[i].height == ysz) {
+                    res_idx = i;
+                    break;  /* found it */
+                }
+            }
+        }
+        if(res_idx == -1)
+            break;  /* no matching resolution */
+
+#if RANDR_MAJOR >= 1 && RANDR_MINOR >= 1
+        if(rate <= 0) {
+            fgState.GameModeRefresh = XRRConfigCurrentRate(xrr_config);
+        }
+
+        if(use_rate) {
+            rate = fgState.GameModeRefresh;
+
+            /* for the selected resolution, let's find out if there is
+             * a matching refresh rate available.
+             */
+            rates = XRRConfigRates(xrr_config, res_idx, &rates_count);
+
+            for(i=0; i<rates_count; i++) {
+                if(rates[i] == rate) {
+                    break;
+                }
+            }
+            if(i == rates_count) {
+                break; /* no matching rate */
+            }
+        }
+#endif
+
+        if(just_checking) {
+            result = 0;
+            break;
+        }
+
+#if RANDR_MAJOR >= 1 && RANDR_MINOR >= 1
+        if(use_rate)
+            result = XRRSetScreenConfigAndRate(fgDisplay.Display, xrr_config,
+                    fgDisplay.RootWindow, res_idx, rot, rate, timestamp);
+        else
+#endif
+            result = XRRSetScreenConfig(fgDisplay.Display, xrr_config,
+                    fgDisplay.RootWindow, res_idx, rot, timestamp);
+
+    } while(result == RRSetConfigInvalidTime);
+
+    if(xrr_config) {
+        XRRFreeScreenConfigInfo(xrr_config);
     }
 
-    if((st = XRRSetScreenConfig(fgDisplay.Display, xrr_config, fgDisplay.RootWindow,
-                    i, rot, timestamp)) != 0) {
-        fgWarning("XRRSetScreenConfig failed");
-        goto done;
+    if(result == 0) {
+        return 0;
     }
-    res = 0;
 
-done:
-    XRRFreeScreenConfigInfo(xrr_config);
-#endif
-    return res;
+#endif  /* HAVE_X11_EXTENSIONS_XRANDR_H */
+    return -1;
 }
+#endif  /* TARGET_HOST_POSIX_X11 */
 
-
 /*
  * Remembers the current visual settings, so that
  * we can change them and restore later...
@@ -108,6 +166,18 @@
 #if TARGET_HOST_POSIX_X11
     int event_base, error_base;
 
+    /*
+     * Remember the current pointer location before going fullscreen
+     * for restoring it later:
+     */
+    Window junk_window;
+    unsigned int junk_mask;
+
+    XQueryPointer(fgDisplay.Display, fgDisplay.RootWindow,
+            &junk_window, &junk_window,
+            &fgDisplay.DisplayPointerX, &fgDisplay.DisplayPointerY,
+            &fgDisplay.DisplayPointerX, &fgDisplay.DisplayPointerY, &junk_mask);
+
 #   ifdef HAVE_X11_EXTENSIONS_XRANDR_H
     if(XRRQueryExtension(fgDisplay.Display, &event_base, &error_base)) {
         XRRScreenConfiguration *xrr_config;
@@ -121,9 +191,17 @@
 
             fgDisplay.prev_xsz = ssizes[curr].width;
             fgDisplay.prev_ysz = ssizes[curr].height;
+            fgDisplay.prev_refresh = -1;
+
+#       if RANDR_MAJOR >= 1 && RANDR_MINOR >= 1
+            if(fgState.GameModeRefresh != -1) {
+                fgDisplay.prev_refresh = XRRConfigCurrentRate(xrr_config);
+            }
+#       endif
+
             fgDisplay.prev_size_valid = 1;
+
             XRRFreeScreenConfigInfo(xrr_config);
-            return;
         }
     }
 #   endif
@@ -148,22 +226,7 @@
              &fgDisplay.DisplayViewPortY ) )
         fgWarning( "XF86VidModeGetViewPort failed" );
 
-    /*
-     * Remember the current pointer location before going fullscreen
-     * for restoring it later:
-     */
-    {
-        Window junk_window;
-        unsigned int mask;
 
-        XQueryPointer(
-            fgDisplay.Display, fgDisplay.RootWindow,
-            &junk_window, &junk_window,
-            &fgDisplay.DisplayPointerX, &fgDisplay.DisplayPointerY,
-            &fgDisplay.DisplayPointerX, &fgDisplay.DisplayPointerY, &mask
-        );
-    }
-
     /* Query the current display settings: */
     fgDisplay.DisplayModeValid =
       XF86VidModeGetModeLine(
@@ -174,7 +237,7 @@
     );
 
     if( !fgDisplay.DisplayModeValid )
-            fgWarning( "XF86VidModeGetModeLine failed" );
+        fgWarning( "XF86VidModeGetModeLine failed" );
 #   endif
 
 #elif TARGET_HOST_MS_WINDOWS
@@ -202,24 +265,28 @@
 static void fghRestoreState( void )
 {
 #if TARGET_HOST_POSIX_X11
+    /* Restore the remembered pointer position: */
+    XWarpPointer(
+        fgDisplay.Display, None, fgDisplay.RootWindow, 0, 0, 0, 0,
+        fgDisplay.DisplayPointerX, fgDisplay.DisplayPointerY
+    );
 
+
 #   ifdef HAVE_X11_EXTENSIONS_XRANDR_H
     if(fgDisplay.prev_size_valid) {
-        if(xrandr_resize(fgDisplay.prev_xsz, fgDisplay.prev_ysz, 0) != -1) {
+        if(xrandr_resize(fgDisplay.prev_xsz, fgDisplay.prev_ysz, fgDisplay.prev_refresh, 0) != -1) {
             fgDisplay.prev_size_valid = 0;
+#       ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
+            fgDisplay.DisplayModeValid = 0;
+#       endif
             return;
         }
     }
 #   endif
 
 
+
 #   ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
-    /* Restore the remembered pointer position: */
-    XWarpPointer(
-        fgDisplay.Display, None, fgDisplay.RootWindow, 0, 0, 0, 0,
-        fgDisplay.DisplayPointerX, fgDisplay.DisplayPointerY
-    );
-
     /*
      * This highly depends on the XFree86 extensions,
      * not approved as X Consortium standards
@@ -265,7 +332,7 @@
                          fgDisplay.Screen,
                          fgDisplay.DisplayViewPortX,
                          fgDisplay.DisplayViewPortY ) )
-                    fgWarning( "HAVE_X11_EXTENSIONS_XF86VMODE_H failed" );
+                    fgWarning( "XF86VidModeSetViewPort failed" );
 
 
                 /*
@@ -275,6 +342,11 @@
                  */
                 XFlush( fgDisplay.Display );
 
+                fgDisplay.DisplayModeValid = 0;
+#       ifdef HAVE_X11_EXTENSIONS_XRANDR_H
+                fgDisplay.prev_size_valid = 0;
+#       endif
+
                 break;
             }
         }
@@ -351,7 +423,8 @@
 
     /* first try to use XRandR, then fallback to XF86VidMode */
 #   ifdef HAVE_X11_EXTENSIONS_XRANDR_H
-    if(xrandr_resize(fgState.GameModeSize.X, fgState.GameModeSize.Y, haveToTest) != -1) {
+    if(xrandr_resize(fgState.GameModeSize.X, fgState.GameModeSize.Y,
+                fgState.GameModeRefresh, haveToTest) != -1) {
         return GL_TRUE;
     }
 #   endif
@@ -372,9 +445,18 @@
         XF86VidModeModeInfo** displayModes;
         int i, displayModesCount;
 
-        /* current display mode was queried in fghRememberState
-         * set defaulted values to the current display mode's
+        /* If we don't have a valid modeline in the display structure, which
+         * can happen if this is called from glutGameModeGet instead of
+         * glutEnterGameMode, then we need to query the current mode, to make
+         * unspecified settings to default to their current values.
          */
+        if(!fgDisplay.DisplayModeValid) {
+            if(!XF86VidModeGetModeLine(fgDisplay.Display, fgDisplay.Screen,
+                    &fgDisplay.DisplayModeClock, &fgDisplay.DisplayMode)) {
+                return success;
+            }
+        }
+
         if (fgState.GameModeSize.X == -1)
         {
             fgState.GameModeSize.X = fgDisplay.DisplayMode.hdisplay;
@@ -389,7 +471,7 @@
              * TODO: get with XGetVisualInfo()? but then how to set?
              */
         }
-        if (fgState.GameModeRefresh != -1)
+        if (fgState.GameModeRefresh == -1)
         {
             /* Compute the displays refresh rate, dotclock comes in kHz. */
             int refresh = ( fgDisplay.DisplayModeClock * 1000 ) /
@@ -431,16 +513,9 @@
         XFree( displayModes );
     }
 
-#   else
+#   endif
 
-    /*
-     * XXX warning fghChangeDisplayMode: missing XFree86 video mode extensions,
-     * XXX game mode will not change screen resolution when activated
-     */
-    success = GL_TRUE;
 
-#   endif
-
 #elif TARGET_HOST_MS_WINDOWS
 
     DEVMODE  devMode;
@@ -600,7 +675,6 @@
      * the window before we can grab the pointer into it:
      */
     XSync( fgDisplay.Display, False );
-
     /*
      * Grab the pointer to confine it into the window after the calls to
      * XWrapPointer() which ensure that the pointer really enters the window.
@@ -618,7 +692,6 @@
                GrabModeAsync, GrabModeAsync,
                fgStructure.GameModeWindow->Window.Handle, None, CurrentTime) )
         usleep( 100 );
-
     /*
      * Change input focus to the new window. This will exit the application
      * if the new window is not viewable yet, see the XGrabPointer loop above.

Modified: trunk/freeglut/freeglut/src/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_internal.h	2011-03-22 11:44:31 UTC (rev 907)
+++ trunk/freeglut/freeglut/src/freeglut_internal.h	2011-03-22 11:51:00 UTC (rev 908)
@@ -365,6 +365,7 @@
 
 #ifdef HAVE_X11_EXTENSIONS_XRANDR_H
     int prev_xsz, prev_ysz;
+    int prev_refresh;
     int prev_size_valid;
 #endif	/* HAVE_X11_EXTENSIONS_XRANDR_H */
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 917
          http://freeglut.svn.sourceforge.net/freeglut/?rev=917&view=rev
Author:   fayjf
Date:     2011-05-27 20:10:13 +0000 (Fri, 27 May 2011)

Log Message:
-----------
Fixing 'GLUT_BORDERLESS' on Windows per e-mail from Eero Pajarre dated 4/24/2011 9:19 AM

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_main.c
    trunk/freeglut/freeglut/src/freeglut_window.c

Modified: trunk/freeglut/freeglut/src/freeglut_main.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_main.c	2011-05-27 20:03:10 UTC (rev 916)
+++ trunk/freeglut/freeglut/src/freeglut_main.c	2011-05-27 20:10:13 UTC (rev 917)
@@ -122,7 +122,8 @@
 
         if ( window->Parent == NULL )
         {
-            if ( ! window->IsMenu && (window != fgStructure.GameModeWindow) )
+	   if ( ! window->IsMenu && (window != fgStructure.GameModeWindow) &&
+	       !( fgState.DisplayMode & GLUT_BORDERLESS ))
             {
                 w += GetSystemMetrics( SM_CXSIZEFRAME ) * 2;
                 h += GetSystemMetrics( SM_CYSIZEFRAME ) * 2 +

Modified: trunk/freeglut/freeglut/src/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_window.c	2011-05-27 20:03:10 UTC (rev 916)
+++ trunk/freeglut/freeglut/src/freeglut_window.c	2011-05-27 20:10:13 UTC (rev 917)
@@ -1286,7 +1286,7 @@
     else if ( fgState.DisplayMode & GLUT_BORDERLESS )
     {
         SetWindowLong ( window->Window.Handle, GWL_STYLE,
-                        WindowStyle & ~(WS_BORDER | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX));
+                        WindowStyle & ~(WS_BORDER | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_DLGFRAME | WS_SIZEBOX));
     }
 /*  SetWindowPos(window->Window.Handle, NULL, 0, 0, 0, 0,
      SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED); */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 919
          http://freeglut.svn.sourceforge.net/freeglut/?rev=919&view=rev
Author:   fayjf
Date:     2011-05-27 20:17:34 +0000 (Fri, 27 May 2011)

Log Message:
-----------
Fixing multitouch for Windows per e-mail from Florian Echtler dated 5/3/11 10:33 AM

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_main.c
    trunk/freeglut/freeglut/src/freeglut_window.c

Modified: trunk/freeglut/freeglut/src/freeglut_main.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_main.c	2011-05-27 20:12:02 UTC (rev 918)
+++ trunk/freeglut/freeglut/src/freeglut_main.c	2011-05-27 20:17:34 UTC (rev 919)
@@ -70,6 +70,12 @@
 #    define MIN(a,b) (((a)<(b)) ? (a) : (b))
 #endif
 
+#ifdef WM_TOUCH
+    typedef BOOL (*pGetTouchInputInfo)(HTOUCHINPUT,UINT,PTOUCHINPUT,int);
+    typedef BOOL (*pCloseTouchInputHandle)(HTOUCHINPUT);
+	static pGetTouchInputInfo fghGetTouchInputInfo = (pGetTouchInputInfo)0xDEADBEEF;
+	static pCloseTouchInputHandle fghCloseTouchInputHandle = (pCloseTouchInputHandle)0xDEADBEEF;
+#endif
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
@@ -2456,7 +2462,18 @@
 		unsigned int numInputs = (unsigned int)wParam;
 		unsigned int i = 0;
 		TOUCHINPUT* ti = (TOUCHINPUT*)malloc( sizeof(TOUCHINPUT)*numInputs);
-		if (GetTouchInputInfo( (HTOUCHINPUT)lParam, numInputs, ti, sizeof(TOUCHINPUT) )) {
+
+		if (fghGetTouchInputInfo == (pGetTouchInputInfo)0xDEADBEEF) {
+		    fghGetTouchInputInfo = (pGetTouchInputInfo)GetProcAddress(GetModuleHandle("user32"),"GetTouchInputInfo");
+		    fghCloseTouchInputHandle = (pCloseTouchInputHandle)GetProcAddress(GetModuleHandle("user32"),"CloseTouchInputHandle");
+		}
+
+		if (!fghGetTouchInputInfo) { 
+			free( (void*)ti );
+			break;
+		}
+
+		if (fghGetTouchInputInfo( (HTOUCHINPUT)lParam, numInputs, ti, sizeof(TOUCHINPUT) )) {
 			/* Handle each contact point */
 			for (i = 0; i < numInputs; ++i ) {
 
@@ -2478,7 +2495,7 @@
 				}
 			}
 		}
-		CloseTouchInputHandle((HTOUCHINPUT)lParam);
+		fghCloseTouchInputHandle((HTOUCHINPUT)lParam);
 		free( (void*)ti );
 		lRet = 0; /*DefWindowProc( hWnd, uMsg, wParam, lParam );*/
 		break;

Modified: trunk/freeglut/freeglut/src/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_window.c	2011-05-27 20:12:02 UTC (rev 918)
+++ trunk/freeglut/freeglut/src/freeglut_window.c	2011-05-27 20:17:34 UTC (rev 919)
@@ -141,6 +141,10 @@
 
 #endif  /* TARGET_HOST_MS_WINDOWS */
 
+#ifdef WM_TOUCH
+	typedef BOOL (*pRegisterTouchWindow)(HWND,ULONG);
+   static pRegisterTouchWindow fghRegisterTouchWindow = (pRegisterTouchWindow)0xDEADBEEF;
+#endif
 
 /* pushing attribute/value pairs into an array */
 #define ATTRIB(a) attributes[where++]=(a)
@@ -1293,7 +1297,10 @@
 
     /* Enable multitouch: additional flag TWF_FINETOUCH, TWF_WANTPALM */
     #ifdef WM_TOUCH
-       RegisterTouchWindow( window->Window.Handle, TWF_FINETOUCH | TWF_WANTPALM );
+        if (fghRegisterTouchWindow == (pRegisterTouchWindow)0xDEADBEEF) 
+			fghRegisterTouchWindow = (pRegisterTouchWindow)GetProcAddress(GetModuleHandle("user32"),"RegisterTouchWindow");
+		if (fghRegisterTouchWindow)
+             fghRegisterTouchWindow( window->Window.Handle, TWF_FINETOUCH | TWF_WANTPALM );
     #endif
 
 #if defined(_WIN32_WCE)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 920
          http://freeglut.svn.sourceforge.net/freeglut/?rev=920&view=rev
Author:   fayjf
Date:     2011-05-27 20:27:04 +0000 (Fri, 27 May 2011)

Log Message:
-----------
Adding "MouseWheelTicks" to the "fgState" structure as a first step towards supporting fractional mouse wheel ticks

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_init.c
    trunk/freeglut/freeglut/src/freeglut_internal.h

Modified: trunk/freeglut/freeglut/src/freeglut_init.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_init.c	2011-05-27 20:17:34 UTC (rev 919)
+++ trunk/freeglut/freeglut/src/freeglut_init.c	2011-05-27 20:27:04 UTC (rev 920)
@@ -86,6 +86,7 @@
                       GL_FALSE,               /* JoysticksInitialised */
                       0,                      /* NumActiveJoysticks */
                       GL_FALSE,               /* InputDevsInitialised */
+                      0,                      /* MouseWheelTicks */
                       1,                      /* AuxiliaryBufferNumber */
                       4,                      /* SampleNumber */
                       1,                      /* MajorVersion */
@@ -442,6 +443,8 @@
     fgState.JoysticksInitialised = GL_FALSE;
     fgState.InputDevsInitialised = GL_FALSE;
 
+	fgState.MouseWheelTicks = 0;
+
     fgState.MajorVersion = 1;
     fgState.MinorVersion = 0;
     fgState.ContextFlags = 0;

Modified: trunk/freeglut/freeglut/src/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_internal.h	2011-05-27 20:17:34 UTC (rev 919)
+++ trunk/freeglut/freeglut/src/freeglut_internal.h	2011-05-27 20:27:04 UTC (rev 920)
@@ -339,6 +339,8 @@
     int              NumActiveJoysticks;    /* Number of active joysticks -- if zero, don't poll joysticks */
     GLboolean        InputDevsInitialised;  /* Only initialize if application calls for them */
 
+	int              MouseWheelTicks;      /* Number of ticks the mouse wheel has turned */
+
     int              AuxiliaryBufferNumber;  /* Number of auxiliary buffers */
     int              SampleNumber;         /*  Number of samples per pixel  */
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 925
          http://freeglut.svn.sourceforge.net/freeglut/?rev=925&view=rev
Author:   fayjf
Date:     2011-06-10 03:50:27 +0000 (Fri, 10 Jun 2011)

Log Message:
-----------
Adding a multitouch patch from Eero Pajarre per e-mail dated 6/8/2011 1:14 AM

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/freeglut_main.c
    trunk/freeglut/freeglut/src/freeglut_window.c

Modified: trunk/freeglut/freeglut/src/freeglut_main.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_main.c	2011-06-10 03:47:11 UTC (rev 924)
+++ trunk/freeglut/freeglut/src/freeglut_main.c	2011-06-10 03:50:27 UTC (rev 925)
@@ -71,8 +71,8 @@
 #endif
 
 #ifdef WM_TOUCH
-    typedef BOOL (*pGetTouchInputInfo)(HTOUCHINPUT,UINT,PTOUCHINPUT,int);
-    typedef BOOL (*pCloseTouchInputHandle)(HTOUCHINPUT);
+    typedef BOOL (WINAPI *pGetTouchInputInfo)(HTOUCHINPUT,UINT,PTOUCHINPUT,int);
+    typedef BOOL (WINAPI *pCloseTouchInputHandle)(HTOUCHINPUT);
 	static pGetTouchInputInfo fghGetTouchInputInfo = (pGetTouchInputInfo)0xDEADBEEF;
 	static pCloseTouchInputHandle fghCloseTouchInputHandle = (pCloseTouchInputHandle)0xDEADBEEF;
 #endif

Modified: trunk/freeglut/freeglut/src/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/freeglut_window.c	2011-06-10 03:47:11 UTC (rev 924)
+++ trunk/freeglut/freeglut/src/freeglut_window.c	2011-06-10 03:50:27 UTC (rev 925)
@@ -142,7 +142,7 @@
 #endif  /* TARGET_HOST_MS_WINDOWS */
 
 #ifdef WM_TOUCH
-	typedef BOOL (*pRegisterTouchWindow)(HWND,ULONG);
+	typedef BOOL (WINAPI *pRegisterTouchWindow)(HWND,ULONG);
    static pRegisterTouchWindow fghRegisterTouchWindow = (pRegisterTouchWindow)0xDEADBEEF;
 #endif
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 977
          http://freeglut.svn.sourceforge.net/freeglut/?rev=977&view=rev
Author:   fayjf
Date:     2012-01-15 22:28:35 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
Adding directories for platform-specific source code for Windows, X11, and OSX

Added Paths:
-----------
    trunk/freeglut/freeglut/src/mswin/
    trunk/freeglut/freeglut/src/osx/
    trunk/freeglut/freeglut/src/x11/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 982
          http://freeglut.svn.sourceforge.net/freeglut/?rev=982&view=rev
Author:   fayjf
Date:     2012-01-19 23:33:47 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Splitting out the Windows-specific cursor code into its own file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_cursor.c
    trunk/freeglut/freeglut/src/mswin/freeglut_cursor_mswin.c
    trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h

Modified: trunk/freeglut/freeglut/src/Common/freeglut_cursor.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_cursor.c	2012-01-19 23:07:37 UTC (rev 981)
+++ trunk/freeglut/freeglut/src/Common/freeglut_cursor.c	2012-01-19 23:33:47 UTC (rev 982)
@@ -39,6 +39,9 @@
 
 /* -- PRIVATE FUNCTIONS --------------------------------------------------- */
 
+extern void fghSetCursor ( SFG_Window *window, int cursorID );
+extern void fghWarpPointer ( int x, int y );
+
 #if TARGET_HOST_POSIX_X11 || TARGET_HOST_MAC_OSX || TARGET_HOST_SOLARIS
   #include <X11/cursorfont.h>
 
@@ -162,91 +165,6 @@
 #endif
 
 
-#if TARGET_HOST_MS_WINDOWS
-static void fghSetCursor ( SFG_Window *window, int cursorID )
-{
-    /*
-     * Joe Krahn is re-writing the following code.
-     */
-    /* Set the cursor AND change it for this window class. */
-#if !defined(__MINGW64__) && _MSC_VER <= 1200
-#       define MAP_CURSOR(a,b)                                   \
-        case a:                                                  \
-            SetCursor( LoadCursor( NULL, b ) );                  \
-            SetClassLong( window->Window.Handle,                 \
-                          GCL_HCURSOR,                           \
-                          ( LONG )LoadCursor( NULL, b ) );       \
-        break;
-    /* Nuke the cursor AND change it for this window class. */
-#       define ZAP_CURSOR(a,b)                                   \
-        case a:                                                  \
-            SetCursor( NULL );                                   \
-            SetClassLong( window->Window.Handle,                 \
-                          GCL_HCURSOR, ( LONG )NULL );           \
-        break;
-#else
-#       define MAP_CURSOR(a,b)                                   \
-        case a:                                                  \
-            SetCursor( LoadCursor( NULL, b ) );                  \
-            SetClassLongPtr( window->Window.Handle,              \
-                          GCLP_HCURSOR,                          \
-                          ( LONG )( LONG_PTR )LoadCursor( NULL, b ) );       \
-        break;
-    /* Nuke the cursor AND change it for this window class. */
-#       define ZAP_CURSOR(a,b)                                   \
-        case a:                                                  \
-            SetCursor( NULL );                                   \
-            SetClassLongPtr( window->Window.Handle,              \
-                          GCLP_HCURSOR, ( LONG )( LONG_PTR )NULL );          \
-        break;
-#endif
-
-    switch( cursorID )
-    {
-        MAP_CURSOR( GLUT_CURSOR_RIGHT_ARROW,         IDC_ARROW     );
-        MAP_CURSOR( GLUT_CURSOR_LEFT_ARROW,          IDC_ARROW     );
-        MAP_CURSOR( GLUT_CURSOR_INFO,                IDC_HELP      );
-        MAP_CURSOR( GLUT_CURSOR_DESTROY,             IDC_CROSS     );
-        MAP_CURSOR( GLUT_CURSOR_HELP,                IDC_HELP      );
-        MAP_CURSOR( GLUT_CURSOR_CYCLE,               IDC_SIZEALL   );
-        MAP_CURSOR( GLUT_CURSOR_SPRAY,               IDC_CROSS     );
-        MAP_CURSOR( GLUT_CURSOR_WAIT,                IDC_WAIT      );
-        MAP_CURSOR( GLUT_CURSOR_TEXT,                IDC_IBEAM     );
-        MAP_CURSOR( GLUT_CURSOR_CROSSHAIR,           IDC_CROSS     );
-        MAP_CURSOR( GLUT_CURSOR_UP_DOWN,             IDC_SIZENS    );
-        MAP_CURSOR( GLUT_CURSOR_LEFT_RIGHT,          IDC_SIZEWE    );
-        MAP_CURSOR( GLUT_CURSOR_TOP_SIDE,            IDC_ARROW     ); /* XXX ToDo */
-        MAP_CURSOR( GLUT_CURSOR_BOTTOM_SIDE,         IDC_ARROW     ); /* XXX ToDo */
-        MAP_CURSOR( GLUT_CURSOR_LEFT_SIDE,           IDC_ARROW     ); /* XXX ToDo */
-        MAP_CURSOR( GLUT_CURSOR_RIGHT_SIDE,          IDC_ARROW     ); /* XXX ToDo */
-        MAP_CURSOR( GLUT_CURSOR_TOP_LEFT_CORNER,     IDC_SIZENWSE  );
-        MAP_CURSOR( GLUT_CURSOR_TOP_RIGHT_CORNER,    IDC_SIZENESW  );
-        MAP_CURSOR( GLUT_CURSOR_BOTTOM_RIGHT_CORNER, IDC_SIZENWSE  );
-        MAP_CURSOR( GLUT_CURSOR_BOTTOM_LEFT_CORNER,  IDC_SIZENESW  );
-        MAP_CURSOR( GLUT_CURSOR_INHERIT,             IDC_ARROW     ); /* XXX ToDo */
-        ZAP_CURSOR( GLUT_CURSOR_NONE,                NULL          );
-        MAP_CURSOR( GLUT_CURSOR_FULL_CROSSHAIR,      IDC_CROSS     ); /* XXX ToDo */
-
-    default:
-        fgError( "Unknown cursor type: %d", cursorID );
-        break;
-    }
-}
-
-
-static void fghWarpPointer ( int x, int y )
-{
-    POINT coords;
-    coords.x = x;
-    coords.y = y;
-
-    /* ClientToScreen() translates {coords} for us. */
-    ClientToScreen( fgStructure.CurrentWindow->Window.Handle, &coords );
-    SetCursorPos( coords.x, coords.y );
-}
-#endif
-
-
 /* -- INTERNAL FUNCTIONS ---------------------------------------------------- */
 void fgSetCursor ( SFG_Window *window, int cursorID )
 {

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_cursor_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_cursor_mswin.c	2012-01-19 23:07:37 UTC (rev 981)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_cursor_mswin.c	2012-01-19 23:33:47 UTC (rev 982)
@@ -0,0 +1,115 @@
+/*
+ * freeglut_cursor_mswin.c
+ *
+ * The Windows-specific mouse cursor related stuff.
+ *
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
+ * Written by John F. Fay, <fayjf@...>
+ * Creation date: Thu Jan 19, 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "freeglut_internal_mswin.h"
+
+
+
+void fghSetCursor ( SFG_Window *window, int cursorID )
+{
+    /*
+     * Joe Krahn is re-writing the following code.
+     */
+    /* Set the cursor AND change it for this window class. */
+#if !defined(__MINGW64__) && _MSC_VER <= 1200
+#       define MAP_CURSOR(a,b)                                   \
+        case a:                                                  \
+            SetCursor( LoadCursor( NULL, b ) );                  \
+            SetClassLong( window->Window.Handle,                 \
+                          GCL_HCURSOR,                           \
+                          ( LONG )LoadCursor( NULL, b ) );       \
+        break;
+    /* Nuke the cursor AND change it for this window class. */
+#       define ZAP_CURSOR(a,b)                                   \
+        case a:                                                  \
+            SetCursor( NULL );                                   \
+            SetClassLong( window->Window.Handle,                 \
+                          GCL_HCURSOR, ( LONG )NULL );           \
+        break;
+#else
+#       define MAP_CURSOR(a,b)                                   \
+        case a:                                                  \
+            SetCursor( LoadCursor( NULL, b ) );                  \
+            SetClassLongPtr( window->Window.Handle,              \
+                          GCLP_HCURSOR,                          \
+                          ( LONG )( LONG_PTR )LoadCursor( NULL, b ) );       \
+        break;
+    /* Nuke the cursor AND change it for this window class. */
+#       define ZAP_CURSOR(a,b)                                   \
+        case a:                                                  \
+            SetCursor( NULL );                                   \
+            SetClassLongPtr( window->Window.Handle,              \
+                          GCLP_HCURSOR, ( LONG )( LONG_PTR )NULL );          \
+        break;
+#endif
+
+    switch( cursorID )
+    {
+        MAP_CURSOR( GLUT_CURSOR_RIGHT_ARROW,         IDC_ARROW     );
+        MAP_CURSOR( GLUT_CURSOR_LEFT_ARROW,          IDC_ARROW     );
+        MAP_CURSOR( GLUT_CURSOR_INFO,                IDC_HELP      );
+        MAP_CURSOR( GLUT_CURSOR_DESTROY,             IDC_CROSS     );
+        MAP_CURSOR( GLUT_CURSOR_HELP,                IDC_HELP      );
+        MAP_CURSOR( GLUT_CURSOR_CYCLE,               IDC_SIZEALL   );
+        MAP_CURSOR( GLUT_CURSOR_SPRAY,               IDC_CROSS     );
+        MAP_CURSOR( GLUT_CURSOR_WAIT,                IDC_WAIT      );
+        MAP_CURSOR( GLUT_CURSOR_TEXT,                IDC_IBEAM     );
+        MAP_CURSOR( GLUT_CURSOR_CROSSHAIR,           IDC_CROSS     );
+        MAP_CURSOR( GLUT_CURSOR_UP_DOWN,             IDC_SIZENS    );
+        MAP_CURSOR( GLUT_CURSOR_LEFT_RIGHT,          IDC_SIZEWE    );
+        MAP_CURSOR( GLUT_CURSOR_TOP_SIDE,            IDC_ARROW     ); /* XXX ToDo */
+        MAP_CURSOR( GLUT_CURSOR_BOTTOM_SIDE,         IDC_ARROW     ); /* XXX ToDo */
+        MAP_CURSOR( GLUT_CURSOR_LEFT_SIDE,           IDC_ARROW     ); /* XXX ToDo */
+        MAP_CURSOR( GLUT_CURSOR_RIGHT_SIDE,          IDC_ARROW     ); /* XXX ToDo */
+        MAP_CURSOR( GLUT_CURSOR_TOP_LEFT_CORNER,     IDC_SIZENWSE  );
+        MAP_CURSOR( GLUT_CURSOR_TOP_RIGHT_CORNER,    IDC_SIZENESW  );
+        MAP_CURSOR( GLUT_CURSOR_BOTTOM_RIGHT_CORNER, IDC_SIZENWSE  );
+        MAP_CURSOR( GLUT_CURSOR_BOTTOM_LEFT_CORNER,  IDC_SIZENESW  );
+        MAP_CURSOR( GLUT_CURSOR_INHERIT,             IDC_ARROW     ); /* XXX ToDo */
+        ZAP_CURSOR( GLUT_CURSOR_NONE,                NULL          );
+        MAP_CURSOR( GLUT_CURSOR_FULL_CROSSHAIR,      IDC_CROSS     ); /* XXX ToDo */
+
+    default:
+        fgError( "Unknown cursor type: %d", cursorID );
+        break;
+    }
+}
+
+
+void fghWarpPointer ( int x, int y )
+{
+    POINT coords;
+    coords.x = x;
+    coords.y = y;
+
+    /* ClientToScreen() translates {coords} for us. */
+    ClientToScreen( fgStructure.CurrentWindow->Window.Handle, &coords );
+    SetCursorPos( coords.x, coords.y );
+}
+
+

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-19 23:07:37 UTC (rev 981)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-19 23:33:47 UTC (rev 982)
@@ -0,0 +1,36 @@
+/*
+ * freeglut_internal_mswin.h
+ *
+ * The freeglut library private include file.
+ *
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
+ * Written by John F. Fay, <fayjf@...>
+ * Creation date: Thu Jan 19, 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef  FREEGLUT_INTERNAL_MSWIN_H
+#define  FREEGLUT_INTERNAL_MSWIN_H
+
+
+
+#include "..\Common\freeglut_internal.h"
+
+
+#endif  /* FREEGLUT_INTERNAL_MSWIN_H */
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 984
          http://freeglut.svn.sourceforge.net/freeglut/?rev=984&view=rev
Author:   fayjf
Date:     2012-01-20 03:38:05 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
Moving some Windows-specific code from "freeglut_ext.c" into its own file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_ext.c
    trunk/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_ext.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_ext.c	2012-01-19 23:35:57 UTC (rev 983)
+++ trunk/freeglut/freeglut/src/Common/freeglut_ext.c	2012-01-20 03:38:05 UTC (rev 984)
@@ -29,6 +29,8 @@
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
+extern SFG_Proc fghGetProcAddress( const char *procName );
+
 static GLUTproc fghGetGLUTProcAddress( const char* procName )
 {
     /* optimization: quick initial check */
@@ -209,16 +211,16 @@
 }
 
 
+#if TARGET_HOST_POSIX_X11
 SFG_Proc fghGetProcAddress( const char *procName )
 {
-#if TARGET_HOST_MS_WINDOWS
-    return (SFG_Proc)wglGetProcAddress( ( LPCSTR )procName );
-#elif TARGET_HOST_POSIX_X11 && defined( GLX_ARB_get_proc_address )
+#if defined( GLX_ARB_get_proc_address )
     return (SFG_Proc)glXGetProcAddressARB( ( const GLubyte * )procName );
 #else
     return NULL;
 #endif
 }
+#endif
 
 
 GLUTproc FGAPIENTRY

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c	2012-01-19 23:35:57 UTC (rev 983)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c	2012-01-20 03:38:05 UTC (rev 984)
@@ -0,0 +1,36 @@
+/*
+ * freeglut_cursor_mswin.c
+ *
+ * The Windows-specific mouse cursor related stuff.
+ *
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
+ * Written by John F. Fay, <fayjf@...>
+ * Creation date: Thu Jan 19, 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "freeglut_internal_mswin.h"
+
+
+
+SFG_Proc fghGetProcAddress( const char *procName )
+{
+    return (SFG_Proc)wglGetProcAddress( ( LPCSTR )procName );
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 985
          http://freeglut.svn.sourceforge.net/freeglut/?rev=985&view=rev
Author:   fayjf
Date:     2012-01-20 03:44:03 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
Moving more Windows-specific code from "freeglut_ext.c" to the windows-specific file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_ext.c
    trunk/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_ext.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_ext.c	2012-01-20 03:38:05 UTC (rev 984)
+++ trunk/freeglut/freeglut/src/Common/freeglut_ext.c	2012-01-20 03:44:03 UTC (rev 985)
@@ -30,6 +30,7 @@
 #include "freeglut_internal.h"
 
 extern SFG_Proc fghGetProcAddress( const char *procName );
+extern GLUTproc fghGetPlatformSpecificGLUTProcAddress( const char *procName );
 
 static GLUTproc fghGetGLUTProcAddress( const char* procName )
 {
@@ -111,9 +112,6 @@
     CHECK_NAME(glutWindowStatusFunc);
     CHECK_NAME(glutKeyboardUpFunc);
     CHECK_NAME(glutSpecialUpFunc);
-#if !defined(_WIN32_WCE)
-    CHECK_NAME(glutJoystickFunc);
-#endif /* !defined(_WIN32_WCE) */
     CHECK_NAME(glutSetColor);
     CHECK_NAME(glutGetColor);
     CHECK_NAME(glutCopyColormap);
@@ -154,13 +152,7 @@
     CHECK_NAME(glutReportErrors);
     CHECK_NAME(glutIgnoreKeyRepeat);
     CHECK_NAME(glutSetKeyRepeat);
-#if !defined(_WIN32_WCE)
-    CHECK_NAME(glutForceJoystickFunc);
-    CHECK_NAME(glutGameModeString);
-    CHECK_NAME(glutEnterGameMode);
-    CHECK_NAME(glutLeaveGameMode);
-    CHECK_NAME(glutGameModeGet);
-#endif /* !defined(_WIN32_WCE) */
+
     /* freeglut extensions */
     CHECK_NAME(glutMainLoopEvent);
     CHECK_NAME(glutLeaveMainLoop);
@@ -212,6 +204,25 @@
 
 
 #if TARGET_HOST_POSIX_X11
+static GLUTproc fghGetGLUTProcAddress( const char* procName )
+{
+    /* optimization: quick initial check */
+    if( strncmp( procName, "glut", 4 ) != 0 )
+        return NULL;
+
+#define CHECK_NAME(x) if( strcmp( procName, #x ) == 0) return (GLUTproc)x;
+    CHECK_NAME(glutJoystickFunc);
+    CHECK_NAME(glutForceJoystickFunc);
+    CHECK_NAME(glutGameModeString);
+    CHECK_NAME(glutEnterGameMode);
+    CHECK_NAME(glutLeaveGameMode);
+    CHECK_NAME(glutGameModeGet);
+#undef CHECK_NAME
+
+    return NULL;
+}
+
+
 SFG_Proc fghGetProcAddress( const char *procName )
 {
 #if defined( GLX_ARB_get_proc_address )
@@ -231,5 +242,10 @@
 
     /* Try GLUT functions first, then core GL functions */
     p = fghGetGLUTProcAddress( procName );
+
+	/* Some GLUT functions are platform-specific: */
+	if ( !p )
+      p = fghGetPlatformSpecificGLUTProcAddress( procName );
+
     return ( p != NULL ) ? p : fghGetProcAddress( procName );
 }

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c	2012-01-20 03:38:05 UTC (rev 984)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c	2012-01-20 03:44:03 UTC (rev 985)
@@ -28,8 +28,28 @@
 #include <GL/freeglut.h>
 #include "freeglut_internal_mswin.h"
 
+GLUTproc fghGetPlatformSpecificGLUTProcAddress( const char* procName )
+{
+#if !defined(_WIN32_WCE)
+    /* optimization: quick initial check */
+    if( strncmp( procName, "glut", 4 ) != 0 )
+        return NULL;
 
+#define CHECK_NAME(x) if( strcmp( procName, #x ) == 0) return (GLUTproc)x;
+    CHECK_NAME(glutJoystickFunc);
+    CHECK_NAME(glutForceJoystickFunc);
+    CHECK_NAME(glutGameModeString);
+    CHECK_NAME(glutEnterGameMode);
+    CHECK_NAME(glutLeaveGameMode);
+    CHECK_NAME(glutGameModeGet);
+#undef CHECK_NAME
+#endif /* !defined(_WIN32_WCE) */
 
+    return NULL;
+}
+
+
+
 SFG_Proc fghGetProcAddress( const char *procName )
 {
     return (SFG_Proc)wglGetProcAddress( ( LPCSTR )procName );

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 986
          http://freeglut.svn.sourceforge.net/freeglut/?rev=986&view=rev
Author:   fayjf
Date:     2012-01-20 03:51:15 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
Moving some Windows-specific code from "freeglut_gamemode.c" into its own file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_gamemode.c
    trunk/freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_gamemode.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_gamemode.c	2012-01-20 03:44:03 UTC (rev 985)
+++ trunk/freeglut/freeglut/src/Common/freeglut_gamemode.c	2012-01-20 03:51:15 UTC (rev 986)
@@ -39,7 +39,11 @@
 
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
+extern void fghRememberState( void );
+extern void fghRestoreState( void );
+extern GLboolean fghChangeDisplayMode( GLboolean haveToTest );
 
+
 #if TARGET_HOST_POSIX_X11
 static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)
 {
@@ -154,13 +158,13 @@
 }
 #endif  /* TARGET_HOST_POSIX_X11 */
 
+#if TARGET_HOST_POSIX_X11
 /*
  * Remembers the current visual settings, so that
  * we can change them and restore later...
  */
 static void fghRememberState( void )
 {
-#if TARGET_HOST_POSIX_X11
     int event_base, error_base;
 
     /*
@@ -237,31 +241,15 @@
         fgWarning( "XF86VidModeGetModeLine failed" );
 #   endif
 
-#elif TARGET_HOST_MS_WINDOWS
-
-/*    DEVMODE devMode; */
-
-    /* Grab the current desktop settings... */
-
-/* hack to get around my stupid cross-gcc headers */
-#define FREEGLUT_ENUM_CURRENT_SETTINGS -1
-
-    EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS,
-                         &fgDisplay.DisplayMode );
-
-    /* Make sure we will be restoring all settings needed */
-    fgDisplay.DisplayMode.dmFields |=
-        DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY;
-
-#endif
 }
+#endif
 
+#if TARGET_HOST_POSIX_X11
 /*
  * Restores the previously remembered visual settings
  */
 static void fghRestoreState( void )
 {
-#if TARGET_HOST_POSIX_X11
     /* Restore the remembered pointer position: */
     XWarpPointer(
         fgDisplay.Display, None, fgDisplay.RootWindow, 0, 0, 0, 0,
@@ -352,13 +340,8 @@
 
 #   endif
 
-#elif TARGET_HOST_MS_WINDOWS
-
-    /* Restore the previously remembered desktop display settings */
-    ChangeDisplaySettingsEx( fgDisplay.DisplayName,&fgDisplay.DisplayMode, 0,0,0 );
-
-#endif
 }
+#endif
 
 #if TARGET_HOST_POSIX_X11
 #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
@@ -410,14 +393,14 @@
 #endif
 #endif
 
+#if TARGET_HOST_POSIX_X11
+
 /*
  * Changes the current display mode to match user's settings
  */
 static GLboolean fghChangeDisplayMode( GLboolean haveToTest )
 {
     GLboolean success = GL_FALSE;
-#if TARGET_HOST_POSIX_X11
-
     /* first try to use XRandR, then fallback to XF86VidMode */
 #   ifdef HAVE_X11_EXTENSIONS_XRANDR_H
     if(xrandr_resize(fgState.GameModeSize.X, fgState.GameModeSize.Y,
@@ -512,88 +495,10 @@
 
 #   endif
 
-
-#elif TARGET_HOST_MS_WINDOWS
-
-    DEVMODE  devMode;
-    char *fggmstr = NULL;
-    char displayMode[300];
-
-    success = GL_FALSE;
-
-    EnumDisplaySettings( fgDisplay.DisplayName, -1, &devMode ); 
-    devMode.dmFields = 0;
-
-    if (fgState.GameModeSize.X!=-1)
-    {
-        devMode.dmPelsWidth  = fgState.GameModeSize.X;
-        devMode.dmFields |= DM_PELSWIDTH;
-    }
-    if (fgState.GameModeSize.Y!=-1)
-    {
-        devMode.dmPelsHeight  = fgState.GameModeSize.Y;
-        devMode.dmFields |= DM_PELSHEIGHT;
-    }
-    if (fgState.GameModeDepth!=-1)
-    {
-        devMode.dmBitsPerPel  = fgState.GameModeDepth;
-        devMode.dmFields |= DM_BITSPERPEL;
-    }
-    if (fgState.GameModeRefresh!=-1)
-    {
-        devMode.dmDisplayFrequency  = fgState.GameModeRefresh;
-        devMode.dmFields |= DM_DISPLAYFREQUENCY;
-    }
-
-    switch ( ChangeDisplaySettingsEx(fgDisplay.DisplayName, &devMode, NULL, haveToTest ? CDS_TEST : CDS_FULLSCREEN , NULL) )
-    {
-    case DISP_CHANGE_SUCCESSFUL:
-        success = GL_TRUE;
-
-        if (!haveToTest)
-        {
-            /* update vars in case if windows switched to proper mode */
-            EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS, &devMode );
-            fgState.GameModeSize.X  = devMode.dmPelsWidth;        
-            fgState.GameModeSize.Y  = devMode.dmPelsHeight;
-            fgState.GameModeDepth   = devMode.dmBitsPerPel;
-            fgState.GameModeRefresh = devMode.dmDisplayFrequency;
-        }
-		break;
-    case DISP_CHANGE_RESTART:
-        fggmstr = "The computer must be restarted for the graphics mode to work.";
-        break;
-    case DISP_CHANGE_BADFLAGS:
-        fggmstr = "An invalid set of flags was passed in.";
-        break;
-    case DISP_CHANGE_BADPARAM:
-        fggmstr = "An invalid parameter was passed in. This can include an invalid flag or combination of flags.";
-        break;
-    case DISP_CHANGE_FAILED:
-        fggmstr = "The display driver failed the specified graphics mode.";
-        break;
-    case DISP_CHANGE_BADMODE:
-        fggmstr = "The graphics mode is not supported.";
-        break;
-    default:
-        fggmstr = "Unknown error in graphics mode???"; /* dunno if it is possible,MSDN does not mention any other error */
-        break;
-    }
-
-    if ( !success )
-    {
-        /* I'd rather get info whats going on in my program than wonder about */
-        /* magic happenings behind my back, its lib for devels at last ;) */
-        
-        /* append display mode to error to make things more informative */
-        sprintf(displayMode,"%s Problem with requested mode: %ix%i:%i@...", fggmstr, devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel, devMode.dmDisplayFrequency);
-        fgWarning(displayMode);
-    }
-#endif
-
     return success;
 }
 
+#endif
 
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
 

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c	2012-01-20 03:44:03 UTC (rev 985)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c	2012-01-20 03:51:15 UTC (rev 986)
@@ -0,0 +1,149 @@
+/*
+ * freeglut_cursor_mswin.c
+ *
+ * The Windows-specific mouse cursor related stuff.
+ *
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
+ * Written by John F. Fay, <fayjf@...>
+ * Creation date: Thu Jan 19, 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "freeglut_internal_mswin.h"
+
+/*
+ * Remembers the current visual settings, so that
+ * we can change them and restore later...
+ */
+void fghRememberState( void )
+{
+/*    DEVMODE devMode; */
+
+    /* Grab the current desktop settings... */
+
+/* hack to get around my stupid cross-gcc headers */
+#define FREEGLUT_ENUM_CURRENT_SETTINGS -1
+
+    EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS,
+                         &fgDisplay.DisplayMode );
+
+    /* Make sure we will be restoring all settings needed */
+    fgDisplay.DisplayMode.dmFields |=
+        DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY;
+
+}
+
+/*
+ * Restores the previously remembered visual settings
+ */
+void fghRestoreState( void )
+{
+    /* Restore the previously remembered desktop display settings */
+    ChangeDisplaySettingsEx( fgDisplay.DisplayName,&fgDisplay.DisplayMode, 0,0,0 );
+
+}
+
+
+
+
+/*
+ * Changes the current display mode to match user's settings
+ */
+GLboolean fghChangeDisplayMode( GLboolean haveToTest )
+{
+    GLboolean success = GL_FALSE;
+    DEVMODE  devMode;
+    char *fggmstr = NULL;
+    char displayMode[300];
+
+    success = GL_FALSE;
+
+    EnumDisplaySettings( fgDisplay.DisplayName, -1, &devMode ); 
+    devMode.dmFields = 0;
+
+    if (fgState.GameModeSize.X!=-1)
+    {
+        devMode.dmPelsWidth  = fgState.GameModeSize.X;
+        devMode.dmFields |= DM_PELSWIDTH;
+    }
+    if (fgState.GameModeSize.Y!=-1)
+    {
+        devMode.dmPelsHeight  = fgState.GameModeSize.Y;
+        devMode.dmFields |= DM_PELSHEIGHT;
+    }
+    if (fgState.GameModeDepth!=-1)
+    {
+        devMode.dmBitsPerPel  = fgState.GameModeDepth;
+        devMode.dmFields |= DM_BITSPERPEL;
+    }
+    if (fgState.GameModeRefresh!=-1)
+    {
+        devMode.dmDisplayFrequency  = fgState.GameModeRefresh;
+        devMode.dmFields |= DM_DISPLAYFREQUENCY;
+    }
+
+    switch ( ChangeDisplaySettingsEx(fgDisplay.DisplayName, &devMode, NULL, haveToTest ? CDS_TEST : CDS_FULLSCREEN , NULL) )
+    {
+    case DISP_CHANGE_SUCCESSFUL:
+        success = GL_TRUE;
+
+        if (!haveToTest)
+        {
+            /* update vars in case if windows switched to proper mode */
+            EnumDisplaySettings( fgDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS, &devMode );
+            fgState.GameModeSize.X  = devMode.dmPelsWidth;        
+            fgState.GameModeSize.Y  = devMode.dmPelsHeight;
+            fgState.GameModeDepth   = devMode.dmBitsPerPel;
+            fgState.GameModeRefresh = devMode.dmDisplayFrequency;
+        }
+		break;
+    case DISP_CHANGE_RESTART:
+        fggmstr = "The computer must be restarted for the graphics mode to work.";
+        break;
+    case DISP_CHANGE_BADFLAGS:
+        fggmstr = "An invalid set of flags was passed in.";
+        break;
+    case DISP_CHANGE_BADPARAM:
+        fggmstr = "An invalid parameter was passed in. This can include an invalid flag or combination of flags.";
+        break;
+    case DISP_CHANGE_FAILED:
+        fggmstr = "The display driver failed the specified graphics mode.";
+        break;
+    case DISP_CHANGE_BADMODE:
+        fggmstr = "The graphics mode is not supported.";
+        break;
+    default:
+        fggmstr = "Unknown error in graphics mode???"; /* dunno if it is possible,MSDN does not mention any other error */
+        break;
+    }
+
+    if ( !success )
+    {
+        /* I'd rather get info whats going on in my program than wonder about */
+        /* magic happenings behind my back, its lib for devels at last ;) */
+        
+        /* append display mode to error to make things more informative */
+        sprintf(displayMode,"%s Problem with requested mode: %ix%i:%i@...", fggmstr, devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel, devMode.dmDisplayFrequency);
+        fgWarning(displayMode);
+    }
+
+    return success;
+}
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 987
          http://freeglut.svn.sourceforge.net/freeglut/?rev=987&view=rev
Author:   fayjf
Date:     2012-01-20 04:10:00 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
Moving some Windows-specific "freeglut_init.c" helper functions into their own file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_init.c
    trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_init.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-01-20 03:51:15 UTC (rev 986)
+++ trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-01-20 04:10:00 UTC (rev 987)
@@ -100,6 +100,10 @@
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
+extern void fghInitialize( const char* displayName );
+extern void fghDeinitialiseInputDevices ( void );
+extern void fghCloseDisplay ( void );
+
 #if TARGET_HOST_POSIX_X11
 
 /* Return the atom associated with "name". */
@@ -238,12 +242,12 @@
 #endif /*  TARGET_HOST_POSIX_X11  */
 
 
+#if TARGET_HOST_POSIX_X11
 /*
  * A call to this function should initialize all the display stuff...
  */
 static void fghInitialize( const char* displayName )
 {
-#if TARGET_HOST_POSIX_X11
     fgDisplay.Display = XOpenDisplay( displayName );
 
     if( fgDisplay.Display == NULL )
@@ -307,103 +311,49 @@
       }
     }
 
-#elif TARGET_HOST_MS_WINDOWS
 
-    WNDCLASS wc;
-    ATOM atom;
+    fgState.Initialised = GL_TRUE;
 
-    /* What we need to do is to initialize the fgDisplay global structure here. */
-    fgDisplay.Instance = GetModuleHandle( NULL );
-    fgDisplay.DisplayName= displayName ? strdup(displayName) : 0 ;
-    atom = GetClassInfo( fgDisplay.Instance, _T("FREEGLUT"), &wc );
+    atexit(fgDeinitialize);
 
-    if( atom == 0 )
-    {
-        ZeroMemory( &wc, sizeof(WNDCLASS) );
+    /* InputDevice uses GlutTimerFunc(), so fgState.Initialised must be TRUE */
+    fgInitialiseInputDevices();
+}
 
-        /*
-         * Each of the windows should have its own device context, and we
-         * want redraw events during Vertical and Horizontal Resizes by
-         * the user.
-         *
-         * XXX Old code had "| CS_DBCLCKS" commented out.  Plans for the
-         * XXX future?  Dead-end idea?
-         */
-        wc.lpfnWndProc    = fgWindowProc;
-        wc.cbClsExtra     = 0;
-        wc.cbWndExtra     = 0;
-        wc.hInstance      = fgDisplay.Instance;
-        wc.hIcon          = LoadIcon( fgDisplay.Instance, _T("GLUT_ICON") );
-
-#if defined(_WIN32_WCE)
-        wc.style          = CS_HREDRAW | CS_VREDRAW;
-#else
-        wc.style          = CS_OWNDC | CS_HREDRAW | CS_VREDRAW;
-        if (!wc.hIcon)
-          wc.hIcon        = LoadIcon( NULL, IDI_WINLOGO );
 #endif
 
-        wc.hCursor        = LoadCursor( NULL, IDC_ARROW );
-        wc.hbrBackground  = NULL;
-        wc.lpszMenuName   = NULL;
-        wc.lpszClassName  = _T("FREEGLUT");
+#if TARGET_HOST_POSIX_X11
+static void fghDeinitialiseInputDevices ( void )
+{
+    if ( fgState.JoysticksInitialised )
+        fgJoystickClose( );
 
-        /* Register the window class */
-        atom = RegisterClass( &wc );
-        FREEGLUT_INTERNAL_ERROR_EXIT ( atom, "Window Class Not Registered", "fghInitialize" );
-    }
+    if ( fgState.InputDevsInitialised )
+        fgInputDeviceClose( );
 
-    /* The screen dimensions can be obtained via GetSystemMetrics() calls */
-    fgDisplay.ScreenWidth  = GetSystemMetrics( SM_CXSCREEN );
-    fgDisplay.ScreenHeight = GetSystemMetrics( SM_CYSCREEN );
+    fgState.JoysticksInitialised = GL_FALSE;
+    fgState.InputDevsInitialised = GL_FALSE;
+}
 
-    {
-        HWND desktop = GetDesktopWindow( );
-        HDC  context = GetDC( desktop );
 
-        fgDisplay.ScreenWidthMM  = GetDeviceCaps( context, HORZSIZE );
-        fgDisplay.ScreenHeightMM = GetDeviceCaps( context, VERTSIZE );
+static void fghCloseDisplay ( void )
+{
+    /*
+     * Make sure all X-client data we have created will be destroyed on
+     * display closing
+     */
+    XSetCloseDownMode( fgDisplay.Display, DestroyAll );
 
-        ReleaseDC( desktop, context );
-    }
-    /* If we have a DisplayName try to use it for metrics */
-    if( fgDisplay.DisplayName )
-    {
-        HDC context = CreateDC(fgDisplay.DisplayName,0,0,0);
-        if( context )
-        {
-	    fgDisplay.ScreenWidth  = GetDeviceCaps( context, HORZRES );
-	    fgDisplay.ScreenHeight = GetDeviceCaps( context, VERTRES );
-	    fgDisplay.ScreenWidthMM  = GetDeviceCaps( context, HORZSIZE );
-	    fgDisplay.ScreenHeightMM = GetDeviceCaps( context, VERTSIZE );
-	    DeleteDC(context);
-        }
-        else
-	    fgWarning("fghInitialize: "
-		      "CreateDC failed, Screen size info may be incorrect\n"
-          "This is quite likely caused by a bad '-display' parameter");
-      
-    }
-    /* Set the timer granularity to 1 ms */
-    timeBeginPeriod ( 1 );
+    /*
+     * Close the display connection, destroying all windows we have
+     * created so far
+     */
+    XCloseDisplay( fgDisplay.Display );
+}
 
 #endif
 
-    fgState.Initialised = GL_TRUE;
 
-    /* Avoid registering atexit callback on Win32 as it results in an access
-     * violation due to calling into a module which has been unloaded.
-     * Any cleanup isn't needed on Windows anyway, the OS takes care of it.c
-     * see: http://blogs.msdn.com/b/oldnewthing/archive/2012/01/05/10253268.aspx
-     */
-#if ( TARGET_HOST_MS_WINDOWS == 0 )
-    atexit(fgDeinitialize);
-#endif
-
-    /* InputDevice uses GlutTimerFunc(), so fgState.Initialised must be TRUE */
-    fgInitialiseInputDevices();
-}
-
 /*
  * Perform the freeglut deinitialization...
  */
@@ -446,16 +396,8 @@
         free( timer );
     }
 
-#if !defined(_WIN32_WCE)
-    if ( fgState.JoysticksInitialised )
-        fgJoystickClose( );
+	fghDeinitialiseInputDevices ();
 
-    if ( fgState.InputDevsInitialised )
-        fgInputDeviceClose( );
-#endif /* !defined(_WIN32_WCE) */
-    fgState.JoysticksInitialised = GL_FALSE;
-    fgState.InputDevsInitialised = GL_FALSE;
-
 	fgState.MouseWheelTicks = 0;
 
     fgState.MajorVersion = 1;
@@ -508,32 +450,8 @@
         fgState.ProgramName = NULL;
     }
 
-#if TARGET_HOST_POSIX_X11
+	fghCloseDisplay ();
 
-    /*
-     * Make sure all X-client data we have created will be destroyed on
-     * display closing
-     */
-    XSetCloseDownMode( fgDisplay.Display, DestroyAll );
-
-    /*
-     * Close the display connection, destroying all windows we have
-     * created so far
-     */
-    XCloseDisplay( fgDisplay.Display );
-
-#elif TARGET_HOST_MS_WINDOWS
-    if( fgDisplay.DisplayName )
-    {
-        free( fgDisplay.DisplayName );
-        fgDisplay.DisplayName = NULL;
-    }
-
-    /* Reset the timer granularity */
-    timeEndPeriod ( 1 );
-
-#endif
-
     fgState.Initialised = GL_FALSE;
 }
 

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c	2012-01-20 03:51:15 UTC (rev 986)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c	2012-01-20 04:10:00 UTC (rev 987)
@@ -0,0 +1,160 @@
+/*
+ * freeglut_cursor_mswin.c
+ *
+ * The Windows-specific mouse cursor related stuff.
+ *
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
+ * Written by John F. Fay, <fayjf@...>
+ * Creation date: Thu Jan 19, 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "freeglut_internal_mswin.h"
+
+
+/*
+ * A call to this function should initialize all the display stuff...
+ */
+void fghInitialize( const char* displayName )
+{
+    WNDCLASS wc;
+    ATOM atom;
+
+    /* What we need to do is to initialize the fgDisplay global structure here. */
+    fgDisplay.Instance = GetModuleHandle( NULL );
+    fgDisplay.DisplayName= displayName ? strdup(displayName) : 0 ;
+    atom = GetClassInfo( fgDisplay.Instance, _T("FREEGLUT"), &wc );
+
+    if( atom == 0 )
+    {
+        ZeroMemory( &wc, sizeof(WNDCLASS) );
+
+        /*
+         * Each of the windows should have its own device context, and we
+         * want redraw events during Vertical and Horizontal Resizes by
+         * the user.
+         *
+         * XXX Old code had "| CS_DBCLCKS" commented out.  Plans for the
+         * XXX future?  Dead-end idea?
+         */
+        wc.lpfnWndProc    = fgWindowProc;
+        wc.cbClsExtra     = 0;
+        wc.cbWndExtra     = 0;
+        wc.hInstance      = fgDisplay.Instance;
+        wc.hIcon          = LoadIcon( fgDisplay.Instance, _T("GLUT_ICON") );
+
+#if defined(_WIN32_WCE)
+        wc.style          = CS_HREDRAW | CS_VREDRAW;
+#else
+        wc.style          = CS_OWNDC | CS_HREDRAW | CS_VREDRAW;
+        if (!wc.hIcon)
+          wc.hIcon        = LoadIcon( NULL, IDI_WINLOGO );
+#endif
+
+        wc.hCursor        = LoadCursor( NULL, IDC_ARROW );
+        wc.hbrBackground  = NULL;
+        wc.lpszMenuName   = NULL;
+        wc.lpszClassName  = _T("FREEGLUT");
+
+        /* Register the window class */
+        atom = RegisterClass( &wc );
+        FREEGLUT_INTERNAL_ERROR_EXIT ( atom, "Window Class Not Registered", "fghInitialize" );
+    }
+
+    /* The screen dimensions can be obtained via GetSystemMetrics() calls */
+    fgDisplay.ScreenWidth  = GetSystemMetrics( SM_CXSCREEN );
+    fgDisplay.ScreenHeight = GetSystemMetrics( SM_CYSCREEN );
+
+    {
+        HWND desktop = GetDesktopWindow( );
+        HDC  context = GetDC( desktop );
+
+        fgDisplay.ScreenWidthMM  = GetDeviceCaps( context, HORZSIZE );
+        fgDisplay.ScreenHeightMM = GetDeviceCaps( context, VERTSIZE );
+
+        ReleaseDC( desktop, context );
+    }
+    /* If we have a DisplayName try to use it for metrics */
+    if( fgDisplay.DisplayName )
+    {
+        HDC context = CreateDC(fgDisplay.DisplayName,0,0,0);
+        if( context )
+        {
+	    fgDisplay.ScreenWidth  = GetDeviceCaps( context, HORZRES );
+	    fgDisplay.ScreenHeight = GetDeviceCaps( context, VERTRES );
+	    fgDisplay.ScreenWidthMM  = GetDeviceCaps( context, HORZSIZE );
+	    fgDisplay.ScreenHeightMM = GetDeviceCaps( context, VERTSIZE );
+	    DeleteDC(context);
+        }
+        else
+	    fgWarning("fghInitialize: "
+		      "CreateDC failed, Screen size info may be incorrect\n"
+          "This is quite likely caused by a bad '-display' parameter");
+      
+    }
+    /* Set the timer granularity to 1 ms */
+    timeBeginPeriod ( 1 );
+
+
+    fgState.Initialised = GL_TRUE;
+
+    /* Avoid registering atexit callback on Win32 as it results in an access
+     * violation due to calling into a module which has been unloaded.
+     * Any cleanup isn't needed on Windows anyway, the OS takes care of it.c
+     * see: http://blogs.msdn.com/b/oldnewthing/archive/2012/01/05/10253268.aspx
+     */
+/*    atexit(fgDeinitialize); */
+
+    /* InputDevice uses GlutTimerFunc(), so fgState.Initialised must be TRUE */
+    fgInitialiseInputDevices();
+}
+
+
+
+/* Platform-Specific Deinitialization Functions: */
+void fghDeinitialiseInputDevices ( void )
+{
+#if !defined(_WIN32_WCE)
+    if ( fgState.JoysticksInitialised )
+        fgJoystickClose( );
+
+    if ( fgState.InputDevsInitialised )
+        fgInputDeviceClose( );
+#endif /* !defined(_WIN32_WCE) */
+    fgState.JoysticksInitialised = GL_FALSE;
+    fgState.InputDevsInitialised = GL_FALSE;
+}
+
+void fghCloseDisplay ( void )
+{
+    if( fgDisplay.DisplayName )
+    {
+        free( fgDisplay.DisplayName );
+        fgDisplay.DisplayName = NULL;
+    }
+
+    /* Reset the timer granularity */
+    timeEndPeriod ( 1 );
+}
+
+
+
+
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 988
          http://freeglut.svn.sourceforge.net/freeglut/?rev=988&view=rev
Author:   fayjf
Date:     2012-01-20 04:20:28 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
Removing some duplicate code from "freeglut_init.c" and its Windows version

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_init.c
    trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_init.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-01-20 04:10:00 UTC (rev 987)
+++ trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-01-20 04:20:28 UTC (rev 988)
@@ -322,8 +322,7 @@
 
 #endif
 
-#if TARGET_HOST_POSIX_X11
-static void fghDeinitialiseInputDevices ( void )
+void fghCloseInputDevices ( void )
 {
     if ( fgState.JoysticksInitialised )
         fgJoystickClose( );
@@ -336,6 +335,16 @@
 }
 
 
+#if TARGET_HOST_POSIX_X11
+static void fghDeinitialiseInputDevices ( void )
+{
+	fghCloseInputDevices ();
+
+    fgState.JoysticksInitialised = GL_FALSE;
+    fgState.InputDevsInitialised = GL_FALSE;
+}
+
+
 static void fghCloseDisplay ( void )
 {
     /*

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c	2012-01-20 04:10:00 UTC (rev 987)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c	2012-01-20 04:20:28 UTC (rev 988)
@@ -129,14 +129,12 @@
 
 
 /* Platform-Specific Deinitialization Functions: */
+extern void fghCloseInputDevices ( void );
+
 void fghDeinitialiseInputDevices ( void )
 {
 #if !defined(_WIN32_WCE)
-    if ( fgState.JoysticksInitialised )
-        fgJoystickClose( );
-
-    if ( fgState.InputDevsInitialised )
-        fgInputDeviceClose( );
+	fghCloseInputDevices ();
 #endif /* !defined(_WIN32_WCE) */
     fgState.JoysticksInitialised = GL_FALSE;
     fgState.InputDevsInitialised = GL_FALSE;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 992
          http://freeglut.svn.sourceforge.net/freeglut/?rev=992&view=rev
Author:   fayjf
Date:     2012-01-22 01:42:57 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
Splitting the Windows-specific input device code into its own file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_input_devices.c
    trunk/freeglut/freeglut/src/mswin/freeglut_input_devices_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_input_devices.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_input_devices.c	2012-01-22 01:32:31 UTC (rev 991)
+++ trunk/freeglut/freeglut/src/Common/freeglut_input_devices.c	2012-01-22 01:42:57 UTC (rev 992)
@@ -46,22 +46,16 @@
 #include <termios.h>
 #include <fcntl.h>
 
-typedef struct {
+struct {
    int fd;
    struct termios termio, termio_save;
-} SERIALPORT;
+} _serialport;
 
-#elif TARGET_HOST_MS_WINDOWS
-#include <sys/types.h>
-#include <winbase.h>
-typedef struct {
-   HANDLE fh;
-   COMMTIMEOUTS timeouts_save;
-   DCB dcb_save;
-} SERIALPORT;
-
 #endif
 
+typedef struct _serialport SERIALPORT;
+
+
 /********************* Dialbox definitions ***********************/
 
 #define DIAL_NUM_VALUATORS 8
@@ -99,12 +93,13 @@
 
 /*****************************************************************/
 
-static SERIALPORT *serial_open ( const char *device );
-static void serial_close ( SERIALPORT *port );
-static int serial_getchar ( SERIALPORT *port );
-static int serial_putchar ( SERIALPORT *port, unsigned char ch );
-static void serial_flush ( SERIALPORT *port );
+extern SERIALPORT *serial_open ( const char *device );
+extern void serial_close ( SERIALPORT *port );
+extern int serial_getchar ( SERIALPORT *port );
+extern int serial_putchar ( SERIALPORT *port, unsigned char ch );
+extern void serial_flush ( SERIALPORT *port );
 
+extern void fghRegisterDialDevice ( const char *dial_device );
 static void send_dial_event(int dial, int value);
 static void poll_dials(int id);
 
@@ -132,26 +127,20 @@
 /*
  * Try initializing the input device(s)
  */
+#if TARGET_HOST_POSIX_X11
+static void fghRegisterDialDevice ( const char *dial_device )
+{
+}
+#endif
+
 void fgInitialiseInputDevices ( void )
 {
     if( !fgState.InputDevsInitialised )
     {
         const char *dial_device=NULL;
         dial_device = getenv ( "GLUT_DIALS_SERIAL" );
-#if TARGET_HOST_MS_WINDOWS
-        if (!dial_device){
-            static char devname[256];
-            DWORD size=sizeof(devname);
-            DWORD type = REG_SZ;
-            HKEY key;
-            if (RegOpenKeyA(HKEY_LOCAL_MACHINE,"SOFTWARE\\FreeGLUT",&key)==ERROR_SUCCESS) {
-                if (RegQueryValueExA(key,"DialboxSerialPort",NULL,&type,(LPBYTE)devname,&size)==ERROR_SUCCESS){
-                    dial_device=devname;
-                }
-                RegCloseKey(key);
-            }
-        }
-#endif
+		fghRegisterDialDevice ( dial_device );
+
         if ( !dial_device ) return;
         if ( !( dialbox_port = serial_open ( dial_device ) ) ) return;
         serial_putchar(dialbox_port,DIAL_INITIALIZE);
@@ -311,68 +300,4 @@
     tcflush ( port->fd, TCIOFLUSH );
 }
 
-#elif TARGET_HOST_MS_WINDOWS
-
-static SERIALPORT *serial_open(const char *device){
-    HANDLE fh;
-    DCB dcb={sizeof(DCB)};
-    COMMTIMEOUTS timeouts;
-    SERIALPORT *port;
-
-    fh = CreateFile(device,GENERIC_READ|GENERIC_WRITE,0,NULL,
-      OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
-    if (!fh) return NULL;
-
-    port = malloc(sizeof(SERIALPORT));
-    ZeroMemory(port, sizeof(SERIALPORT));
-    port->fh = fh;
-
-    /* save current port settings */
-    GetCommState(fh,&port->dcb_save);
-    GetCommTimeouts(fh,&port->timeouts_save);
-
-    dcb.DCBlength=sizeof(DCB);
-    BuildCommDCB("96,n,8,1",&dcb);
-    SetCommState(fh,&dcb);
-
-    ZeroMemory(&timeouts,sizeof(timeouts));
-    timeouts.ReadTotalTimeoutConstant=1;
-    timeouts.WriteTotalTimeoutConstant=1;
-    SetCommTimeouts(fh,&timeouts);
-
-    serial_flush(port);
-
-    return port;
-}
-
-static void serial_close(SERIALPORT *port){
-    if (port){
-        /* restore old port settings */
-        SetCommState(port->fh,&port->dcb_save);
-        SetCommTimeouts(port->fh,&port->timeouts_save);
-        CloseHandle(port->fh);
-        free(port);
-    }
-}
-
-static int serial_getchar(SERIALPORT *port){
-    DWORD n;
-    unsigned char ch;
-    if (!port) return EOF;
-    if (!ReadFile(port->fh,&ch,1,&n,NULL)) return EOF;
-    if (n==1) return ch;
-    return EOF;
-}
-
-static int serial_putchar(SERIALPORT *port, unsigned char ch){
-    DWORD n;
-    if (!port) return 0;
-    return WriteFile(port->fh,&ch,1,&n,NULL);
-}
-
-static void serial_flush ( SERIALPORT *port )
-{
-    FlushFileBuffers(port->fh);
-}
-
 #endif

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_input_devices_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_input_devices_mswin.c	2012-01-22 01:32:31 UTC (rev 991)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_input_devices_mswin.c	2012-01-22 01:42:57 UTC (rev 992)
@@ -0,0 +1,127 @@
+/*
+ * freeglut_input_devices_mswin.c
+ *
+ * The Windows-specific mouse cursor related stuff.
+ *
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
+ * Written by John F. Fay, <fayjf@...>
+ * Creation date: Sat Jan 21, 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "freeglut_internal_mswin.h"
+
+#include <sys/types.h>
+#include <winbase.h>
+
+typedef struct {
+   HANDLE fh;
+   COMMTIMEOUTS timeouts_save;
+   DCB dcb_save;
+} SERIALPORT;
+
+/* Serial Port Prototypes */
+SERIALPORT *serial_open ( const char *device );
+void serial_close ( SERIALPORT *port );
+int serial_getchar ( SERIALPORT *port );
+int serial_putchar ( SERIALPORT *port, unsigned char ch );
+void serial_flush ( SERIALPORT *port );
+
+
+void fghRegisterDialDevice ( const char *dial_device )
+{
+        if (!dial_device){
+            static char devname[256];
+            DWORD size=sizeof(devname);
+            DWORD type = REG_SZ;
+            HKEY key;
+            if (RegOpenKeyA(HKEY_LOCAL_MACHINE,"SOFTWARE\\FreeGLUT",&key)==ERROR_SUCCESS) {
+                if (RegQueryValueExA(key,"DialboxSerialPort",NULL,&type,(LPBYTE)devname,&size)==ERROR_SUCCESS){
+                    dial_device=devname;
+                }
+                RegCloseKey(key);
+            }
+        }
+}
+
+
+/*  Serial Port Functions */
+SERIALPORT *serial_open(const char *device){
+    HANDLE fh;
+    DCB dcb={sizeof(DCB)};
+    COMMTIMEOUTS timeouts;
+    SERIALPORT *port;
+
+    fh = CreateFile(device,GENERIC_READ|GENERIC_WRITE,0,NULL,
+      OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+    if (!fh) return NULL;
+
+    port = malloc(sizeof(SERIALPORT));
+    ZeroMemory(port, sizeof(SERIALPORT));
+    port->fh = fh;
+
+    /* save current port settings */
+    GetCommState(fh,&port->dcb_save);
+    GetCommTimeouts(fh,&port->timeouts_save);
+
+    dcb.DCBlength=sizeof(DCB);
+    BuildCommDCB("96,n,8,1",&dcb);
+    SetCommState(fh,&dcb);
+
+    ZeroMemory(&timeouts,sizeof(timeouts));
+    timeouts.ReadTotalTimeoutConstant=1;
+    timeouts.WriteTotalTimeoutConstant=1;
+    SetCommTimeouts(fh,&timeouts);
+
+    serial_flush(port);
+
+    return port;
+}
+
+void serial_close(SERIALPORT *port){
+    if (port){
+        /* restore old port settings */
+        SetCommState(port->fh,&port->dcb_save);
+        SetCommTimeouts(port->fh,&port->timeouts_save);
+        CloseHandle(port->fh);
+        free(port);
+    }
+}
+
+int serial_getchar(SERIALPORT *port){
+    DWORD n;
+    unsigned char ch;
+    if (!port) return EOF;
+    if (!ReadFile(port->fh,&ch,1,&n,NULL)) return EOF;
+    if (n==1) return ch;
+    return EOF;
+}
+
+int serial_putchar(SERIALPORT *port, unsigned char ch){
+    DWORD n;
+    if (!port) return 0;
+    return WriteFile(port->fh,&ch,1,&n,NULL);
+}
+
+void serial_flush ( SERIALPORT *port )
+{
+    FlushFileBuffers(port->fh);
+}
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 993
          http://freeglut.svn.sourceforge.net/freeglut/?rev=993&view=rev
Author:   fayjf
Date:     2012-01-22 01:48:15 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
Splitting out more Windows-specific code in "freeglut_init.c"

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_init.c
    trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_init.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-01-22 01:42:57 UTC (rev 992)
+++ trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-01-22 01:48:15 UTC (rev 993)
@@ -565,40 +565,8 @@
     fgState.Initialised = GL_FALSE;
 }
 
-/*
- * Everything inside the following #ifndef is copied from the X sources.
- */
 
-#if TARGET_HOST_MS_WINDOWS
-
-/*
-
-Copyright 1985, 1986, 1987,1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
+#if defined TARGET_HOST_MS_WINDOWS
 #define NoValue         0x0000
 #define XValue          0x0001
 #define YValue          0x0002
@@ -608,132 +576,12 @@
 #define XNegative       0x0010
 #define YNegative       0x0020
 
-/*
- *    XParseGeometry parses strings of the form
- *   "=<width>x<height>{+-}<xoffset>{+-}<yoffset>", where
- *   width, height, xoffset, and yoffset are unsigned integers.
- *   Example:  "=80x24+300-49"
- *   The equal sign is optional.
- *   It returns a bitmask that indicates which of the four values
- *   were actually found in the string.  For each value found,
- *   the corresponding argument is updated;  for each value
- *   not found, the corresponding argument is left unchanged.
- */
-
-static int
-ReadInteger(char *string, char **NextString)
-{
-    register int Result = 0;
-    int Sign = 1;
-
-    if (*string == '+')
-        string++;
-    else if (*string == '-')
-    {
-        string++;
-        Sign = -1;
-    }
-    for (; (*string >= '0') && (*string <= '9'); string++)
-    {
-        Result = (Result * 10) + (*string - '0');
-    }
-    *NextString = string;
-    if (Sign >= 0)
-        return Result;
-    else
-        return -Result;
-}
-
-static int XParseGeometry (
+extern int XParseGeometry (
     const char *string,
     int *x,
     int *y,
     unsigned int *width,    /* RETURN */
-    unsigned int *height)    /* RETURN */
-{
-    int mask = NoValue;
-    register char *strind;
-    unsigned int tempWidth = 0, tempHeight = 0;
-    int tempX = 0, tempY = 0;
-    char *nextCharacter;
-
-    if ( (string == NULL) || (*string == '\0'))
-      return mask;
-    if (*string == '=')
-        string++;  /* ignore possible '=' at beg of geometry spec */
-
-    strind = (char *)string;
-    if (*strind != '+' && *strind != '-' && *strind != 'x') {
-        tempWidth = ReadInteger(strind, &nextCharacter);
-        if (strind == nextCharacter)
-            return 0;
-        strind = nextCharacter;
-        mask |= WidthValue;
-    }
-
-    if (*strind == 'x' || *strind == 'X') {
-        strind++;
-        tempHeight = ReadInteger(strind, &nextCharacter);
-        if (strind == nextCharacter)
-            return 0;
-        strind = nextCharacter;
-        mask |= HeightValue;
-    }
-
-    if ((*strind == '+') || (*strind == '-')) {
-        if (*strind == '-') {
-            strind++;
-            tempX = -ReadInteger(strind, &nextCharacter);
-            if (strind == nextCharacter)
-                return 0;
-            strind = nextCharacter;
-            mask |= XNegative;
-        }
-        else
-        {
-            strind++;
-            tempX = ReadInteger(strind, &nextCharacter);
-            if (strind == nextCharacter)
-                return 0;
-            strind = nextCharacter;
-        }
-        mask |= XValue;
-        if ((*strind == '+') || (*strind == '-')) {
-            if (*strind == '-') {
-                strind++;
-                tempY = -ReadInteger(strind, &nextCharacter);
-                if (strind == nextCharacter)
-                    return 0;
-                strind = nextCharacter;
-                mask |= YNegative;
-            }
-            else
-            {
-                strind++;
-                tempY = ReadInteger(strind, &nextCharacter);
-                if (strind == nextCharacter)
-                    return 0;
-                strind = nextCharacter;
-            }
-            mask |= YValue;
-        }
-    }
-
-    /* If strind isn't at the end of the string the it's an invalid
-       geometry specification. */
-
-    if (*strind != '\0') return 0;
-
-    if (mask & XValue)
-        *x = tempX;
-    if (mask & YValue)
-        *y = tempY;
-    if (mask & WidthValue)
-        *width = tempWidth;
-    if (mask & HeightValue)
-        *height = tempHeight;
-    return mask;
-}
+    unsigned int *height);    /* RETURN */
 #endif
 
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c	2012-01-22 01:42:57 UTC (rev 992)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c	2012-01-22 01:48:15 UTC (rev 993)
@@ -154,5 +154,173 @@
 
 
 
+/*
+ * Everything down to the end of the next two functions is copied from the X sources.
+ */
 
+/*
 
+Copyright 1985, 1986, 1987,1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+*/
+
+#define NoValue         0x0000
+#define XValue          0x0001
+#define YValue          0x0002
+#define WidthValue      0x0004
+#define HeightValue     0x0008
+#define AllValues       0x000F
+#define XNegative       0x0010
+#define YNegative       0x0020
+
+/*
+ *    XParseGeometry parses strings of the form
+ *   "=<width>x<height>{+-}<xoffset>{+-}<yoffset>", where
+ *   width, height, xoffset, and yoffset are unsigned integers.
+ *   Example:  "=80x24+300-49"
+ *   The equal sign is optional.
+ *   It returns a bitmask that indicates which of the four values
+ *   were actually found in the string.  For each value found,
+ *   the corresponding argument is updated;  for each value
+ *   not found, the corresponding argument is left unchanged.
+ */
+
+static int
+ReadInteger(char *string, char **NextString)
+{
+    register int Result = 0;
+    int Sign = 1;
+
+    if (*string == '+')
+        string++;
+    else if (*string == '-')
+    {
+        string++;
+        Sign = -1;
+    }
+    for (; (*string >= '0') && (*string <= '9'); string++)
+    {
+        Result = (Result * 10) + (*string - '0');
+    }
+    *NextString = string;
+    if (Sign >= 0)
+        return Result;
+    else
+        return -Result;
+}
+
+int XParseGeometry (
+    const char *string,
+    int *x,
+    int *y,
+    unsigned int *width,    /* RETURN */
+    unsigned int *height)    /* RETURN */
+{
+    int mask = NoValue;
+    register char *strind;
+    unsigned int tempWidth = 0, tempHeight = 0;
+    int tempX = 0, tempY = 0;
+    char *nextCharacter;
+
+    if ( (string == NULL) || (*string == '\0'))
+      return mask;
+    if (*string == '=')
+        string++;  /* ignore possible '=' at beg of geometry spec */
+
+    strind = (char *)string;
+    if (*strind != '+' && *strind != '-' && *strind != 'x') {
+        tempWidth = ReadInteger(strind, &nextCharacter);
+        if (strind == nextCharacter)
+            return 0;
+        strind = nextCharacter;
+        mask |= WidthValue;
+    }
+
+    if (*strind == 'x' || *strind == 'X') {
+        strind++;
+        tempHeight = ReadInteger(strind, &nextCharacter);
+        if (strind == nextCharacter)
+            return 0;
+        strind = nextCharacter;
+        mask |= HeightValue;
+    }
+
+    if ((*strind == '+') || (*strind == '-')) {
+        if (*strind == '-') {
+            strind++;
+            tempX = -ReadInteger(strind, &nextCharacter);
+            if (strind == nextCharacter)
+                return 0;
+            strind = nextCharacter;
+            mask |= XNegative;
+        }
+        else
+        {
+            strind++;
+            tempX = ReadInteger(strind, &nextCharacter);
+            if (strind == nextCharacter)
+                return 0;
+            strind = nextCharacter;
+        }
+        mask |= XValue;
+        if ((*strind == '+') || (*strind == '-')) {
+            if (*strind == '-') {
+                strind++;
+                tempY = -ReadInteger(strind, &nextCharacter);
+                if (strind == nextCharacter)
+                    return 0;
+                strind = nextCharacter;
+                mask |= YNegative;
+            }
+            else
+            {
+                strind++;
+                tempY = ReadInteger(strind, &nextCharacter);
+                if (strind == nextCharacter)
+                    return 0;
+                strind = nextCharacter;
+            }
+            mask |= YValue;
+        }
+    }
+
+    /* If strind isn't at the end of the string the it's an invalid
+       geometry specification. */
+
+    if (*strind != '\0') return 0;
+
+    if (mask & XValue)
+        *x = tempX;
+    if (mask & YValue)
+        *y = tempY;
+    if (mask & WidthValue)
+        *width = tempWidth;
+    if (mask & HeightValue)
+        *height = tempHeight;
+    return mask;
+}
+
+
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 994
          http://freeglut.svn.sourceforge.net/freeglut/?rev=994&view=rev
Author:   fayjf
Date:     2012-01-22 06:21:50 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
Moving some Windows-specific code out of "freeglut_main.c" into the Windows-specific file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_main.c
    trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_main.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_main.c	2012-01-22 01:48:15 UTC (rev 993)
+++ trunk/freeglut/freeglut/src/Common/freeglut_main.c	2012-01-22 06:21:50 UTC (rev 994)
@@ -77,6 +77,12 @@
 	static pCloseTouchInputHandle fghCloseTouchInputHandle = (pCloseTouchInputHandle)0xDEADBEEF;
 #endif
 
+extern void fghPlatformReshapeWindow ( SFG_Window *window, int width, int height );
+extern void fghcbPlatformDisplayWindow ( SFG_Window *window );
+extern void fghPlatformSleepForEvents( long msec );
+extern void fghProcessSingleEvent ( void );
+
+
 /*
  * TODO BEFORE THE STABLE RELEASE:
  *
@@ -95,66 +101,23 @@
  * callback is hooked, the viewport size is updated to
  * match the new window size.
  */
-static void fghReshapeWindow ( SFG_Window *window, int width, int height )
-{
-    SFG_Window *current_window = fgStructure.CurrentWindow;
-
-    freeglut_return_if_fail( window != NULL );
-
 #if TARGET_HOST_POSIX_X11
-
+static void fghPlatformReshapeWindow ( SFG_Window *window, int width, int height )
+{
     XResizeWindow( fgDisplay.Display, window->Window.Handle,
                    width, height );
     XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+}
+#endif
 
-#elif TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
-    {
-        RECT windowRect;
+static void fghReshapeWindow ( SFG_Window *window, int width, int height )
+{
+    SFG_Window *current_window = fgStructure.CurrentWindow;
 
-        /*
-         * For windowed mode, get the current position of the
-         * window and resize taking the size of the frame
-         * decorations into account.
-         */
+    freeglut_return_if_fail( window != NULL );
 
-        /* "GetWindowRect" returns the pixel coordinates of the outside of the window */
-        GetWindowRect( window->Window.Handle, &windowRect );
+	fghPlatformReshapeWindow ( window, width, height );
 
-        /* Create rect in FreeGLUT format, (X,Y) topleft outside window, WxH of client area */
-        windowRect.right    = windowRect.left+width;
-        windowRect.bottom   = windowRect.top+height;
-
-        if (window->Parent == NULL)
-            /* get the window rect from this to feed to SetWindowPos, correct for window decorations */
-            fghComputeWindowRectFromClientArea_QueryWindow(window,&windowRect,TRUE);
-        else
-        {
-            /* correct rect for position client area of parent window
-             * (SetWindowPos input for child windows is in coordinates
-             * relative to the parent's client area).
-             * Child windows don't have decoration, so no need to correct
-             * for them.
-             */
-            RECT parentRect;
-            parentRect = fghGetClientArea( window->Parent, FALSE );
-            windowRect.left   -= parentRect.left;
-            windowRect.right  -= parentRect.left;
-            windowRect.top    -= parentRect.top;
-            windowRect.bottom -= parentRect.top;
-        }
-        
-        /* Do the actual resizing */
-        SetWindowPos( window->Window.Handle,
-                      HWND_TOP,
-                      windowRect.left, windowRect.top,
-                      windowRect.right - windowRect.left,
-                      windowRect.bottom- windowRect.top,
-                      SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING |
-                      SWP_NOZORDER
-        );
-    }
-#endif
-
     if( FETCH_WCB( *window, Reshape ) )
         INVOKE_WCB( *window, Reshape, ( width, height ) );
     else
@@ -212,6 +175,13 @@
 /*
  * A static helper function to execute display callback for a window
  */
+#if TARGET_HOST_POSIX_X11
+static void fghcbPlatformDisplayWindow ( SFG_Window *window )
+{
+        fghRedrawWindow ( window ) ;
+}
+#endif
+
 static void fghcbDisplayWindow( SFG_Window *window,
                                 SFG_Enumerator *enumerator )
 {
@@ -219,16 +189,7 @@
         window->State.Visible )
     {
         window->State.Redisplay = GL_FALSE;
-
-#if TARGET_HOST_POSIX_X11
-        fghRedrawWindow ( window ) ;
-#elif TARGET_HOST_MS_WINDOWS
-
-        RedrawWindow(
-            window->Window.Handle, NULL, NULL,
-            RDW_NOERASE | RDW_INTERNALPAINT | RDW_INVALIDATE | RDW_UPDATENOW
-        );
-#endif
+		fghcbPlatformDisplayWindow ( window );
     }
 
     fgEnumSubWindows( window, fghcbDisplayWindow, enumerator );
@@ -459,20 +420,10 @@
  * Does the magic required to relinquish the CPU until something interesting
  * happens.
  */
-static void fghSleepForEvents( void )
-{
-    long msec;
 
-    if( fgState.IdleCallback || fghHavePendingRedisplays( ) )
-        return;
-
-    msec = fghNextTimer( );
-    /* XXX Use GLUT timers for joysticks... */
-    /* XXX Dumb; forces granularity to .01sec */
-    if( fghHaveJoystick( ) && ( msec > 10 ) )     
-        msec = 10;
-
 #if TARGET_HOST_POSIX_X11
+static void fghPlatformSleepForEvents( long msec )
+{
     /*
      * Possibly due to aggressive use of XFlush() and friends,
      * it is possible to have our socket drained but still have
@@ -501,9 +452,23 @@
             fgWarning ( "freeglut select() error: %d", errno );
 #endif
     }
-#elif TARGET_HOST_MS_WINDOWS
-    MsgWaitForMultipleObjects( 0, NULL, FALSE, msec, QS_ALLINPUT );
+}
 #endif
+
+static void fghSleepForEvents( void )
+{
+    long msec;
+
+    if( fgState.IdleCallback || fghHavePendingRedisplays( ) )
+        return;
+
+    msec = fghNextTimer( );
+    /* XXX Use GLUT timers for joysticks... */
+    /* XXX Dumb; forces granularity to .01sec */
+    if( fghHaveJoystick( ) && ( msec > 10 ) )     
+        msec = 10;
+
+	fghPlatformSleepForEvents ( msec );
 }
 
 #if TARGET_HOST_POSIX_X11
@@ -523,10 +488,8 @@
 
     return ret;
 }
-#endif
 
 
-#if TARGET_HOST_POSIX_X11 && _DEBUG
 
 static const char* fghTypeToString( int type )
 {
@@ -968,16 +931,9 @@
     }
 }
 
-#endif
 
-/* -- INTERFACE FUNCTIONS -------------------------------------------------- */
-
-/*
- * Executes a single iteration in the freeglut processing loop.
- */
-void FGAPIENTRY glutMainLoopEvent( void )
+void fghProcessSingleEvent ( void )
 {
-#if TARGET_HOST_POSIX_X11
     SFG_Window* window;
     XEvent event;
 
@@ -1452,33 +1408,18 @@
             break;
         }
     }
+}
+#endif
 
-#elif TARGET_HOST_MS_WINDOWS
+/* -- INTERFACE FUNCTIONS -------------------------------------------------- */
 
-    MSG stMsg;
+/*
+ * Executes a single iteration in the freeglut processing loop.
+ */
+void FGAPIENTRY glutMainLoopEvent( void )
+{
+	fghProcessSingleEvent ();
 
-    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutMainLoopEvent" );
-
-    while( PeekMessage( &stMsg, NULL, 0, 0, PM_NOREMOVE ) )
-    {
-        if( GetMessage( &stMsg, NULL, 0, 0 ) == 0 )
-        {
-            if( fgState.ActionOnWindowClose == GLUT_ACTION_EXIT )
-            {
-                fgDeinitialize( );
-                exit( 0 );
-            }
-            else if( fgState.ActionOnWindowClose == GLUT_ACTION_GLUTMAINLOOP_RETURNS )
-                fgState.ExecState = GLUT_EXEC_STATE_STOP;
-
-            return;
-        }
-
-        TranslateMessage( &stMsg );
-        DispatchMessage( &stMsg );
-    }
-#endif
-
     if( fgState.Timers.First )
         fghCheckTimers( );
     fghCheckJoystickPolls( );

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c	2012-01-22 01:48:15 UTC (rev 993)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c	2012-01-22 06:21:50 UTC (rev 994)
@@ -0,0 +1,123 @@
+/*
+ * freeglut_main_mswin.c
+ *
+ * The Windows-specific mouse cursor related stuff.
+ *
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
+ * Written by John F. Fay, <fayjf@...>
+ * Creation date: Sat Jan 21, 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "freeglut_internal_mswin.h"
+
+
+
+
+void fghPlatformReshapeWindow ( SFG_Window *window, int width, int height )
+{
+    RECT windowRect;
+
+    /*
+     * For windowed mode, get the current position of the
+     * window and resize taking the size of the frame
+     * decorations into account.
+     */
+
+    /* "GetWindowRect" returns the pixel coordinates of the outside of the window */
+    GetWindowRect( window->Window.Handle, &windowRect );
+
+    /* Create rect in FreeGLUT format, (X,Y) topleft outside window, WxH of client area */
+    windowRect.right    = windowRect.left+width;
+    windowRect.bottom   = windowRect.top+height;
+
+    if (window->Parent == NULL)
+        /* get the window rect from this to feed to SetWindowPos, correct for window decorations */
+        fghComputeWindowRectFromClientArea_QueryWindow(window,&windowRect,TRUE);
+    else
+    {
+        /* correct rect for position client area of parent window
+         * (SetWindowPos input for child windows is in coordinates
+         * relative to the parent's client area).
+         * Child windows don't have decoration, so no need to correct
+         * for them.
+         */
+        RECT parentRect;
+        parentRect = fghGetClientArea( window->Parent, FALSE );
+        windowRect.left   -= parentRect.left;
+        windowRect.right  -= parentRect.left;
+        windowRect.top    -= parentRect.top;
+        windowRect.bottom -= parentRect.top;
+    }
+    
+    /* Do the actual resizing */
+    SetWindowPos( window->Window.Handle,
+                  HWND_TOP,
+                  windowRect.left, windowRect.top,
+                  windowRect.right - windowRect.left,
+                  windowRect.bottom- windowRect.top,
+                  SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING |
+                  SWP_NOZORDER
+    );
+}
+
+
+void fghcbPlatformDisplayWindow ( SFG_Window *window )
+{
+    RedrawWindow(
+        window->Window.Handle, NULL, NULL,
+        RDW_NOERASE | RDW_INTERNALPAINT | RDW_INVALIDATE | RDW_UPDATENOW
+    );
+}
+
+
+void fghPlatformSleepForEvents( long msec )
+{
+    MsgWaitForMultipleObjects( 0, NULL, FALSE, msec, QS_ALLINPUT );
+}
+
+
+void fghProcessSingleEvent ( void )
+{
+    MSG stMsg;
+
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutMainLoopEvent" );
+
+    while( PeekMessage( &stMsg, NULL, 0, 0, PM_NOREMOVE ) )
+    {
+        if( GetMessage( &stMsg, NULL, 0, 0 ) == 0 )
+        {
+            if( fgState.ActionOnWindowClose == GLUT_ACTION_EXIT )
+            {
+                fgDeinitialize( );
+                exit( 0 );
+            }
+            else if( fgState.ActionOnWindowClose == GLUT_ACTION_GLUTMAINLOOP_RETURNS )
+                fgState.ExecState = GLUT_EXEC_STATE_STOP;
+
+            return;
+        }
+
+        TranslateMessage( &stMsg );
+        DispatchMessage( &stMsg );
+    }
+}
+
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 996
          http://freeglut.svn.sourceforge.net/freeglut/?rev=996&view=rev
Author:   fayjf
Date:     2012-01-23 02:46:16 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
Splitting a little Windows-specific menu code into its own file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_menu.c
    trunk/freeglut/freeglut/src/mswin/freeglut_menu_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_menu.c	2012-01-22 19:25:56 UTC (rev 995)
+++ trunk/freeglut/freeglut/src/Common/freeglut_menu.c	2012-01-23 02:46:16 UTC (rev 996)
@@ -84,6 +84,9 @@
 static float menu_pen_hback [4] = {1.0f,  1.0f,  1.0f,  1.0f};
 #endif
 
+
+extern GLvoid fghGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y );
+
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
 /*
@@ -139,27 +142,28 @@
 /*
  * Private function to get the virtual maximum screen extent
  */
-static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y )
+#if TARGET_HOST_POSIX_X11
+static GLvoid fghGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
 {
-    if( fgStructure.GameModeWindow )
-    {
-#if TARGET_HOST_POSIX_X11
-        int wx, wy;
-        Window w;
+    int wx, wy;
+    Window w;
 
-        XTranslateCoordinates(
-            fgDisplay.Display,
-            window->Window.Handle,
-            fgDisplay.RootWindow,
-            0, 0, &wx, &wy, &w);
+    XTranslateCoordinates(
+        fgDisplay.Display,
+        window->Window.Handle,
+        fgDisplay.RootWindow,
+        0, 0, &wx, &wy, &w);
 
-        *x = fgState.GameModeSize.X + wx;
-        *y = fgState.GameModeSize.Y + wy;
-#else
-        *x = glutGet ( GLUT_SCREEN_WIDTH );
-        *y = glutGet ( GLUT_SCREEN_HEIGHT );
+    *x = fgState.GameModeSize.X + wx;
+    *y = fgState.GameModeSize.Y + wy;
+}
 #endif
-    }
+
+
+static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y )
+{
+    if( fgStructure.GameModeWindow )
+		fghGetGameModeVMaxExtent ( window, x, y );
     else
     {
         *x = fgDisplay.ScreenWidth;

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_menu_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_menu_mswin.c	2012-01-22 19:25:56 UTC (rev 995)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_menu_mswin.c	2012-01-23 02:46:16 UTC (rev 996)
@@ -0,0 +1,36 @@
+/*
+ * freeglut_menu_mswin.c
+ *
+ * The Windows-specific mouse cursor related stuff.
+ *
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
+ * Written by John F. Fay, <fayjf@...>
+ * Creation date: Sun Jan 22, 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "freeglut_internal_mswin.h"
+
+
+GLvoid fghGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
+{
+    *x = glutGet ( GLUT_SCREEN_WIDTH );
+    *y = glutGet ( GLUT_SCREEN_HEIGHT );
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 997
          http://freeglut.svn.sourceforge.net/freeglut/?rev=997&view=rev
Author:   fayjf
Date:     2012-01-23 04:06:48 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
Moving Windows-specific "glutGet" code into its own file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_state.c
    trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_state.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_state.c	2012-01-23 02:46:16 UTC (rev 996)
+++ trunk/freeglut/freeglut/src/Common/freeglut_state.c	2012-01-23 04:06:48 UTC (rev 997)
@@ -41,6 +41,8 @@
  * The fail-on-call policy will help adding the most needed things imho.
  */
 
+extern int fgPlatformGlutGet ( GLenum eWhat );
+
 /* -- LOCAL DEFINITIONS ---------------------------------------------------- */
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
@@ -62,129 +64,13 @@
 
   return returnValue;
 }
-#endif
 
-/* -- INTERFACE FUNCTIONS -------------------------------------------------- */
-
-/*
- * General settings assignment method
- */
-void FGAPIENTRY glutSetOption( GLenum eWhat, int value )
+static int fgPlatformGlutGet ( GLenum eWhat )
 {
-    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetOption" );
-
-    /*
-     * XXX In chronological code add order.  (WHY in that order?)
-     */
-    switch( eWhat )
-    {
-    case GLUT_INIT_WINDOW_X:
-        fgState.Position.X = (GLint)value;
-        break;
-
-    case GLUT_INIT_WINDOW_Y:
-        fgState.Position.Y = (GLint)value;
-        break;
-
-    case GLUT_INIT_WINDOW_WIDTH:
-        fgState.Size.X = (GLint)value;
-        break;
-
-    case GLUT_INIT_WINDOW_HEIGHT:
-        fgState.Size.Y = (GLint)value;
-        break;
-
-    case GLUT_INIT_DISPLAY_MODE:
-        fgState.DisplayMode = (unsigned int)value;
-        break;
-
-    case GLUT_ACTION_ON_WINDOW_CLOSE:
-        fgState.ActionOnWindowClose = value;
-        break;
-
-    case GLUT_RENDERING_CONTEXT:
-        fgState.UseCurrentContext =
-            ( value == GLUT_USE_CURRENT_CONTEXT ) ? GL_TRUE : GL_FALSE;
-        break;
-
-    case GLUT_DIRECT_RENDERING:
-        fgState.DirectContext = value;
-        break;
-
-    case GLUT_WINDOW_CURSOR:
-        if( fgStructure.CurrentWindow != NULL )
-            fgStructure.CurrentWindow->State.Cursor = value;
-        break;
-
-    case GLUT_AUX:
-      fgState.AuxiliaryBufferNumber = value;
-      break;
-
-    case GLUT_MULTISAMPLE:
-      fgState.SampleNumber = value;
-      break;
-
-    default:
-        fgWarning( "glutSetOption(): missing enum handle %d", eWhat );
-        break;
-    }
-}
-
-#if TARGET_HOST_MS_WINDOWS
-/* The following include file is available from SGI but is not standard:
- *   #include <GL/wglext.h>
- * So we copy the necessary parts out of it to support the multisampling query
- */
-#define WGL_SAMPLES_ARB                0x2042
-#endif
-
-
-/*
- * General settings query method
- */
-int FGAPIENTRY glutGet( GLenum eWhat )
-{
-#if TARGET_HOST_MS_WINDOWS
-    int returnValue ;
-    GLboolean boolValue ;
-#endif
-
     int nsamples = 0;
 
-    switch (eWhat)
-    {
-    case GLUT_INIT_STATE:
-        return fgState.Initialised;
-
-    case GLUT_ELAPSED_TIME:
-        return fgElapsedTime();
-    }
-
-    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGet" );
-
-    /* XXX In chronological code add order.  (WHY in that order?) */
     switch( eWhat )
     {
-    /* Following values are stored in fgState and fgDisplay global structures */
-    case GLUT_SCREEN_WIDTH:         return fgDisplay.ScreenWidth   ;
-    case GLUT_SCREEN_HEIGHT:        return fgDisplay.ScreenHeight  ;
-    case GLUT_SCREEN_WIDTH_MM:      return fgDisplay.ScreenWidthMM ;
-    case GLUT_SCREEN_HEIGHT_MM:     return fgDisplay.ScreenHeightMM;
-    case GLUT_INIT_WINDOW_X:        return fgState.Position.Use ?
-                                           fgState.Position.X : -1 ;
-    case GLUT_INIT_WINDOW_Y:        return fgState.Position.Use ?
-                                           fgState.Position.Y : -1 ;
-    case GLUT_INIT_WINDOW_WIDTH:    return fgState.Size.Use ?
-                                           fgState.Size.X : -1     ;
-    case GLUT_INIT_WINDOW_HEIGHT:   return fgState.Size.Use ?
-                                           fgState.Size.Y : -1     ;
-    case GLUT_INIT_DISPLAY_MODE:    return fgState.DisplayMode     ;
-    case GLUT_INIT_MAJOR_VERSION:   return fgState.MajorVersion    ;
-    case GLUT_INIT_MINOR_VERSION:   return fgState.MinorVersion    ;
-    case GLUT_INIT_FLAGS:           return fgState.ContextFlags    ;
-    case GLUT_INIT_PROFILE:         return fgState.ContextProfile  ;
-
-#if TARGET_HOST_POSIX_X11
     /*
      * The window/context specific queries are handled mostly by
      * fghGetConfig().
@@ -332,185 +218,117 @@
 
         return fghGetConfig( GLX_VISUAL_ID );
 
-#elif TARGET_HOST_MS_WINDOWS
-
-    case GLUT_WINDOW_NUM_SAMPLES:
-      glGetIntegerv(WGL_SAMPLES_ARB, &nsamples);
-      return nsamples;
-
-    /* Handle the OpenGL inquiries */
-    case GLUT_WINDOW_RGBA:
-#if defined(_WIN32_WCE)
-      boolValue = (GLboolean)0;  /* WinCE doesn't support this feature */
-#else
-      glGetBooleanv ( GL_RGBA_MODE, &boolValue );
-      returnValue = boolValue ? 1 : 0;
+    default:
+        fgWarning( "glutGet(): missing enum handle %d", eWhat );
+        break;
+    }
+}
 #endif
-      return returnValue;
-    case GLUT_WINDOW_DOUBLEBUFFER:
-#if defined(_WIN32_WCE)
-      boolValue = (GLboolean)0;  /* WinCE doesn't support this feature */
-#else
-      glGetBooleanv ( GL_DOUBLEBUFFER, &boolValue );
-      returnValue = boolValue ? 1 : 0;
-#endif
-      return returnValue;
-    case GLUT_WINDOW_STEREO:
-#if defined(_WIN32_WCE)
-      boolValue = (GLboolean)0;  /* WinCE doesn't support this feature */
-#else
-      glGetBooleanv ( GL_STEREO, &boolValue );
-      returnValue = boolValue ? 1 : 0;
-#endif
-      return returnValue;
 
-    case GLUT_WINDOW_RED_SIZE:
-      glGetIntegerv ( GL_RED_BITS, &returnValue );
-      return returnValue;
-    case GLUT_WINDOW_GREEN_SIZE:
-      glGetIntegerv ( GL_GREEN_BITS, &returnValue );
-      return returnValue;
-    case GLUT_WINDOW_BLUE_SIZE:
-      glGetIntegerv ( GL_BLUE_BITS, &returnValue );
-      return returnValue;
-    case GLUT_WINDOW_ALPHA_SIZE:
-      glGetIntegerv ( GL_ALPHA_BITS, &returnValue );
-      return returnValue;
-    case GLUT_WINDOW_ACCUM_RED_SIZE:
-#if defined(_WIN32_WCE)
-      returnValue = 0;  /* WinCE doesn't support this feature */
-#else
-      glGetIntegerv ( GL_ACCUM_RED_BITS, &returnValue );
-#endif
-      return returnValue;
-    case GLUT_WINDOW_ACCUM_GREEN_SIZE:
-#if defined(_WIN32_WCE)
-      returnValue = 0;  /* WinCE doesn't support this feature */
-#else
-      glGetIntegerv ( GL_ACCUM_GREEN_BITS, &returnValue );
-#endif
-      return returnValue;
-    case GLUT_WINDOW_ACCUM_BLUE_SIZE:
-#if defined(_WIN32_WCE)
-      returnValue = 0;  /* WinCE doesn't support this feature */
-#else
-      glGetIntegerv ( GL_ACCUM_BLUE_BITS, &returnValue );
-#endif
-      return returnValue;
-    case GLUT_WINDOW_ACCUM_ALPHA_SIZE:
-#if defined(_WIN32_WCE)
-      returnValue = 0;  /* WinCE doesn't support this feature */
-#else
-      glGetIntegerv ( GL_ACCUM_ALPHA_BITS, &returnValue );
-#endif
-      return returnValue;
-    case GLUT_WINDOW_DEPTH_SIZE:
-      glGetIntegerv ( GL_DEPTH_BITS, &returnValue );
-      return returnValue;
+/* -- INTERFACE FUNCTIONS -------------------------------------------------- */
 
-    case GLUT_WINDOW_BUFFER_SIZE:
-      returnValue = 1 ;                                      /* ????? */
-      return returnValue;
-    case GLUT_WINDOW_STENCIL_SIZE:
-      returnValue = 0 ;                                      /* ????? */
-      return returnValue;
+/*
+ * General settings assignment method
+ */
+void FGAPIENTRY glutSetOption( GLenum eWhat, int value )
+{
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetOption" );
 
-    case GLUT_WINDOW_X:
-    case GLUT_WINDOW_Y:
-    case GLUT_WINDOW_WIDTH:
-    case GLUT_WINDOW_HEIGHT:
+    /*
+     * XXX In chronological code add order.  (WHY in that order?)
+     */
+    switch( eWhat )
     {
-        /*
-         *  There is considerable confusion about the "right thing to
-         *  do" concerning window  size and position.  GLUT itself is
-         *  not consistent between Windows and UNIX/X11; since
-         *  platform independence is a virtue for "freeglut", we
-         *  decided to break with GLUT's behaviour.
-         *
-         *  Under UNIX/X11, it is apparently not possible to get the
-         *  window border sizes in order to subtract them off the
-         *  window's initial position until some time after the window
-         *  has been created.  Therefore we decided on the following
-         *  behaviour, both under Windows and under UNIX/X11:
-         *  - When you create a window with position (x,y) and size
-         *    (w,h), the upper left hand corner of the outside of the
-         *    window is at (x,y) and the size of the drawable area  is
-         *    (w,h).
-         *  - When you query the size and position of the window--as
-         *    is happening here for Windows--"freeglut" will return
-         *    the size of the drawable area--the (w,h) that you
-         *    specified when you created the window--and the coordinates
-         *    of the upper left hand corner of the drawable
-         *    area--which is NOT the (x,y) you specified.
-         */
+    case GLUT_INIT_WINDOW_X:
+        fgState.Position.X = (GLint)value;
+        break;
 
-        RECT winRect;
+    case GLUT_INIT_WINDOW_Y:
+        fgState.Position.Y = (GLint)value;
+        break;
 
-        freeglut_return_val_if_fail( fgStructure.CurrentWindow != NULL, 0 );
+    case GLUT_INIT_WINDOW_WIDTH:
+        fgState.Size.X = (GLint)value;
+        break;
 
-#if defined(_WIN32_WCE)
-        GetWindowRect( fgStructure.CurrentWindow->Window.Handle, &winRect );
-#else
-        winRect = fghGetClientArea(fgStructure.CurrentWindow, FALSE);
-#endif /* defined(_WIN32_WCE) */
+    case GLUT_INIT_WINDOW_HEIGHT:
+        fgState.Size.Y = (GLint)value;
+        break;
 
-        switch( eWhat )
-        {
-        case GLUT_WINDOW_X:      return winRect.left                ;
-        case GLUT_WINDOW_Y:      return winRect.top                 ;
-        case GLUT_WINDOW_WIDTH:  return winRect.right - winRect.left;
-        case GLUT_WINDOW_HEIGHT: return winRect.bottom - winRect.top;
-        }
-    }
-    break;
+    case GLUT_INIT_DISPLAY_MODE:
+        fgState.DisplayMode = (unsigned int)value;
+        break;
 
-    case GLUT_WINDOW_BORDER_WIDTH :
-    case GLUT_WINDOW_HEADER_HEIGHT :
-#if defined(_WIN32_WCE)
-        return 0;
-#else
-        {
-            DWORD windowStyle;
+    case GLUT_ACTION_ON_WINDOW_CLOSE:
+        fgState.ActionOnWindowClose = value;
+        break;
 
-            if (fgStructure.CurrentWindow && fgStructure.CurrentWindow->Window.Handle)
-                windowStyle = GetWindowLong(fgStructure.CurrentWindow->Window.Handle, GWL_STYLE);
-            else
-                /* If no window, return sizes for a default window with title bar and border */
-                windowStyle = WS_OVERLAPPEDWINDOW;
-            
-            switch( eWhat )
-            {
-            case GLUT_WINDOW_BORDER_WIDTH:
-                {
-                    int xBorderWidth, yBorderWidth;
-                    fghGetBorderWidth(windowStyle, &xBorderWidth, &yBorderWidth);
-                    return xBorderWidth;
-                }
-            case GLUT_WINDOW_HEADER_HEIGHT:
-                /* Need to query for WS_MAXIMIZEBOX to see if we have a title bar, the WS_CAPTION query is also true for a WS_DLGFRAME only... */
-                return (windowStyle & WS_MAXIMIZEBOX)? GetSystemMetrics( SM_CYCAPTION ) : 0;
-            }
-        }
-#endif /* defined(_WIN32_WCE) */
+    case GLUT_RENDERING_CONTEXT:
+        fgState.UseCurrentContext =
+            ( value == GLUT_USE_CURRENT_CONTEXT ) ? GL_TRUE : GL_FALSE;
+        break;
 
-    case GLUT_DISPLAY_MODE_POSSIBLE:
-#if defined(_WIN32_WCE)
-        return 0;
-#else
-        return fgSetupPixelFormat( fgStructure.CurrentWindow, GL_TRUE,
-                                    PFD_MAIN_PLANE );
-#endif /* defined(_WIN32_WCE) */
+    case GLUT_DIRECT_RENDERING:
+        fgState.DirectContext = value;
+        break;
 
-
-    case GLUT_WINDOW_FORMAT_ID:
-#if !defined(_WIN32_WCE)
+    case GLUT_WINDOW_CURSOR:
         if( fgStructure.CurrentWindow != NULL )
-            return GetPixelFormat( fgStructure.CurrentWindow->Window.Device );
-#endif /* defined(_WIN32_WCE) */
-        return 0;
+            fgStructure.CurrentWindow->State.Cursor = value;
+        break;
 
-#endif
+    case GLUT_AUX:
+      fgState.AuxiliaryBufferNumber = value;
+      break;
 
+    case GLUT_MULTISAMPLE:
+      fgState.SampleNumber = value;
+      break;
+
+    default:
+        fgWarning( "glutSetOption(): missing enum handle %d", eWhat );
+        break;
+    }
+}
+
+/*
+ * General settings query method
+ */
+int FGAPIENTRY glutGet( GLenum eWhat )
+{
+    switch (eWhat)
+    {
+    case GLUT_INIT_STATE:
+        return fgState.Initialised;
+
+    case GLUT_ELAPSED_TIME:
+        return fgElapsedTime();
+    }
+
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGet" );
+
+    /* XXX In chronological code add order.  (WHY in that order?) */
+    switch( eWhat )
+    {
+    /* Following values are stored in fgState and fgDisplay global structures */
+    case GLUT_SCREEN_WIDTH:         return fgDisplay.ScreenWidth   ;
+    case GLUT_SCREEN_HEIGHT:        return fgDisplay.ScreenHeight  ;
+    case GLUT_SCREEN_WIDTH_MM:      return fgDisplay.ScreenWidthMM ;
+    case GLUT_SCREEN_HEIGHT_MM:     return fgDisplay.ScreenHeightMM;
+    case GLUT_INIT_WINDOW_X:        return fgState.Position.Use ?
+                                           fgState.Position.X : -1 ;
+    case GLUT_INIT_WINDOW_Y:        return fgState.Position.Use ?
+                                           fgState.Position.Y : -1 ;
+    case GLUT_INIT_WINDOW_WIDTH:    return fgState.Size.Use ?
+                                           fgState.Size.X : -1     ;
+    case GLUT_INIT_WINDOW_HEIGHT:   return fgState.Size.Use ?
+                                           fgState.Size.Y : -1     ;
+    case GLUT_INIT_DISPLAY_MODE:    return fgState.DisplayMode     ;
+    case GLUT_INIT_MAJOR_VERSION:   return fgState.MajorVersion    ;
+    case GLUT_INIT_MINOR_VERSION:   return fgState.MinorVersion    ;
+    case GLUT_INIT_FLAGS:           return fgState.ContextFlags    ;
+    case GLUT_INIT_PROFILE:         return fgState.ContextProfile  ;
+
     /* The window structure queries */
     case GLUT_WINDOW_PARENT:
         if( fgStructure.CurrentWindow         == NULL ) return 0;
@@ -555,7 +373,7 @@
       return fgState.SampleNumber;
 
     default:
-        fgWarning( "glutGet(): missing enum handle %d", eWhat );
+        return fgPlatformGlutGet ( eWhat );
         break;
     }
     return -1;

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c	2012-01-23 02:46:16 UTC (rev 996)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c	2012-01-23 04:06:48 UTC (rev 997)
@@ -0,0 +1,231 @@
+/*
+ * freeglut_state_mswin.c
+ *
+ * The Windows-specific mouse cursor related stuff.
+ *
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
+ * Written by John F. Fay, <fayjf@...>
+ * Creation date: Sun Jan 22, 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "freeglut_internal_mswin.h"
+
+
+
+/* The following include file is available from SGI but is not standard:
+ *   #include <GL/wglext.h>
+ * So we copy the necessary parts out of it to support the multisampling query
+ */
+#define WGL_SAMPLES_ARB                0x2042
+
+
+
+int fgPlatformGlutGet ( GLenum eWhat )
+{
+    int returnValue ;
+    GLboolean boolValue ;
+
+    int nsamples = 0;
+
+    switch( eWhat )
+    {
+    case GLUT_WINDOW_NUM_SAMPLES:
+      glGetIntegerv(WGL_SAMPLES_ARB, &nsamples);
+      return nsamples;
+
+    /* Handle the OpenGL inquiries */
+    case GLUT_WINDOW_RGBA:
+#if defined(_WIN32_WCE)
+      boolValue = (GLboolean)0;  /* WinCE doesn't support this feature */
+#else
+      glGetBooleanv ( GL_RGBA_MODE, &boolValue );
+      returnValue = boolValue ? 1 : 0;
+#endif
+      return returnValue;
+    case GLUT_WINDOW_DOUBLEBUFFER:
+#if defined(_WIN32_WCE)
+      boolValue = (GLboolean)0;  /* WinCE doesn't support this feature */
+#else
+      glGetBooleanv ( GL_DOUBLEBUFFER, &boolValue );
+      returnValue = boolValue ? 1 : 0;
+#endif
+      return returnValue;
+    case GLUT_WINDOW_STEREO:
+#if defined(_WIN32_WCE)
+      boolValue = (GLboolean)0;  /* WinCE doesn't support this feature */
+#else
+      glGetBooleanv ( GL_STEREO, &boolValue );
+      returnValue = boolValue ? 1 : 0;
+#endif
+      return returnValue;
+
+    case GLUT_WINDOW_RED_SIZE:
+      glGetIntegerv ( GL_RED_BITS, &returnValue );
+      return returnValue;
+    case GLUT_WINDOW_GREEN_SIZE:
+      glGetIntegerv ( GL_GREEN_BITS, &returnValue );
+      return returnValue;
+    case GLUT_WINDOW_BLUE_SIZE:
+      glGetIntegerv ( GL_BLUE_BITS, &returnValue );
+      return returnValue;
+    case GLUT_WINDOW_ALPHA_SIZE:
+      glGetIntegerv ( GL_ALPHA_BITS, &returnValue );
+      return returnValue;
+    case GLUT_WINDOW_ACCUM_RED_SIZE:
+#if defined(_WIN32_WCE)
+      returnValue = 0;  /* WinCE doesn't support this feature */
+#else
+      glGetIntegerv ( GL_ACCUM_RED_BITS, &returnValue );
+#endif
+      return returnValue;
+    case GLUT_WINDOW_ACCUM_GREEN_SIZE:
+#if defined(_WIN32_WCE)
+      returnValue = 0;  /* WinCE doesn't support this feature */
+#else
+      glGetIntegerv ( GL_ACCUM_GREEN_BITS, &returnValue );
+#endif
+      return returnValue;
+    case GLUT_WINDOW_ACCUM_BLUE_SIZE:
+#if defined(_WIN32_WCE)
+      returnValue = 0;  /* WinCE doesn't support this feature */
+#else
+      glGetIntegerv ( GL_ACCUM_BLUE_BITS, &returnValue );
+#endif
+      return returnValue;
+    case GLUT_WINDOW_ACCUM_ALPHA_SIZE:
+#if defined(_WIN32_WCE)
+      returnValue = 0;  /* WinCE doesn't support this feature */
+#else
+      glGetIntegerv ( GL_ACCUM_ALPHA_BITS, &returnValue );
+#endif
+      return returnValue;
+    case GLUT_WINDOW_DEPTH_SIZE:
+      glGetIntegerv ( GL_DEPTH_BITS, &returnValue );
+      return returnValue;
+
+    case GLUT_WINDOW_BUFFER_SIZE:
+      returnValue = 1 ;                                      /* ????? */
+      return returnValue;
+    case GLUT_WINDOW_STENCIL_SIZE:
+      returnValue = 0 ;                                      /* ????? */
+      return returnValue;
+
+    case GLUT_WINDOW_X:
+    case GLUT_WINDOW_Y:
+    case GLUT_WINDOW_WIDTH:
+    case GLUT_WINDOW_HEIGHT:
+    {
+        /*
+         *  There is considerable confusion about the "right thing to
+         *  do" concerning window  size and position.  GLUT itself is
+         *  not consistent between Windows and UNIX/X11; since
+         *  platform independence is a virtue for "freeglut", we
+         *  decided to break with GLUT's behaviour.
+         *
+         *  Under UNIX/X11, it is apparently not possible to get the
+         *  window border sizes in order to subtract them off the
+         *  window's initial position until some time after the window
+         *  has been created.  Therefore we decided on the following
+         *  behaviour, both under Windows and under UNIX/X11:
+         *  - When you create a window with position (x,y) and size
+         *    (w,h), the upper left hand corner of the outside of the
+         *    window is at (x,y) and the size of the drawable area  is
+         *    (w,h).
+         *  - When you query the size and position of the window--as
+         *    is happening here for Windows--"freeglut" will return
+         *    the size of the drawable area--the (w,h) that you
+         *    specified when you created the window--and the coordinates
+         *    of the upper left hand corner of the drawable
+         *    area--which is NOT the (x,y) you specified.
+         */
+
+        RECT winRect;
+
+        freeglut_return_val_if_fail( fgStructure.CurrentWindow != NULL, 0 );
+
+#if defined(_WIN32_WCE)
+        GetWindowRect( fgStructure.CurrentWindow->Window.Handle, &winRect );
+#else
+        winRect = fghGetClientArea(fgStructure.CurrentWindow, FALSE);
+#endif /* defined(_WIN32_WCE) */
+
+        switch( eWhat )
+        {
+        case GLUT_WINDOW_X:      return winRect.left                ;
+        case GLUT_WINDOW_Y:      return winRect.top                 ;
+        case GLUT_WINDOW_WIDTH:  return winRect.right - winRect.left;
+        case GLUT_WINDOW_HEIGHT: return winRect.bottom - winRect.top;
+        }
+    }
+    break;
+
+    case GLUT_WINDOW_BORDER_WIDTH :
+    case GLUT_WINDOW_HEADER_HEIGHT :
+#if defined(_WIN32_WCE)
+        return 0;
+#else
+        {
+            DWORD windowStyle;
+
+            if (fgStructure.CurrentWindow && fgStructure.CurrentWindow->Window.Handle)
+                windowStyle = GetWindowLong(fgStructure.CurrentWindow->Window.Handle, GWL_STYLE);
+            else
+                /* If no window, return sizes for a default window with title bar and border */
+                windowStyle = WS_OVERLAPPEDWINDOW;
+            
+            switch( eWhat )
+            {
+            case GLUT_WINDOW_BORDER_WIDTH:
+                {
+                    int xBorderWidth, yBorderWidth;
+                    fghGetBorderWidth(windowStyle, &xBorderWidth, &yBorderWidth);
+                    return xBorderWidth;
+                }
+            case GLUT_WINDOW_HEADER_HEIGHT:
+                /* Need to query for WS_MAXIMIZEBOX to see if we have a title bar, the WS_CAPTION query is also true for a WS_DLGFRAME only... */
+                return (windowStyle & WS_MAXIMIZEBOX)? GetSystemMetrics( SM_CYCAPTION ) : 0;
+            }
+        }
+#endif /* defined(_WIN32_WCE) */
+
+    case GLUT_DISPLAY_MODE_POSSIBLE:
+#if defined(_WIN32_WCE)
+        return 0;
+#else
+        return fgSetupPixelFormat( fgStructure.CurrentWindow, GL_TRUE,
+                                    PFD_MAIN_PLANE );
+#endif /* defined(_WIN32_WCE) */
+
+
+    case GLUT_WINDOW_FORMAT_ID:
+#if !defined(_WIN32_WCE)
+        if( fgStructure.CurrentWindow != NULL )
+            return GetPixelFormat( fgStructure.CurrentWindow->Window.Device );
+#endif /* defined(_WIN32_WCE) */
+        return 0;
+
+    default:
+        fgWarning( "glutGet(): missing enum handle %d", eWhat );
+        break;
+    }
+
+	return -1;
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 998
          http://freeglut.svn.sourceforge.net/freeglut/?rev=998&view=rev
Author:   fayjf
Date:     2012-01-23 04:37:06 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
Splitting the other "glutGet" Windows-specific code into its own function

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_state.c
    trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_state.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_state.c	2012-01-23 04:06:48 UTC (rev 997)
+++ trunk/freeglut/freeglut/src/Common/freeglut_state.c	2012-01-23 04:37:06 UTC (rev 998)
@@ -42,6 +42,8 @@
  */
 
 extern int fgPlatformGlutGet ( GLenum eWhat );
+extern int fgPlatformGlutDeviceGet ( GLenum eWhat );
+extern int fgPlatformGlutLayerGet ( GLenum eWhat );
 
 /* -- LOCAL DEFINITIONS ---------------------------------------------------- */
 
@@ -223,6 +225,92 @@
         break;
     }
 }
+
+
+static int fgPlatformGlutDeviceGet ( GLenum eWhat )
+{
+    switch( eWhat )
+    {
+    case GLUT_HAS_KEYBOARD:
+        /*
+         * X11 has a core keyboard by definition, although it can
+         * be present as a virtual/dummy keyboard. For now, there
+         * is no reliable way to tell if a real keyboard is present.
+         */
+        return 1;
+
+    /* X11 has a mouse by definition */
+    case GLUT_HAS_MOUSE:
+        return 1 ;
+
+    case GLUT_NUM_MOUSE_BUTTONS:
+        /* We should be able to pass NULL when the last argument is zero,
+         * but at least one X server has a bug where this causes a segfault.
+         *
+         * In XFree86/Xorg servers, a mouse wheel is seen as two buttons
+         * rather than an Axis; "freeglut_main.c" expects this when
+         * checking for a wheel event.
+         */
+        {
+            unsigned char map;
+            int nbuttons = XGetPointerMapping(fgDisplay.Display, &map,0);
+            return nbuttons;
+        }
+
+    default:
+        fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat );
+        break;
+    }
+
+    /* And now -- the failure. */
+    return -1;
+}
+
+int fgPlatformGlutLayerGet( GLenum eWhat )
+{
+    /*
+     * This is easy as layers are not implemented ;-)
+     *
+     * XXX Can we merge the UNIX/X11 and WIN32 sections?  Or
+     * XXX is overlay support planned?
+     */
+    switch( eWhat )
+    {
+    case GLUT_OVERLAY_POSSIBLE:
+        return 0;
+
+    case GLUT_LAYER_IN_USE:
+        return GLUT_NORMAL;
+
+    case GLUT_HAS_OVERLAY:
+        return 0;
+
+    case GLUT_TRANSPARENT_INDEX:
+        /*
+         * Return just anything, which is always defined as zero
+         *
+         * XXX HUH?
+         */
+        return 0;
+
+    case GLUT_NORMAL_DAMAGED:
+        /* XXX Actually I do not know. Maybe. */
+        return 0;
+
+    case GLUT_OVERLAY_DAMAGED:
+        return -1;
+
+    default:
+        fgWarning( "glutLayerGet(): missing enum handle %d", eWhat );
+        break;
+    }
+
+    /* And fail. That's good. Programs do love failing. */
+    return -1;
+}
+
+
+
 #endif
 
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
@@ -389,61 +477,6 @@
     /* XXX WARNING: we are mostly lying in this function. */
     switch( eWhat )
     {
-    case GLUT_HAS_KEYBOARD:
-        /*
-         * Win32 is assumed a keyboard, and this cannot be queried,
-         * except for WindowsCE.
-         *
-         * X11 has a core keyboard by definition, although it can
-         * be present as a virtual/dummy keyboard. For now, there
-         * is no reliable way to tell if a real keyboard is present.
-         */
-#if defined(_WIN32_CE)
-        return ( GetKeyboardStatus() & KBDI_KEYBOARD_PRESENT ) ? 1 : 0;
-#   if FREEGLUT_LIB_PRAGMAS
-#       pragma comment (lib,"Kbdui.lib")
-#   endif
-
-#else
-        return 1;
-#endif
-
-#if TARGET_HOST_POSIX_X11
-
-    /* X11 has a mouse by definition */
-    case GLUT_HAS_MOUSE:
-        return 1 ;
-
-    case GLUT_NUM_MOUSE_BUTTONS:
-        /* We should be able to pass NULL when the last argument is zero,
-         * but at least one X server has a bug where this causes a segfault.
-         *
-         * In XFree86/Xorg servers, a mouse wheel is seen as two buttons
-         * rather than an Axis; "freeglut_main.c" expects this when
-         * checking for a wheel event.
-         */
-        {
-            unsigned char map;
-            int nbuttons = XGetPointerMapping(fgDisplay.Display, &map,0);
-            return nbuttons;
-        }
-
-#elif TARGET_HOST_MS_WINDOWS
-
-    case GLUT_HAS_MOUSE:
-        /*
-         * MS Windows can be booted without a mouse.
-         */
-        return GetSystemMetrics( SM_MOUSEPRESENT );
-
-    case GLUT_NUM_MOUSE_BUTTONS:
-#  if defined(_WIN32_WCE)
-        return 1;
-#  else
-        return GetSystemMetrics( SM_CMOUSEBUTTONS );
-#  endif
-#endif
-
     case GLUT_HAS_JOYSTICK:
         return fgJoystickDetect ();
 
@@ -489,8 +522,7 @@
         return fgState.KeyRepeat;
 
     default:
-        fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat );
-        break;
+		return fgPlatformGlutDeviceGet ( eWhat );
     }
 
     /* And now -- the failure. */
@@ -528,64 +560,8 @@
     switch( eWhat )
     {
 
-#if TARGET_HOST_POSIX_X11
-
-    case GLUT_OVERLAY_POSSIBLE:
-        return 0;
-
-    case GLUT_LAYER_IN_USE:
-        return GLUT_NORMAL;
-
-    case GLUT_HAS_OVERLAY:
-        return 0;
-
-    case GLUT_TRANSPARENT_INDEX:
-        /*
-         * Return just anything, which is always defined as zero
-         *
-         * XXX HUH?
-         */
-        return 0;
-
-    case GLUT_NORMAL_DAMAGED:
-        /* XXX Actually I do not know. Maybe. */
-        return 0;
-
-    case GLUT_OVERLAY_DAMAGED:
-        return -1;
-
-#elif TARGET_HOST_MS_WINDOWS
-
-    case GLUT_OVERLAY_POSSIBLE:
-/*      return fgSetupPixelFormat( fgStructure.CurrentWindow, GL_TRUE,
-                                   PFD_OVERLAY_PLANE ); */
-      return 0 ;
-
-    case GLUT_LAYER_IN_USE:
-        return GLUT_NORMAL;
-
-    case GLUT_HAS_OVERLAY:
-        return 0;
-
-    case GLUT_TRANSPARENT_INDEX:
-        /*
-         * Return just anything, which is always defined as zero
-         *
-         * XXX HUH?
-         */
-        return 0;
-
-    case GLUT_NORMAL_DAMAGED:
-        /* XXX Actually I do not know. Maybe. */
-        return 0;
-
-    case GLUT_OVERLAY_DAMAGED:
-        return -1;
-#endif
-
     default:
-        fgWarning( "glutLayerGet(): missing enum handle %d", eWhat );
-        break;
+        return fgPlatformGlutLayerGet( eWhat );
     }
 
     /* And fail. That's good. Programs do love failing. */

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c	2012-01-23 04:06:48 UTC (rev 997)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c	2012-01-23 04:37:06 UTC (rev 998)
@@ -229,3 +229,99 @@
 
 	return -1;
 }
+
+
+int fgPlatformGlutDeviceGet ( GLenum eWhat )
+{
+    switch( eWhat )
+    {
+    case GLUT_HAS_KEYBOARD:
+        /*
+         * Win32 is assumed a keyboard, and this cannot be queried,
+         * except for WindowsCE.
+         *
+         * X11 has a core keyboard by definition, although it can
+         * be present as a virtual/dummy keyboard. For now, there
+         * is no reliable way to tell if a real keyboard is present.
+         */
+#if defined(_WIN32_CE)
+        return ( GetKeyboardStatus() & KBDI_KEYBOARD_PRESENT ) ? 1 : 0;
+#   if FREEGLUT_LIB_PRAGMAS
+#       pragma comment (lib,"Kbdui.lib")
+#   endif
+
+#else
+        return 1;
+#endif
+
+    case GLUT_HAS_MOUSE:
+        /*
+         * MS Windows can be booted without a mouse.
+         */
+        return GetSystemMetrics( SM_MOUSEPRESENT );
+
+    case GLUT_NUM_MOUSE_BUTTONS:
+#  if defined(_WIN32_WCE)
+        return 1;
+#  else
+        return GetSystemMetrics( SM_CMOUSEBUTTONS );
+#  endif
+
+    default:
+        fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat );
+        break;
+    }
+
+    /* And now -- the failure. */
+    return -1;
+}
+
+
+int fgPlatformGlutLayerGet( GLenum eWhat )
+{
+    /*
+     * This is easy as layers are not implemented ;-)
+     *
+     * XXX Can we merge the UNIX/X11 and WIN32 sections?  Or
+     * XXX is overlay support planned?
+     */
+    switch( eWhat )
+    {
+
+    case GLUT_OVERLAY_POSSIBLE:
+/*      return fgSetupPixelFormat( fgStructure.CurrentWindow, GL_TRUE,
+                                   PFD_OVERLAY_PLANE ); */
+      return 0 ;
+
+    case GLUT_LAYER_IN_USE:
+        return GLUT_NORMAL;
+
+    case GLUT_HAS_OVERLAY:
+        return 0;
+
+    case GLUT_TRANSPARENT_INDEX:
+        /*
+         * Return just anything, which is always defined as zero
+         *
+         * XXX HUH?
+         */
+        return 0;
+
+    case GLUT_NORMAL_DAMAGED:
+        /* XXX Actually I do not know. Maybe. */
+        return 0;
+
+    case GLUT_OVERLAY_DAMAGED:
+        return -1;
+
+    default:
+        fgWarning( "glutLayerGet(): missing enum handle %d", eWhat );
+        break;
+    }
+
+    /* And fail. That's good. Programs do love failing. */
+    return -1;
+}
+
+
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 999
          http://freeglut.svn.sourceforge.net/freeglut/?rev=999&view=rev
Author:   fayjf
Date:     2012-01-23 04:42:31 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
Splitting Windows-specific "freeglut_structure.c" code into its own file (there isn't any)

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_structure.c
    trunk/freeglut/freeglut/src/mswin/freeglut_structure_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_structure.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_structure.c	2012-01-23 04:37:06 UTC (rev 998)
+++ trunk/freeglut/freeglut/src/Common/freeglut_structure.c	2012-01-23 04:42:31 UTC (rev 999)
@@ -48,6 +48,8 @@
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
+extern void fgPlatformCreateWindow ( SFG_Window *window );
+
 static void fghClearCallBacks( SFG_Window *window )
 {
     if( window )
@@ -58,6 +60,15 @@
     }
 }
 
+#if TARGET_HOST_POSIX_X11
+void fgPlatformCreateWindow ( SFG_Window *window )
+{
+    window->Window.FBConfig = NULL;
+
+    window->State.OldHeight = window->State.OldWidth = -1;
+}
+#endif
+
 /*
  * This private function creates, opens and adds to the hierarchy
  * a freeglut window complete with OpenGL context and stuff...
@@ -72,16 +83,12 @@
     /* Have the window object created */
     SFG_Window *window = (SFG_Window *)calloc( sizeof(SFG_Window), 1 );
 
-#if TARGET_HOST_UNIX_X11
-    window->Window.FBConfig = NULL;
-#endif
+	fgPlatformCreateWindow ( window );
+
     fghClearCallBacks( window );
 
     /* Initialize the object properties */
     window->ID = ++fgStructure.WindowID;
-#if TARGET_HOST_POSIX_X11
-    window->State.OldHeight = window->State.OldWidth = -1;
-#endif
 
     fgListInit( &window->Children );
     if( parent )

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_structure_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_structure_mswin.c	2012-01-23 04:37:06 UTC (rev 998)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_structure_mswin.c	2012-01-23 04:42:31 UTC (rev 999)
@@ -0,0 +1,34 @@
+/*
+ * freeglut_structure_mswin.c
+ *
+ * The Windows-specific mouse cursor related stuff.
+ *
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
+ * Written by John F. Fay, <fayjf@...>
+ * Creation date: Sun Jan 22, 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "freeglut_internal_mswin.h"
+
+
+void fgPlatformCreateWindow ( SFG_Window *window )
+{
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1000
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1000&view=rev
Author:   fayjf
Date:     2012-01-23 05:01:37 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
Rationalizing the names of the platform-specific functions so that they begin with "fgPlatform"

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_cursor.c
    trunk/freeglut/freeglut/src/Common/freeglut_ext.c
    trunk/freeglut/freeglut/src/Common/freeglut_gamemode.c
    trunk/freeglut/freeglut/src/Common/freeglut_init.c
    trunk/freeglut/freeglut/src/Common/freeglut_input_devices.c
    trunk/freeglut/freeglut/src/Common/freeglut_internal.h
    trunk/freeglut/freeglut/src/Common/freeglut_main.c
    trunk/freeglut/freeglut/src/Common/freeglut_menu.c
    trunk/freeglut/freeglut/src/Common/freeglut_xinput.c
    trunk/freeglut/freeglut/src/mswin/freeglut_cursor_mswin.c
    trunk/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c
    trunk/freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c
    trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c
    trunk/freeglut/freeglut/src/mswin/freeglut_input_devices_mswin.c
    trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c
    trunk/freeglut/freeglut/src/mswin/freeglut_menu_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_cursor.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_cursor.c	2012-01-23 04:42:31 UTC (rev 999)
+++ trunk/freeglut/freeglut/src/Common/freeglut_cursor.c	2012-01-23 05:01:37 UTC (rev 1000)
@@ -39,8 +39,8 @@
 
 /* -- PRIVATE FUNCTIONS --------------------------------------------------- */
 
-extern void fghSetCursor ( SFG_Window *window, int cursorID );
-extern void fghWarpPointer ( int x, int y );
+extern void fgPlatformSetCursor ( SFG_Window *window, int cursorID );
+extern void fgPlatformWarpPointer ( int x, int y );
 
 #if TARGET_HOST_POSIX_X11 || TARGET_HOST_MAC_OSX || TARGET_HOST_SOLARIS
   #include <X11/cursorfont.h>
@@ -104,7 +104,7 @@
     { XC_bottom_left_corner,  None }  /* GLUT_CURSOR_BOTTOM_LEFT_CORNER */
 };
 
-static void fghSetCursor ( SFG_Window *window, int cursorID )
+static void fgPlatformSetCursor ( SFG_Window *window, int cursorID )
 {
     Cursor cursor;
     /*
@@ -150,7 +150,7 @@
 }
 
 
-static void fghWarpPointer ( int x, int y )
+static void fgPlatformWarpPointer ( int x, int y )
 {
     XWarpPointer(
         fgDisplay.Display,
@@ -168,7 +168,7 @@
 /* -- INTERNAL FUNCTIONS ---------------------------------------------------- */
 void fgSetCursor ( SFG_Window *window, int cursorID )
 {
-    fghSetCursor ( window, cursorID );
+    fgPlatformSetCursor ( window, cursorID );
 }
 
 
@@ -182,7 +182,7 @@
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetCursor" );
     FREEGLUT_EXIT_IF_NO_WINDOW ( "glutSetCursor" );
 
-    fghSetCursor ( fgStructure.CurrentWindow, cursorID );
+    fgPlatformSetCursor ( fgStructure.CurrentWindow, cursorID );
     fgStructure.CurrentWindow->State.Cursor = cursorID;
 }
 
@@ -194,7 +194,7 @@
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWarpPointer" );
     FREEGLUT_EXIT_IF_NO_WINDOW ( "glutWarpPointer" );
 
-    fghWarpPointer ( x, y );
+    fgPlatformWarpPointer ( x, y );
 }
 
 /*** END OF FILE ***/

Modified: trunk/freeglut/freeglut/src/Common/freeglut_ext.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_ext.c	2012-01-23 04:42:31 UTC (rev 999)
+++ trunk/freeglut/freeglut/src/Common/freeglut_ext.c	2012-01-23 05:01:37 UTC (rev 1000)
@@ -30,7 +30,7 @@
 #include "freeglut_internal.h"
 
 extern SFG_Proc fghGetProcAddress( const char *procName );
-extern GLUTproc fghGetPlatformSpecificGLUTProcAddress( const char *procName );
+extern GLUTproc fgPlatformGlutGetProcAddress( const char *procName );
 
 static GLUTproc fghGetGLUTProcAddress( const char* procName )
 {
@@ -223,6 +223,12 @@
 }
 
 
+static GLUTproc fgPlatformGlutGetProcAddress( const char* procName )
+{
+    return NULL;
+}
+
+
 SFG_Proc fghGetProcAddress( const char *procName )
 {
 #if defined( GLX_ARB_get_proc_address )
@@ -245,7 +251,7 @@
 
 	/* Some GLUT functions are platform-specific: */
 	if ( !p )
-      p = fghGetPlatformSpecificGLUTProcAddress( procName );
+      p = fgPlatformGlutGetProcAddress( procName );
 
     return ( p != NULL ) ? p : fghGetProcAddress( procName );
 }

Modified: trunk/freeglut/freeglut/src/Common/freeglut_gamemode.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_gamemode.c	2012-01-23 04:42:31 UTC (rev 999)
+++ trunk/freeglut/freeglut/src/Common/freeglut_gamemode.c	2012-01-23 05:01:37 UTC (rev 1000)
@@ -39,9 +39,9 @@
 
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
-extern void fghRememberState( void );
-extern void fghRestoreState( void );
-extern GLboolean fghChangeDisplayMode( GLboolean haveToTest );
+extern void fgPlatformRememberState( void );
+extern void fgPlatformRestoreState( void );
+extern GLboolean fgPlatformChangeDisplayMode( GLboolean haveToTest );
 
 
 #if TARGET_HOST_POSIX_X11
@@ -163,7 +163,7 @@
  * Remembers the current visual settings, so that
  * we can change them and restore later...
  */
-static void fghRememberState( void )
+static void fgPlatformRememberState( void )
 {
     int event_base, error_base;
 
@@ -248,7 +248,7 @@
 /*
  * Restores the previously remembered visual settings
  */
-static void fghRestoreState( void )
+static void fgPlatformRestoreState( void )
 {
     /* Restore the remembered pointer position: */
     XWarpPointer(
@@ -398,7 +398,7 @@
 /*
  * Changes the current display mode to match user's settings
  */
-static GLboolean fghChangeDisplayMode( GLboolean haveToTest )
+static GLboolean fgPlatformChangeDisplayMode( GLboolean haveToTest )
 {
     GLboolean success = GL_FALSE;
     /* first try to use XRandR, then fallback to XF86VidMode */
@@ -532,7 +532,7 @@
 
     /* All values not specified are now set to -1, which means those
      * aspects of the current display mode are not changed in
-     * fghChangeDisplayMode() above.
+     * fgPlatformChangeDisplayMode() above.
      */
     fgState.GameModeSize.X  = width;
     fgState.GameModeSize.Y  = height;
@@ -552,9 +552,9 @@
     if( fgStructure.GameModeWindow )
         fgAddToWindowDestroyList( fgStructure.GameModeWindow );
     else
-        fghRememberState( );
+        fgPlatformRememberState( );
 
-    if( ! fghChangeDisplayMode( GL_FALSE ) )
+    if( ! fgPlatformChangeDisplayMode( GL_FALSE ) )
     {
         fgWarning( "failed to change screen settings" );
         return 0;
@@ -680,7 +680,7 @@
 
 #endif
 
-    fghRestoreState();
+    fgPlatformRestoreState();
 }
 
 /*
@@ -696,7 +696,7 @@
         return !!fgStructure.GameModeWindow;
 
     case GLUT_GAME_MODE_POSSIBLE:
-        return fghChangeDisplayMode( GL_TRUE );
+        return fgPlatformChangeDisplayMode( GL_TRUE );
 
     case GLUT_GAME_MODE_WIDTH:
         return fgState.GameModeSize.X;

Modified: trunk/freeglut/freeglut/src/Common/freeglut_init.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-01-23 04:42:31 UTC (rev 999)
+++ trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-01-23 05:01:37 UTC (rev 1000)
@@ -100,9 +100,9 @@
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
-extern void fghInitialize( const char* displayName );
-extern void fghDeinitialiseInputDevices ( void );
-extern void fghCloseDisplay ( void );
+extern void fgPlatformInitialize( const char* displayName );
+extern void fgPlatformDeinitialiseInputDevices ( void );
+extern void fgPlatformCloseDisplay ( void );
 
 #if TARGET_HOST_POSIX_X11
 
@@ -246,7 +246,7 @@
 /*
  * A call to this function should initialize all the display stuff...
  */
-static void fghInitialize( const char* displayName )
+static void fgPlatformInitialize( const char* displayName )
 {
     fgDisplay.Display = XOpenDisplay( displayName );
 
@@ -437,7 +437,7 @@
 
 
 #if TARGET_HOST_POSIX_X11
-static void fghDeinitialiseInputDevices ( void )
+static void fgPlatformDeinitialiseInputDevices ( void )
 {
 	fghCloseInputDevices ();
 
@@ -446,7 +446,7 @@
 }
 
 
-static void fghCloseDisplay ( void )
+static void fgPlatformCloseDisplay ( void )
 {
     /*
      * Make sure all X-client data we have created will be destroyed on
@@ -506,7 +506,7 @@
         free( timer );
     }
 
-	fghDeinitialiseInputDevices ();
+	fgPlatformDeinitialiseInputDevices ();
 
 	fgState.MouseWheelTicks = 0;
 
@@ -560,7 +560,7 @@
         fgState.ProgramName = NULL;
     }
 
-	fghCloseDisplay ();
+	fgPlatformCloseDisplay ();
 
     fgState.Initialised = GL_FALSE;
 }
@@ -617,7 +617,7 @@
      * in the program arguments, we will use the DISPLAY environment
      * variable for opening the X display (see code above):
      */
-    fghInitialize( displayName );
+    fgPlatformInitialize( displayName );
 
     /*
      * Geometry parsing deffered until here because we may need the screen

Modified: trunk/freeglut/freeglut/src/Common/freeglut_input_devices.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_input_devices.c	2012-01-23 04:42:31 UTC (rev 999)
+++ trunk/freeglut/freeglut/src/Common/freeglut_input_devices.c	2012-01-23 05:01:37 UTC (rev 1000)
@@ -99,7 +99,7 @@
 extern int serial_putchar ( SERIALPORT *port, unsigned char ch );
 extern void serial_flush ( SERIALPORT *port );
 
-extern void fghRegisterDialDevice ( const char *dial_device );
+extern void fgPlatformRegisterDialDevice ( const char *dial_device );
 static void send_dial_event(int dial, int value);
 static void poll_dials(int id);
 
@@ -128,7 +128,7 @@
  * Try initializing the input device(s)
  */
 #if TARGET_HOST_POSIX_X11
-static void fghRegisterDialDevice ( const char *dial_device )
+static void fgPlatformRegisterDialDevice ( const char *dial_device )
 {
 }
 #endif
@@ -139,7 +139,7 @@
     {
         const char *dial_device=NULL;
         dial_device = getenv ( "GLUT_DIALS_SERIAL" );
-		fghRegisterDialDevice ( dial_device );
+		fgPlatformRegisterDialDevice ( dial_device );
 
         if ( !dial_device ) return;
         if ( !( dialbox_port = serial_open ( dial_device ) ) ) return;

Modified: trunk/freeglut/freeglut/src/Common/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-23 04:42:31 UTC (rev 999)
+++ trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-23 05:01:37 UTC (rev 1000)
@@ -859,7 +859,7 @@
 
 /* The window procedure for Win32 events handling */
 #if TARGET_HOST_MS_WINDOWS
-LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg,
+LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg,
                                WPARAM wParam, LPARAM lParam );
 void fgNewWGLCreateContext( SFG_Window* window );
 GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,

Modified: trunk/freeglut/freeglut/src/Common/freeglut_main.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_main.c	2012-01-23 04:42:31 UTC (rev 999)
+++ trunk/freeglut/freeglut/src/Common/freeglut_main.c	2012-01-23 05:01:37 UTC (rev 1000)
@@ -77,11 +77,11 @@
 	static pCloseTouchInputHandle fghCloseTouchInputHandle = (pCloseTouchInputHandle)0xDEADBEEF;
 #endif
 
-extern void fghPlatformReshapeWindow ( SFG_Window *window, int width, int height );
-extern void fghcbPlatformDisplayWindow ( SFG_Window *window );
-extern void fghPlatformSleepForEvents( long msec );
-extern void fghProcessSingleEvent ( void );
-extern void fghMainLoopPreliminaryWork ( void );
+extern void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height );
+extern void fgPlatformDisplayWindow ( SFG_Window *window );
+extern void fgPlatformSleepForEvents( long msec );
+extern void fgPlatformProcessSingleEvent ( void );
+extern void fgPlatformMainLoopPreliminaryWork ( void );
 
 
 /*
@@ -103,7 +103,7 @@
  * match the new window size.
  */
 #if TARGET_HOST_POSIX_X11
-static void fghPlatformReshapeWindow ( SFG_Window *window, int width, int height )
+static void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )
 {
     XResizeWindow( fgDisplay.Display, window->Window.Handle,
                    width, height );
@@ -117,7 +117,7 @@
 
     freeglut_return_if_fail( window != NULL );
 
-	fghPlatformReshapeWindow ( window, width, height );
+	fgPlatformReshapeWindow ( window, width, height );
 
     if( FETCH_WCB( *window, Reshape ) )
         INVOKE_WCB( *window, Reshape, ( width, height ) );
@@ -177,7 +177,7 @@
  * A static helper function to execute display callback for a window
  */
 #if TARGET_HOST_POSIX_X11
-static void fghcbPlatformDisplayWindow ( SFG_Window *window )
+static void fgPlatformDisplayWindow ( SFG_Window *window )
 {
         fghRedrawWindow ( window ) ;
 }
@@ -190,7 +190,7 @@
         window->State.Visible )
     {
         window->State.Redisplay = GL_FALSE;
-		fghcbPlatformDisplayWindow ( window );
+		fgPlatformDisplayWindow ( window );
     }
 
     fgEnumSubWindows( window, fghcbDisplayWindow, enumerator );
@@ -423,7 +423,7 @@
  */
 
 #if TARGET_HOST_POSIX_X11
-static void fghPlatformSleepForEvents( long msec )
+static void fgPlatformSleepForEvents( long msec )
 {
     /*
      * Possibly due to aggressive use of XFlush() and friends,
@@ -469,14 +469,14 @@
     if( fghHaveJoystick( ) && ( msec > 10 ) )     
         msec = 10;
 
-	fghPlatformSleepForEvents ( msec );
+	fgPlatformSleepForEvents ( msec );
 }
 
 #if TARGET_HOST_POSIX_X11
 /*
  * Returns GLUT modifier mask for the state field of an X11 event.
  */
-int fghGetModifiers( int state )
+int fgPlatformGetModifiers( int state )
 {
     int ret = 0;
 
@@ -933,7 +933,7 @@
 }
 
 
-void fghProcessSingleEvent ( void )
+void fgPlatformProcessSingleEvent ( void )
 {
     SFG_Window* window;
     XEvent event;
@@ -1147,7 +1147,7 @@
              * XXX track ButtonPress/ButtonRelease events in our own
              * XXX bit-mask?
              */
-            fgState.Modifiers = fghGetModifiers( event.xmotion.state );
+            fgState.Modifiers = fgPlatformGetModifiers( event.xmotion.state );
             if ( event.xmotion.state & ( Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask ) ) {
                 INVOKE_WCB( *window, Motion, ( event.xmotion.x,
                                                event.xmotion.y ) );
@@ -1201,7 +1201,7 @@
                 ! FETCH_WCB( *window, MouseWheel ) )
                 break;
 
-            fgState.Modifiers = fghGetModifiers( event.xbutton.state );
+            fgState.Modifiers = fgPlatformGetModifiers( event.xbutton.state );
 
             /* Finally execute the mouse or mouse wheel callback */
             if( ( button < glutDeviceGet ( GLUT_NUM_MOUSE_BUTTONS ) ) || ( ! FETCH_WCB( *window, MouseWheel ) ) )
@@ -1316,7 +1316,7 @@
                     if( keyboard_cb )
                     {
                         fgSetWindow( window );
-                        fgState.Modifiers = fghGetModifiers( event.xkey.state );
+                        fgState.Modifiers = fgPlatformGetModifiers( event.xkey.state );
                         keyboard_cb( asciiCode[ 0 ],
                                      event.xkey.x, event.xkey.y
                         );
@@ -1385,7 +1385,7 @@
                     if( special_cb && (special != -1) )
                     {
                         fgSetWindow( window );
-                        fgState.Modifiers = fghGetModifiers( event.xkey.state );
+                        fgState.Modifiers = fgPlatformGetModifiers( event.xkey.state );
                         special_cb( special, event.xkey.x, event.xkey.y );
                         fgState.Modifiers = INVALID_MODIFIERS;
                     }
@@ -1412,7 +1412,7 @@
 }
 
 
-static void fghMainLoopPreliminaryWork ( void )
+static void fgPlatformMainLoopPreliminaryWork ( void )
 {
 }
 #endif
@@ -1424,7 +1424,7 @@
  */
 void FGAPIENTRY glutMainLoopEvent( void )
 {
-	fghProcessSingleEvent ();
+	fgPlatformProcessSingleEvent ();
 
     if( fgState.Timers.First )
         fghCheckTimers( );
@@ -1444,7 +1444,7 @@
 
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutMainLoop" );
 
-	fghMainLoopPreliminaryWork ();
+	fgPlatformMainLoopPreliminaryWork ();
 
     fgState.ExecState = GLUT_EXEC_STATE_RUNNING ;
     while( fgState.ExecState == GLUT_EXEC_STATE_RUNNING )

Modified: trunk/freeglut/freeglut/src/Common/freeglut_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_menu.c	2012-01-23 04:42:31 UTC (rev 999)
+++ trunk/freeglut/freeglut/src/Common/freeglut_menu.c	2012-01-23 05:01:37 UTC (rev 1000)
@@ -85,7 +85,7 @@
 #endif
 
 
-extern GLvoid fghGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y );
+extern GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y );
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
@@ -143,7 +143,7 @@
  * Private function to get the virtual maximum screen extent
  */
 #if TARGET_HOST_POSIX_X11
-static GLvoid fghGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
+static GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
 {
     int wx, wy;
     Window w;
@@ -163,7 +163,7 @@
 static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y )
 {
     if( fgStructure.GameModeWindow )
-		fghGetGameModeVMaxExtent ( window, x, y );
+		fgPlatformGetGameModeVMaxExtent ( window, x, y );
     else
     {
         *x = fgDisplay.ScreenWidth;

Modified: trunk/freeglut/freeglut/src/Common/freeglut_xinput.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_xinput.c	2012-01-23 04:42:31 UTC (rev 999)
+++ trunk/freeglut/freeglut/src/Common/freeglut_xinput.c	2012-01-23 05:01:37 UTC (rev 1000)
@@ -14,7 +14,7 @@
 #include <X11/extensions/XInput2.h>
 
 /* import function from freeglut_main.c */
-int fghGetModifiers( int state );
+extern int fgPlatformGetModifiers( int state );
 
 /* extension opcode for XInput */
 int xi_opcode = -1;
@@ -160,7 +160,7 @@
 
 			case XI_Enter:
 			case XI_Leave:
-				fgState.Modifiers = fghGetModifiers( ((XIEnterEvent*)event)->mods.base );
+				fgState.Modifiers = fgPlatformGetModifiers( ((XIEnterEvent*)event)->mods.base );
 				INVOKE_WCB( *window, MultiEntry, (
 					event->deviceid, 
 					(event->evtype == XI_Enter ? GLUT_ENTERED : GLUT_LEFT)
@@ -172,7 +172,7 @@
 
 			case XI_ButtonPress:
 			case XI_ButtonRelease:
-				fgState.Modifiers = fghGetModifiers( event->mods.base );
+				fgState.Modifiers = fgPlatformGetModifiers( event->mods.base );
 				INVOKE_WCB( *window, MultiButton, (
 					event->deviceid, 
 					event->event_x,
@@ -189,7 +189,7 @@
 				break;
 
 			case XI_Motion:
-				fgState.Modifiers = fghGetModifiers( event->mods.base );
+				fgState.Modifiers = fgPlatformGetModifiers( event->mods.base );
 				for (i = 0; i < event->buttons.mask_len; i++) if (event->buttons.mask[i]) button = 1;
 				if (button) {
 					INVOKE_WCB( *window, MultiMotion,  ( event->deviceid, event->event_x, event->event_y ) );

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_cursor_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_cursor_mswin.c	2012-01-23 04:42:31 UTC (rev 999)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_cursor_mswin.c	2012-01-23 05:01:37 UTC (rev 1000)
@@ -30,7 +30,7 @@
 
 
 
-void fghSetCursor ( SFG_Window *window, int cursorID )
+void fgPlatformSetCursor ( SFG_Window *window, int cursorID )
 {
     /*
      * Joe Krahn is re-writing the following code.
@@ -101,7 +101,7 @@
 }
 
 
-void fghWarpPointer ( int x, int y )
+void fgPlatformWarpPointer ( int x, int y )
 {
     POINT coords;
     coords.x = x;

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c	2012-01-23 04:42:31 UTC (rev 999)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c	2012-01-23 05:01:37 UTC (rev 1000)
@@ -28,7 +28,7 @@
 #include <GL/freeglut.h>
 #include "freeglut_internal_mswin.h"
 
-GLUTproc fghGetPlatformSpecificGLUTProcAddress( const char* procName )
+GLUTproc fgPlatformGlutGetProcAddress( const char* procName )
 {
 #if !defined(_WIN32_WCE)
     /* optimization: quick initial check */

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c	2012-01-23 04:42:31 UTC (rev 999)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c	2012-01-23 05:01:37 UTC (rev 1000)
@@ -32,7 +32,7 @@
  * Remembers the current visual settings, so that
  * we can change them and restore later...
  */
-void fghRememberState( void )
+void fgPlatformRememberState( void )
 {
 /*    DEVMODE devMode; */
 
@@ -53,7 +53,7 @@
 /*
  * Restores the previously remembered visual settings
  */
-void fghRestoreState( void )
+void fgPlatformRestoreState( void )
 {
     /* Restore the previously remembered desktop display settings */
     ChangeDisplaySettingsEx( fgDisplay.DisplayName,&fgDisplay.DisplayMode, 0,0,0 );
@@ -66,7 +66,7 @@
 /*
  * Changes the current display mode to match user's settings
  */
-GLboolean fghChangeDisplayMode( GLboolean haveToTest )
+GLboolean fgPlatformChangeDisplayMode( GLboolean haveToTest )
 {
     GLboolean success = GL_FALSE;
     DEVMODE  devMode;

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c	2012-01-23 04:42:31 UTC (rev 999)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c	2012-01-23 05:01:37 UTC (rev 1000)
@@ -32,7 +32,7 @@
 /*
  * A call to this function should initialize all the display stuff...
  */
-void fghInitialize( const char* displayName )
+void fgPlatformInitialize( const char* displayName )
 {
     WNDCLASS wc;
     ATOM atom;
@@ -54,7 +54,7 @@
          * XXX Old code had "| CS_DBCLCKS" commented out.  Plans for the
          * XXX future?  Dead-end idea?
          */
-        wc.lpfnWndProc    = fgWindowProc;
+        wc.lpfnWndProc    = fgPlatformWindowProc;
         wc.cbClsExtra     = 0;
         wc.cbWndExtra     = 0;
         wc.hInstance      = fgDisplay.Instance;
@@ -75,7 +75,7 @@
 
         /* Register the window class */
         atom = RegisterClass( &wc );
-        FREEGLUT_INTERNAL_ERROR_EXIT ( atom, "Window Class Not Registered", "fghInitialize" );
+        FREEGLUT_INTERNAL_ERROR_EXIT ( atom, "Window Class Not Registered", "fgPlatformInitialize" );
     }
 
     /* The screen dimensions can be obtained via GetSystemMetrics() calls */
@@ -104,7 +104,7 @@
 	    DeleteDC(context);
         }
         else
-	    fgWarning("fghInitialize: "
+	    fgWarning("fgPlatformInitialize: "
 		      "CreateDC failed, Screen size info may be incorrect\n"
           "This is quite likely caused by a bad '-display' parameter");
       
@@ -131,7 +131,7 @@
 /* Platform-Specific Deinitialization Functions: */
 extern void fghCloseInputDevices ( void );
 
-void fghDeinitialiseInputDevices ( void )
+void fgPlatformDeinitialiseInputDevices ( void )
 {
 #if !defined(_WIN32_WCE)
 	fghCloseInputDevices ();
@@ -140,7 +140,7 @@
     fgState.InputDevsInitialised = GL_FALSE;
 }
 
-void fghCloseDisplay ( void )
+void fgPlatformCloseDisplay ( void )
 {
     if( fgDisplay.DisplayName )
     {

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_input_devices_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_input_devices_mswin.c	2012-01-23 04:42:31 UTC (rev 999)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_input_devices_mswin.c	2012-01-23 05:01:37 UTC (rev 1000)
@@ -45,7 +45,7 @@
 void serial_flush ( SERIALPORT *port );
 
 
-void fghRegisterDialDevice ( const char *dial_device )
+void fgPlatformRegisterDialDevice ( const char *dial_device )
 {
         if (!dial_device){
             static char devname[256];

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c	2012-01-23 04:42:31 UTC (rev 999)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c	2012-01-23 05:01:37 UTC (rev 1000)
@@ -32,7 +32,7 @@
 extern void fghRedrawWindow ( SFG_Window *window );
 
 
-void fghPlatformReshapeWindow ( SFG_Window *window, int width, int height )
+void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )
 {
     RECT windowRect;
 
@@ -80,7 +80,7 @@
 }
 
 
-void fghcbPlatformDisplayWindow ( SFG_Window *window )
+void fgPlatformDisplayWindow ( SFG_Window *window )
 {
     RedrawWindow(
         window->Window.Handle, NULL, NULL,
@@ -89,13 +89,13 @@
 }
 
 
-void fghPlatformSleepForEvents( long msec )
+void fgPlatformSleepForEvents( long msec )
 {
     MsgWaitForMultipleObjects( 0, NULL, FALSE, msec, QS_ALLINPUT );
 }
 
 
-void fghProcessSingleEvent ( void )
+void fgPlatformProcessSingleEvent ( void )
 {
     MSG stMsg;
 
@@ -123,7 +123,7 @@
 
 
 
-void fghMainLoopPreliminaryWork ( void )
+void fgPlatformMainLoopPreliminaryWork ( void )
 {
     SFG_Window *window = (SFG_Window *)fgStructure.Windows.First ;
 
@@ -154,7 +154,7 @@
 /*
  * Determine a GLUT modifer mask based on MS-WINDOWS system info.
  */
-static int fghGetModifiers (void)
+static int fgPlatformGetModifiers (void)
 {
     return
         ( ( ( GetKeyState( VK_LSHIFT   ) < 0 ) ||
@@ -168,8 +168,8 @@
 /*
  * The window procedure for handling Win32 events
  */
-LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
-                               LPARAM lParam )
+LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
+                                       LPARAM lParam )
 {
     static unsigned char lControl = 0, rControl = 0, lShift = 0,
                          rShift = 0, lAlt = 0, rAlt = 0;
@@ -307,7 +307,7 @@
         /* The window structure is passed as the creation structure parameter... */
         window = (SFG_Window *) (((LPCREATESTRUCT) lParam)->lpCreateParams);
         FREEGLUT_INTERNAL_ERROR_EXIT ( ( window != NULL ), "Cannot create window",
-                                       "fgWindowProc" );
+                                       "fgPlatformWindowProc" );
 
         window->Window.Handle = hWnd;
         window->Window.Device = GetDC( hWnd );
@@ -497,7 +497,7 @@
         }
         SetFocus(window->Window.Handle);
 
-        fgState.Modifiers = fghGetModifiers( );
+        fgState.Modifiers = fgPlatformGetModifiers( );
 
         if( ( wParam & MK_LBUTTON ) ||
             ( wParam & MK_MBUTTON ) ||
@@ -607,7 +607,7 @@
             break;
 
         fgSetWindow( window );
-        fgState.Modifiers = fghGetModifiers( );
+        fgState.Modifiers = fgPlatformGetModifiers( );
 
         INVOKE_WCB(
             *window, Mouse,
@@ -641,7 +641,7 @@
                 break;
 
             fgSetWindow( window );
-            fgState.Modifiers = fghGetModifiers( );
+            fgState.Modifiers = fgPlatformGetModifiers( );
 
             /*
              * XXX Should use WHEEL_DELTA instead of 120
@@ -702,7 +702,7 @@
          * Remember the current modifiers state. This is done here in order
          * to make sure the VK_DELETE keyboard callback is executed properly.
          */
-        fgState.Modifiers = fghGetModifiers( );
+        fgState.Modifiers = fgPlatformGetModifiers( );
 
         GetCursorPos( &mouse_pos );
         ScreenToClient( window->Window.Handle, &mouse_pos );
@@ -792,7 +792,7 @@
          * Remember the current modifiers state. This is done here in order
          * to make sure the VK_DELETE keyboard callback is executed properly.
          */
-        fgState.Modifiers = fghGetModifiers( );
+        fgState.Modifiers = fgPlatformGetModifiers( );
 
         GetCursorPos( &mouse_pos );
         ScreenToClient( window->Window.Handle, &mouse_pos );
@@ -877,7 +877,7 @@
       if( (fgState.KeyRepeat==GLUT_KEY_REPEAT_OFF || window->State.IgnoreKeyRepeat==GL_TRUE) && (HIWORD(lParam) & KF_REPEAT) )
             break;
 
-        fgState.Modifiers = fghGetModifiers( );
+        fgState.Modifiers = fgPlatformGetModifiers( );
         INVOKE_WCB( *window, Keyboard,
                     ( (char)wParam,
                       window->State.MouseX, window->State.MouseY )

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_menu_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_menu_mswin.c	2012-01-23 04:42:31 UTC (rev 999)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_menu_mswin.c	2012-01-23 05:01:37 UTC (rev 1000)
@@ -29,7 +29,7 @@
 #include "freeglut_internal_mswin.h"
 
 
-GLvoid fghGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
+GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
 {
     *x = glutGet ( GLUT_SCREEN_WIDTH );
     *y = glutGet ( GLUT_SCREEN_HEIGHT );

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1001
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1001&view=rev
Author:   fayjf
Date:     2012-01-23 05:06:58 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
Moving some function prototypes into the source files where they are found and out of the "freeglut_internal.h" file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_internal.h
    trunk/freeglut/freeglut/src/Common/freeglut_state.c
    trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c
    trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c
    trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-23 05:01:37 UTC (rev 1000)
+++ trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-23 05:06:58 UTC (rev 1001)
@@ -852,20 +852,6 @@
 void fgCreateStructure( void );
 void fgDestroyStructure( void );
 
-/* A helper function to check if a display mode is possible to use */
-#if TARGET_HOST_POSIX_X11
-GLXFBConfig* fgChooseFBConfig( int* numcfgs );
-#endif
-
-/* The window procedure for Win32 events handling */
-#if TARGET_HOST_MS_WINDOWS
-LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg,
-                               WPARAM wParam, LPARAM lParam );
-void fgNewWGLCreateContext( SFG_Window* window );
-GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
-                              unsigned char layer_type );
-#endif
-
 /*
  * Window creation, opening, closing and destruction.
  * Also CallBack clearing/initialization.

Modified: trunk/freeglut/freeglut/src/Common/freeglut_state.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_state.c	2012-01-23 05:01:37 UTC (rev 1000)
+++ trunk/freeglut/freeglut/src/Common/freeglut_state.c	2012-01-23 05:06:58 UTC (rev 1001)
@@ -45,6 +45,12 @@
 extern int fgPlatformGlutDeviceGet ( GLenum eWhat );
 extern int fgPlatformGlutLayerGet ( GLenum eWhat );
 
+/* A helper function to check if a display mode is possible to use */
+#if TARGET_HOST_POSIX_X11
+GLXFBConfig* fgChooseFBConfig( int* numcfgs );
+#endif
+
+
 /* -- LOCAL DEFINITIONS ---------------------------------------------------- */
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c	2012-01-23 05:01:37 UTC (rev 1000)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c	2012-01-23 05:06:58 UTC (rev 1001)
@@ -29,6 +29,11 @@
 #include "freeglut_internal_mswin.h"
 
 
+
+extern LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg,
+                               WPARAM wParam, LPARAM lParam );
+
+
 /*
  * A call to this function should initialize all the display stuff...
  */

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c	2012-01-23 05:01:37 UTC (rev 1000)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c	2012-01-23 05:06:58 UTC (rev 1001)
@@ -31,7 +31,12 @@
 
 extern void fghRedrawWindow ( SFG_Window *window );
 
+extern void fgNewWGLCreateContext( SFG_Window* window );
+extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
+                                     unsigned char layer_type );
 
+
+
 void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )
 {
     RECT windowRect;

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c	2012-01-23 05:01:37 UTC (rev 1000)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c	2012-01-23 05:06:58 UTC (rev 1001)
@@ -29,7 +29,10 @@
 #include "freeglut_internal_mswin.h"
 
 
+extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
+                                     unsigned char layer_type );
 
+
 /* The following include file is available from SGI but is not standard:
  *   #include <GL/wglext.h>
  * So we copy the necessary parts out of it to support the multisampling query

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1003
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1003&view=rev
Author:   fayjf
Date:     2012-01-23 05:44:18 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
Splitting the rest of the Windows-specific "freeglut_window.c" functions into their own file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_window.c
    trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-01-23 05:24:34 UTC (rev 1002)
+++ trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-01-23 05:44:18 UTC (rev 1003)
@@ -128,7 +128,19 @@
                                   GLboolean sizeUse, int w, int h,
                                   GLboolean gameMode, GLboolean isSubWindow );
 extern void fgPlatformCloseWindow( SFG_Window* window );
+extern void fgPlatformGlutShowWindow( void );
+extern void fgPlatformGlutHideWindow( void );
+extern void fgPlatformGlutIconifyWindow( void );
+extern void fgPlatformGlutSetWindowTitle( const char* title );
+extern void fgPlatformGlutSetIconTitle( const char* title );
+extern void fgPlatformGlutPositionWindow( int x, int y );
+extern void fgPlatformGlutPushWindow( void );
+extern void fgPlatformGlutPopWindow( void );
+extern void fgPlatformGlutFullScreen( SFG_Window *win );
+extern void fgPlatformGlutLeaveFullScreen( SFG_Window *win );
+extern void fgPlatformGlutFullScreenToggle( SFG_Window *win );
 
+
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
 int fghIsLegacyContextVersionRequested( void )
@@ -751,6 +763,154 @@
     /* XFlush( fgDisplay.Display ); */ /* XXX Shouldn't need this */
 }
 
+
+static Bool fghWindowIsVisible( Display *display, XEvent *event, XPointer arg)
+{
+    Window window = (Window)arg;
+    return (event->type == MapNotify) && (event->xmap.window == window);
+}
+
+
+
+
+/*
+ * This function makes the current window visible
+ */
+void fgPlatformGlutShowWindow( void )
+{
+    XMapWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
+    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+}
+
+/*
+ * This function hides the current window
+ */
+void fgPlatformGlutHideWindow( void )
+{
+    if( fgStructure.CurrentWindow->Parent == NULL )
+        XWithdrawWindow( fgDisplay.Display,
+                         fgStructure.CurrentWindow->Window.Handle,
+                         fgDisplay.Screen );
+    else
+        XUnmapWindow( fgDisplay.Display,
+                      fgStructure.CurrentWindow->Window.Handle );
+    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+}
+
+/*
+ * Iconify the current window (top-level windows only)
+ */
+void fgPlatformGlutIconifyWindow( void )
+{
+    XIconifyWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle,
+                    fgDisplay.Screen );
+    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+}
+
+/*
+ * Set the current window's title
+ */
+void fgPlatformGlutSetWindowTitle( const char* title )
+{
+    XTextProperty text;
+
+    text.value = (unsigned char *) title;
+    text.encoding = XA_STRING;
+    text.format = 8;
+    text.nitems = strlen( title );
+
+    XSetWMName(
+        fgDisplay.Display,
+        fgStructure.CurrentWindow->Window.Handle,
+        &text
+    );
+
+    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+}
+
+/*
+ * Set the current window's iconified title
+ */
+void fgPlatformGlutSetIconTitle( const char* title )
+{
+    XTextProperty text;
+
+    text.value = (unsigned char *) title;
+    text.encoding = XA_STRING;
+    text.format = 8;
+    text.nitems = strlen( title );
+
+    XSetWMIconName(
+        fgDisplay.Display,
+        fgStructure.CurrentWindow->Window.Handle,
+        &text
+    );
+
+    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+}
+
+/*
+ * Change the current window's position
+ */
+void fgPlatformGlutPositionWindow( int x, int y )
+{
+    XMoveWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle,
+                 x, y );
+    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+}
+
+/*
+ * Lowers the current window (by Z order change)
+ */
+void fgPlatformGlutPushWindow( void )
+{
+    XLowerWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
+}
+
+/*
+ * Raises the current window (by Z order change)
+ */
+void fgPlatformGlutPopWindow( void )
+{
+    XRaiseWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
+}
+
+/*
+ * Resize the current window so that it fits the whole screen
+ */
+void fgPlatformGlutFullScreen( SFG_Window *win )
+{
+    if(!glutGet(GLUT_FULL_SCREEN)) {
+        if(fghToggleFullscreen() != -1) {
+            win->State.IsFullscreen = GL_TRUE;
+        }
+    }
+}
+
+/*
+ * If we are fullscreen, resize the current window back to its original size
+ */
+void fgPlatformGlutLeaveFullScreen( SFG_Window *win )
+{
+    if(glutGet(GLUT_FULL_SCREEN)) {
+        if(fghToggleFullscreen() != -1) {
+            win->State.IsFullscreen = GL_FALSE;
+        }
+    }
+}
+
+/*
+ * Toggle the window's full screen state.
+ */
+void fgPlatformGlutFullScreenToggle( SFG_Window *win )
+{
+    if(fghToggleFullscreen() != -1) {
+        win->State.IsFullscreen = !win->State.IsFullscreen;
+    }
+}
+
+
+
 #endif  /* TARGET_HOST_POSIX_X11 */
 
 
@@ -766,13 +926,6 @@
 }
 
 
-#if TARGET_HOST_POSIX_X11
-static Bool fghWindowIsVisible( Display *display, XEvent *event, XPointer arg)
-{
-    Window window = (Window)arg;
-    return (event->type == MapNotify) && (event->xmap.window == window);
-}
-#endif
 
 
 /*
@@ -955,17 +1108,8 @@
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutShowWindow" );
     FREEGLUT_EXIT_IF_NO_WINDOW ( "glutShowWindow" );
 
-#if TARGET_HOST_POSIX_X11
+	fgPlatformGlutShowWindow ();
 
-    XMapWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
-    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
-
-#elif TARGET_HOST_MS_WINDOWS
-
-    ShowWindow( fgStructure.CurrentWindow->Window.Handle, SW_SHOW );
-
-#endif
-
     fgStructure.CurrentWindow->State.Redisplay = GL_TRUE;
 }
 
@@ -977,23 +1121,8 @@
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutHideWindow" );
     FREEGLUT_EXIT_IF_NO_WINDOW ( "glutHideWindow" );
 
-#if TARGET_HOST_POSIX_X11
+	fgPlatformGlutHideWindow ();
 
-    if( fgStructure.CurrentWindow->Parent == NULL )
-        XWithdrawWindow( fgDisplay.Display,
-                         fgStructure.CurrentWindow->Window.Handle,
-                         fgDisplay.Screen );
-    else
-        XUnmapWindow( fgDisplay.Display,
-                      fgStructure.CurrentWindow->Window.Handle );
-    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
-
-#elif TARGET_HOST_MS_WINDOWS
-
-    ShowWindow( fgStructure.CurrentWindow->Window.Handle, SW_HIDE );
-
-#endif
-
     fgStructure.CurrentWindow->State.Redisplay = GL_FALSE;
 }
 
@@ -1006,18 +1135,9 @@
     FREEGLUT_EXIT_IF_NO_WINDOW ( "glutIconifyWindow" );
 
     fgStructure.CurrentWindow->State.Visible   = GL_FALSE;
-#if TARGET_HOST_POSIX_X11
 
-    XIconifyWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle,
-                    fgDisplay.Screen );
-    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+	fgPlatformGlutIconifyWindow ();
 
-#elif TARGET_HOST_MS_WINDOWS
-
-    ShowWindow( fgStructure.CurrentWindow->Window.Handle, SW_MINIMIZE );
-
-#endif
-
     fgStructure.CurrentWindow->State.Redisplay = GL_FALSE;
 }
 
@@ -1030,35 +1150,7 @@
     FREEGLUT_EXIT_IF_NO_WINDOW ( "glutSetWindowTitle" );
     if( ! fgStructure.CurrentWindow->Parent )
     {
-#if TARGET_HOST_POSIX_X11
-
-        XTextProperty text;
-
-        text.value = (unsigned char *) title;
-        text.encoding = XA_STRING;
-        text.format = 8;
-        text.nitems = strlen( title );
-
-        XSetWMName(
-            fgDisplay.Display,
-            fgStructure.CurrentWindow->Window.Handle,
-            &text
-        );
-
-        XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
-
-#elif TARGET_HOST_MS_WINDOWS
-#    ifdef _WIN32_WCE
-        {
-            wchar_t* wstr = fghWstrFromStr(title);
-            SetWindowText( fgStructure.CurrentWindow->Window.Handle, wstr );
-            free(wstr);
-        }
-#    else
-        SetWindowText( fgStructure.CurrentWindow->Window.Handle, title );
-#    endif
-
-#endif
+		fgPlatformGlutSetWindowTitle ( title );
     }
 }
 
@@ -1072,35 +1164,7 @@
 
     if( ! fgStructure.CurrentWindow->Parent )
     {
-#if TARGET_HOST_POSIX_X11
-
-        XTextProperty text;
-
-        text.value = (unsigned char *) title;
-        text.encoding = XA_STRING;
-        text.format = 8;
-        text.nitems = strlen( title );
-
-        XSetWMIconName(
-            fgDisplay.Display,
-            fgStructure.CurrentWindow->Window.Handle,
-            &text
-        );
-
-        XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
-
-#elif TARGET_HOST_MS_WINDOWS
-#    ifdef _WIN32_WCE
-        {
-            wchar_t* wstr = fghWstrFromStr(title);
-            SetWindowText( fgStructure.CurrentWindow->Window.Handle, wstr );
-            free(wstr);
-        }
-#    else
-        SetWindowText( fgStructure.CurrentWindow->Window.Handle, title );
-#    endif
-
-#endif
+		fgPlatformGlutSetIconTitle ( title );
     }
 }
 
@@ -1137,30 +1201,7 @@
       glutLeaveFullScreen();
     }
 
-#if TARGET_HOST_POSIX_X11
-
-    XMoveWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle,
-                 x, y );
-    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
-
-#elif TARGET_HOST_MS_WINDOWS
-
-    {
-        RECT winRect;
-
-        /* "GetWindowRect" returns the pixel coordinates of the outside of the window */
-        GetWindowRect( fgStructure.CurrentWindow->Window.Handle, &winRect );
-        MoveWindow(
-            fgStructure.CurrentWindow->Window.Handle,
-            x,
-            y,
-            winRect.right - winRect.left,
-            winRect.bottom - winRect.top,
-            TRUE
-        );
-    }
-
-#endif
+	fgPlatformGlutPositionWindow ( x, y );
 }
 
 /*
@@ -1171,20 +1212,7 @@
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutPushWindow" );
     FREEGLUT_EXIT_IF_NO_WINDOW ( "glutPushWindow" );
 
-#if TARGET_HOST_POSIX_X11
-
-    XLowerWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
-
-#elif TARGET_HOST_MS_WINDOWS
-
-    SetWindowPos(
-        fgStructure.CurrentWindow->Window.Handle,
-        HWND_BOTTOM,
-        0, 0, 0, 0,
-        SWP_NOSIZE | SWP_NOMOVE
-    );
-
-#endif
+	fgPlatformGlutPushWindow ();
 }
 
 /*
@@ -1195,20 +1223,7 @@
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutPopWindow" );
     FREEGLUT_EXIT_IF_NO_WINDOW ( "glutPopWindow" );
 
-#if TARGET_HOST_POSIX_X11
-
-    XRaiseWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
-
-#elif TARGET_HOST_MS_WINDOWS
-
-    SetWindowPos(
-        fgStructure.CurrentWindow->Window.Handle,
-        HWND_TOP,
-        0, 0, 0, 0,
-        SWP_NOSIZE | SWP_NOMOVE
-    );
-
-#endif
+	fgPlatformGlutPopWindow ();
 }
 
 /*
@@ -1238,91 +1253,7 @@
         return;
     }
 
-#if TARGET_HOST_POSIX_X11
-    if(!glutGet(GLUT_FULL_SCREEN)) {
-        if(fghToggleFullscreen() != -1) {
-            win->State.IsFullscreen = GL_TRUE;
-        }
-    }
-
-#elif TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE) /* FIXME: what about WinCE */
-
-    if (glutGet(GLUT_FULL_SCREEN))
-    {
-        /*  Leave full screen state before entering fullscreen again (resizing?) */
-        glutLeaveFullScreen();
-    }
-
-    {
-#if(WINVER >= 0x0500) /* Windows 2000 or later */
-        DWORD s;
-        RECT rect;
-        HMONITOR hMonitor;
-        MONITORINFO mi;
-
-        /* For fullscreen mode, first remove all window decoration
-         * and set style to popup so it will overlap the taskbar
-         * then force to maximize on the screen on which it has the most
-         * overlap.
-         */
-
-        
-        /* store current window rect */
-        GetWindowRect( win->Window.Handle, &win->State.OldRect );
-
-        /* store current window style */
-        win->State.OldStyle = s = GetWindowLong(win->Window.Handle, GWL_STYLE);
-
-        /* remove decorations from style and add popup style*/
-        s &= ~WS_OVERLAPPEDWINDOW;
-        s |= WS_POPUP;
-        SetWindowLong(win->Window.Handle, GWL_STYLE, s);
-        SetWindowPos(win->Window.Handle, HWND_TOP, 0,0,0,0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
-
-        /* For fullscreen mode, find the monitor that is covered the most
-         * by the window and get its rect as the resize target.
-	     */
-        hMonitor= MonitorFromRect(&win->State.OldRect, MONITOR_DEFAULTTONEAREST);
-        mi.cbSize = sizeof(mi);
-        GetMonitorInfo(hMonitor, &mi);
-        rect = mi.rcMonitor;
-#else   /* if (WINVER >= 0x0500) */
-        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 );
-#endif  /* (WINVER >= 0x0500) */
-
-        /*
-         * then resize window
-         * SWP_NOACTIVATE     Do not activate the window
-         * SWP_NOOWNERZORDER  Do not change position in z-order
-         * SWP_NOSENDCHANGING Suppress WM_WINDOWPOSCHANGING message
-         * SWP_NOZORDER       Retains the current Z order (ignore 2nd param)
-         */
-        SetWindowPos( fgStructure.CurrentWindow->Window.Handle,
-                      HWND_TOP,
-                      rect.left,
-                      rect.top,
-                      rect.right  - rect.left,
-                      rect.bottom - rect.top,
-                      SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING |
-                      SWP_NOZORDER
-                    );
-
-        win->State.IsFullscreen = GL_TRUE;
-    }
-#endif
+	fgPlatformGlutFullScreen ( win );
 }
 
 /*
@@ -1337,37 +1268,7 @@
 
     win = fgStructure.CurrentWindow;
 
-#if TARGET_HOST_POSIX_X11
-    if(glutGet(GLUT_FULL_SCREEN)) {
-        if(fghToggleFullscreen() != -1) {
-            win->State.IsFullscreen = GL_FALSE;
-        }
-    }
-
-#elif TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE) /* FIXME: what about WinCE */
-    if (!glutGet(GLUT_FULL_SCREEN))
-    {
-        /* nothing to do */
-        return;
-    }
-
-    /* restore style of window before making it fullscreen */
-    SetWindowLong(win->Window.Handle, GWL_STYLE, win->State.OldStyle);
-    SetWindowPos(win->Window.Handle, HWND_TOP, 0,0,0,0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
-
-    /* Then resize */
-    SetWindowPos(win->Window.Handle,
-        HWND_TOP,
-        win->State.OldRect.left,
-        win->State.OldRect.top,
-        win->State.OldRect.right  - win->State.OldRect.left,
-        win->State.OldRect.bottom - win->State.OldRect.top,
-        SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING |
-        SWP_NOZORDER
-        );
-
-    win->State.IsFullscreen = GL_FALSE;
-#endif
+	fgPlatformGlutLeaveFullScreen ( win );
 }
 
 /*
@@ -1382,16 +1283,7 @@
 
     win = fgStructure.CurrentWindow;
 
-#if TARGET_HOST_POSIX_X11
-    if(fghToggleFullscreen() != -1) {
-        win->State.IsFullscreen = !win->State.IsFullscreen;
-    }
-#elif TARGET_HOST_MS_WINDOWS
-    if (!win->State.IsFullscreen)
-        glutFullScreen();
-    else
-        glutLeaveFullScreen();
-#endif
+	fgPlatformGlutFullScreenToggle ( win );
 }
 
 /*

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c	2012-01-23 05:24:34 UTC (rev 1002)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c	2012-01-23 05:44:18 UTC (rev 1003)
@@ -837,3 +837,232 @@
 
 
 
+/*
+ * This function makes the current window visible
+ */
+void fgPlatformGlutShowWindow( void )
+{
+    ShowWindow( fgStructure.CurrentWindow->Window.Handle, SW_SHOW );
+}
+
+/*
+ * This function hides the current window
+ */
+void fgPlatformGlutHideWindow( void )
+{
+    ShowWindow( fgStructure.CurrentWindow->Window.Handle, SW_HIDE );
+}
+
+/*
+ * Iconify the current window (top-level windows only)
+ */
+void fgPlatformGlutIconifyWindow( void )
+{
+    ShowWindow( fgStructure.CurrentWindow->Window.Handle, SW_MINIMIZE );
+}
+
+/*
+ * Set the current window's title
+ */
+void fgPlatformGlutSetWindowTitle( const char* title )
+{
+#ifdef _WIN32_WCE
+    {
+        wchar_t* wstr = fghWstrFromStr(title);
+        SetWindowText( fgStructure.CurrentWindow->Window.Handle, wstr );
+        free(wstr);
+    }
+#else
+    SetWindowText( fgStructure.CurrentWindow->Window.Handle, title );
+#endif
+}
+
+/*
+ * Set the current window's iconified title
+ */
+void fgPlatformGlutSetIconTitle( const char* title )
+{
+#ifdef _WIN32_WCE
+    {
+        wchar_t* wstr = fghWstrFromStr(title);
+        SetWindowText( fgStructure.CurrentWindow->Window.Handle, wstr );
+        free(wstr);
+    }
+#else
+    SetWindowText( fgStructure.CurrentWindow->Window.Handle, title );
+#endif
+}
+
+/*
+ * Change the current window's position
+ */
+void fgPlatformGlutPositionWindow( int x, int y )
+{
+    RECT winRect;
+
+    /* "GetWindowRect" returns the pixel coordinates of the outside of the window */
+    GetWindowRect( fgStructure.CurrentWindow->Window.Handle, &winRect );
+    MoveWindow(
+        fgStructure.CurrentWindow->Window.Handle,
+        x,
+        y,
+        winRect.right - winRect.left,
+        winRect.bottom - winRect.top,
+        TRUE
+    );
+}
+
+/*
+ * Lowers the current window (by Z order change)
+ */
+void fgPlatformGlutPushWindow( void )
+{
+    SetWindowPos(
+        fgStructure.CurrentWindow->Window.Handle,
+        HWND_BOTTOM,
+        0, 0, 0, 0,
+        SWP_NOSIZE | SWP_NOMOVE
+    );
+}
+
+/*
+ * Raises the current window (by Z order change)
+ */
+void fgPlatformGlutPopWindow( void )
+{
+    SetWindowPos(
+        fgStructure.CurrentWindow->Window.Handle,
+        HWND_TOP,
+        0, 0, 0, 0,
+        SWP_NOSIZE | SWP_NOMOVE
+    );
+}
+
+/*
+ * Resize the current window so that it fits the whole screen
+ */
+void fgPlatformGlutFullScreen( SFG_Window *win )
+{
+#if !defined(_WIN32_WCE) /* FIXME: what about WinCE */
+
+    if (glutGet(GLUT_FULL_SCREEN))
+    {
+        /*  Leave full screen state before entering fullscreen again (resizing?) */
+        glutLeaveFullScreen();
+    }
+
+    {
+#if(WINVER >= 0x0500) /* Windows 2000 or later */
+        DWORD s;
+        RECT rect;
+        HMONITOR hMonitor;
+        MONITORINFO mi;
+
+        /* For fullscreen mode, first remove all window decoration
+         * and set style to popup so it will overlap the taskbar
+         * then force to maximize on the screen on which it has the most
+         * overlap.
+         */
+
+        
+        /* store current window rect */
+        GetWindowRect( win->Window.Handle, &win->State.OldRect );
+
+        /* store current window style */
+        win->State.OldStyle = s = GetWindowLong(win->Window.Handle, GWL_STYLE);
+
+        /* remove decorations from style and add popup style*/
+        s &= ~WS_OVERLAPPEDWINDOW;
+        s |= WS_POPUP;
+        SetWindowLong(win->Window.Handle, GWL_STYLE, s);
+        SetWindowPos(win->Window.Handle, HWND_TOP, 0,0,0,0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
+
+        /* For fullscreen mode, find the monitor that is covered the most
+         * by the window and get its rect as the resize target.
+	     */
+        hMonitor= MonitorFromRect(&win->State.OldRect, MONITOR_DEFAULTTONEAREST);
+        mi.cbSize = sizeof(mi);
+        GetMonitorInfo(hMonitor, &mi);
+        rect = mi.rcMonitor;
+#else   /* if (WINVER >= 0x0500) */
+        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 );
+#endif  /* (WINVER >= 0x0500) */
+
+        /*
+         * then resize window
+         * SWP_NOACTIVATE     Do not activate the window
+         * SWP_NOOWNERZORDER  Do not change position in z-order
+         * SWP_NOSENDCHANGING Suppress WM_WINDOWPOSCHANGING message
+         * SWP_NOZORDER       Retains the current Z order (ignore 2nd param)
+         */
+        SetWindowPos( fgStructure.CurrentWindow->Window.Handle,
+                      HWND_TOP,
+                      rect.left,
+                      rect.top,
+                      rect.right  - rect.left,
+                      rect.bottom - rect.top,
+                      SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING |
+                      SWP_NOZORDER
+                    );
+
+        win->State.IsFullscreen = GL_TRUE;
+    }
+#endif
+}
+
+/*
+ * If we are fullscreen, resize the current window back to its original size
+ */
+void fgPlatformGlutLeaveFullScreen( SFG_Window *win )
+{
+#if !defined(_WIN32_WCE) /* FIXME: what about WinCE */
+    if (!glutGet(GLUT_FULL_SCREEN))
+    {
+        /* nothing to do */
+        return;
+    }
+
+    /* restore style of window before making it fullscreen */
+    SetWindowLong(win->Window.Handle, GWL_STYLE, win->State.OldStyle);
+    SetWindowPos(win->Window.Handle, HWND_TOP, 0,0,0,0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
+
+    /* Then resize */
+    SetWindowPos(win->Window.Handle,
+        HWND_TOP,
+        win->State.OldRect.left,
+        win->State.OldRect.top,
+        win->State.OldRect.right  - win->State.OldRect.left,
+        win->State.OldRect.bottom - win->State.OldRect.top,
+        SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING |
+        SWP_NOZORDER
+        );
+
+    win->State.IsFullscreen = GL_FALSE;
+#endif
+}
+
+/*
+ * Toggle the window's full screen state.
+ */
+void fgPlatformGlutFullScreenToggle( SFG_Window *win )
+{
+    if (!win->State.IsFullscreen)
+        glutFullScreen();
+    else
+        glutLeaveFullScreen();
+}
+
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1005
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1005&view=rev
Author:   fayjf
Date:     2012-01-24 00:09:40 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
Putting in Diederick Niehorster's patch from e-mail dated 1/23/12 at 6:48 AM to fix the "WM_TOUCH" bugs inserted in the recent code changes

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_main.c
    trunk/freeglut/freeglut/src/Common/freeglut_window.c
    trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c
    trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_main.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_main.c	2012-01-23 05:46:18 UTC (rev 1004)
+++ trunk/freeglut/freeglut/src/Common/freeglut_main.c	2012-01-24 00:09:40 UTC (rev 1005)
@@ -70,13 +70,6 @@
 #    define MIN(a,b) (((a)<(b)) ? (a) : (b))
 #endif
 
-#ifdef WM_TOUCH
-    typedef BOOL (WINAPI *pGetTouchInputInfo)(HTOUCHINPUT,UINT,PTOUCHINPUT,int);
-    typedef BOOL (WINAPI *pCloseTouchInputHandle)(HTOUCHINPUT);
-	static pGetTouchInputInfo fghGetTouchInputInfo = (pGetTouchInputInfo)0xDEADBEEF;
-	static pCloseTouchInputHandle fghCloseTouchInputHandle = (pCloseTouchInputHandle)0xDEADBEEF;
-#endif
-
 extern void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height );
 extern void fgPlatformDisplayWindow ( SFG_Window *window );
 extern void fgPlatformSleepForEvents( long msec );

Modified: trunk/freeglut/freeglut/src/Common/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-01-23 05:46:18 UTC (rev 1004)
+++ trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-01-24 00:09:40 UTC (rev 1005)
@@ -89,11 +89,6 @@
 #endif  /* TARGET_HOST_POSIX_X11 */
 
 
-#ifdef WM_TOUCH
-	typedef BOOL (WINAPI *pRegisterTouchWindow)(HWND,ULONG);
-   static pRegisterTouchWindow fghRegisterTouchWindow = (pRegisterTouchWindow)0xDEADBEEF;
-#endif
-
 /* pushing attribute/value pairs into an array */
 #define ATTRIB(a) attributes[where++]=(a)
 #define ATTRIB_VAL(a,v) {ATTRIB(a); ATTRIB(v);}

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c	2012-01-23 05:46:18 UTC (rev 1004)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c	2012-01-24 00:09:40 UTC (rev 1005)
@@ -35,8 +35,15 @@
 extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
                                      unsigned char layer_type );
 
+#ifdef WM_TOUCH
+typedef BOOL (WINAPI *pGetTouchInputInfo)(HTOUCHINPUT,UINT,PTOUCHINPUT,int);
+typedef BOOL (WINAPI *pCloseTouchInputHandle)(HTOUCHINPUT);
+static pGetTouchInputInfo fghGetTouchInputInfo = (pGetTouchInputInfo)0xDEADBEEF;
+static pCloseTouchInputHandle fghCloseTouchInputHandle = (pCloseTouchInputHandle)0xDEADBEEF;
+#endif
 
 
+
 void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )
 {
     RECT windowRect;

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c	2012-01-23 05:46:18 UTC (rev 1004)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c	2012-01-24 00:09:40 UTC (rev 1005)
@@ -90,7 +90,12 @@
 extern void fghContextCreationError( void );
 extern int fghNumberOfAuxBuffersRequested( void );
 
+#ifdef WM_TOUCH
+typedef BOOL (WINAPI *pRegisterTouchWindow)(HWND,ULONG);
+static pRegisterTouchWindow fghRegisterTouchWindow = (pRegisterTouchWindow)0xDEADBEEF;
+#endif
 
+
 /*
  * Setup the pixel format for a Win32 window
  */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1008
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1008&view=rev
Author:   fayjf
Date:     2012-01-24 04:07:10 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
Removing some Windows-specific function prototypes from "freeglut_internal.h"

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_internal.h
    trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c
    trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c
    trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-24 03:48:12 UTC (rev 1007)
+++ trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-24 04:07:10 UTC (rev 1008)
@@ -918,19 +918,6 @@
 void fgEnumSubWindows( SFG_Window* window, FGCBenumerator enumCallback,
                        SFG_Enumerator* enumerator );
 
-#if TARGET_HOST_MS_WINDOWS
-/* 
- * Helper functions for getting client area from the window rect
- * and the window rect from the client area given the style of the window
- * (or a valid window pointer from which the style can be queried).
- */
-void fghComputeWindowRectFromClientArea_UseStyle   ( const DWORD windowStyle , RECT *clientRect, BOOL posIsOutside );
-void fghComputeWindowRectFromClientArea_QueryWindow( const SFG_Window *window, RECT *clientRect, BOOL posIsOutside );
-void fghComputeClientAreaFromWindowRect            ( const SFG_Window *window, RECT *windowRect, BOOL wantPosOutside );
-RECT fghGetClientArea                              ( const SFG_Window *window,                   BOOL wantPosOutside );
-void fghGetBorderWidth(const DWORD windowStyle, int* xBorderWidth, int* yBorderWidth);
-#endif
-
 /*
  * fgWindowByHandle returns a (SFG_Window *) value pointing to the
  * first window in the queue matching the specified window handle.

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c	2012-01-24 03:48:12 UTC (rev 1007)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c	2012-01-24 04:07:10 UTC (rev 1008)
@@ -42,6 +42,13 @@
 static pCloseTouchInputHandle fghCloseTouchInputHandle = (pCloseTouchInputHandle)0xDEADBEEF;
 #endif
 
+/* 
+ * Helper functions for getting client area from the window rect
+ * and the window rect from the client area given the style of the window
+ * (or a valid window pointer from which the style can be queried).
+ */
+extern void fghComputeWindowRectFromClientArea_QueryWindow( const SFG_Window *window, RECT *clientRect, BOOL posIsOutside );
+extern RECT fghGetClientArea                              ( const SFG_Window *window,                   BOOL wantPosOutside );
 
 
 void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c	2012-01-24 03:48:12 UTC (rev 1007)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c	2012-01-24 04:07:10 UTC (rev 1008)
@@ -32,7 +32,15 @@
 extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
                                      unsigned char layer_type );
 
+/* 
+ * Helper functions for getting client area from the window rect
+ * and the window rect from the client area given the style of the window
+ * (or a valid window pointer from which the style can be queried).
+ */
+extern RECT fghGetClientArea( const SFG_Window *window, BOOL wantPosOutside );
+extern void fghGetBorderWidth(const DWORD windowStyle, int* xBorderWidth, int* yBorderWidth);
 
+
 /* The following include file is available from SGI but is not standard:
  *   #include <GL/wglext.h>
  * So we copy the necessary parts out of it to support the multisampling query

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c	2012-01-24 03:48:12 UTC (rev 1007)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c	2012-01-24 04:07:10 UTC (rev 1008)
@@ -95,7 +95,14 @@
 static pRegisterTouchWindow fghRegisterTouchWindow = (pRegisterTouchWindow)0xDEADBEEF;
 #endif
 
+/* 
+ * Helper functions for getting client area from the window rect
+ * and the window rect from the client area given the style of the window
+ * (or a valid window pointer from which the style can be queried).
+ */
+extern void fghGetBorderWidth(const DWORD windowStyle, int* xBorderWidth, int* yBorderWidth);
 
+
 /*
  * Setup the pixel format for a Win32 window
  */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1012
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1012&view=rev
Author:   fayjf
Date:     2012-01-29 02:52:21 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Moving the Windows platform-specific "SwapBuffers" calls into a Windows platform-specific file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_display.c
    trunk/freeglut/freeglut/src/mswin/freeglut_display_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_display.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_display.c	2012-01-29 02:45:04 UTC (rev 1011)
+++ trunk/freeglut/freeglut/src/Common/freeglut_display.c	2012-01-29 02:52:21 UTC (rev 1012)
@@ -28,6 +28,18 @@
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
+
+/* Function prototypes */
+extern void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow );
+
+
+#if TARGET_HOST_POSIX_X11
+void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow )
+{
+    glXSwapBuffers( pDisplayPtr->Display, CurrentWindow->Window.Handle );
+}
+#endif
+
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
 
 /*
@@ -61,11 +73,7 @@
     if( ! fgStructure.CurrentWindow->Window.DoubleBuffered )
         return;
 
-#if TARGET_HOST_POSIX_X11
-    glXSwapBuffers( fgDisplay.pDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
-#elif TARGET_HOST_MS_WINDOWS
-    SwapBuffers( fgStructure.CurrentWindow->Window.Device );
-#endif
+    fgPlatformGlutSwapBuffers( &fgDisplay.pDisplay, fgStructure.CurrentWindow );
 
     /* GLUT_FPS env var support */
     if( fgState.FPSInterval )

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_display_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_display_mswin.c	2012-01-29 02:45:04 UTC (rev 1011)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_display_mswin.c	2012-01-29 02:52:21 UTC (rev 1012)
@@ -0,0 +1,37 @@
+/*
+ * freeglut_display_mswin.c
+ *
+ * The Windows-specific mouse cursor related stuff.
+ *
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
+ * Written by John F. Fay, <fayjf@...>
+ * Creation date: Sat Jan 28, 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "../Common/freeglut_internal.h"
+
+
+
+
+void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow )
+{
+    SwapBuffers( CurrentWindow->Window.Device );
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1013
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1013&view=rev
Author:   fayjf
Date:     2012-01-29 03:04:35 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Moving the platform-specific window handle and context type definitions into platform-specific code regions

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_internal.h
    trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h

Modified: trunk/freeglut/freeglut/src/Common/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 02:52:21 UTC (rev 1012)
+++ trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 03:04:35 UTC (rev 1013)
@@ -214,6 +214,7 @@
 
 /* Platform-specific includes */
 #if TARGET_HOST_POSIX_X11
+
 typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay;
 struct tagSFG_PlatformDisplay
 {
@@ -247,6 +248,15 @@
     int             DisplayPointerY;    /* saved Y location of the pointer   */
 };
 
+
+/*
+ * Make "freeglut" window handle and context types so that we don't need so
+ * much conditionally-compiled code later in the library.
+ */
+typedef Window     SFG_WindowHandleType ;
+typedef GLXContext SFG_WindowContextType ;
+
+
 #endif
 #if TARGET_HOST_MS_WINDOWS
 #include "../mswin/freeglut_internal_mswin.h"
@@ -419,22 +429,6 @@
 };
 
 /*
- * Make "freeglut" window handle and context types so that we don't need so
- * much conditionally-compiled code later in the library.
- */
-#if TARGET_HOST_POSIX_X11
-
-typedef Window     SFG_WindowHandleType ;
-typedef GLXContext SFG_WindowContextType ;
-
-#elif TARGET_HOST_MS_WINDOWS
-
-typedef HWND    SFG_WindowHandleType ;
-typedef HGLRC   SFG_WindowContextType ;
-
-#endif
-
-/*
  * A window and its OpenGL context. The contents of this structure
  * are highly dependant on the target operating system we aim at...
  */

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-29 02:52:21 UTC (rev 1012)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-29 03:04:35 UTC (rev 1013)
@@ -36,6 +36,13 @@
     char           *DisplayName;        /* Display name for multi display support*/ 
 };
 
+/*
+ * Make "freeglut" window handle and context types so that we don't need so
+ * much conditionally-compiled code later in the library.
+ */
+typedef HWND    SFG_WindowHandleType ;
+typedef HGLRC   SFG_WindowContextType ;
 
 
+
 #endif  /* FREEGLUT_INTERNAL_MSWIN_H */
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1014
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1014&view=rev
Author:   fayjf
Date:     2012-01-29 03:15:41 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Moving the platform-specific FBConfig and device context variables into platform-specific parts of the code

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_internal.h
    trunk/freeglut/freeglut/src/Common/freeglut_state.c
    trunk/freeglut/freeglut/src/Common/freeglut_structure.c
    trunk/freeglut/freeglut/src/Common/freeglut_window.c
    trunk/freeglut/freeglut/src/mswin/freeglut_display_mswin.c
    trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
    trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c
    trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c
    trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 03:04:35 UTC (rev 1013)
+++ trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 03:15:41 UTC (rev 1014)
@@ -255,8 +255,14 @@
  */
 typedef Window     SFG_WindowHandleType ;
 typedef GLXContext SFG_WindowContextType ;
+typedef struct tagSFG_PlatformContext SFG_PlatformContext;
+struct tagSFG_PlatformContext
+{
+    GLXFBConfig*    FBConfig;        /* The window's FBConfig               */
+};
 
 
+
 #endif
 #if TARGET_HOST_MS_WINDOWS
 #include "../mswin/freeglut_internal_mswin.h"
@@ -438,11 +444,7 @@
     SFG_WindowHandleType  Handle;    /* The window's handle                 */
     SFG_WindowContextType Context;   /* The window's OpenGL/WGL context     */
 
-#if TARGET_HOST_POSIX_X11
-    GLXFBConfig*    FBConfig;        /* The window's FBConfig               */
-#elif TARGET_HOST_MS_WINDOWS
-    HDC             Device;          /* The window's device context         */
-#endif
+	SFG_PlatformContext pContext;    /* The window's FBConfig (X11) or device context (Windows) */
 
     int             DoubleBuffered;  /* Treat the window as double-buffered */
 };

Modified: trunk/freeglut/freeglut/src/Common/freeglut_state.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_state.c	2012-01-29 03:04:35 UTC (rev 1013)
+++ trunk/freeglut/freeglut/src/Common/freeglut_state.c	2012-01-29 03:15:41 UTC (rev 1014)
@@ -66,7 +66,7 @@
 
   if( fgStructure.CurrentWindow )
       result = glXGetFBConfigAttrib( fgDisplay.Display,
-                                     *(fgStructure.CurrentWindow->Window.FBConfig),
+                                     *(fgStructure.CurrentWindow->Window.pContext.FBConfig),
                                      attribute,
                                      &returnValue );
 
@@ -125,7 +125,7 @@
         else
         {
           const GLXFBConfig * fbconfig =
-                fgStructure.CurrentWindow->Window.FBConfig;
+                fgStructure.CurrentWindow->Window.pContext.FBConfig;
 
           XVisualInfo * visualInfo =
                 glXGetVisualFromFBConfig( fgDisplay.Display, *fbconfig );

Modified: trunk/freeglut/freeglut/src/Common/freeglut_structure.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_structure.c	2012-01-29 03:04:35 UTC (rev 1013)
+++ trunk/freeglut/freeglut/src/Common/freeglut_structure.c	2012-01-29 03:15:41 UTC (rev 1014)
@@ -63,7 +63,7 @@
 #if TARGET_HOST_POSIX_X11
 void fgPlatformCreateWindow ( SFG_Window *window )
 {
-    window->Window.FBConfig = NULL;
+    window->Window.pContext.FBConfig = NULL;
 
     window->State.OldHeight = window->State.OldWidth = -1;
 }

Modified: trunk/freeglut/freeglut/src/Common/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-01-29 03:04:35 UTC (rev 1013)
+++ trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-01-29 03:15:41 UTC (rev 1014)
@@ -398,7 +398,7 @@
 
   /* "classic" context creation */
   Display *dpy = fgDisplay.Display;
-  GLXFBConfig config = *(window->Window.FBConfig);
+  GLXFBConfig config = *(window->Window.pContext.FBConfig);
   int render_type = ( !menu && index_mode ) ? GLX_COLOR_INDEX_TYPE : GLX_RGBA_TYPE;
   GLXContext share_list = NULL;
   Bool direct = ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT );
@@ -548,12 +548,12 @@
     if( window->IsMenu && ( ! fgStructure.MenuContext ) )
         fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB ;
 
-    window->Window.FBConfig = fgChooseFBConfig( &num_FBConfigs );
+    window->Window.pContext.FBConfig = fgChooseFBConfig( &num_FBConfigs );
 
     if( window->IsMenu && ( ! fgStructure.MenuContext ) )
         fgState.DisplayMode = current_DisplayMode ;
 
-    if( ! window->Window.FBConfig )
+    if( ! window->Window.pContext.FBConfig )
     {
         /*
          * The "fgChooseFBConfig" returned a null meaning that the visual
@@ -563,25 +563,25 @@
         if( !( fgState.DisplayMode & GLUT_DOUBLE ) )
         {
             fgState.DisplayMode |= GLUT_DOUBLE ;
-            window->Window.FBConfig = fgChooseFBConfig( &num_FBConfigs );
+            window->Window.pContext.FBConfig = fgChooseFBConfig( &num_FBConfigs );
             fgState.DisplayMode &= ~GLUT_DOUBLE;
         }
 
         if( fgState.DisplayMode & GLUT_MULTISAMPLE )
         {
             fgState.DisplayMode &= ~GLUT_MULTISAMPLE ;
-            window->Window.FBConfig = fgChooseFBConfig( &num_FBConfigs );
+            window->Window.pContext.FBConfig = fgChooseFBConfig( &num_FBConfigs );
             fgState.DisplayMode |= GLUT_MULTISAMPLE;
         }
     }
 
-    FREEGLUT_INTERNAL_ERROR_EXIT( window->Window.FBConfig != NULL,
+    FREEGLUT_INTERNAL_ERROR_EXIT( window->Window.pContext.FBConfig != NULL,
                                   "FBConfig with necessary capabilities not found", "fgOpenWindow" );
 
     /*  Get the X visual.  */
     for (i = 0; i < num_FBConfigs; i++) {
 	    visualInfo = glXGetVisualFromFBConfig( fgDisplay.Display,
-						   window->Window.FBConfig[i] );
+						   window->Window.pContext.FBConfig[i] );
 	    if (visualInfo)
 		break;
     }
@@ -750,7 +750,7 @@
 {
     if( window->Window.Context )
         glXDestroyContext( fgDisplay.Display, window->Window.Context );
-    XFree( window->Window.FBConfig );
+    XFree( window->Window.pContext.FBConfig );
 
     if( window->Window.Handle ) {
         XDestroyWindow( fgDisplay.Display, window->Window.Handle );

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_display_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_display_mswin.c	2012-01-29 03:04:35 UTC (rev 1013)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_display_mswin.c	2012-01-29 03:15:41 UTC (rev 1014)
@@ -33,5 +33,5 @@
 
 void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow )
 {
-    SwapBuffers( CurrentWindow->Window.Device );
+    SwapBuffers( CurrentWindow->Window.pContext.Device );
 }

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-29 03:04:35 UTC (rev 1013)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-29 03:15:41 UTC (rev 1014)
@@ -42,7 +42,13 @@
  */
 typedef HWND    SFG_WindowHandleType ;
 typedef HGLRC   SFG_WindowContextType ;
+typedef struct tagSFG_PlatformContext SFG_PlatformContext;
+struct tagSFG_PlatformContext
+{
+    HDC             Device;          /* The window's device context         */
+};
 
 
 
+
 #endif  /* FREEGLUT_INTERNAL_MSWIN_H */
\ No newline at end of file

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c	2012-01-29 03:04:35 UTC (rev 1013)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c	2012-01-29 03:15:41 UTC (rev 1014)
@@ -329,7 +329,7 @@
                                        "fgPlatformWindowProc" );
 
         window->Window.Handle = hWnd;
-        window->Window.Device = GetDC( hWnd );
+        window->Window.pContext.Device = GetDC( hWnd );
         if( window->IsMenu )
         {
             unsigned int current_DisplayMode = fgState.DisplayMode;
@@ -340,7 +340,7 @@
             fgState.DisplayMode = current_DisplayMode;
 
             if( fgStructure.MenuContext )
-                wglMakeCurrent( window->Window.Device,
+                wglMakeCurrent( window->Window.pContext.Device,
                                 fgStructure.MenuContext->MContext
                 );
             else
@@ -348,11 +348,11 @@
                 fgStructure.MenuContext =
                     (SFG_MenuContext *)malloc( sizeof(SFG_MenuContext) );
                 fgStructure.MenuContext->MContext =
-                    wglCreateContext( window->Window.Device );
+                    wglCreateContext( window->Window.pContext.Device );
             }
 
             /* window->Window.Context = wglGetCurrentContext ();   */
-            window->Window.Context = wglCreateContext( window->Window.Device );
+            window->Window.Context = wglCreateContext( window->Window.pContext.Device );
         }
         else
         {
@@ -362,13 +362,13 @@
 
             if( ! fgState.UseCurrentContext )
                 window->Window.Context =
-                    wglCreateContext( window->Window.Device );
+                    wglCreateContext( window->Window.pContext.Device );
             else
             {
                 window->Window.Context = wglGetCurrentContext( );
                 if( ! window->Window.Context )
                     window->Window.Context =
-                        wglCreateContext( window->Window.Device );
+                        wglCreateContext( window->Window.pContext.Device );
             }
 
 #if !defined(_WIN32_WCE)
@@ -391,7 +391,7 @@
             fgSetWindow( current_window );
         }
 
-        ReleaseDC( window->Window.Handle, window->Window.Device );
+        ReleaseDC( window->Window.Handle, window->Window.pContext.Device );
 
 #if defined(_WIN32_WCE)
         /* Take over button handling */

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c	2012-01-29 03:04:35 UTC (rev 1013)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c	2012-01-29 03:15:41 UTC (rev 1014)
@@ -229,7 +229,7 @@
     case GLUT_WINDOW_FORMAT_ID:
 #if !defined(_WIN32_WCE)
         if( fgStructure.CurrentWindow != NULL )
-            return GetPixelFormat( fgStructure.CurrentWindow->Window.Device );
+            return GetPixelFormat( fgStructure.CurrentWindow->Window.pContext.Device );
 #endif /* defined(_WIN32_WCE) */
         return 0;
 

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c	2012-01-29 03:04:35 UTC (rev 1013)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c	2012-01-29 03:15:41 UTC (rev 1014)
@@ -169,9 +169,9 @@
         return;
     }
 
-    wglMakeCurrent( window->Window.Device, window->Window.Context );
+    wglMakeCurrent( window->Window.pContext.Device, window->Window.Context );
 
-    if ( !fghIsExtensionSupported( window->Window.Device, "WGL_ARB_create_context" ) )
+    if ( !fghIsExtensionSupported( window->Window.pContext.Device, "WGL_ARB_create_context" ) )
     {
         return;
     }
@@ -185,7 +185,7 @@
         fgError( "wglCreateContextAttribsARB not found" );
     }
 
-    context = wglCreateContextAttribsARB( window->Window.Device, 0, attributes );
+    context = wglCreateContextAttribsARB( window->Window.pContext.Device, 0, attributes );
     if ( context == NULL )
     {
         fghContextCreationError();
@@ -296,7 +296,7 @@
     if (checkOnly)
       current_hDC = CreateDC(TEXT("DISPLAY"), NULL ,NULL ,NULL);
     else
-      current_hDC = window->Window.Device;
+      current_hDC = window->Window.pContext.Device;
 
     fghFillPFD( ppfd, current_hDC, layer_type );
     pixelformat = ChoosePixelFormat( current_hDC, ppfd );
@@ -370,13 +370,13 @@
     {
         if( fgStructure.CurrentWindow )
             ReleaseDC( fgStructure.CurrentWindow->Window.Handle,
-                       fgStructure.CurrentWindow->Window.Device );
+                       fgStructure.CurrentWindow->Window.pContext.Device );
 
         if ( window )
         {
-            window->Window.Device = GetDC( window->Window.Handle );
+            window->Window.pContext.Device = GetDC( window->Window.Handle );
             wglMakeCurrent(
-                window->Window.Device,
+                window->Window.pContext.Device,
                 window->Window.Context
             );
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1015
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1015&view=rev
Author:   fayjf
Date:     2012-01-29 03:22:28 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Moving the "glutCreateWindowWithExit" and its associated variable to the Windows-specific files

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_internal.h
    trunk/freeglut/freeglut/src/Common/freeglut_window.c
    trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
    trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 03:15:41 UTC (rev 1014)
+++ trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 03:22:28 UTC (rev 1015)
@@ -991,10 +991,6 @@
 
 SFG_Proc fghGetProcAddress( const char *procName );
 
-#if TARGET_HOST_MS_WINDOWS
-extern void (__cdecl *__glutExitFunc)( int return_value );
-#endif
-
 #endif /* FREEGLUT_INTERNAL_H */
 
 /*** END OF FILE ***/

Modified: trunk/freeglut/freeglut/src/Common/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-01-29 03:15:41 UTC (rev 1014)
+++ trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-01-29 03:22:28 UTC (rev 1015)
@@ -986,14 +986,6 @@
                            GL_FALSE, GL_FALSE )->ID;
 }
 
-#if TARGET_HOST_MS_WINDOWS
-int FGAPIENTRY __glutCreateWindowWithExit( const char *title, void (__cdecl *exit_function)(int) )
-{
-  __glutExitFunc = exit_function;
-  return glutCreateWindow( title );
-}
-#endif
-
 /*
  * This function creates a sub window.
  */

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-29 03:15:41 UTC (rev 1014)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-29 03:22:28 UTC (rev 1015)
@@ -49,6 +49,8 @@
 };
 
 
+/* Function to be called on exit */
+extern void (__cdecl *__glutExitFunc)( int return_value );
 
 
 #endif  /* FREEGLUT_INTERNAL_MSWIN_H */
\ No newline at end of file

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c	2012-01-29 03:15:41 UTC (rev 1014)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c	2012-01-29 03:22:28 UTC (rev 1015)
@@ -1078,3 +1078,12 @@
 }
 
 
+/* -- PLATFORM-SPECIFIC INTERFACE FUNCTION -------------------------------------------------- */
+
+
+int FGAPIENTRY __glutCreateWindowWithExit( const char *title, void (__cdecl *exit_function)(int) )
+{
+  __glutExitFunc = exit_function;
+  return glutCreateWindow( title );
+}
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1016
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1016&view=rev
Author:   fayjf
Date:     2012-01-29 03:25:31 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Moving the Windows-specific "glutInitWithExit" function to a Windows-specific file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_init.c
    trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_init.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-01-29 03:22:28 UTC (rev 1015)
+++ trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-01-29 03:25:31 UTC (rev 1016)
@@ -648,16 +648,6 @@
     }
 }
 
-#if TARGET_HOST_MS_WINDOWS
-void (__cdecl *__glutExitFunc)( int return_value ) = NULL;
-
-void FGAPIENTRY __glutInitWithExit( int *pargc, char **argv, void (__cdecl *exit_function)(int) )
-{
-  __glutExitFunc = exit_function;
-  glutInit(pargc, argv);
-}
-#endif
-
 /*
  * Undoes all the "glutInit" stuff
  */

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c	2012-01-29 03:22:28 UTC (rev 1015)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c	2012-01-29 03:25:31 UTC (rev 1016)
@@ -329,3 +329,14 @@
 
 
 
+/* -- PLATFORM-SPECIFIC INTERFACE FUNCTION -------------------------------------------------- */
+
+
+void (__cdecl *__glutExitFunc)( int return_value ) = NULL;
+
+void FGAPIENTRY __glutInitWithExit( int *pargc, char **argv, void (__cdecl *exit_function)(int) )
+{
+  __glutExitFunc = exit_function;
+  glutInit(pargc, argv);
+}
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1017
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1017&view=rev
Author:   fayjf
Date:     2012-01-29 03:38:11 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Splitting platform-specific code out of "fgJoystickClose" function

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_joystick.c
    trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_joystick.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_joystick.c	2012-01-29 03:25:31 UTC (rev 1016)
+++ trunk/freeglut/freeglut/src/Common/freeglut_joystick.c	2012-01-29 03:38:11 UTC (rev 1017)
@@ -455,6 +455,9 @@
 #endif
 
 
+/* External function declarations (mostly platform-specific) */
+extern void fgPlatformJoystickClose ( int ident );
+
 /*
  * The static joystick structure pointer
  */
@@ -1619,49 +1622,57 @@
 /*
  *
  */
-void fgJoystickClose( void )
-{
-    int ident ;
-    for( ident = 0; ident < MAX_NUM_JOYSTICKS; ident++ )
-    {
-        if( fgJoystick[ ident ] )
-        {
 
 #if TARGET_HOST_MACINTOSH
-            ISpSuspend( );
-            ISpStop( );
-            ISpShutdown( );
+void fgPlatformJoystickClose ( int ident )
+{
+    ISpSuspend( );
+    ISpStop( );
+    ISpShutdown( );
+}
 #endif
 
 #if TARGET_HOST_MAC_OSX
-            ( *( fgJoystick[ ident ]->hidDev ) )->
-                close( fgJoystick[ ident ]->hidDev );
+void fgPlatformJoystickClose ( int ident )
+{
+    ( *( fgJoystick[ ident ]->hidDev ) )->
+        close( fgJoystick[ ident ]->hidDev );
+}
 #endif
 
-#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
-            /* Do nothing special */
-#endif
-
 #if TARGET_HOST_POSIX_X11
+void fgPlatformJoystickClose ( int ident )
+{
 #if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-            if( fgJoystick[ident]->os )
-            {
-                if( ! fgJoystick[ ident ]->error )
-                    close( fgJoystick[ ident ]->os->fd );
+    if( fgJoystick[ident]->os )
+    {
+        if( ! fgJoystick[ ident ]->error )
+            close( fgJoystick[ ident ]->os->fd );
 #ifdef HAVE_USB_JS
-                if( fgJoystick[ ident ]->os->hids )
-                    free (fgJoystick[ ident ]->os->hids);
-                if( fgJoystick[ ident ]->os->hid_data_buf )
-                    free( fgJoystick[ ident ]->os->hid_data_buf );
+        if( fgJoystick[ ident ]->os->hids )
+            free (fgJoystick[ ident ]->os->hids);
+        if( fgJoystick[ ident ]->os->hid_data_buf )
+            free( fgJoystick[ ident ]->os->hid_data_buf );
 #endif
-                free( fgJoystick[ident]->os );
-            }
+        free( fgJoystick[ident]->os );
+	}
 #endif
 
-            if( ! fgJoystick[ident]->error )
-                close( fgJoystick[ ident ]->fd );
+    if( ! fgJoystick[ident]->error )
+         close( fgJoystick[ ident ]->fd );
+}
 #endif
 
+
+void fgJoystickClose( void )
+{
+    int ident ;
+    for( ident = 0; ident < MAX_NUM_JOYSTICKS; ident++ )
+    {
+        if( fgJoystick[ ident ] )
+        {
+			fgPlatformJoystickClose ( ident );
+
             free( fgJoystick[ ident ] );
             fgJoystick[ ident ] = NULL;
             /* show joystick has been deinitialized */

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c	2012-01-29 03:25:31 UTC (rev 1016)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c	2012-01-29 03:38:11 UTC (rev 1017)
@@ -0,0 +1,38 @@
+/*
+ * freeglut_joystick_mswin.c
+ *
+ * The Windows-specific mouse cursor related stuff.
+ *
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
+ * Written by John F. Fay, <fayjf@...>
+ * Creation date: Sat Jan 28, 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "../Common/freeglut_internal.h"
+
+
+#if !defined(_WIN32_WCE)
+void fgPlatformJoystickClose ( int ident )
+{
+    /* Do nothing special */
+}
+#endif
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1020
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1020&view=rev
Author:   fayjf
Date:     2012-01-29 04:01:24 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Splitting out the platform-specific code from "fghJoystickInit"

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_joystick.c
    trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_joystick.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_joystick.c	2012-01-29 03:51:12 UTC (rev 1019)
+++ trunk/freeglut/freeglut/src/Common/freeglut_joystick.c	2012-01-29 04:01:24 UTC (rev 1020)
@@ -388,6 +388,7 @@
 
 
 /* External function declarations (mostly platform-specific) */
+extern void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident );
 extern void fgPlatformJoystickClose ( int ident );
 
 /*
@@ -401,6 +402,14 @@
  */
 
 #if TARGET_HOST_MACINTOSH
+void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
+{
+    fgJoystick[ ident ]->id = ident;
+    snprintf( fgJoystick[ ident ]->fname, sizeof(fgJoystick[ ident ]->fname), "/dev/js%d", ident ); /* FIXME */
+    fgJoystick[ ident ]->error = GL_FALSE;
+}
+
+
 void fgPlatformJoystickClose ( int ident )
 {
     ISpSuspend( );
@@ -410,6 +419,51 @@
 #endif
 
 #if TARGET_HOST_MAC_OSX
+void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
+{
+    fgJoystick[ ident ]->id = ident;
+    fgJoystick[ ident ]->error = GL_FALSE;
+    fgJoystick[ ident ]->num_axes = 0;
+    fgJoystick[ ident ]->num_buttons = 0;
+
+    if( numDevices < 0 )
+    {
+        /* do first-time init (since we can't over-ride jsInit, hmm */
+        numDevices = 0;
+
+        mach_port_t masterPort;
+        IOReturn rv = IOMasterPort( bootstrap_port, &masterPort );
+        if( rv != kIOReturnSuccess )
+        {
+            fgWarning( "error getting master Mach port" );
+            return;
+        }
+        fghJoystickFindDevices( masterPort );
+    }
+
+    if ( ident >= numDevices )
+    {
+        fgJoystick[ ident ]->error = GL_TRUE;
+        return;
+    }
+
+    /* get the name now too */
+    CFDictionaryRef properties = getCFProperties( ioDevices[ ident ] );
+    CFTypeRef ref = CFDictionaryGetValue( properties,
+                                          CFSTR( kIOHIDProductKey ) );
+    if (!ref)
+        ref = CFDictionaryGetValue(properties, CFSTR( "USB Product Name" ) );
+
+    if( !ref ||
+        !CFStringGetCString( ( CFStringRef )ref, name, 128,
+                             CFStringGetSystemEncoding( ) ) )
+    {
+        fgWarning( "error getting device name" );
+        name[ 0 ] = '\0';
+    }
+}
+
+
 void fgPlatformJoystickClose ( int ident )
 {
     ( *( fgJoystick[ ident ]->hidDev ) )->
@@ -418,6 +472,33 @@
 #endif
 
 #if TARGET_HOST_POSIX_X11
+void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
+{
+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
+    fgJoystick[ ident ]->id = ident;
+    fgJoystick[ ident ]->error = GL_FALSE;
+
+    fgJoystick[ ident ]->os = calloc( 1, sizeof( struct os_specific_s ) );
+    memset( fgJoystick[ ident ]->os, 0, sizeof( struct os_specific_s ) );
+    if( ident < USB_IDENT_OFFSET )
+        fgJoystick[ ident ]->os->is_analog = 1;
+    if( fgJoystick[ ident ]->os->is_analog )
+        snprintf( fgJoystick[ ident ]->os->fname, sizeof(fgJoystick[ ident ]->os->fname), "%s%d", AJSDEV, ident );
+    else
+        snprintf( fgJoystick[ ident ]->os->fname, sizeof(fgJoystick[ ident ]->os->fname), "%s%d", UHIDDEV,
+                 ident - USB_IDENT_OFFSET );
+#elif defined( __linux__ )
+    fgJoystick[ ident ]->id = ident;
+    fgJoystick[ ident ]->error = GL_FALSE;
+
+    snprintf( fgJoystick[ident]->fname, sizeof(fgJoystick[ident]->fname), "/dev/input/js%d", ident );
+
+    if( access( fgJoystick[ ident ]->fname, F_OK ) != 0 )
+        snprintf( fgJoystick[ ident ]->fname, sizeof(fgJoystick[ ident ]->fname), "/dev/js%d", ident );
+#endif
+}
+
+
 void fgPlatformJoystickClose ( int ident )
 {
 #if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
@@ -1486,98 +1567,8 @@
     fgJoystick[ ident ]->num_axes = fgJoystick[ ident ]->num_buttons = 0;
     fgJoystick[ ident ]->error = GL_TRUE;
 
-#if TARGET_HOST_MACINTOSH
-    fgJoystick[ ident ]->id = ident;
-    snprintf( fgJoystick[ ident ]->fname, sizeof(fgJoystick[ ident ]->fname), "/dev/js%d", ident ); /* FIXME */
-    fgJoystick[ ident ]->error = GL_FALSE;
-#endif
+	fgPlatformJoystickInit( fgJoystick, ident );
 
-#if TARGET_HOST_MAC_OSX
-    fgJoystick[ ident ]->id = ident;
-    fgJoystick[ ident ]->error = GL_FALSE;
-    fgJoystick[ ident ]->num_axes = 0;
-    fgJoystick[ ident ]->num_buttons = 0;
-
-    if( numDevices < 0 )
-    {
-        /* do first-time init (since we can't over-ride jsInit, hmm */
-        numDevices = 0;
-
-        mach_port_t masterPort;
-        IOReturn rv = IOMasterPort( bootstrap_port, &masterPort );
-        if( rv != kIOReturnSuccess )
-        {
-            fgWarning( "error getting master Mach port" );
-            return;
-        }
-        fghJoystickFindDevices( masterPort );
-    }
-
-    if ( ident >= numDevices )
-    {
-        fgJoystick[ ident ]->error = GL_TRUE;
-        return;
-    }
-
-    /* get the name now too */
-    CFDictionaryRef properties = getCFProperties( ioDevices[ ident ] );
-    CFTypeRef ref = CFDictionaryGetValue( properties,
-                                          CFSTR( kIOHIDProductKey ) );
-    if (!ref)
-        ref = CFDictionaryGetValue(properties, CFSTR( "USB Product Name" ) );
-
-    if( !ref ||
-        !CFStringGetCString( ( CFStringRef )ref, name, 128,
-                             CFStringGetSystemEncoding( ) ) )
-    {
-        fgWarning( "error getting device name" );
-        name[ 0 ] = '\0';
-    }
-#endif
-
-#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
-    switch( ident )
-    {
-    case 0:
-        fgJoystick[ ident ]->js_id = JOYSTICKID1;
-        fgJoystick[ ident ]->error = GL_FALSE;
-        break;
-    case 1:
-        fgJoystick[ ident ]->js_id = JOYSTICKID2;
-        fgJoystick[ ident ]->error = GL_FALSE;
-        break;
-    default:
-        fgJoystick[ ident ]->num_axes = 0;
-        fgJoystick[ ident ]->error = GL_TRUE;
-        return;
-    }
-#endif
-
-#if TARGET_HOST_POSIX_X11
-#    if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-    fgJoystick[ ident ]->id = ident;
-    fgJoystick[ ident ]->error = GL_FALSE;
-
-    fgJoystick[ ident ]->os = calloc( 1, sizeof( struct os_specific_s ) );
-    memset( fgJoystick[ ident ]->os, 0, sizeof( struct os_specific_s ) );
-    if( ident < USB_IDENT_OFFSET )
-        fgJoystick[ ident ]->os->is_analog = 1;
-    if( fgJoystick[ ident ]->os->is_analog )
-        snprintf( fgJoystick[ ident ]->os->fname, sizeof(fgJoystick[ ident ]->os->fname), "%s%d", AJSDEV, ident );
-    else
-        snprintf( fgJoystick[ ident ]->os->fname, sizeof(fgJoystick[ ident ]->os->fname), "%s%d", UHIDDEV,
-                 ident - USB_IDENT_OFFSET );
-#    elif defined( __linux__ )
-    fgJoystick[ ident ]->id = ident;
-    fgJoystick[ ident ]->error = GL_FALSE;
-
-    snprintf( fgJoystick[ident]->fname, sizeof(fgJoystick[ident]->fname), "/dev/input/js%d", ident );
-
-    if( access( fgJoystick[ ident ]->fname, F_OK ) != 0 )
-        snprintf( fgJoystick[ ident ]->fname, sizeof(fgJoystick[ ident ]->fname), "/dev/js%d", ident );
-#    endif
-#endif
-
     fghJoystickOpen( fgJoystick[ ident  ] );
 }
 

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c	2012-01-29 03:51:12 UTC (rev 1019)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c	2012-01-29 04:01:24 UTC (rev 1020)
@@ -30,6 +30,27 @@
 
 
 #if !defined(_WIN32_WCE)
+void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
+{
+    switch( ident )
+    {
+    case 0:
+        fgJoystick[ ident ]->js_id = JOYSTICKID1;
+        fgJoystick[ ident ]->error = GL_FALSE;
+        break;
+    case 1:
+        fgJoystick[ ident ]->js_id = JOYSTICKID2;
+        fgJoystick[ ident ]->error = GL_FALSE;
+        break;
+    default:
+        fgJoystick[ ident ]->num_axes = 0;
+        fgJoystick[ ident ]->error = GL_TRUE;
+        return;
+    }
+}
+
+
+
 void fgPlatformJoystickClose ( int ident )
 {
     /* Do nothing special */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1021
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1021&view=rev
Author:   fayjf
Date:     2012-01-29 04:25:56 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Moving non-Windows platform-specific code lower in the file again to avoid declaration problems and splitting out the platform-specific fghJoystickOpen code

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_joystick.c
    trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_joystick.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_joystick.c	2012-01-29 04:01:24 UTC (rev 1020)
+++ trunk/freeglut/freeglut/src/Common/freeglut_joystick.c	2012-01-29 04:25:56 UTC (rev 1021)
@@ -388,6 +388,7 @@
 
 
 /* External function declarations (mostly platform-specific) */
+extern void fgPlatformJoystickOpen( SFG_Joystick* joy );
 extern void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident );
 extern void fgPlatformJoystickClose ( int ident );
 
@@ -398,132 +399,6 @@
 static SFG_Joystick *fgJoystick [ MAX_NUM_JOYSTICKS ];
 
 /*
- *  Platform-Specific Code
- */
-
-#if TARGET_HOST_MACINTOSH
-void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
-{
-    fgJoystick[ ident ]->id = ident;
-    snprintf( fgJoystick[ ident ]->fname, sizeof(fgJoystick[ ident ]->fname), "/dev/js%d", ident ); /* FIXME */
-    fgJoystick[ ident ]->error = GL_FALSE;
-}
-
-
-void fgPlatformJoystickClose ( int ident )
-{
-    ISpSuspend( );
-    ISpStop( );
-    ISpShutdown( );
-}
-#endif
-
-#if TARGET_HOST_MAC_OSX
-void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
-{
-    fgJoystick[ ident ]->id = ident;
-    fgJoystick[ ident ]->error = GL_FALSE;
-    fgJoystick[ ident ]->num_axes = 0;
-    fgJoystick[ ident ]->num_buttons = 0;
-
-    if( numDevices < 0 )
-    {
-        /* do first-time init (since we can't over-ride jsInit, hmm */
-        numDevices = 0;
-
-        mach_port_t masterPort;
-        IOReturn rv = IOMasterPort( bootstrap_port, &masterPort );
-        if( rv != kIOReturnSuccess )
-        {
-            fgWarning( "error getting master Mach port" );
-            return;
-        }
-        fghJoystickFindDevices( masterPort );
-    }
-
-    if ( ident >= numDevices )
-    {
-        fgJoystick[ ident ]->error = GL_TRUE;
-        return;
-    }
-
-    /* get the name now too */
-    CFDictionaryRef properties = getCFProperties( ioDevices[ ident ] );
-    CFTypeRef ref = CFDictionaryGetValue( properties,
-                                          CFSTR( kIOHIDProductKey ) );
-    if (!ref)
-        ref = CFDictionaryGetValue(properties, CFSTR( "USB Product Name" ) );
-
-    if( !ref ||
-        !CFStringGetCString( ( CFStringRef )ref, name, 128,
-                             CFStringGetSystemEncoding( ) ) )
-    {
-        fgWarning( "error getting device name" );
-        name[ 0 ] = '\0';
-    }
-}
-
-
-void fgPlatformJoystickClose ( int ident )
-{
-    ( *( fgJoystick[ ident ]->hidDev ) )->
-        close( fgJoystick[ ident ]->hidDev );
-}
-#endif
-
-#if TARGET_HOST_POSIX_X11
-void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
-{
-#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-    fgJoystick[ ident ]->id = ident;
-    fgJoystick[ ident ]->error = GL_FALSE;
-
-    fgJoystick[ ident ]->os = calloc( 1, sizeof( struct os_specific_s ) );
-    memset( fgJoystick[ ident ]->os, 0, sizeof( struct os_specific_s ) );
-    if( ident < USB_IDENT_OFFSET )
-        fgJoystick[ ident ]->os->is_analog = 1;
-    if( fgJoystick[ ident ]->os->is_analog )
-        snprintf( fgJoystick[ ident ]->os->fname, sizeof(fgJoystick[ ident ]->os->fname), "%s%d", AJSDEV, ident );
-    else
-        snprintf( fgJoystick[ ident ]->os->fname, sizeof(fgJoystick[ ident ]->os->fname), "%s%d", UHIDDEV,
-                 ident - USB_IDENT_OFFSET );
-#elif defined( __linux__ )
-    fgJoystick[ ident ]->id = ident;
-    fgJoystick[ ident ]->error = GL_FALSE;
-
-    snprintf( fgJoystick[ident]->fname, sizeof(fgJoystick[ident]->fname), "/dev/input/js%d", ident );
-
-    if( access( fgJoystick[ ident ]->fname, F_OK ) != 0 )
-        snprintf( fgJoystick[ ident ]->fname, sizeof(fgJoystick[ ident ]->fname), "/dev/js%d", ident );
-#endif
-}
-
-
-void fgPlatformJoystickClose ( int ident )
-{
-#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-    if( fgJoystick[ident]->os )
-    {
-        if( ! fgJoystick[ ident ]->error )
-            close( fgJoystick[ ident ]->os->fd );
-#ifdef HAVE_USB_JS
-        if( fgJoystick[ ident ]->os->hids )
-            free (fgJoystick[ ident ]->os->hids);
-        if( fgJoystick[ ident ]->os->hid_data_buf )
-            free( fgJoystick[ ident ]->os->hid_data_buf );
-#endif
-        free( fgJoystick[ident]->os );
-	}
-#endif
-
-    if( ! fgJoystick[ident]->error )
-         close( fgJoystick[ ident ]->fd );
-}
-#endif
-
-
-
-/*
  * Read the raw joystick data
  */
 static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
@@ -1054,109 +929,16 @@
 }
 #endif
 
-#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
-/* Inspired by
-   http://msdn.microsoft.com/archive/en-us/dnargame/html/msdn_sidewind3d.asp
+/*
+ *  Platform-Specific Code
  */
-#    if FREEGLUT_LIB_PRAGMAS
-#        pragma comment (lib, "advapi32.lib")
-#    endif
 
-static int fghJoystickGetOEMProductName ( SFG_Joystick* joy, char *buf, int buf_sz )
-{
-    char buffer [ 256 ];
-
-    char OEMKey [ 256 ];
-
-    HKEY  hKey;
-    DWORD dwcb;
-    LONG  lr;
-
-    if ( joy->error )
-        return 0;
-
-    /* Open .. MediaResources\CurrentJoystickSettings */
-    _snprintf ( buffer, sizeof(buffer), "%s\\%s\\%s",
-                REGSTR_PATH_JOYCONFIG, joy->jsCaps.szRegKey,
-                REGSTR_KEY_JOYCURR );
-
-    lr = RegOpenKeyEx ( HKEY_LOCAL_MACHINE, buffer, 0, KEY_QUERY_VALUE, &hKey);
-
-    if ( lr != ERROR_SUCCESS ) return 0;
-
-    /* Get OEM Key name */
-    dwcb = sizeof(OEMKey);
-
-    /* JOYSTICKID1-16 is zero-based; registry entries for VJOYD are 1-based. */
-    _snprintf ( buffer, sizeof(buffer), "Joystick%d%s", joy->js_id + 1, REGSTR_VAL_JOYOEMNAME );
-
-    lr = RegQueryValueEx ( hKey, buffer, 0, 0, (LPBYTE) OEMKey, &dwcb);
-    RegCloseKey ( hKey );
-
-    if ( lr != ERROR_SUCCESS ) return 0;
-
-    /* Open OEM Key from ...MediaProperties */
-    _snprintf ( buffer, sizeof(buffer), "%s\\%s", REGSTR_PATH_JOYOEM, OEMKey );
-
-    lr = RegOpenKeyEx ( HKEY_LOCAL_MACHINE, buffer, 0, KEY_QUERY_VALUE, &hKey );
-
-    if ( lr != ERROR_SUCCESS ) return 0;
-
-    /* Get OEM Name */
-    dwcb = buf_sz;
-
-    lr = RegQueryValueEx ( hKey, REGSTR_VAL_JOYOEMNAME, 0, 0, (LPBYTE) buf,
-                             &dwcb );
-    RegCloseKey ( hKey );
-
-    if ( lr != ERROR_SUCCESS ) return 0;
-
-    return 1;
-}
-#endif
-
-
-static void fghJoystickOpen( SFG_Joystick* joy )
-{
-    int i = 0;
 #if TARGET_HOST_MACINTOSH
+void fgPlatformJoystickOpen( SFG_Joystick* joy )
+{
+	int i = 0;
     OSStatus err;
-#endif
-#if TARGET_HOST_MAC_OSX
-        IOReturn rv;
-        SInt32 score;
-        IOCFPlugInInterface **plugin;
 
-        HRESULT pluginResult;
-
-        CFDictionaryRef props;
-    CFTypeRef topLevelElement;
-#endif
-#if TARGET_HOST_POSIX_X11
-#    if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-       char *cp;
-#    endif
-#    ifdef JS_NEW
-       unsigned char u;
-#    else
-#      if defined( __linux__ ) || TARGET_HOST_SOLARIS
-         int counter = 0;
-#      endif
-#    endif
-#endif
-
-    /* Silence gcc, the correct #ifdefs would be too fragile... */
-    (void)i;
-
-    /*
-     * Default values (for no joystick -- each conditional will reset the
-     * error flag)
-     */
-    joy->error = TRUE;
-    joy->num_axes = joy->num_buttons = 0;
-    joy->name[ 0 ] = '\0';
-
-#if TARGET_HOST_MACINTOSH
     /* XXX FIXME: get joystick name in Mac */
 
     err = ISpStartup( );
@@ -1254,9 +1036,37 @@
     }
     else
         joy->num_buttons = joy->num_axes = 0;
+}
+
+
+void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
+{
+    fgJoystick[ ident ]->id = ident;
+    snprintf( fgJoystick[ ident ]->fname, sizeof(fgJoystick[ ident ]->fname), "/dev/js%d", ident ); /* FIXME */
+    fgJoystick[ ident ]->error = GL_FALSE;
+}
+
+
+void fgPlatformJoystickClose ( int ident )
+{
+    ISpSuspend( );
+    ISpStop( );
+    ISpShutdown( );
+}
 #endif
 
 #if TARGET_HOST_MAC_OSX
+void fgPlatformJoystickOpen( SFG_Joystick* joy )
+{
+    IOReturn rv;
+    SInt32 score;
+    IOCFPlugInInterface **plugin;
+
+    HRESULT pluginResult;
+
+    CFDictionaryRef props;
+    CFTypeRef topLevelElement;
+
     if( joy->id >= numDevices )
     {
         fgWarning( "device index out of range in fgJoystickOpen()" );
@@ -1304,72 +1114,78 @@
     enumerateElements( topLevelElement );
 
     CFRelease( props );
-#endif
+}
 
-#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
-    joy->js.dwFlags = JOY_RETURNALL;
-    joy->js.dwSize  = sizeof( joy->js );
 
-    memset( &joy->jsCaps, 0, sizeof( joy->jsCaps ) );
+void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
+{
+    fgJoystick[ ident ]->id = ident;
+    fgJoystick[ ident ]->error = GL_FALSE;
+    fgJoystick[ ident ]->num_axes = 0;
+    fgJoystick[ ident ]->num_buttons = 0;
 
-    joy->error =
-        ( joyGetDevCaps( joy->js_id, &joy->jsCaps, sizeof( joy->jsCaps ) ) !=
-          JOYERR_NOERROR );
-
-    if( joy->jsCaps.wNumAxes == 0 )
+    if( numDevices < 0 )
     {
-        joy->num_axes = 0;
-        joy->error = GL_TRUE;
-    }
-    else
-    {
-        /* Device name from jsCaps is often "Microsoft PC-joystick driver",
-         * at least for USB.  Try to get the real name from the registry.
-         */
-        if ( ! fghJoystickGetOEMProductName( joy, joy->name,
-                                             sizeof( joy->name ) ) )
-        {
-            fgWarning( "JS: Failed to read joystick name from registry" );
-            strncpy( joy->name, joy->jsCaps.szPname, sizeof( joy->name ) );
-        }
+        /* do first-time init (since we can't over-ride jsInit, hmm */
+        numDevices = 0;
 
-        /* Windows joystick drivers may provide any combination of
-         * X,Y,Z,R,U,V,POV - not necessarily the first n of these.
-         */
-        if( joy->jsCaps.wCaps & JOYCAPS_HASPOV )
+        mach_port_t masterPort;
+        IOReturn rv = IOMasterPort( bootstrap_port, &masterPort );
+        if( rv != kIOReturnSuccess )
         {
-            joy->num_axes = _JS_MAX_AXES;
-            joy->min[ 7 ] = -1.0; joy->max[ 7 ] = 1.0;  /* POV Y */
-            joy->min[ 6 ] = -1.0; joy->max[ 6 ] = 1.0;  /* POV X */
+            fgWarning( "error getting master Mach port" );
+            return;
         }
-        else
-            joy->num_axes = 6;
+        fghJoystickFindDevices( masterPort );
+    }
 
-        joy->min[ 5 ] = ( float )joy->jsCaps.wVmin;
-        joy->max[ 5 ] = ( float )joy->jsCaps.wVmax;
-        joy->min[ 4 ] = ( float )joy->jsCaps.wUmin;
-        joy->max[ 4 ] = ( float )joy->jsCaps.wUmax;
-        joy->min[ 3 ] = ( float )joy->jsCaps.wRmin;
-        joy->max[ 3 ] = ( float )joy->jsCaps.wRmax;
-        joy->min[ 2 ] = ( float )joy->jsCaps.wZmin;
-        joy->max[ 2 ] = ( float )joy->jsCaps.wZmax;
-        joy->min[ 1 ] = ( float )joy->jsCaps.wYmin;
-        joy->max[ 1 ] = ( float )joy->jsCaps.wYmax;
-        joy->min[ 0 ] = ( float )joy->jsCaps.wXmin;
-        joy->max[ 0 ] = ( float )joy->jsCaps.wXmax;
+    if ( ident >= numDevices )
+    {
+        fgJoystick[ ident ]->error = GL_TRUE;
+        return;
     }
 
-    /* Guess all the rest judging on the axes extremals */
-    for( i = 0; i < joy->num_axes; i++ )
+    /* get the name now too */
+    CFDictionaryRef properties = getCFProperties( ioDevices[ ident ] );
+    CFTypeRef ref = CFDictionaryGetValue( properties,
+                                          CFSTR( kIOHIDProductKey ) );
+    if (!ref)
+        ref = CFDictionaryGetValue(properties, CFSTR( "USB Product Name" ) );
+
+    if( !ref ||
+        !CFStringGetCString( ( CFStringRef )ref, name, 128,
+                             CFStringGetSystemEncoding( ) ) )
     {
-        joy->center   [ i ] = ( joy->max[ i ] + joy->min[ i ] ) * 0.5f;
-        joy->dead_band[ i ] = 0.0f;
-        joy->saturate [ i ] = 1.0f;
+        fgWarning( "error getting device name" );
+        name[ 0 ] = '\0';
     }
+}
+
+
+void fgPlatformJoystickClose ( int ident )
+{
+    ( *( fgJoystick[ ident ]->hidDev ) )->
+        close( fgJoystick[ ident ]->hidDev );
+}
 #endif
 
 #if TARGET_HOST_POSIX_X11
+void fgPlatformJoystickOpen( SFG_Joystick* joy )
+{
 #if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
+	int i = 0;
+       char *cp;
+#endif
+#ifdef JS_NEW
+       unsigned char u;
+#else
+#  if defined( __linux__ ) || TARGET_HOST_SOLARIS
+	int i = 0;
+    int counter = 0;
+#  endif
+#endif
+
+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
     for( i = 0; i < _JS_MAX_AXES; i++ )
         joy->os->cache_axes[ i ] = 0.0f;
 
@@ -1546,9 +1362,77 @@
         joy->saturate [ i ] = 1.0f;
     }
 #endif
+}
+
+
+void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
+{
+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
+    fgJoystick[ ident ]->id = ident;
+    fgJoystick[ ident ]->error = GL_FALSE;
+
+    fgJoystick[ ident ]->os = calloc( 1, sizeof( struct os_specific_s ) );
+    memset( fgJoystick[ ident ]->os, 0, sizeof( struct os_specific_s ) );
+    if( ident < USB_IDENT_OFFSET )
+        fgJoystick[ ident ]->os->is_analog = 1;
+    if( fgJoystick[ ident ]->os->is_analog )
+        snprintf( fgJoystick[ ident ]->os->fname, sizeof(fgJoystick[ ident ]->os->fname), "%s%d", AJSDEV, ident );
+    else
+        snprintf( fgJoystick[ ident ]->os->fname, sizeof(fgJoystick[ ident ]->os->fname), "%s%d", UHIDDEV,
+                 ident - USB_IDENT_OFFSET );
+#elif defined( __linux__ )
+    fgJoystick[ ident ]->id = ident;
+    fgJoystick[ ident ]->error = GL_FALSE;
+
+    snprintf( fgJoystick[ident]->fname, sizeof(fgJoystick[ident]->fname), "/dev/input/js%d", ident );
+
+    if( access( fgJoystick[ ident ]->fname, F_OK ) != 0 )
+        snprintf( fgJoystick[ ident ]->fname, sizeof(fgJoystick[ ident ]->fname), "/dev/js%d", ident );
 #endif
 }
 
+
+void fgPlatformJoystickClose ( int ident )
+{
+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
+    if( fgJoystick[ident]->os )
+    {
+        if( ! fgJoystick[ ident ]->error )
+            close( fgJoystick[ ident ]->os->fd );
+#ifdef HAVE_USB_JS
+        if( fgJoystick[ ident ]->os->hids )
+            free (fgJoystick[ ident ]->os->hids);
+        if( fgJoystick[ ident ]->os->hid_data_buf )
+            free( fgJoystick[ ident ]->os->hid_data_buf );
+#endif
+        free( fgJoystick[ident]->os );
+	}
+#endif
+
+    if( ! fgJoystick[ident]->error )
+         close( fgJoystick[ ident ]->fd );
+}
+#endif
+
+
+
+
+
+
+static void fghJoystickOpen( SFG_Joystick* joy )
+{
+    /*
+     * Default values (for no joystick -- each conditional will reset the
+     * error flag)
+     */
+    joy->error = TRUE;
+    joy->num_axes = joy->num_buttons = 0;
+    joy->name[ 0 ] = '\0';
+
+	fgPlatformJoystickOpen ( joy );
+
+}
+
 /*
  * This function replaces the constructor method in the JS library.
  */

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c	2012-01-29 04:01:24 UTC (rev 1020)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c	2012-01-29 04:25:56 UTC (rev 1021)
@@ -30,6 +30,139 @@
 
 
 #if !defined(_WIN32_WCE)
+#    include <windows.h>
+#    include <mmsystem.h>
+#    include <regstr.h>
+
+
+
+/* Inspired by
+   http://msdn.microsoft.com/archive/en-us/dnargame/html/msdn_sidewind3d.asp
+ */
+#  if FREEGLUT_LIB_PRAGMAS
+#      pragma comment (lib, "advapi32.lib")
+#  endif
+
+static int fghJoystickGetOEMProductName ( SFG_Joystick* joy, char *buf, int buf_sz )
+{
+    char buffer [ 256 ];
+
+    char OEMKey [ 256 ];
+
+    HKEY  hKey;
+    DWORD dwcb;
+    LONG  lr;
+
+    if ( joy->error )
+        return 0;
+
+    /* Open .. MediaResources\CurrentJoystickSettings */
+    _snprintf ( buffer, sizeof(buffer), "%s\\%s\\%s",
+                REGSTR_PATH_JOYCONFIG, joy->jsCaps.szRegKey,
+                REGSTR_KEY_JOYCURR );
+
+    lr = RegOpenKeyEx ( HKEY_LOCAL_MACHINE, buffer, 0, KEY_QUERY_VALUE, &hKey);
+
+    if ( lr != ERROR_SUCCESS ) return 0;
+
+    /* Get OEM Key name */
+    dwcb = sizeof(OEMKey);
+
+    /* JOYSTICKID1-16 is zero-based; registry entries for VJOYD are 1-based. */
+    _snprintf ( buffer, sizeof(buffer), "Joystick%d%s", joy->js_id + 1, REGSTR_VAL_JOYOEMNAME );
+
+    lr = RegQueryValueEx ( hKey, buffer, 0, 0, (LPBYTE) OEMKey, &dwcb);
+    RegCloseKey ( hKey );
+
+    if ( lr != ERROR_SUCCESS ) return 0;
+
+    /* Open OEM Key from ...MediaProperties */
+    _snprintf ( buffer, sizeof(buffer), "%s\\%s", REGSTR_PATH_JOYOEM, OEMKey );
+
+    lr = RegOpenKeyEx ( HKEY_LOCAL_MACHINE, buffer, 0, KEY_QUERY_VALUE, &hKey );
+
+    if ( lr != ERROR_SUCCESS ) return 0;
+
+    /* Get OEM Name */
+    dwcb = buf_sz;
+
+    lr = RegQueryValueEx ( hKey, REGSTR_VAL_JOYOEMNAME, 0, 0, (LPBYTE) buf,
+                             &dwcb );
+    RegCloseKey ( hKey );
+
+    if ( lr != ERROR_SUCCESS ) return 0;
+
+    return 1;
+}
+
+
+void fgPlatformJoystickOpen( SFG_Joystick* joy )
+{
+	int i = 0;
+
+    joy->js.dwFlags = JOY_RETURNALL;
+    joy->js.dwSize  = sizeof( joy->js );
+
+    memset( &joy->jsCaps, 0, sizeof( joy->jsCaps ) );
+
+    joy->error =
+        ( joyGetDevCaps( joy->js_id, &joy->jsCaps, sizeof( joy->jsCaps ) ) !=
+          JOYERR_NOERROR );
+
+    if( joy->jsCaps.wNumAxes == 0 )
+    {
+        joy->num_axes = 0;
+        joy->error = GL_TRUE;
+    }
+    else
+    {
+        /* Device name from jsCaps is often "Microsoft PC-joystick driver",
+         * at least for USB.  Try to get the real name from the registry.
+         */
+        if ( ! fghJoystickGetOEMProductName( joy, joy->name,
+                                             sizeof( joy->name ) ) )
+        {
+            fgWarning( "JS: Failed to read joystick name from registry" );
+            strncpy( joy->name, joy->jsCaps.szPname, sizeof( joy->name ) );
+        }
+
+        /* Windows joystick drivers may provide any combination of
+         * X,Y,Z,R,U,V,POV - not necessarily the first n of these.
+         */
+        if( joy->jsCaps.wCaps & JOYCAPS_HASPOV )
+        {
+            joy->num_axes = _JS_MAX_AXES;
+            joy->min[ 7 ] = -1.0; joy->max[ 7 ] = 1.0;  /* POV Y */
+            joy->min[ 6 ] = -1.0; joy->max[ 6 ] = 1.0;  /* POV X */
+        }
+        else
+            joy->num_axes = 6;
+
+        joy->min[ 5 ] = ( float )joy->jsCaps.wVmin;
+        joy->max[ 5 ] = ( float )joy->jsCaps.wVmax;
+        joy->min[ 4 ] = ( float )joy->jsCaps.wUmin;
+        joy->max[ 4 ] = ( float )joy->jsCaps.wUmax;
+        joy->min[ 3 ] = ( float )joy->jsCaps.wRmin;
+        joy->max[ 3 ] = ( float )joy->jsCaps.wRmax;
+        joy->min[ 2 ] = ( float )joy->jsCaps.wZmin;
+        joy->max[ 2 ] = ( float )joy->jsCaps.wZmax;
+        joy->min[ 1 ] = ( float )joy->jsCaps.wYmin;
+        joy->max[ 1 ] = ( float )joy->jsCaps.wYmax;
+        joy->min[ 0 ] = ( float )joy->jsCaps.wXmin;
+        joy->max[ 0 ] = ( float )joy->jsCaps.wXmax;
+    }
+
+    /* Guess all the rest judging on the axes extremals */
+    for( i = 0; i < joy->num_axes; i++ )
+    {
+        joy->center   [ i ] = ( joy->max[ i ] + joy->min[ i ] ) * 0.5f;
+        joy->dead_band[ i ] = 0.0f;
+        joy->saturate [ i ] = 1.0f;
+    }
+}
+
+
+
 void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
 {
     switch( ident )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1022
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1022&view=rev
Author:   fayjf
Date:     2012-01-29 04:32:41 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Splitting the platform-specific "fgSystemTime" code into its own functions

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_main.c
    trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_main.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_main.c	2012-01-29 04:25:56 UTC (rev 1021)
+++ trunk/freeglut/freeglut/src/Common/freeglut_main.c	2012-01-29 04:32:41 UTC (rev 1022)
@@ -72,6 +72,7 @@
 
 extern void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height );
 extern void fgPlatformDisplayWindow ( SFG_Window *window );
+extern unsigned long fgPlatformSystemTime ( void );
 extern void fgPlatformSleepForEvents( long msec );
 extern void fgPlatformProcessSingleEvent ( void );
 extern void fgPlatformMainLoopPreliminaryWork ( void );
@@ -174,7 +175,17 @@
 {
         fghRedrawWindow ( window ) ;
 }
+
+
+unsigned long fgPlatformSystemTime ( void )
+{
+#if TARGET_HOST_SOLARIS || HAVE_GETTIMEOFDAY
+    struct timeval now;
+    gettimeofday( &now, NULL );
+    return now.tv_usec/1000 + now.tv_sec*1000;
 #endif
+}
+#endif
 
 static void fghcbDisplayWindow( SFG_Window *window,
                                 SFG_Enumerator *enumerator )
@@ -262,18 +273,9 @@
  * when subtracting an initial start time, unless the total time exceeds
  * 32-bit, where the GLUT API return value is also overflowed.
  */  
-unsigned long fgSystemTime(void) {
-#if TARGET_HOST_SOLARIS || HAVE_GETTIMEOFDAY
-    struct timeval now;
-    gettimeofday( &now, NULL );
-    return now.tv_usec/1000 + now.tv_sec*1000;
-#elif TARGET_HOST_MS_WINDOWS
-#    if defined(_WIN32_WCE)
-    return GetTickCount();
-#    else
-    return timeGetTime();
-#    endif
-#endif
+unsigned long fgSystemTime(void)
+{
+	return fgPlatformSystemTime ();
 }
   
 /*

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c	2012-01-29 04:25:56 UTC (rev 1021)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c	2012-01-29 04:32:41 UTC (rev 1022)
@@ -108,6 +108,16 @@
 }
 
 
+unsigned long fgPlatformSystemTime ( void )
+{
+#if defined(_WIN32_WCE)
+    return GetTickCount();
+#else
+    return timeGetTime();
+#endif
+}
+
+
 void fgPlatformSleepForEvents( long msec )
 {
     MsgWaitForMultipleObjects( 0, NULL, FALSE, msec, QS_ALLINPUT );

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1023
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1023&view=rev
Author:   fayjf
Date:     2012-01-29 04:45:17 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Splitting the platform-specific joystick "Raw Read" code into its own functions

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_joystick.c
    trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_joystick.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_joystick.c	2012-01-29 04:32:41 UTC (rev 1022)
+++ trunk/freeglut/freeglut/src/Common/freeglut_joystick.c	2012-01-29 04:45:17 UTC (rev 1023)
@@ -388,6 +388,7 @@
 
 
 /* External function declarations (mostly platform-specific) */
+extern void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes );
 extern void fgPlatformJoystickOpen( SFG_Joystick* joy );
 extern void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident );
 extern void fgPlatformJoystickClose ( int ident );
@@ -403,16 +404,6 @@
  */
 static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
 {
-#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
-    MMRESULT status;
-#else
-    int status;
-#endif
-
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-    int len;
-#endif
-
     int i;
 
     /* Defaults */
@@ -426,291 +417,7 @@
     if( joy->error )
         return;
 
-#if TARGET_HOST_MACINTOSH
-    if ( buttons )
-    {
-        *buttons = 0;
-
-        for ( i = 0; i < joy->num_buttons; i++ )
-        {
-            UInt32 state;
-            int err = ISpElement_GetSimpleState ( isp_elem [ i + isp_num_axis ], &state);
-            ISP_CHECK_ERR(err)
-
-            *buttons |= state << i;
-        }
-    }
-
-    if ( axes )
-    {
-        for ( i = 0; i < joy->num_axes; i++ )
-        {
-            UInt32 state;
-            int err = ISpElement_GetSimpleState ( isp_elem [ i ], &state );
-            ISP_CHECK_ERR(err)
-
-            axes [i] = (float) state;
-        }
-    }
-#endif
-
-#if TARGET_HOST_MAC_OSX
-    if ( buttons != NULL )
-    {
-        *buttons = 0;
-
-        for ( i = 0; i < joy->num_buttons; i++ )
-        {
-            IOHIDEventStruct hidEvent;
-            (*(joy->hidDev))->getElementValue ( joy->hidDev, buttonCookies[i], &hidEvent );
-            if ( hidEvent.value )
-                *buttons |= 1 << i;
-        }
-    }
-
-    if ( axes != NULL )
-    {
-        for ( i = 0; i < joy->num_axes; i++ )
-        {
-            IOHIDEventStruct hidEvent;
-            (*(joy->hidDev))->getElementValue ( joy->hidDev, axisCookies[i], &hidEvent );
-            axes[i] = hidEvent.value;
-        }
-    }
-#endif
-
-#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
-    status = joyGetPosEx( joy->js_id, &joy->js );
-
-    if ( status != JOYERR_NOERROR )
-    {
-        joy->error = GL_TRUE;
-        return;
-    }
-
-    if ( buttons )
-        *buttons = joy->js.dwButtons;
-
-    if ( axes )
-    {
-        /*
-         * WARNING - Fall through case clauses!!
-         */
-        switch ( joy->num_axes )
-        {
-        case 8:
-            /* Generate two POV axes from the POV hat angle.
-             * Low 16 bits of js.dwPOV gives heading (clockwise from ahead) in
-             *   hundredths of a degree, or 0xFFFF when idle.
-             */
-            if ( ( joy->js.dwPOV & 0xFFFF ) == 0xFFFF )
-            {
-              axes [ 6 ] = 0.0;
-              axes [ 7 ] = 0.0;
-            }
-            else
-            {
-              /* This is the contentious bit: how to convert angle to X/Y.
-               *    wk: I know of no define for PI that we could use here:
-               *    SG_PI would pull in sg, M_PI is undefined for MSVC
-               * But the accuracy of the value of PI is very unimportant at
-               * this point.
-               */
-              float s = (float) sin ( ( joy->js.dwPOV & 0xFFFF ) * ( 0.01 * 3.1415926535f / 180.0f ) );
-              float c = (float) cos ( ( joy->js.dwPOV & 0xFFFF ) * ( 0.01 * 3.1415926535f / 180.0f ) );
-
-              /* Convert to coordinates on a square so that North-East
-               * is (1,1) not (.7,.7), etc.
-               * s and c cannot both be zero so we won't divide by zero.
-               */
-              if ( fabs ( s ) < fabs ( c ) )
-              {
-                axes [ 6 ] = ( c < 0.0 ) ? -s/c  : s/c ;
-                axes [ 7 ] = ( c < 0.0 ) ? -1.0f : 1.0f;
-              }
-              else
-              {
-                axes [ 6 ] = ( s < 0.0 ) ? -1.0f : 1.0f;
-                axes [ 7 ] = ( s < 0.0 ) ? -c/s  : c/s ;
-              }
-            }
-
-        case 6: axes[5] = (float) joy->js.dwVpos;
-        case 5: axes[4] = (float) joy->js.dwUpos;
-        case 4: axes[3] = (float) joy->js.dwRpos;
-        case 3: axes[2] = (float) joy->js.dwZpos;
-        case 2: axes[1] = (float) joy->js.dwYpos;
-        case 1: axes[0] = (float) joy->js.dwXpos;
-        }
-    }
-#endif
-
-#if TARGET_HOST_POSIX_X11
-#    if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-    if ( joy->os->is_analog )
-    {
-        int status = read ( joy->os->fd, &joy->os->ajs, sizeof(joy->os->ajs) );
-        if ( status != sizeof(joy->os->ajs) ) {
-            perror ( joy->os->fname );
-            joy->error = GL_TRUE;
-            return;
-        }
-        if ( buttons != NULL )
-            *buttons = ( joy->os->ajs.b1 ? 1 : 0 ) | ( joy->os->ajs.b2 ? 2 : 0 );
-
-        if ( axes != NULL )
-        {
-            axes[0] = (float) joy->os->ajs.x;
-            axes[1] = (float) joy->os->ajs.y;
-        }
-
-        return;
-    }
-
-#        ifdef HAVE_USB_JS
-    while ( ( len = read ( joy->os->fd, joy->os->hid_data_buf, joy->os->hid_dlen ) ) == joy->os->hid_dlen )
-    {
-        struct hid_item *h;
-
-        for  ( h = joy->os->hids; h; h = h->next )
-        {
-            int d = hid_get_data ( joy->os->hid_data_buf, h );
-
-            int page = HID_PAGE ( h->usage );
-            int usage = HID_USAGE ( h->usage );
-
-            if ( page == HUP_GENERIC_DESKTOP )
-            {
-                int i;
-                for ( i = 0; i < joy->num_axes; i++ )
-                    if (joy->os->axes_usage[i] == usage)
-                    {
-                        if (usage == HUG_HAT_SWITCH)
-                        {
-                            if (d < 0 || d > 8)
-                                d = 0;  /* safety */
-                            joy->os->cache_axes[i] = (float)hatmap_x[d];
-                            joy->os->cache_axes[i + 1] = (float)hatmap_y[d];
-                        }
-                        else
-                        {
-                            joy->os->cache_axes[i] = (float)d;
-                        }
-                        break;
-                    }
-            }
-            else if (page == HUP_BUTTON)
-            {
-               if (usage > 0 && usage < _JS_MAX_BUTTONS + 1)
-               {
-                   if (d)
-                       joy->os->cache_buttons |=  (1 << ( usage - 1 ));
-                   else
-                       joy->os->cache_buttons &= ~(1 << ( usage - 1 ));
-               }
-            }
-        }
-    }
-#ifdef HAVE_ERRNO_H
-    if ( len < 0 && errno != EAGAIN )
-#else
-    if ( len < 0 )
-#endif
-    {
-        perror( joy->os->fname );
-        joy->error = 1;
-    }
-    if ( buttons != NULL ) *buttons = joy->os->cache_buttons;
-    if ( axes    != NULL )
-        memcpy ( axes, joy->os->cache_axes, sizeof(float) * joy->num_axes );
-#        endif
-#    endif
-
-#    ifdef JS_NEW
-
-    while ( 1 )
-    {
-        status = read ( joy->fd, &joy->js, sizeof(struct js_event) );
-
-        if ( status != sizeof( struct js_event ) )
-        {
-#ifdef HAVE_ERRNO_H
-            if ( errno == EAGAIN )
-            {
-                /* Use the old values */
-                if ( buttons )
-                    *buttons = joy->tmp_buttons;
-                if ( axes )
-                    memcpy( axes, joy->tmp_axes,
-                            sizeof( float ) * joy->num_axes );
-                return;
-            }
-#endif
-
-            fgWarning ( "%s", joy->fname );
-            joy->error = GL_TRUE;
-            return;
-        }
-
-        switch ( joy->js.type & ~JS_EVENT_INIT )
-        {
-        case JS_EVENT_BUTTON:
-            if( joy->js.value == 0 ) /* clear the flag */
-                joy->tmp_buttons &= ~( 1 << joy->js.number );
-            else
-                joy->tmp_buttons |= ( 1 << joy->js.number );
-            break;
-
-        case JS_EVENT_AXIS:
-            if ( joy->js.number < joy->num_axes )
-            {
-                joy->tmp_axes[ joy->js.number ] = ( float )joy->js.value;
-
-                if( axes )
-                    memcpy( axes, joy->tmp_axes, sizeof(float) * joy->num_axes );
-            }
-            break;
-
-        default:
-            fgWarning ( "PLIB_JS: Unrecognised /dev/js return!?!" );
-
-            /* use the old values */
-
-            if ( buttons != NULL ) *buttons = joy->tmp_buttons;
-            if ( axes    != NULL )
-                memcpy ( axes, joy->tmp_axes, sizeof(float) * joy->num_axes );
-
-            return;
-        }
-
-        if( buttons )
-            *buttons = joy->tmp_buttons;
-    }
-#    else
-
-    status = read( joy->fd, &joy->js, JS_RETURN );
-
-    if ( status != JS_RETURN )
-    {
-        fgWarning( "%s", joy->fname );
-        joy->error = GL_TRUE;
-        return;
-    }
-
-    if ( buttons )
-#        if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-        *buttons = ( joy->js.b1 ? 1 : 0 ) | ( joy->js.b2 ? 2 : 0 );  /* XXX Should not be here -- BSD is handled earlier */
-#        else
-        *buttons = joy->js.buttons;
-#        endif
-
-    if ( axes )
-    {
-        axes[ 0 ] = (float) joy->js.x;
-        axes[ 1 ] = (float) joy->js.y;
-    }
-#    endif
-#endif
+	fgPlatformJoystickRawRead ( joy, buttons, axes );
 }
 
 /*
@@ -934,6 +641,38 @@
  */
 
 #if TARGET_HOST_MACINTOSH
+void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
+{
+    int i;
+
+    if ( buttons )
+    {
+        *buttons = 0;
+
+        for ( i = 0; i < joy->num_buttons; i++ )
+        {
+            UInt32 state;
+            int err = ISpElement_GetSimpleState ( isp_elem [ i + isp_num_axis ], &state);
+            ISP_CHECK_ERR(err)
+
+            *buttons |= state << i;
+        }
+    }
+
+    if ( axes )
+    {
+        for ( i = 0; i < joy->num_axes; i++ )
+        {
+            UInt32 state;
+            int err = ISpElement_GetSimpleState ( isp_elem [ i ], &state );
+            ISP_CHECK_ERR(err)
+
+            axes [i] = (float) state;
+        }
+    }
+}
+
+
 void fgPlatformJoystickOpen( SFG_Joystick* joy )
 {
 	int i = 0;
@@ -1056,6 +795,35 @@
 #endif
 
 #if TARGET_HOST_MAC_OSX
+void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
+{
+    int i;
+
+    if ( buttons != NULL )
+    {
+        *buttons = 0;
+
+        for ( i = 0; i < joy->num_buttons; i++ )
+        {
+            IOHIDEventStruct hidEvent;
+            (*(joy->hidDev))->getElementValue ( joy->hidDev, buttonCookies[i], &hidEvent );
+            if ( hidEvent.value )
+                *buttons |= 1 << i;
+        }
+    }
+
+    if ( axes != NULL )
+    {
+        for ( i = 0; i < joy->num_axes; i++ )
+        {
+            IOHIDEventStruct hidEvent;
+            (*(joy->hidDev))->getElementValue ( joy->hidDev, axisCookies[i], &hidEvent );
+            axes[i] = hidEvent.value;
+        }
+    }
+}
+
+
 void fgPlatformJoystickOpen( SFG_Joystick* joy )
 {
     IOReturn rv;
@@ -1170,6 +938,181 @@
 #endif
 
 #if TARGET_HOST_POSIX_X11
+void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
+{
+    int status;
+
+    int i;
+
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+    int len;
+
+    if ( joy->os->is_analog )
+    {
+        int status = read ( joy->os->fd, &joy->os->ajs, sizeof(joy->os->ajs) );
+        if ( status != sizeof(joy->os->ajs) ) {
+            perror ( joy->os->fname );
+            joy->error = GL_TRUE;
+            return;
+        }
+        if ( buttons != NULL )
+            *buttons = ( joy->os->ajs.b1 ? 1 : 0 ) | ( joy->os->ajs.b2 ? 2 : 0 );
+
+        if ( axes != NULL )
+        {
+            axes[0] = (float) joy->os->ajs.x;
+            axes[1] = (float) joy->os->ajs.y;
+        }
+
+        return;
+    }
+
+#  ifdef HAVE_USB_JS
+    while ( ( len = read ( joy->os->fd, joy->os->hid_data_buf, joy->os->hid_dlen ) ) == joy->os->hid_dlen )
+    {
+        struct hid_item *h;
+
+        for  ( h = joy->os->hids; h; h = h->next )
+        {
+            int d = hid_get_data ( joy->os->hid_data_buf, h );
+
+            int page = HID_PAGE ( h->usage );
+            int usage = HID_USAGE ( h->usage );
+
+            if ( page == HUP_GENERIC_DESKTOP )
+            {
+                int i;
+                for ( i = 0; i < joy->num_axes; i++ )
+                    if (joy->os->axes_usage[i] == usage)
+                    {
+                        if (usage == HUG_HAT_SWITCH)
+                        {
+                            if (d < 0 || d > 8)
+                                d = 0;  /* safety */
+                            joy->os->cache_axes[i] = (float)hatmap_x[d];
+                            joy->os->cache_axes[i + 1] = (float)hatmap_y[d];
+                        }
+                        else
+                        {
+                            joy->os->cache_axes[i] = (float)d;
+                        }
+                        break;
+                    }
+            }
+            else if (page == HUP_BUTTON)
+            {
+               if (usage > 0 && usage < _JS_MAX_BUTTONS + 1)
+               {
+                   if (d)
+                       joy->os->cache_buttons |=  (1 << ( usage - 1 ));
+                   else
+                       joy->os->cache_buttons &= ~(1 << ( usage - 1 ));
+               }
+            }
+        }
+    }
+#    ifdef HAVE_ERRNO_H
+    if ( len < 0 && errno != EAGAIN )
+#    else
+    if ( len < 0 )
+#    endif
+    {
+        perror( joy->os->fname );
+        joy->error = 1;
+    }
+    if ( buttons != NULL ) *buttons = joy->os->cache_buttons;
+    if ( axes    != NULL )
+        memcpy ( axes, joy->os->cache_axes, sizeof(float) * joy->num_axes );
+#  endif
+#endif
+
+#ifdef JS_NEW
+
+    while ( 1 )
+    {
+        status = read ( joy->fd, &joy->js, sizeof(struct js_event) );
+
+        if ( status != sizeof( struct js_event ) )
+        {
+#  ifdef HAVE_ERRNO_H
+            if ( errno == EAGAIN )
+            {
+                /* Use the old values */
+                if ( buttons )
+                    *buttons = joy->tmp_buttons;
+                if ( axes )
+                    memcpy( axes, joy->tmp_axes,
+                            sizeof( float ) * joy->num_axes );
+                return;
+            }
+#  endif
+
+            fgWarning ( "%s", joy->fname );
+            joy->error = GL_TRUE;
+            return;
+        }
+
+        switch ( joy->js.type & ~JS_EVENT_INIT )
+        {
+        case JS_EVENT_BUTTON:
+            if( joy->js.value == 0 ) /* clear the flag */
+                joy->tmp_buttons &= ~( 1 << joy->js.number );
+            else
+                joy->tmp_buttons |= ( 1 << joy->js.number );
+            break;
+
+        case JS_EVENT_AXIS:
+            if ( joy->js.number < joy->num_axes )
+            {
+                joy->tmp_axes[ joy->js.number ] = ( float )joy->js.value;
+
+                if( axes )
+                    memcpy( axes, joy->tmp_axes, sizeof(float) * joy->num_axes );
+            }
+            break;
+
+        default:
+            fgWarning ( "PLIB_JS: Unrecognised /dev/js return!?!" );
+
+            /* use the old values */
+
+            if ( buttons != NULL ) *buttons = joy->tmp_buttons;
+            if ( axes    != NULL )
+                memcpy ( axes, joy->tmp_axes, sizeof(float) * joy->num_axes );
+
+            return;
+        }
+
+        if( buttons )
+            *buttons = joy->tmp_buttons;
+    }
+#else
+
+    status = read( joy->fd, &joy->js, JS_RETURN );
+
+    if ( status != JS_RETURN )
+    {
+        fgWarning( "%s", joy->fname );
+        joy->error = GL_TRUE;
+        return;
+    }
+
+    if ( buttons )
+#    if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
+        *buttons = ( joy->js.b1 ? 1 : 0 ) | ( joy->js.b2 ? 2 : 0 );  /* XXX Should not be here -- BSD is handled earlier */
+#    else
+        *buttons = joy->js.buttons;
+#    endif
+
+    if ( axes )
+    {
+        axes[ 0 ] = (float) joy->js.x;
+        axes[ 1 ] = (float) joy->js.y;
+    }
+#endif
+}
+
+
 void fgPlatformJoystickOpen( SFG_Joystick* joy )
 {
 #if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c	2012-01-29 04:32:41 UTC (rev 1022)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c	2012-01-29 04:45:17 UTC (rev 1023)
@@ -36,6 +36,78 @@
 
 
 
+
+void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
+{
+    MMRESULT status;
+
+    status = joyGetPosEx( joy->js_id, &joy->js );
+
+    if ( status != JOYERR_NOERROR )
+    {
+        joy->error = GL_TRUE;
+        return;
+    }
+
+    if ( buttons )
+        *buttons = joy->js.dwButtons;
+
+    if ( axes )
+    {
+        /*
+         * WARNING - Fall through case clauses!!
+         */
+        switch ( joy->num_axes )
+        {
+        case 8:
+            /* Generate two POV axes from the POV hat angle.
+             * Low 16 bits of js.dwPOV gives heading (clockwise from ahead) in
+             *   hundredths of a degree, or 0xFFFF when idle.
+             */
+            if ( ( joy->js.dwPOV & 0xFFFF ) == 0xFFFF )
+            {
+              axes [ 6 ] = 0.0;
+              axes [ 7 ] = 0.0;
+            }
+            else
+            {
+              /* This is the contentious bit: how to convert angle to X/Y.
+               *    wk: I know of no define for PI that we could use here:
+               *    SG_PI would pull in sg, M_PI is undefined for MSVC
+               * But the accuracy of the value of PI is very unimportant at
+               * this point.
+               */
+              float s = (float) sin ( ( joy->js.dwPOV & 0xFFFF ) * ( 0.01 * 3.1415926535f / 180.0f ) );
+              float c = (float) cos ( ( joy->js.dwPOV & 0xFFFF ) * ( 0.01 * 3.1415926535f / 180.0f ) );
+
+              /* Convert to coordinates on a square so that North-East
+               * is (1,1) not (.7,.7), etc.
+               * s and c cannot both be zero so we won't divide by zero.
+               */
+              if ( fabs ( s ) < fabs ( c ) )
+              {
+                axes [ 6 ] = ( c < 0.0 ) ? -s/c  : s/c ;
+                axes [ 7 ] = ( c < 0.0 ) ? -1.0f : 1.0f;
+              }
+              else
+              {
+                axes [ 6 ] = ( s < 0.0 ) ? -1.0f : 1.0f;
+                axes [ 7 ] = ( s < 0.0 ) ? -c/s  : c/s ;
+              }
+            }
+
+        case 6: axes[5] = (float) joy->js.dwVpos;
+        case 5: axes[4] = (float) joy->js.dwUpos;
+        case 4: axes[3] = (float) joy->js.dwRpos;
+        case 3: axes[2] = (float) joy->js.dwZpos;
+        case 2: axes[1] = (float) joy->js.dwYpos;
+        case 1: axes[0] = (float) joy->js.dwXpos;
+        }
+    }
+}
+
+
+
 /* Inspired by
    http://msdn.microsoft.com/archive/en-us/dnargame/html/msdn_sidewind3d.asp
  */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1025
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1025&view=rev
Author:   fayjf
Date:     2012-01-29 05:25:10 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Moved the platform-specific variables in the Joystick structure into their own platform-specific substructure.

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_internal.h
    trunk/freeglut/freeglut/src/Common/freeglut_joystick.c
    trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 04:46:29 UTC (rev 1024)
+++ trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 05:25:10 UTC (rev 1025)
@@ -788,50 +788,47 @@
 
 #if TARGET_HOST_MACINTOSH
 #    define _JS_MAX_AXES  9
-#endif
-
-#if TARGET_HOST_MAC_OSX
-#    define _JS_MAX_AXES 16
-#endif
-
-#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
-#    define _JS_MAX_AXES  8
-#endif
-
-#if TARGET_HOST_POSIX_X11
-#    define _JS_MAX_AXES 16
-#endif
-
-/*
- * Definition of "SFG_Joystick" structure -- based on JS's "jsJoystick" object class.
- * See "js.h" lines 80-178.
- */
-typedef struct tagSFG_Joystick SFG_Joystick;
-struct tagSFG_Joystick
+typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;
+struct tagSFG_PlatformJoystick
 {
-#if TARGET_HOST_MACINTOSH
 #define  ISP_NUM_AXIS    9
 #define  ISP_NUM_NEEDS  41
     ISpElementReference isp_elem  [ ISP_NUM_NEEDS ];
     ISpNeed             isp_needs [ ISP_NUM_NEEDS ];
+};
 #endif
 
 #if TARGET_HOST_MAC_OSX
+#    define _JS_MAX_AXES 16
+typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;
+struct tagSFG_PlatformJoystick
+{
     IOHIDDeviceInterface ** hidDev;
     IOHIDElementCookie buttonCookies[41];
     IOHIDElementCookie axisCookies[_JS_MAX_AXES];
-    long minReport[_JS_MAX_AXES],
-         maxReport[_JS_MAX_AXES];
+/* The next two variables are not used anywhere */
+/*    long minReport[_JS_MAX_AXES],
+ *         maxReport[_JS_MAX_AXES];
+ */
+};
 #endif
 
 #if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
+#    define _JS_MAX_AXES  8
+typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;
+struct tagSFG_PlatformJoystick
+{
     JOYCAPS     jsCaps;
     JOYINFOEX   js;
     UINT        js_id;
+};
 #endif
 
-
 #if TARGET_HOST_POSIX_X11
+#    define _JS_MAX_AXES 16
+typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;
+struct tagSFG_PlatformJoystick
+{
 #   if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
        struct os_specific_s *os;
 #   endif
@@ -846,8 +843,18 @@
 
     char         fname [ 128 ];
     int          fd;
+};
 #endif
 
+/*
+ * Definition of "SFG_Joystick" structure -- based on JS's "jsJoystick" object class.
+ * See "js.h" lines 80-178.
+ */
+typedef struct tagSFG_Joystick SFG_Joystick;
+struct tagSFG_Joystick
+{
+	SFG_PlatformJoystick pJoystick;
+
     int          id;
     GLboolean    error;
     char         name [ 128 ];

Modified: trunk/freeglut/freeglut/src/Common/freeglut_joystick.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_joystick.c	2012-01-29 04:46:29 UTC (rev 1024)
+++ trunk/freeglut/freeglut/src/Common/freeglut_joystick.c	2012-01-29 05:25:10 UTC (rev 1025)
@@ -594,7 +594,7 @@
         CFDictionaryGetValue ( axis, CFSTR(kIOHIDElementCookieKey) ),
         kCFNumberLongType, &cookie);
 
-    axisCookies[index] = (IOHIDElementCookie) cookie;
+    joy->pJoystick.axisCookies[index] = (IOHIDElementCookie) cookie;
 
     CFNumberGetValue ((CFNumberRef)
         CFDictionaryGetValue ( axis, CFSTR(kIOHIDElementMinKey) ),
@@ -618,7 +618,7 @@
             CFDictionaryGetValue ( button, CFSTR(kIOHIDElementCookieKey) ),
             kCFNumberLongType, &cookie);
 
-    joy->buttonCookies[num_buttons++] = (IOHIDElementCookie) cookie;
+    joy->pJoystick.buttonCookies[num_buttons++] = (IOHIDElementCookie) cookie;
     /* anything else for buttons? */
 }
 
@@ -645,7 +645,7 @@
         for ( i = 0; i < joy->num_buttons; i++ )
         {
             UInt32 state;
-            int err = ISpElement_GetSimpleState ( isp_elem [ i + isp_num_axis ], &state);
+            int err = ISpElement_GetSimpleState ( joy->pJoystick.isp_elem [ i + ISP_NUM_AXIS ], &state);
             ISP_CHECK_ERR(err)
 
             *buttons |= state << i;
@@ -657,7 +657,7 @@
         for ( i = 0; i < joy->num_axes; i++ )
         {
             UInt32 state;
-            int err = ISpElement_GetSimpleState ( isp_elem [ i ], &state );
+            int err = ISpElement_GetSimpleState ( joy->pJoystick.isp_elem [ i ], &state );
             ISP_CHECK_ERR(err)
 
             axes [i] = (float) state;
@@ -682,7 +682,7 @@
         joy->error = GL_TRUE;
 
         /* initialize the needs structure */
-        ISpNeed temp_isp_needs[ isp_num_needs ] =
+        ISpNeed temp_isp_needs[ ISP_NUM_NEEDS ] =
         {
           { "\pX-Axis",  128, 0, 0, kISpElementKind_Axis,   kISpElementLabel_None, 0, 0, 0, 0 },
           { "\pY-Axis",  128, 0, 0, kISpElementKind_Axis,   kISpElementLabel_None, 0, 0, 0, 0 },
@@ -728,7 +728,7 @@
           { "\pButton 31", 128, 0, 0, kISpElementKind_Button, kISpElementLabel_Btn_Select, 0, 0, 0, 0 },
         };
 
-        memcpy( joy->isp_needs, temp_isp_needs, sizeof (temp_isp_needs ) );
+        memcpy( joy->pJoystick.isp_needs, temp_isp_needs, sizeof (temp_isp_needs ) );
 
 
         /* next two calls allow keyboard and mouse to emulate other input
@@ -743,17 +743,17 @@
           ISP_CHECK_ERR(err)
         */
 
-        err = ISpElement_NewVirtualFromNeeds( joy->isp_num_needs,
-                                              joy->isp_needs, joy->isp_elem,
+        err = ISpElement_NewVirtualFromNeeds( ISP_NUM_NEEDS,
+                                              joy->pJoystick.isp_needs, joy->pJoystick.isp_elem,
                                               0 );
         ISP_CHECK_ERR( err )
 
-        err = ISpInit( joy->isp_num_needs, joy->isp_needs, joy->isp_elem,
+        err = ISpInit( ISP_NUM_NEEDS, joy->pJoystick.isp_needs, joy->pJoystick.isp_elem,
                        'freeglut', nil, 0, 128, 0 );
         ISP_CHECK_ERR( err )
 
-        joy->num_buttons = joy->isp_num_needs - joy->isp_num_axis;
-        joy->num_axes    = joy->isp_num_axis;
+        joy->num_buttons = ISP_NUM_NEEDS - ISP_NUM_AXIS;
+        joy->num_axes    = ISP_NUM_AXIS;
 
         for( i = 0; i < joy->num_axes; i++ )
         {
@@ -774,7 +774,7 @@
 void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
 {
     fgJoystick[ ident ]->id = ident;
-    snprintf( fgJoystick[ ident ]->fname, sizeof(fgJoystick[ ident ]->fname), "/dev/js%d", ident ); /* FIXME */
+    snprintf( fgJoystick[ ident ]->pJoystick.fname, sizeof(fgJoystick[ ident ]->pJoystick.fname), "/dev/js%d", ident ); /* FIXME */
     fgJoystick[ ident ]->error = GL_FALSE;
 }
 
@@ -799,7 +799,7 @@
         for ( i = 0; i < joy->num_buttons; i++ )
         {
             IOHIDEventStruct hidEvent;
-            (*(joy->hidDev))->getElementValue ( joy->hidDev, buttonCookies[i], &hidEvent );
+            (*(joy->pJoystick.hidDev))->getElementValue ( joy->pJoystick.hidDev, joy->pJoystick.buttonCookies[i], &hidEvent );
             if ( hidEvent.value )
                 *buttons |= 1 << i;
         }
@@ -810,7 +810,7 @@
         for ( i = 0; i < joy->num_axes; i++ )
         {
             IOHIDEventStruct hidEvent;
-            (*(joy->hidDev))->getElementValue ( joy->hidDev, axisCookies[i], &hidEvent );
+            (*(joy->pJoystick.hidDev))->getElementValue ( joy->pJoystick.hidDev, joy->pJoystick.axisCookies[i], &hidEvent );
             axes[i] = hidEvent.value;
         }
     }
@@ -849,18 +849,18 @@
     pluginResult = ( *plugin )->QueryInterface(
         plugin,
         CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID),
-        &( LPVOID )joy->hidDev
+        &( LPVOID )joy->pJoystick.hidDev
     );
 
     if( pluginResult != S_OK )
         fgWarning ( "QI-ing IO plugin to HID Device interface failed" );
 
     ( *plugin )->Release( plugin ); /* don't leak a ref */
-    if( joy->hidDev == NULL )
+    if( joy->pJoystick.hidDev == NULL )
         return;
 
     /* store the interface in this instance */
-    rv = ( *( joy->hidDev ) )->open( joy->hidDev, 0 );
+    rv = ( *( joy->pJoystick.hidDev ) )->open( joy->pJoystick.hidDev, 0 );
     if( rv != kIOReturnSuccess )
     {
         fgWarning( "error opening device interface");
@@ -925,8 +925,8 @@
 
 void fgPlatformJoystickClose ( int ident )
 {
-    ( *( fgJoystick[ ident ]->hidDev ) )->
-        close( fgJoystick[ ident ]->hidDev );
+    ( *( fgJoystick[ ident ]->pJoystick.hidDev ) )->
+        close( fgJoystick[ ident ]->pJoystick.hidDev );
 }
 #endif
 
@@ -940,34 +940,34 @@
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
     int len;
 
-    if ( joy->os->is_analog )
+    if ( joy->pJoystick.os->is_analog )
     {
-        int status = read ( joy->os->fd, &joy->os->ajs, sizeof(joy->os->ajs) );
-        if ( status != sizeof(joy->os->ajs) ) {
-            perror ( joy->os->fname );
+        int status = read ( joy->pJoystick.os->fd, &joy->pJoystick.os->ajs, sizeof(joy->pJoystick.os->ajs) );
+        if ( status != sizeof(joy->pJoystick.os->ajs) ) {
+            perror ( joy->pJoystick.os->fname );
             joy->error = GL_TRUE;
             return;
         }
         if ( buttons != NULL )
-            *buttons = ( joy->os->ajs.b1 ? 1 : 0 ) | ( joy->os->ajs.b2 ? 2 : 0 );
+            *buttons = ( joy->pJoystick.os->ajs.b1 ? 1 : 0 ) | ( joy->pJoystick.os->ajs.b2 ? 2 : 0 );
 
         if ( axes != NULL )
         {
-            axes[0] = (float) joy->os->ajs.x;
-            axes[1] = (float) joy->os->ajs.y;
+            axes[0] = (float) joy->pJoystick.os->ajs.x;
+            axes[1] = (float) joy->pJoystick.os->ajs.y;
         }
 
         return;
     }
 
 #  ifdef HAVE_USB_JS
-    while ( ( len = read ( joy->os->fd, joy->os->hid_data_buf, joy->os->hid_dlen ) ) == joy->os->hid_dlen )
+    while ( ( len = read ( joy->pJoystick.os->fd, joy->pJoystick.os->hid_data_buf, joy->pJoystick.os->hid_dlen ) ) == joy->pJoystick.os->hid_dlen )
     {
         struct hid_item *h;
 
-        for  ( h = joy->os->hids; h; h = h->next )
+        for  ( h = joy->pJoystick.os->hids; h; h = h->next )
         {
-            int d = hid_get_data ( joy->os->hid_data_buf, h );
+            int d = hid_get_data ( joy->pJoystick.os->hid_data_buf, h );
 
             int page = HID_PAGE ( h->usage );
             int usage = HID_USAGE ( h->usage );
@@ -976,18 +976,18 @@
             {
                 int i;
                 for ( i = 0; i < joy->num_axes; i++ )
-                    if (joy->os->axes_usage[i] == usage)
+                    if (joy->pJoystick.os->axes_usage[i] == usage)
                     {
                         if (usage == HUG_HAT_SWITCH)
                         {
                             if (d < 0 || d > 8)
                                 d = 0;  /* safety */
-                            joy->os->cache_axes[i] = (float)hatmap_x[d];
-                            joy->os->cache_axes[i + 1] = (float)hatmap_y[d];
+                            joy->pJoystick.os->cache_axes[i] = (float)hatmap_x[d];
+                            joy->pJoystick.os->cache_axes[i + 1] = (float)hatmap_y[d];
                         }
                         else
                         {
-                            joy->os->cache_axes[i] = (float)d;
+                            joy->pJoystick.os->cache_axes[i] = (float)d;
                         }
                         break;
                     }
@@ -997,9 +997,9 @@
                if (usage > 0 && usage < _JS_MAX_BUTTONS + 1)
                {
                    if (d)
-                       joy->os->cache_buttons |=  (1 << ( usage - 1 ));
+                       joy->pJoystick.os->cache_buttons |=  (1 << ( usage - 1 ));
                    else
-                       joy->os->cache_buttons &= ~(1 << ( usage - 1 ));
+                       joy->pJoystick.os->cache_buttons &= ~(1 << ( usage - 1 ));
                }
             }
         }
@@ -1010,12 +1010,12 @@
     if ( len < 0 )
 #    endif
     {
-        perror( joy->os->fname );
+        perror( joy->pJoystick.os->fname );
         joy->error = 1;
     }
-    if ( buttons != NULL ) *buttons = joy->os->cache_buttons;
+    if ( buttons != NULL ) *buttons = joy->pJoystick.os->cache_buttons;
     if ( axes    != NULL )
-        memcpy ( axes, joy->os->cache_axes, sizeof(float) * joy->num_axes );
+        memcpy ( axes, joy->pJoystick.os->cache_axes, sizeof(float) * joy->num_axes );
 #  endif
 #endif
 
@@ -1023,7 +1023,7 @@
 
     while ( 1 )
     {
-        status = read ( joy->fd, &joy->js, sizeof(struct js_event) );
+        status = read ( joy->pJoystick.fd, &joy->pJoystick.js, sizeof(struct js_event) );
 
         if ( status != sizeof( struct js_event ) )
         {
@@ -1032,35 +1032,35 @@
             {
                 /* Use the old values */
                 if ( buttons )
-                    *buttons = joy->tmp_buttons;
+                    *buttons = joy->pJoystick.tmp_buttons;
                 if ( axes )
-                    memcpy( axes, joy->tmp_axes,
+                    memcpy( axes, joy->pJoystick.tmp_axes,
                             sizeof( float ) * joy->num_axes );
                 return;
             }
 #  endif
 
-            fgWarning ( "%s", joy->fname );
+            fgWarning ( "%s", joy->pJoystick.fname );
             joy->error = GL_TRUE;
             return;
         }
 
-        switch ( joy->js.type & ~JS_EVENT_INIT )
+        switch ( joy->pJoystick.js.type & ~JS_EVENT_INIT )
         {
         case JS_EVENT_BUTTON:
-            if( joy->js.value == 0 ) /* clear the flag */
-                joy->tmp_buttons &= ~( 1 << joy->js.number );
+            if( joy->pJoystick.js.value == 0 ) /* clear the flag */
+                joy->pJoystick.tmp_buttons &= ~( 1 << joy->pJoystick.js.number );
             else
-                joy->tmp_buttons |= ( 1 << joy->js.number );
+                joy->pJoystick.tmp_buttons |= ( 1 << joy->pJoystick.js.number );
             break;
 
         case JS_EVENT_AXIS:
-            if ( joy->js.number < joy->num_axes )
+            if ( joy->pJoystick.js.number < joy->num_axes )
             {
-                joy->tmp_axes[ joy->js.number ] = ( float )joy->js.value;
+                joy->pJoystick.tmp_axes[ joy->pJoystick.js.number ] = ( float )joy->pJoystick.js.value;
 
                 if( axes )
-                    memcpy( axes, joy->tmp_axes, sizeof(float) * joy->num_axes );
+                    memcpy( axes, joy->pJoystick.tmp_axes, sizeof(float) * joy->num_axes );
             }
             break;
 
@@ -1069,38 +1069,38 @@
 
             /* use the old values */
 
-            if ( buttons != NULL ) *buttons = joy->tmp_buttons;
+            if ( buttons != NULL ) *buttons = joy->pJoystick.tmp_buttons;
             if ( axes    != NULL )
-                memcpy ( axes, joy->tmp_axes, sizeof(float) * joy->num_axes );
+                memcpy ( axes, joy->pJoystick.tmp_axes, sizeof(float) * joy->num_axes );
 
             return;
         }
 
         if( buttons )
-            *buttons = joy->tmp_buttons;
+            *buttons = joy->pJoystick.tmp_buttons;
     }
 #else
 
-    status = read( joy->fd, &joy->js, JS_RETURN );
+    status = read( joy->pJoystick.fd, &joy->pJoystick.js, JS_RETURN );
 
     if ( status != JS_RETURN )
     {
-        fgWarning( "%s", joy->fname );
+        fgWarning( "%s", joy->pJoystick.fname );
         joy->error = GL_TRUE;
         return;
     }
 
     if ( buttons )
 #    if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-        *buttons = ( joy->js.b1 ? 1 : 0 ) | ( joy->js.b2 ? 2 : 0 );  /* XXX Should not be here -- BSD is handled earlier */
+        *buttons = ( joy->pJoystick.js.b1 ? 1 : 0 ) | ( joy->pJoystick.js.b2 ? 2 : 0 );  /* XXX Should not be here -- BSD is handled earlier */
 #    else
-        *buttons = joy->js.buttons;
+        *buttons = joy->pJoystick.js.buttons;
 #    endif
 
     if ( axes )
     {
-        axes[ 0 ] = (float) joy->js.x;
-        axes[ 1 ] = (float) joy->js.y;
+        axes[ 0 ] = (float) joy->pJoystick.js.x;
+        axes[ 1 ] = (float) joy->pJoystick.js.y;
     }
 #endif
 }
@@ -1123,25 +1123,25 @@
 
 #if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
     for( i = 0; i < _JS_MAX_AXES; i++ )
-        joy->os->cache_axes[ i ] = 0.0f;
+        joy->pJoystick.os->cache_axes[ i ] = 0.0f;
 
-    joy->os->cache_buttons = 0;
+    joy->pJoystick.os->cache_buttons = 0;
 
-    joy->os->fd = open( joy->os->fname, O_RDONLY | O_NONBLOCK);
+    joy->pJoystick.os->fd = open( joy->pJoystick.os->fname, O_RDONLY | O_NONBLOCK);
 
 #ifdef HAVE_ERRNO_H
-    if( joy->os->fd < 0 && errno == EACCES )
-        fgWarning ( "%s exists but is not readable by you", joy->os->fname );
+    if( joy->pJoystick.os->fd < 0 && errno == EACCES )
+        fgWarning ( "%s exists but is not readable by you", joy->pJoystick.os->fname );
 #endif
 
-    joy->error =( joy->os->fd < 0 );
+    joy->error =( joy->pJoystick.os->fd < 0 );
 
     if( joy->error )
         return;
 
     joy->num_axes = 0;
     joy->num_buttons = 0;
-    if( joy->os->is_analog )
+    if( joy->pJoystick.os->is_analog )
     {
         FILE *joyfile;
         char joyfname[ 1024 ];
@@ -1183,15 +1183,15 @@
     }
 
 #    ifdef HAVE_USB_JS
-    if( ! fghJoystickInitializeHID( joy->os, &joy->num_axes,
+    if( ! fghJoystickInitializeHID( joy->pJoystick.os, &joy->num_axes,
                                     &joy->num_buttons ) )
     {
-        close( joy->os->fd );
+        close( joy->pJoystick.os->fd );
         joy->error = GL_TRUE;
         return;
     }
 
-    cp = strrchr( joy->os->fname, '/' );
+    cp = strrchr( joy->pJoystick.os->fname, '/' );
     if( cp )
     {
         if( fghJoystickFindUSBdev( &cp[1], joy->name, sizeof( joy->name ) ) ==
@@ -1208,7 +1208,7 @@
          * to be quite unreliable for analog-to-USB converters. Punt for
          * now.
          */
-        if( joy->os->axes_usage[ i ] == HUG_HAT_SWITCH )
+        if( joy->pJoystick.os->axes_usage[ i ] == HUG_HAT_SWITCH )
         {
             joy->max   [ i ] = 1.0f;
             joy->center[ i ] = 0.0f;
@@ -1234,14 +1234,14 @@
 
 #    ifdef JS_NEW
     for( i = 0; i < _JS_MAX_AXES; i++ )
-        joy->tmp_axes[ i ] = 0.0f;
+        joy->pJoystick.tmp_axes[ i ] = 0.0f;
 
-    joy->tmp_buttons = 0;
+    joy->pJoystick.tmp_buttons = 0;
 #    endif
 
-    joy->fd = open( joy->fname, O_RDONLY );
+    joy->pJoystick.fd = open( joy->pJoystick.fname, O_RDONLY );
 
-    joy->error =( joy->fd < 0 );
+    joy->error =( joy->pJoystick.fd < 0 );
 
     if( joy->error )
         return;
@@ -1252,12 +1252,12 @@
      *  to the upper byte of an uninitialized word doesn't work.
      *  9 April 2003
      */
-    ioctl( joy->fd, JSIOCGAXES, &u );
+    ioctl( joy->pJoystick.fd, JSIOCGAXES, &u );
     joy->num_axes = u;
-    ioctl( joy->fd, JSIOCGBUTTONS, &u );
+    ioctl( joy->pJoystick.fd, JSIOCGBUTTONS, &u );
     joy->num_buttons = u;
-    ioctl( joy->fd, JSIOCGNAME( sizeof( joy->name ) ), joy->name );
-    fcntl( joy->fd, F_SETFL, O_NONBLOCK );
+    ioctl( joy->pJoystick.fd, JSIOCGNAME( sizeof( joy->name ) ), joy->name );
+    fcntl( joy->pJoystick.fd, F_SETFL, O_NONBLOCK );
 #    endif
 
     /*
@@ -1307,23 +1307,23 @@
     fgJoystick[ ident ]->id = ident;
     fgJoystick[ ident ]->error = GL_FALSE;
 
-    fgJoystick[ ident ]->os = calloc( 1, sizeof( struct os_specific_s ) );
-    memset( fgJoystick[ ident ]->os, 0, sizeof( struct os_specific_s ) );
+    fgJoystick[ ident ]->pJoystick.os = calloc( 1, sizeof( struct os_specific_s ) );
+    memset( fgJoystick[ ident ]->pJoystick.os, 0, sizeof( struct os_specific_s ) );
     if( ident < USB_IDENT_OFFSET )
-        fgJoystick[ ident ]->os->is_analog = 1;
-    if( fgJoystick[ ident ]->os->is_analog )
-        snprintf( fgJoystick[ ident ]->os->fname, sizeof(fgJoystick[ ident ]->os->fname), "%s%d", AJSDEV, ident );
+        fgJoystick[ ident ]->pJoystick.os->is_analog = 1;
+    if( fgJoystick[ ident ]->pJoystick.os->is_analog )
+        snprintf( fgJoystick[ ident ]->pJoystick.os->fname, sizeof(fgJoystick[ ident ]->pJoystick.os->fname), "%s%d", AJSDEV, ident );
     else
-        snprintf( fgJoystick[ ident ]->os->fname, sizeof(fgJoystick[ ident ]->os->fname), "%s%d", UHIDDEV,
+        snprintf( fgJoystick[ ident ]->pJoystick.os->fname, sizeof(fgJoystick[ ident ]->pJoystick.os->fname), "%s%d", UHIDDEV,
                  ident - USB_IDENT_OFFSET );
 #elif defined( __linux__ )
     fgJoystick[ ident ]->id = ident;
     fgJoystick[ ident ]->error = GL_FALSE;
 
-    snprintf( fgJoystick[ident]->fname, sizeof(fgJoystick[ident]->fname), "/dev/input/js%d", ident );
+    snprintf( fgJoystick[ident]->pJoystick.fname, sizeof(fgJoystick[ident]->pJoystick.fname), "/dev/input/js%d", ident );
 
-    if( access( fgJoystick[ ident ]->fname, F_OK ) != 0 )
-        snprintf( fgJoystick[ ident ]->fname, sizeof(fgJoystick[ ident ]->fname), "/dev/js%d", ident );
+    if( access( fgJoystick[ ident ]->pJoystick.fname, F_OK ) != 0 )
+        snprintf( fgJoystick[ ident ]->pJoystick.fname, sizeof(fgJoystick[ ident ]->pJoystick.fname), "/dev/js%d", ident );
 #endif
 }
 
@@ -1331,22 +1331,22 @@
 void fgPlatformJoystickClose ( int ident )
 {
 #if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-    if( fgJoystick[ident]->os )
+    if( fgJoystick[ident]->pJoystick.os )
     {
         if( ! fgJoystick[ ident ]->error )
-            close( fgJoystick[ ident ]->os->fd );
+            close( fgJoystick[ ident ]->pJoystick.os->fd );
 #ifdef HAVE_USB_JS
-        if( fgJoystick[ ident ]->os->hids )
-            free (fgJoystick[ ident ]->os->hids);
-        if( fgJoystick[ ident ]->os->hid_data_buf )
-            free( fgJoystick[ ident ]->os->hid_data_buf );
+        if( fgJoystick[ ident ]->pJoystick.os->hids )
+            free (fgJoystick[ ident ]->pJoystick.os->hids);
+        if( fgJoystick[ ident ]->pJoystick.os->hid_data_buf )
+            free( fgJoystick[ ident ]->pJoystick.os->hid_data_buf );
 #endif
-        free( fgJoystick[ident]->os );
+        free( fgJoystick[ident]->pJoystick.os );
 	}
 #endif
 
     if( ! fgJoystick[ident]->error )
-         close( fgJoystick[ ident ]->fd );
+         close( fgJoystick[ ident ]->pJoystick.fd );
 }
 #endif
 

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c	2012-01-29 04:46:29 UTC (rev 1024)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_joystick_mswin.c	2012-01-29 05:25:10 UTC (rev 1025)
@@ -41,7 +41,7 @@
 {
     MMRESULT status;
 
-    status = joyGetPosEx( joy->js_id, &joy->js );
+    status = joyGetPosEx( joy->pJoystick.js_id, &joy->pJoystick.js );
 
     if ( status != JOYERR_NOERROR )
     {
@@ -50,7 +50,7 @@
     }
 
     if ( buttons )
-        *buttons = joy->js.dwButtons;
+        *buttons = joy->pJoystick.js.dwButtons;
 
     if ( axes )
     {
@@ -64,7 +64,7 @@
              * Low 16 bits of js.dwPOV gives heading (clockwise from ahead) in
              *   hundredths of a degree, or 0xFFFF when idle.
              */
-            if ( ( joy->js.dwPOV & 0xFFFF ) == 0xFFFF )
+            if ( ( joy->pJoystick.js.dwPOV & 0xFFFF ) == 0xFFFF )
             {
               axes [ 6 ] = 0.0;
               axes [ 7 ] = 0.0;
@@ -77,8 +77,8 @@
                * But the accuracy of the value of PI is very unimportant at
                * this point.
                */
-              float s = (float) sin ( ( joy->js.dwPOV & 0xFFFF ) * ( 0.01 * 3.1415926535f / 180.0f ) );
-              float c = (float) cos ( ( joy->js.dwPOV & 0xFFFF ) * ( 0.01 * 3.1415926535f / 180.0f ) );
+              float s = (float) sin ( ( joy->pJoystick.js.dwPOV & 0xFFFF ) * ( 0.01 * 3.1415926535f / 180.0f ) );
+              float c = (float) cos ( ( joy->pJoystick.js.dwPOV & 0xFFFF ) * ( 0.01 * 3.1415926535f / 180.0f ) );
 
               /* Convert to coordinates on a square so that North-East
                * is (1,1) not (.7,.7), etc.
@@ -96,12 +96,12 @@
               }
             }
 
-        case 6: axes[5] = (float) joy->js.dwVpos;
-        case 5: axes[4] = (float) joy->js.dwUpos;
-        case 4: axes[3] = (float) joy->js.dwRpos;
-        case 3: axes[2] = (float) joy->js.dwZpos;
-        case 2: axes[1] = (float) joy->js.dwYpos;
-        case 1: axes[0] = (float) joy->js.dwXpos;
+        case 6: axes[5] = (float) joy->pJoystick.js.dwVpos;
+        case 5: axes[4] = (float) joy->pJoystick.js.dwUpos;
+        case 4: axes[3] = (float) joy->pJoystick.js.dwRpos;
+        case 3: axes[2] = (float) joy->pJoystick.js.dwZpos;
+        case 2: axes[1] = (float) joy->pJoystick.js.dwYpos;
+        case 1: axes[0] = (float) joy->pJoystick.js.dwXpos;
         }
     }
 }
@@ -130,7 +130,7 @@
 
     /* Open .. MediaResources\CurrentJoystickSettings */
     _snprintf ( buffer, sizeof(buffer), "%s\\%s\\%s",
-                REGSTR_PATH_JOYCONFIG, joy->jsCaps.szRegKey,
+                REGSTR_PATH_JOYCONFIG, joy->pJoystick.jsCaps.szRegKey,
                 REGSTR_KEY_JOYCURR );
 
     lr = RegOpenKeyEx ( HKEY_LOCAL_MACHINE, buffer, 0, KEY_QUERY_VALUE, &hKey);
@@ -141,7 +141,7 @@
     dwcb = sizeof(OEMKey);
 
     /* JOYSTICKID1-16 is zero-based; registry entries for VJOYD are 1-based. */
-    _snprintf ( buffer, sizeof(buffer), "Joystick%d%s", joy->js_id + 1, REGSTR_VAL_JOYOEMNAME );
+    _snprintf ( buffer, sizeof(buffer), "Joystick%d%s", joy->pJoystick.js_id + 1, REGSTR_VAL_JOYOEMNAME );
 
     lr = RegQueryValueEx ( hKey, buffer, 0, 0, (LPBYTE) OEMKey, &dwcb);
     RegCloseKey ( hKey );
@@ -172,16 +172,16 @@
 {
 	int i = 0;
 
-    joy->js.dwFlags = JOY_RETURNALL;
-    joy->js.dwSize  = sizeof( joy->js );
+    joy->pJoystick.js.dwFlags = JOY_RETURNALL;
+    joy->pJoystick.js.dwSize  = sizeof( joy->pJoystick.js );
 
-    memset( &joy->jsCaps, 0, sizeof( joy->jsCaps ) );
+    memset( &joy->pJoystick.jsCaps, 0, sizeof( joy->pJoystick.jsCaps ) );
 
     joy->error =
-        ( joyGetDevCaps( joy->js_id, &joy->jsCaps, sizeof( joy->jsCaps ) ) !=
+        ( joyGetDevCaps( joy->pJoystick.js_id, &joy->pJoystick.jsCaps, sizeof( joy->pJoystick.jsCaps ) ) !=
           JOYERR_NOERROR );
 
-    if( joy->jsCaps.wNumAxes == 0 )
+    if( joy->pJoystick.jsCaps.wNumAxes == 0 )
     {
         joy->num_axes = 0;
         joy->error = GL_TRUE;
@@ -195,13 +195,13 @@
                                              sizeof( joy->name ) ) )
         {
             fgWarning( "JS: Failed to read joystick name from registry" );
-            strncpy( joy->name, joy->jsCaps.szPname, sizeof( joy->name ) );
+            strncpy( joy->name, joy->pJoystick.jsCaps.szPname, sizeof( joy->name ) );
         }
 
         /* Windows joystick drivers may provide any combination of
          * X,Y,Z,R,U,V,POV - not necessarily the first n of these.
          */
-        if( joy->jsCaps.wCaps & JOYCAPS_HASPOV )
+        if( joy->pJoystick.jsCaps.wCaps & JOYCAPS_HASPOV )
         {
             joy->num_axes = _JS_MAX_AXES;
             joy->min[ 7 ] = -1.0; joy->max[ 7 ] = 1.0;  /* POV Y */
@@ -210,18 +210,18 @@
         else
             joy->num_axes = 6;
 
-        joy->min[ 5 ] = ( float )joy->jsCaps.wVmin;
-        joy->max[ 5 ] = ( float )joy->jsCaps.wVmax;
-        joy->min[ 4 ] = ( float )joy->jsCaps.wUmin;
-        joy->max[ 4 ] = ( float )joy->jsCaps.wUmax;
-        joy->min[ 3 ] = ( float )joy->jsCaps.wRmin;
-        joy->max[ 3 ] = ( float )joy->jsCaps.wRmax;
-        joy->min[ 2 ] = ( float )joy->jsCaps.wZmin;
-        joy->max[ 2 ] = ( float )joy->jsCaps.wZmax;
-        joy->min[ 1 ] = ( float )joy->jsCaps.wYmin;
-        joy->max[ 1 ] = ( float )joy->jsCaps.wYmax;
-        joy->min[ 0 ] = ( float )joy->jsCaps.wXmin;
-        joy->max[ 0 ] = ( float )joy->jsCaps.wXmax;
+        joy->min[ 5 ] = ( float )joy->pJoystick.jsCaps.wVmin;
+        joy->max[ 5 ] = ( float )joy->pJoystick.jsCaps.wVmax;
+        joy->min[ 4 ] = ( float )joy->pJoystick.jsCaps.wUmin;
+        joy->max[ 4 ] = ( float )joy->pJoystick.jsCaps.wUmax;
+        joy->min[ 3 ] = ( float )joy->pJoystick.jsCaps.wRmin;
+        joy->max[ 3 ] = ( float )joy->pJoystick.jsCaps.wRmax;
+        joy->min[ 2 ] = ( float )joy->pJoystick.jsCaps.wZmin;
+        joy->max[ 2 ] = ( float )joy->pJoystick.jsCaps.wZmax;
+        joy->min[ 1 ] = ( float )joy->pJoystick.jsCaps.wYmin;
+        joy->max[ 1 ] = ( float )joy->pJoystick.jsCaps.wYmax;
+        joy->min[ 0 ] = ( float )joy->pJoystick.jsCaps.wXmin;
+        joy->max[ 0 ] = ( float )joy->pJoystick.jsCaps.wXmax;
     }
 
     /* Guess all the rest judging on the axes extremals */
@@ -240,11 +240,11 @@
     switch( ident )
     {
     case 0:
-        fgJoystick[ ident ]->js_id = JOYSTICKID1;
+        fgJoystick[ ident ]->pJoystick.js_id = JOYSTICKID1;
         fgJoystick[ ident ]->error = GL_FALSE;
         break;
     case 1:
-        fgJoystick[ ident ]->js_id = JOYSTICKID2;
+        fgJoystick[ ident ]->pJoystick.js_id = JOYSTICKID2;
         fgJoystick[ ident ]->error = GL_FALSE;
         break;
     default:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1026
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1026&view=rev
Author:   fayjf
Date:     2012-01-29 05:26:54 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Moving the Windows-specific joystick definitions into the Windows-specific header file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_internal.h
    trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h

Modified: trunk/freeglut/freeglut/src/Common/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 05:25:10 UTC (rev 1025)
+++ trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 05:26:54 UTC (rev 1026)
@@ -813,17 +813,6 @@
 };
 #endif
 
-#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
-#    define _JS_MAX_AXES  8
-typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;
-struct tagSFG_PlatformJoystick
-{
-    JOYCAPS     jsCaps;
-    JOYINFOEX   js;
-    UINT        js_id;
-};
-#endif
-
 #if TARGET_HOST_POSIX_X11
 #    define _JS_MAX_AXES 16
 typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-29 05:25:10 UTC (rev 1025)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-29 05:26:54 UTC (rev 1026)
@@ -49,6 +49,20 @@
 };
 
 
+/* Joystick-Specific Definitions */
+#if !defined(_WIN32_WCE)
+#    define _JS_MAX_AXES  8
+typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;
+struct tagSFG_PlatformJoystick
+{
+    JOYCAPS     jsCaps;
+    JOYINFOEX   js;
+    UINT        js_id;
+};
+#endif
+
+
+
 /* Function to be called on exit */
 extern void (__cdecl *__glutExitFunc)( int return_value );
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1027
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1027&view=rev
Author:   fayjf
Date:     2012-01-29 13:06:54 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Moving the Windows-specific "__glutCreateMenuWIthExit" function to the Windows-specific file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_menu.c
    trunk/freeglut/freeglut/src/mswin/freeglut_menu_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_menu.c	2012-01-29 05:26:54 UTC (rev 1026)
+++ trunk/freeglut/freeglut/src/Common/freeglut_menu.c	2012-01-29 13:06:54 UTC (rev 1027)
@@ -783,14 +783,6 @@
     return fgCreateMenu( callback )->ID;
 }
 
-#if TARGET_HOST_MS_WINDOWS
-int FGAPIENTRY __glutCreateMenuWithExit( void(* callback)( int ), void (__cdecl *exit_function)(int) )
-{
-  __glutExitFunc = exit_function;
-  return glutCreateMenu( callback );
-}
-#endif
-
 /*
  * Destroys a menu object, removing all references to it
  */

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_menu_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_menu_mswin.c	2012-01-29 05:26:54 UTC (rev 1026)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_menu_mswin.c	2012-01-29 13:06:54 UTC (rev 1027)
@@ -34,3 +34,15 @@
     *x = glutGet ( GLUT_SCREEN_WIDTH );
     *y = glutGet ( GLUT_SCREEN_HEIGHT );
 }
+
+
+
+/* -- PLATFORM-SPECIFIC INTERFACE FUNCTION -------------------------------------------------- */
+
+
+int FGAPIENTRY __glutCreateMenuWithExit( void(* callback)( int ), void (__cdecl *exit_function)(int) )
+{
+  __glutExitFunc = exit_function;
+  return glutCreateMenu( callback );
+}
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1028
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1028&view=rev
Author:   fayjf
Date:     2012-01-29 13:11:30 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Moving the Windows-specific includes into the Windows-specific header file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_internal.h
    trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h

Modified: trunk/freeglut/freeglut/src/Common/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 13:06:54 UTC (rev 1027)
+++ trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 13:11:30 UTC (rev 1028)
@@ -88,23 +88,7 @@
 
 /* -- PLATFORM-SPECIFIC INCLUDES ------------------------------------------- */
 
-/* All Win32 headers depend on the huge windows.h recursive include.
- * Note: Lower-case header names are used, for best cross-platform
- * compatibility.
- */
-#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
-#    include <windows.h>
-#    include <windowsx.h>
-#    include <mmsystem.h>
-/* CYGWIN does not have tchar.h, but has TEXT(x), defined in winnt.h. */
-#    ifndef __CYGWIN__
-#      include <tchar.h>
-#    else
-#      define _TEXT(x) TEXT(x)
-#      define _T(x)    TEXT(x)
-#    endif
-
-#elif TARGET_HOST_POSIX_X11
+#if TARGET_HOST_POSIX_X11
 #    include <GL/glx.h>
 #    include <X11/Xlib.h>
 #    include <X11/Xatom.h>

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-29 13:06:54 UTC (rev 1027)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-29 13:11:30 UTC (rev 1028)
@@ -28,6 +28,27 @@
 #ifndef  FREEGLUT_INTERNAL_MSWIN_H
 #define  FREEGLUT_INTERNAL_MSWIN_H
 
+
+/* All Win32 headers depend on the huge windows.h recursive include.
+ * Note: Lower-case header names are used, for best cross-platform
+ * compatibility.
+ */
+#if !defined(_WIN32_WCE)
+#    include <windows.h>
+#    include <windowsx.h>
+#    include <mmsystem.h>
+/* CYGWIN does not have tchar.h, but has TEXT(x), defined in winnt.h. */
+#    ifndef __CYGWIN__
+#      include <tchar.h>
+#    else
+#      define _TEXT(x) TEXT(x)
+#      define _T(x)    TEXT(x)
+#    endif
+
+#endif
+
+
+
 typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay;
 struct tagSFG_PlatformDisplay
 {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1029
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1029&view=rev
Author:   fayjf
Date:     2012-01-29 13:14:08 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Moving more Windows-specific header stuff over to the Windows-specific header file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_internal.h
    trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h

Modified: trunk/freeglut/freeglut/src/Common/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 13:11:30 UTC (rev 1028)
+++ trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 13:14:08 UTC (rev 1029)
@@ -148,21 +148,6 @@
 #    endif
 #endif
 
-#if TARGET_HOST_MS_WINDOWS
-#    define  HAVE_VFPRINTF 1
-#endif
-
-/* MinGW may lack a prototype for ChangeDisplaySettingsEx() (depending on the version?) */
-#if TARGET_HOST_MS_WINDOWS && !defined(ChangeDisplaySettingsEx)
-LONG WINAPI ChangeDisplaySettingsExA(LPCSTR,LPDEVMODEA,HWND,DWORD,LPVOID);
-LONG WINAPI ChangeDisplaySettingsExW(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);
-#    ifdef UNICODE
-#        define ChangeDisplaySettingsEx ChangeDisplaySettingsExW
-#    else
-#        define ChangeDisplaySettingsEx ChangeDisplaySettingsExA
-#    endif
-#endif
-
 #if defined(_MSC_VER) || defined(__WATCOMC__)
 /* strdup() is non-standard, for all but POSIX-2001 */
 #define strdup   _strdup

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-29 13:11:30 UTC (rev 1028)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-29 13:14:08 UTC (rev 1029)
@@ -48,7 +48,22 @@
 #endif
 
 
+#define  HAVE_VFPRINTF 1
 
+/* MinGW may lack a prototype for ChangeDisplaySettingsEx() (depending on the version?) */
+#if !defined(ChangeDisplaySettingsEx)
+LONG WINAPI ChangeDisplaySettingsExA(LPCSTR,LPDEVMODEA,HWND,DWORD,LPVOID);
+LONG WINAPI ChangeDisplaySettingsExW(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);
+#    ifdef UNICODE
+#        define ChangeDisplaySettingsEx ChangeDisplaySettingsExW
+#    else
+#        define ChangeDisplaySettingsEx ChangeDisplaySettingsExA
+#    endif
+#endif
+
+
+/* Structure Definitions */
+
 typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay;
 struct tagSFG_PlatformDisplay
 {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1030
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1030&view=rev
Author:   fayjf
Date:     2012-01-29 19:17:18 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Moving the platform-specific window state fields into their own substructure

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_internal.h
    trunk/freeglut/freeglut/src/Common/freeglut_main.c
    trunk/freeglut/freeglut/src/Common/freeglut_structure.c
    trunk/freeglut/freeglut/src/Common/freeglut_window.c
    trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
    trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 13:14:08 UTC (rev 1029)
+++ trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-01-29 19:17:18 UTC (rev 1030)
@@ -419,20 +419,25 @@
 };
 
 /* Window's state description. This structure should be kept portable. */
+#if TARGET_HOST_POSIX_X11
+typedef struct tagSFG_PlatformWindowState SFG_PlatformWindowState;
+struct tagSFG_PlatformWindowState
+{
+    int             OldWidth;           /* Window width from before a resize */
+    int             OldHeight;          /*   "    height  "    "    "   "    */
+};
+#endif
+
+
 typedef struct tagSFG_WindowState SFG_WindowState;
 struct tagSFG_WindowState
 {
     /* Note that on Windows, sizes always refer to the client area, thus without the window decorations */
     int             Width;              /* Window's width in pixels          */
     int             Height;             /* The same about the height         */
-#if TARGET_HOST_POSIX_X11
-    int             OldWidth;           /* Window width from before a resize */
-    int             OldHeight;          /*   "    height  "    "    "   "    */
-#elif TARGET_HOST_MS_WINDOWS
-    RECT            OldRect;            /* window rect - stored before the window is made fullscreen */
-    DWORD           OldStyle;           /* window style - stored before the window is made fullscreen */
-#endif
 
+	SFG_PlatformWindowState pWState;    /* Window width/height (X11) or rectangle/style (Windows) from before a resize */
+
     GLboolean       Redisplay;          /* Do we have to redisplay?          */
     GLboolean       Visible;            /* Is the window visible now         */
 

Modified: trunk/freeglut/freeglut/src/Common/freeglut_main.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_main.c	2012-01-29 13:14:08 UTC (rev 1029)
+++ trunk/freeglut/freeglut/src/Common/freeglut_main.c	2012-01-29 19:17:18 UTC (rev 1030)
@@ -1001,13 +1001,13 @@
                     height = event.xconfigure.height;
                 }
 
-                if( ( width != window->State.OldWidth ) ||
-                    ( height != window->State.OldHeight ) )
+                if( ( width != window->State.pWState.OldWidth ) ||
+                    ( height != window->State.pWState.OldHeight ) )
                 {
                     SFG_Window *current_window = fgStructure.CurrentWindow;
 
-                    window->State.OldWidth = width;
-                    window->State.OldHeight = height;
+                    window->State.pWState.OldWidth = width;
+                    window->State.pWState.OldHeight = height;
                     if( FETCH_WCB( *window, Reshape ) )
                         INVOKE_WCB( *window, Reshape, ( width, height ) );
                     else

Modified: trunk/freeglut/freeglut/src/Common/freeglut_structure.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_structure.c	2012-01-29 13:14:08 UTC (rev 1029)
+++ trunk/freeglut/freeglut/src/Common/freeglut_structure.c	2012-01-29 19:17:18 UTC (rev 1030)
@@ -65,7 +65,7 @@
 {
     window->Window.pContext.FBConfig = NULL;
 
-    window->State.OldHeight = window->State.OldWidth = -1;
+    window->State.pWState.OldHeight = window->State.pWState.OldWidth = -1;
 }
 #endif
 

Modified: trunk/freeglut/freeglut/src/Common/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-01-29 13:14:08 UTC (rev 1029)
+++ trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-01-29 19:17:18 UTC (rev 1030)
@@ -449,8 +449,8 @@
         /* restore original window size */
         SFG_Window *win = fgStructure.CurrentWindow;
         fgStructure.CurrentWindow->State.NeedToResize = GL_TRUE;
-        fgStructure.CurrentWindow->State.Width  = win->State.OldWidth;
-        fgStructure.CurrentWindow->State.Height = win->State.OldHeight;
+        fgStructure.CurrentWindow->State.Width  = win->State.pWState.OldWidth;
+        fgStructure.CurrentWindow->State.Height = win->State.pWState.OldHeight;
 
     } else {
         /* resize the window to cover the entire screen */

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-29 13:14:08 UTC (rev 1029)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-01-29 19:17:18 UTC (rev 1030)
@@ -85,6 +85,16 @@
 };
 
 
+/* Window's state description. This structure should be kept portable. */
+typedef struct tagSFG_PlatformWindowState SFG_PlatformWindowState;
+struct tagSFG_PlatformWindowState
+{
+    RECT            OldRect;            /* window rect - stored before the window is made fullscreen */
+    DWORD           OldStyle;           /* window style - stored before the window is made fullscreen */
+};
+
+
+
 /* Joystick-Specific Definitions */
 #if !defined(_WIN32_WCE)
 #    define _JS_MAX_AXES  8

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c	2012-01-29 13:14:08 UTC (rev 1029)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_window_mswin.c	2012-01-29 19:17:18 UTC (rev 1030)
@@ -978,10 +978,10 @@
 
         
         /* store current window rect */
-        GetWindowRect( win->Window.Handle, &win->State.OldRect );
+        GetWindowRect( win->Window.Handle, &win->State.pWState.OldRect );
 
         /* store current window style */
-        win->State.OldStyle = s = GetWindowLong(win->Window.Handle, GWL_STYLE);
+        win->State.pWState.OldStyle = s = GetWindowLong(win->Window.Handle, GWL_STYLE);
 
         /* remove decorations from style and add popup style*/
         s &= ~WS_OVERLAPPEDWINDOW;
@@ -992,7 +992,7 @@
         /* For fullscreen mode, find the monitor that is covered the most
          * by the window and get its rect as the resize target.
 	     */
-        hMonitor= MonitorFromRect(&win->State.OldRect, MONITOR_DEFAULTTONEAREST);
+        hMonitor= MonitorFromRect(&win->State.pWState.OldRect, MONITOR_DEFAULTTONEAREST);
         mi.cbSize = sizeof(mi);
         GetMonitorInfo(hMonitor, &mi);
         rect = mi.rcMonitor;
@@ -1048,16 +1048,16 @@
     }
 
     /* restore style of window before making it fullscreen */
-    SetWindowLong(win->Window.Handle, GWL_STYLE, win->State.OldStyle);
+    SetWindowLong(win->Window.Handle, GWL_STYLE, win->State.pWState.OldStyle);
     SetWindowPos(win->Window.Handle, HWND_TOP, 0,0,0,0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
 
     /* Then resize */
     SetWindowPos(win->Window.Handle,
         HWND_TOP,
-        win->State.OldRect.left,
-        win->State.OldRect.top,
-        win->State.OldRect.right  - win->State.OldRect.left,
-        win->State.OldRect.bottom - win->State.OldRect.top,
+        win->State.pWState.OldRect.left,
+        win->State.pWState.OldRect.top,
+        win->State.pWState.OldRect.right  - win->State.pWState.OldRect.left,
+        win->State.pWState.OldRect.bottom - win->State.pWState.OldRect.top,
         SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING |
         SWP_NOZORDER
         );

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1035
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1035&view=rev
Author:   fayjf
Date:     2012-02-04 05:01:29 +0000 (Sat, 04 Feb 2012)
Log Message:
-----------
Moving the "\freeglut_xinput.c" file from the Common directory to the x11 directory and adding the "_x11" to the end of the file name

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Makefile.am

Added Paths:
-----------
    trunk/freeglut/freeglut/src/x11/freeglut_xinput_x11.c

Removed Paths:
-------------
    trunk/freeglut/freeglut/src/Common/freeglut_xinput.c

Deleted: trunk/freeglut/freeglut/src/Common/freeglut_xinput.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_xinput.c	2012-02-04 04:57:44 UTC (rev 1034)
+++ trunk/freeglut/freeglut/src/Common/freeglut_xinput.c	2012-02-04 05:01:29 UTC (rev 1035)
@@ -1,219 +0,0 @@
-/* Written for XI1 by Nikolas Doerfler <doerflen@...> (c) 2008 *
- * Rewritten for XI2 by Florian Echtler <echtler@...> (c) 2009 */
-
-#include <GL/freeglut.h>
-
-#include "freeglut_internal.h"
-
-#if TARGET_HOST_POSIX_X11 && HAVE_X11_EXTENSIONS_XINPUT2_H
-
-#include <errno.h>
-#include <stdarg.h>
-
-#include <X11/Xlib.h>
-#include <X11/extensions/XInput2.h>
-
-/* import function from freeglut_main.c */
-extern int fgPlatformGetModifiers( int state );
-
-/* extension opcode for XInput */
-int xi_opcode = -1;
-
-/**
- * \brief Sets window up for XI2 events.
- */
-void fgRegisterDevices( Display* dpy, Window* win ) {
-
-	XIEventMask mask;
-	unsigned char flags[2] = { 0, 0 };
-	int event, error;
-
-	/*Display* dpy = fgDisplay.Display;
-	Window* win = glutGetXWindow();*/
-
-	/* get XInput extension opcode */
-	if (!XQueryExtension( dpy, "XInputExtension", &xi_opcode, &event, &error )) { xi_opcode = -1; }
-
-	/* Select for motion events */
-	mask.deviceid = XIAllMasterDevices;
-	mask.mask_len = 2;
-	mask.mask = flags;
-
-	XISetMask(mask.mask, XI_Enter);
-	XISetMask(mask.mask, XI_Motion);
-	XISetMask(mask.mask, XI_ButtonPress);
-	XISetMask(mask.mask, XI_ButtonRelease);
-	XISetMask(mask.mask, XI_Leave);
-	/*XISetMask(mask.mask, XI_KeyPress);
-	XISetMask(mask.mask, XI_KeyRelease);
-	XISetMask(mask.mask, XI_DeviceChanged);
-	XISetMask(mask.mask, XI_RawEvent);
-	XISetMask(mask.mask, XI_FocusIn);
-	XISetMask(mask.mask, XI_FocusOut);
-	XISetMask(mask.mask, XI_HierarchyChanged);*/
-
-	XISelectEvents( dpy, *win, &mask, 1 );
-}
-
-
-void fgPrintXILeaveEvent(XILeaveEvent* event)
-{
-    char* mode = "";
-		char* detail = "";
-    int i;
-
-    printf("    windows: root 0x%lx event 0x%lx child 0x%ld\n",
-            event->root, event->event, event->child);
-    switch(event->mode)
-    {
-        case NotifyNormal:       mode = "NotifyNormal"; break;
-        case NotifyGrab:         mode = "NotifyGrab"; break;
-        case NotifyUngrab:       mode = "NotifyUngrab"; break;
-        case NotifyWhileGrabbed: mode = "NotifyWhileGrabbed"; break;
-    }
-    switch (event->detail)
-    {
-        case NotifyAncestor: detail = "NotifyAncestor"; break;
-        case NotifyVirtual: detail = "NotifyVirtual"; break;
-        case NotifyInferior: detail = "NotifyInferior"; break;
-        case NotifyNonlinear: detail = "NotifyNonlinear"; break;
-        case NotifyNonlinearVirtual: detail = "NotifyNonlinearVirtual"; break;
-        case NotifyPointer: detail = "NotifyPointer"; break;
-        case NotifyPointerRoot: detail = "NotifyPointerRoot"; break;
-        case NotifyDetailNone: detail = "NotifyDetailNone"; break;
-    }
-    printf("    mode: %s (detail %s)\n", mode, detail);
-    printf("    flags: %s %s\n", event->focus ? "[focus]" : "",
-                                 event->same_screen ? "[same screen]" : "");
-    printf("    buttons:");
-    for (i = 0; i < event->buttons.mask_len * 8; i++)
-        if (XIMaskIsSet(event->buttons.mask, i))
-            printf(" %d", i);
-    printf("\n");
-
-    printf("    modifiers: locked 0x%x latched 0x%x base 0x%x\n",
-            event->mods.locked, event->mods.latched,
-            event->mods.base);
-    printf("    group: locked 0x%x latched 0x%x base 0x%x\n",
-            event->group.locked, event->group.latched,
-            event->group.base);
-
-    printf("    root x/y:  %.2f / %.2f\n", event->root_x, event->root_y);
-    printf("    event x/y: %.2f / %.2f\n", event->event_x, event->event_y);
-
-}
-
-
-void fgPrintXIDeviceEvent(XIDeviceEvent* event)
-{
-    double *val;
-    int i;
-
-    printf("    device: %d (%d)\n", event->deviceid, event->sourceid);
-    printf("    detail: %d\n", event->detail);
-    printf("    buttons:");
- 	  for (i = 0; i < event->buttons.mask_len * 8; i++)
-   	    if (XIMaskIsSet(event->buttons.mask, i))
-     	      printf(" %d", i);
-    printf("\n");
-
-    printf("    modifiers: locked 0x%x latched 0x%x base 0x%x\n",
-            event->mods.locked, event->mods.latched,
-            event->mods.base);
-    printf("    group: locked 0x%x latched 0x%x base 0x%x\n",
-            event->group.locked, event->group.latched,
-            event->group.base);
-    printf("    valuators:");
-
-    val = event->valuators.values;
-    for (i = 0; i < event->valuators.mask_len * 8; i++)
-        if (XIMaskIsSet(event->valuators.mask, i))
-            printf(" %d: %.2f", i, *val++);
-    printf("\n");
-
-    printf("    windows: root 0x%lx event 0x%lx child 0x%ld\n",
-            event->root, event->event, event->child);
-    printf("    root x/y:  %.2f / %.2f\n", event->root_x, event->root_y);
-    printf("    event x/y: %.2f / %.2f\n", event->event_x, event->event_y);
-
-}
-
-
-/**
- * \brief This function is called when an Extension Event is received
- * and calls the corresponding callback functions for these events.
- */
-void fgHandleExtensionEvents( XEvent* base_ev ) {
-
-	int i, button = 0;
-	XGenericEventCookie* cookie = (XGenericEventCookie*)&(base_ev->xcookie);
-
-	if ( XGetEventData( fgDisplay.Display, cookie ) && (cookie->type == GenericEvent) && (cookie->extension == xi_opcode) ) {
-
-		XIDeviceEvent* event = (XIDeviceEvent*)(cookie->data);
-		/*printf("XI2 event type: %d - %d\n", cookie->evtype, event->type );*/
-
-		SFG_Window* window = fgWindowByHandle( event->event );
-		if (!window) return;
-
-		switch (cookie->evtype) {
-
-			case XI_Enter:
-			case XI_Leave:
-				fgState.Modifiers = fgPlatformGetModifiers( ((XIEnterEvent*)event)->mods.base );
-				INVOKE_WCB( *window, MultiEntry, (
-					event->deviceid, 
-					(event->evtype == XI_Enter ? GLUT_ENTERED : GLUT_LEFT)
-				));
-				#if _DEBUG
-					fgPrintXILeaveEvent((XILeaveEvent*)event);
-				#endif
-				break;
-
-			case XI_ButtonPress:
-			case XI_ButtonRelease:
-				fgState.Modifiers = fgPlatformGetModifiers( event->mods.base );
-				INVOKE_WCB( *window, MultiButton, (
-					event->deviceid, 
-					event->event_x,
-					event->event_y,
-					(event->detail)-1, 
-					(event->evtype == XI_ButtonPress ? GLUT_DOWN : GLUT_UP)
-				));
-				INVOKE_WCB( *window, Mouse, (
-					(event->detail)-1, 
-					(event->evtype == XI_ButtonPress ? GLUT_DOWN : GLUT_UP),
-					event->event_x,
-					event->event_y
-				));
-				break;
-
-			case XI_Motion:
-				fgState.Modifiers = fgPlatformGetModifiers( event->mods.base );
-				for (i = 0; i < event->buttons.mask_len; i++) if (event->buttons.mask[i]) button = 1;
-				if (button) {
-					INVOKE_WCB( *window, MultiMotion,  ( event->deviceid, event->event_x, event->event_y ) );
-					INVOKE_WCB( *window,           Motion,  (                  event->event_x, event->event_y ) );
-				} else {
-					INVOKE_WCB( *window, MultiPassive, ( event->deviceid, event->event_x, event->event_y ) );
-					INVOKE_WCB( *window,           Passive, (                  event->event_x, event->event_y ) );
-				}
-				#if _DEBUG
-					fgPrintXIDeviceEvent(event);
-				#endif
-				break;
-
-			default:
-				#if _DEBUG
-					fgWarning( "Unknown XI2 device event:" );
-					fgPrintXIDeviceEvent( event );
-				#endif
-				break;
-		}
-		fgState.Modifiers = INVALID_MODIFIERS;
-	}
-	XFreeEventData( fgDisplay.Display, cookie );
-}
-
-#endif
-

Modified: trunk/freeglut/freeglut/src/Makefile.am
===================================================================
--- trunk/freeglut/freeglut/src/Makefile.am	2012-02-04 04:57:44 UTC (rev 1034)
+++ trunk/freeglut/freeglut/src/Makefile.am	2012-02-04 05:01:29 UTC (rev 1035)
@@ -39,7 +39,6 @@
 			 Common/freeglut_teapot.c \
 			 Common/freeglut_videoresize.c \
 			 Common/freeglut_window.c \
-			 Common/freeglut_xinput.c \
 			 x11/freeglut_cursor_x11.c \
 			 x11/freeglut_display_x11.c \
 			 x11/freeglut_ext_x11.c \
@@ -53,7 +52,8 @@
 			 x11/freeglut_spaceball_x11.c \
 			 x11/freeglut_state_x11.c \
 			 x11/freeglut_structure_x11.c \
-			 x11/freeglut_window_x11.c
+			 x11/freeglut_window_x11.c \
+			 x11/freeglut_xinput_x11.c
 
 #
 # Additional linker flags

Added: trunk/freeglut/freeglut/src/x11/freeglut_xinput_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_xinput_x11.c	                        (rev 0)
+++ trunk/freeglut/freeglut/src/x11/freeglut_xinput_x11.c	2012-02-04 05:01:29 UTC (rev 1035)
@@ -0,0 +1,219 @@
+/* Written for XI1 by Nikolas Doerfler <doerflen@...> (c) 2008 *
+ * Rewritten for XI2 by Florian Echtler <echtler@...> (c) 2009 */
+
+#include <GL/freeglut.h>
+
+#include "freeglut_internal.h"
+
+#if TARGET_HOST_POSIX_X11 && HAVE_X11_EXTENSIONS_XINPUT2_H
+
+#include <errno.h>
+#include <stdarg.h>
+
+#include <X11/Xlib.h>
+#include <X11/extensions/XInput2.h>
+
+/* import function from freeglut_main.c */
+extern int fgPlatformGetModifiers( int state );
+
+/* extension opcode for XInput */
+int xi_opcode = -1;
+
+/**
+ * \brief Sets window up for XI2 events.
+ */
+void fgRegisterDevices( Display* dpy, Window* win ) {
+
+	XIEventMask mask;
+	unsigned char flags[2] = { 0, 0 };
+	int event, error;
+
+	/*Display* dpy = fgDisplay.Display;
+	Window* win = glutGetXWindow();*/
+
+	/* get XInput extension opcode */
+	if (!XQueryExtension( dpy, "XInputExtension", &xi_opcode, &event, &error )) { xi_opcode = -1; }
+
+	/* Select for motion events */
+	mask.deviceid = XIAllMasterDevices;
+	mask.mask_len = 2;
+	mask.mask = flags;
+
+	XISetMask(mask.mask, XI_Enter);
+	XISetMask(mask.mask, XI_Motion);
+	XISetMask(mask.mask, XI_ButtonPress);
+	XISetMask(mask.mask, XI_ButtonRelease);
+	XISetMask(mask.mask, XI_Leave);
+	/*XISetMask(mask.mask, XI_KeyPress);
+	XISetMask(mask.mask, XI_KeyRelease);
+	XISetMask(mask.mask, XI_DeviceChanged);
+	XISetMask(mask.mask, XI_RawEvent);
+	XISetMask(mask.mask, XI_FocusIn);
+	XISetMask(mask.mask, XI_FocusOut);
+	XISetMask(mask.mask, XI_HierarchyChanged);*/
+
+	XISelectEvents( dpy, *win, &mask, 1 );
+}
+
+
+void fgPrintXILeaveEvent(XILeaveEvent* event)
+{
+    char* mode = "";
+		char* detail = "";
+    int i;
+
+    printf("    windows: root 0x%lx event 0x%lx child 0x%ld\n",
+            event->root, event->event, event->child);
+    switch(event->mode)
+    {
+        case NotifyNormal:       mode = "NotifyNormal"; break;
+        case NotifyGrab:         mode = "NotifyGrab"; break;
+        case NotifyUngrab:       mode = "NotifyUngrab"; break;
+        case NotifyWhileGrabbed: mode = "NotifyWhileGrabbed"; break;
+    }
+    switch (event->detail)
+    {
+        case NotifyAncestor: detail = "NotifyAncestor"; break;
+        case NotifyVirtual: detail = "NotifyVirtual"; break;
+        case NotifyInferior: detail = "NotifyInferior"; break;
+        case NotifyNonlinear: detail = "NotifyNonlinear"; break;
+        case NotifyNonlinearVirtual: detail = "NotifyNonlinearVirtual"; break;
+        case NotifyPointer: detail = "NotifyPointer"; break;
+        case NotifyPointerRoot: detail = "NotifyPointerRoot"; break;
+        case NotifyDetailNone: detail = "NotifyDetailNone"; break;
+    }
+    printf("    mode: %s (detail %s)\n", mode, detail);
+    printf("    flags: %s %s\n", event->focus ? "[focus]" : "",
+                                 event->same_screen ? "[same screen]" : "");
+    printf("    buttons:");
+    for (i = 0; i < event->buttons.mask_len * 8; i++)
+        if (XIMaskIsSet(event->buttons.mask, i))
+            printf(" %d", i);
+    printf("\n");
+
+    printf("    modifiers: locked 0x%x latched 0x%x base 0x%x\n",
+            event->mods.locked, event->mods.latched,
+            event->mods.base);
+    printf("    group: locked 0x%x latched 0x%x base 0x%x\n",
+            event->group.locked, event->group.latched,
+            event->group.base);
+
+    printf("    root x/y:  %.2f / %.2f\n", event->root_x, event->root_y);
+    printf("    event x/y: %.2f / %.2f\n", event->event_x, event->event_y);
+
+}
+
+
+void fgPrintXIDeviceEvent(XIDeviceEvent* event)
+{
+    double *val;
+    int i;
+
+    printf("    device: %d (%d)\n", event->deviceid, event->sourceid);
+    printf("    detail: %d\n", event->detail);
+    printf("    buttons:");
+ 	  for (i = 0; i < event->buttons.mask_len * 8; i++)
+   	    if (XIMaskIsSet(event->buttons.mask, i))
+     	      printf(" %d", i);
+    printf("\n");
+
+    printf("    modifiers: locked 0x%x latched 0x%x base 0x%x\n",
+            event->mods.locked, event->mods.latched,
+            event->mods.base);
+    printf("    group: locked 0x%x latched 0x%x base 0x%x\n",
+            event->group.locked, event->group.latched,
+            event->group.base);
+    printf("    valuators:");
+
+    val = event->valuators.values;
+    for (i = 0; i < event->valuators.mask_len * 8; i++)
+        if (XIMaskIsSet(event->valuators.mask, i))
+            printf(" %d: %.2f", i, *val++);
+    printf("\n");
+
+    printf("    windows: root 0x%lx event 0x%lx child 0x%ld\n",
+            event->root, event->event, event->child);
+    printf("    root x/y:  %.2f / %.2f\n", event->root_x, event->root_y);
+    printf("    event x/y: %.2f / %.2f\n", event->event_x, event->event_y);
+
+}
+
+
+/**
+ * \brief This function is called when an Extension Event is received
+ * and calls the corresponding callback functions for these events.
+ */
+void fgHandleExtensionEvents( XEvent* base_ev ) {
+
+	int i, button = 0;
+	XGenericEventCookie* cookie = (XGenericEventCookie*)&(base_ev->xcookie);
+
+	if ( XGetEventData( fgDisplay.Display, cookie ) && (cookie->type == GenericEvent) && (cookie->extension == xi_opcode) ) {
+
+		XIDeviceEvent* event = (XIDeviceEvent*)(cookie->data);
+		/*printf("XI2 event type: %d - %d\n", cookie->evtype, event->type );*/
+
+		SFG_Window* window = fgWindowByHandle( event->event );
+		if (!window) return;
+
+		switch (cookie->evtype) {
+
+			case XI_Enter:
+			case XI_Leave:
+				fgState.Modifiers = fgPlatformGetModifiers( ((XIEnterEvent*)event)->mods.base );
+				INVOKE_WCB( *window, MultiEntry, (
+					event->deviceid, 
+					(event->evtype == XI_Enter ? GLUT_ENTERED : GLUT_LEFT)
+				));
+				#if _DEBUG
+					fgPrintXILeaveEvent((XILeaveEvent*)event);
+				#endif
+				break;
+
+			case XI_ButtonPress:
+			case XI_ButtonRelease:
+				fgState.Modifiers = fgPlatformGetModifiers( event->mods.base );
+				INVOKE_WCB( *window, MultiButton, (
+					event->deviceid, 
+					event->event_x,
+					event->event_y,
+					(event->detail)-1, 
+					(event->evtype == XI_ButtonPress ? GLUT_DOWN : GLUT_UP)
+				));
+				INVOKE_WCB( *window, Mouse, (
+					(event->detail)-1, 
+					(event->evtype == XI_ButtonPress ? GLUT_DOWN : GLUT_UP),
+					event->event_x,
+					event->event_y
+				));
+				break;
+
+			case XI_Motion:
+				fgState.Modifiers = fgPlatformGetModifiers( event->mods.base );
+				for (i = 0; i < event->buttons.mask_len; i++) if (event->buttons.mask[i]) button = 1;
+				if (button) {
+					INVOKE_WCB( *window, MultiMotion,  ( event->deviceid, event->event_x, event->event_y ) );
+					INVOKE_WCB( *window,           Motion,  (                  event->event_x, event->event_y ) );
+				} else {
+					INVOKE_WCB( *window, MultiPassive, ( event->deviceid, event->event_x, event->event_y ) );
+					INVOKE_WCB( *window,           Passive, (                  event->event_x, event->event_y ) );
+				}
+				#if _DEBUG
+					fgPrintXIDeviceEvent(event);
+				#endif
+				break;
+
+			default:
+				#if _DEBUG
+					fgWarning( "Unknown XI2 device event:" );
+					fgPrintXIDeviceEvent( event );
+				#endif
+				break;
+		}
+		fgState.Modifiers = INVALID_MODIFIERS;
+	}
+	XFreeEventData( fgDisplay.Display, cookie );
+}
+
+#endif
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1038
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1038&view=rev
Author:   fayjf
Date:     2012-02-04 05:22:33 +0000 (Sat, 04 Feb 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_glutfont_definitions.c
    trunk/freeglut/freeglut/src/x11/freeglut_glutfont_definitions_x11.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_glutfont_definitions.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_glutfont_definitions.c	2012-02-04 05:21:57 UTC (rev 1037)
+++ trunk/freeglut/freeglut/src/Common/freeglut_glutfont_definitions.c	2012-02-04 05:22:33 UTC (rev 1038)
@@ -1,108 +0,0 @@
-/*
- * freeglut_glutfont_definitions.c
- *
- * Bitmap and stroke fonts displaying.
- *
- * Copyright (c) 2003 Stephen J. Baker (whether he wants it or not).
- * All Rights Reserved.
- * Written by John F. Fay <fayjf@...>, who releases the
- * copyright over to the "freeglut" project lead.
- * Creation date: Mon July 21 2003
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * This file is necessary for the *nix version of "freeglut" because the
- * original GLUT defined its font variables in rather an unusual way.
- * Publicly, in "glut.h", they were defined as "void *".  Privately,
- * in one of the source code files, they were defined as pointers to a
- * structure.  Most compilers and linkers are satisfied with the "void *"
- * and don't go any farther, but some of them balked.  In particular,
- * when compiling with "freeglut" and then trying to run using the GLUT
- * ".so" library, some of them would give an error.  So we are having to
- * create this file to define the variables as pointers to an unusual
- * structure to match GLUT.
- */
-
-/*
- * freeglut_internal.h uses some GL types, but including the GL header portably
- * is a bit tricky, so we include freeglut_std.h here, which contains the
- * necessary machinery. But this poses another problem, caused by the ugly
- * original defintion of the font constants in "classic" GLUT: They are defined
- * as void* externally, so we move them temporarily out of the way by AN EXTREME
- * CPP HACK.
- */
-
-#define glutStrokeRoman glutStrokeRomanIGNOREME
-#define glutStrokeMonoRoman glutStrokeMonoRomanIGNOREME
-#define glutBitmap9By15 glutBitmap9By15IGNOREME
-#define glutBitmap8By13 glutBitmap8By13IGNOREME
-#define glutBitmapTimesRoman10 glutBitmapTimesRoman10IGNOREME
-#define glutBitmapTimesRoman24 glutBitmapTimesRoman24IGNOREME
-#define glutBitmapHelvetica10 glutBitmapHelvetica10IGNOREME
-#define glutBitmapHelvetica12 glutBitmapHelvetica12IGNOREME
-#define glutBitmapHelvetica18 glutBitmapHelvetica18IGNOREME
-
-#include <GL/freeglut_std.h>
-
-#undef glutStrokeRoman
-#undef glutStrokeMonoRoman
-#undef glutBitmap9By15
-#undef glutBitmap8By13
-#undef glutBitmapTimesRoman10
-#undef glutBitmapTimesRoman24
-#undef glutBitmapHelvetica10
-#undef glutBitmapHelvetica12
-#undef glutBitmapHelvetica18
-
-#include "freeglut_internal.h"
-
-#if TARGET_HOST_POSIX_X11
-
-struct freeglutStrokeFont
-{
-  const char *name ;
-  int num_chars ;
-  void *ch ;
-  float top ;
-  float bottom ;
-};
-
-struct freeglutBitmapFont
-{
-  const char *name ;
-  const int num_chars ;
-  const int first ;
-  const void *ch ;
-};
-
-
-struct freeglutStrokeFont glutStrokeRoman ;
-struct freeglutStrokeFont glutStrokeMonoRoman ;
-
-struct freeglutBitmapFont glutBitmap9By15 ;
-struct freeglutBitmapFont glutBitmap8By13 ;
-struct freeglutBitmapFont glutBitmapTimesRoman10 ;
-struct freeglutBitmapFont glutBitmapTimesRoman24 ;
-struct freeglutBitmapFont glutBitmapHelvetica10 ;
-struct freeglutBitmapFont glutBitmapHelvetica12 ;
-struct freeglutBitmapFont glutBitmapHelvetica18 ;
-
-#endif
-

Modified: trunk/freeglut/freeglut/src/x11/freeglut_glutfont_definitions_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_glutfont_definitions_x11.c	2012-02-04 05:21:57 UTC (rev 1037)
+++ trunk/freeglut/freeglut/src/x11/freeglut_glutfont_definitions_x11.c	2012-02-04 05:22:33 UTC (rev 1038)
@@ -0,0 +1,108 @@
+/*
+ * freeglut_glutfont_definitions.c
+ *
+ * Bitmap and stroke fonts displaying.
+ *
+ * Copyright (c) 2003 Stephen J. Baker (whether he wants it or not).
+ * All Rights Reserved.
+ * Written by John F. Fay <fayjf@...>, who releases the
+ * copyright over to the "freeglut" project lead.
+ * Creation date: Mon July 21 2003
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * This file is necessary for the *nix version of "freeglut" because the
+ * original GLUT defined its font variables in rather an unusual way.
+ * Publicly, in "glut.h", they were defined as "void *".  Privately,
+ * in one of the source code files, they were defined as pointers to a
+ * structure.  Most compilers and linkers are satisfied with the "void *"
+ * and don't go any farther, but some of them balked.  In particular,
+ * when compiling with "freeglut" and then trying to run using the GLUT
+ * ".so" library, some of them would give an error.  So we are having to
+ * create this file to define the variables as pointers to an unusual
+ * structure to match GLUT.
+ */
+
+/*
+ * freeglut_internal.h uses some GL types, but including the GL header portably
+ * is a bit tricky, so we include freeglut_std.h here, which contains the
+ * necessary machinery. But this poses another problem, caused by the ugly
+ * original defintion of the font constants in "classic" GLUT: They are defined
+ * as void* externally, so we move them temporarily out of the way by AN EXTREME
+ * CPP HACK.
+ */
+
+#define glutStrokeRoman glutStrokeRomanIGNOREME
+#define glutStrokeMonoRoman glutStrokeMonoRomanIGNOREME
+#define glutBitmap9By15 glutBitmap9By15IGNOREME
+#define glutBitmap8By13 glutBitmap8By13IGNOREME
+#define glutBitmapTimesRoman10 glutBitmapTimesRoman10IGNOREME
+#define glutBitmapTimesRoman24 glutBitmapTimesRoman24IGNOREME
+#define glutBitmapHelvetica10 glutBitmapHelvetica10IGNOREME
+#define glutBitmapHelvetica12 glutBitmapHelvetica12IGNOREME
+#define glutBitmapHelvetica18 glutBitmapHelvetica18IGNOREME
+
+#include <GL/freeglut_std.h>
+
+#undef glutStrokeRoman
+#undef glutStrokeMonoRoman
+#undef glutBitmap9By15
+#undef glutBitmap8By13
+#undef glutBitmapTimesRoman10
+#undef glutBitmapTimesRoman24
+#undef glutBitmapHelvetica10
+#undef glutBitmapHelvetica12
+#undef glutBitmapHelvetica18
+
+#include "freeglut_internal.h"
+
+#if TARGET_HOST_POSIX_X11
+
+struct freeglutStrokeFont
+{
+  const char *name ;
+  int num_chars ;
+  void *ch ;
+  float top ;
+  float bottom ;
+};
+
+struct freeglutBitmapFont
+{
+  const char *name ;
+  const int num_chars ;
+  const int first ;
+  const void *ch ;
+};
+
+
+struct freeglutStrokeFont glutStrokeRoman ;
+struct freeglutStrokeFont glutStrokeMonoRoman ;
+
+struct freeglutBitmapFont glutBitmap9By15 ;
+struct freeglutBitmapFont glutBitmap8By13 ;
+struct freeglutBitmapFont glutBitmapTimesRoman10 ;
+struct freeglutBitmapFont glutBitmapTimesRoman24 ;
+struct freeglutBitmapFont glutBitmapHelvetica10 ;
+struct freeglutBitmapFont glutBitmapHelvetica12 ;
+struct freeglutBitmapFont glutBitmapHelvetica18 ;
+
+#endif
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1040
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1040&view=rev
Author:   fayjf
Date:     2012-02-04 13:37:52 +0000 (Sat, 04 Feb 2012)
Log Message:
-----------
Fixing the "glutGetProcAddress" snafu -- thank you, Evan Felix, for finding this

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_ext.c
    trunk/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_ext.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_ext.c	2012-02-04 05:23:24 UTC (rev 1039)
+++ trunk/freeglut/freeglut/src/Common/freeglut_ext.c	2012-02-04 13:37:52 UTC (rev 1040)
@@ -29,8 +29,8 @@
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
-extern SFG_Proc fghGetProcAddress( const char *procName );
-extern GLUTproc fgPlatformGlutGetProcAddress( const char *procName );
+extern SFG_Proc fgPlatformGetProcAddress( const char *procName );
+extern GLUTproc fgPlatformGetGLUTProcAddress( const char *procName );
 
 static GLUTproc fghGetGLUTProcAddress( const char* procName )
 {
@@ -204,7 +204,7 @@
 
 
 #if TARGET_HOST_POSIX_X11
-static GLUTproc fghGetGLUTProcAddress( const char* procName )
+static GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )
 {
     /* optimization: quick initial check */
     if( strncmp( procName, "glut", 4 ) != 0 )
@@ -223,14 +223,8 @@
 }
 
 
-GLUTproc fgPlatformGlutGetProcAddress( const char* procName )
+SFG_Proc fgPlatformGetProcAddress( const char *procName )
 {
-    return NULL;
-}
-
-
-SFG_Proc fghGetProcAddress( const char *procName )
-{
 #if defined( GLX_ARB_get_proc_address )
     return (SFG_Proc)glXGetProcAddressARB( ( const GLubyte * )procName );
 #else
@@ -251,7 +245,7 @@
 
 	/* Some GLUT functions are platform-specific: */
 	if ( !p )
-      p = fgPlatformGlutGetProcAddress( procName );
+      p = fgPlatformGetGLUTProcAddress( procName );
 
-    return ( p != NULL ) ? p : fghGetProcAddress( procName );
+    return ( p != NULL ) ? p : fgPlatformGetProcAddress( procName );
 }

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c	2012-02-04 05:23:24 UTC (rev 1039)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_ext_mswin.c	2012-02-04 13:37:52 UTC (rev 1040)
@@ -28,7 +28,7 @@
 #include <GL/freeglut.h>
 #include "../Common/freeglut_internal.h"
 
-GLUTproc fgPlatformGlutGetProcAddress( const char* procName )
+GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )
 {
 #if !defined(_WIN32_WCE)
     /* optimization: quick initial check */
@@ -50,7 +50,7 @@
 
 
 
-SFG_Proc fghGetProcAddress( const char *procName )
+SFG_Proc fgPlatformGetProcAddress( const char *procName )
 {
     return (SFG_Proc)wglGetProcAddress( ( LPCSTR )procName );
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1043
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1043&view=rev
Author:   fayjf
Date:     2012-02-04 14:14:04 +0000 (Sat, 04 Feb 2012)
Log Message:
-----------
Moving the X11-specific code from "freeglut_input_devices.c" into its own file (thank you, Evan Felix)

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_input_devices.c
    trunk/freeglut/freeglut/src/x11/freeglut_input_devices_x11.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_input_devices.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_input_devices.c	2012-02-04 14:05:22 UTC (rev 1042)
+++ trunk/freeglut/freeglut/src/Common/freeglut_input_devices.c	2012-02-04 14:14:04 UTC (rev 1043)
@@ -35,24 +35,6 @@
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
-#if TARGET_HOST_POSIX_X11
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#include <sys/ioctl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <termios.h>
-#include <fcntl.h>
-
-struct {
-   int fd;
-   struct termios termio, termio_save;
-} _serialport;
-
-#endif
-
 typedef struct _serialport SERIALPORT;
 
 
@@ -127,12 +109,6 @@
 /*
  * Try initializing the input device(s)
  */
-#if TARGET_HOST_POSIX_X11
-void fgPlatformRegisterDialDevice ( const char *dial_device )
-{
-}
-#endif
-
 void fgInitialiseInputDevices ( void )
 {
     if( !fgState.InputDevsInitialised )
@@ -235,69 +211,3 @@
     glutTimerFunc ( 2, poll_dials, 0 );
 }
 
-
-/******** OS Specific Serial I/O routines *******/
-#if TARGET_HOST_POSIX_X11 /* ==> Linux/BSD/UNIX POSIX serial I/O */
-static SERIALPORT *serial_open ( const char *device )
-{
-    int fd;
-    struct termios termio;
-    SERIALPORT *port;
-
-    fd = open(device, O_RDWR | O_NONBLOCK );
-    if (fd <0) {
-        perror(device);
-        return NULL;
-    }
-
-    port = malloc(sizeof(SERIALPORT));
-    memset(port, 0, sizeof(SERIALPORT));
-    port->fd = fd;
-
-    /* save current port settings */
-    tcgetattr(fd,&port->termio_save);
-
-    memset(&termio, 0, sizeof(termio));
-    termio.c_cflag = CS8 | CREAD | HUPCL ;
-    termio.c_iflag = IGNPAR | IGNBRK ;
-    termio.c_cc[VTIME]    = 0;   /* inter-character timer */
-    termio.c_cc[VMIN]     = 1;   /* block read until 1 chars received, when blocking I/O */
-
-    cfsetispeed(&termio, B9600);
-    cfsetospeed(&termio, B9600);
-    tcsetattr(fd,TCSANOW,&termio);
-
-    serial_flush(port);
-    return port;
-}
-
-static void serial_close(SERIALPORT *port)
-{
-    if (port)
-    {
-        /* restore old port settings */
-        tcsetattr(port->fd,TCSANOW,&port->termio_save);
-        close(port->fd);
-        free(port);
-    }
-}
-
-static int serial_getchar(SERIALPORT *port)
-{
-    unsigned char ch;
-    if (!port) return EOF;
-    if (read(port->fd,&ch,1)) return ch;
-    return EOF;
-}
-
-static int serial_putchar(SERIALPORT *port, unsigned char ch){
-    if (!port) return 0;
-    return write(port->fd,&ch,1);
-}
-
-static void serial_flush ( SERIALPORT *port )
-{
-    tcflush ( port->fd, TCIOFLUSH );
-}
-
-#endif

Modified: trunk/freeglut/freeglut/src/x11/freeglut_input_devices_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_input_devices_x11.c	2012-02-04 14:05:22 UTC (rev 1042)
+++ trunk/freeglut/freeglut/src/x11/freeglut_input_devices_x11.c	2012-02-04 14:14:04 UTC (rev 1043)
@@ -0,0 +1,132 @@
+/*
+ * freeglut_input_devices_x11.c
+ *
+ * Handles miscellaneous input devices via direct serial-port access.
+ * Proper X11 XInput device support is not yet supported.
+ * Also lacks Mac support.
+ *
+ * Written by Joe Krahn <krahn@...> 2005
+ *
+ * Copyright (c) 2005 Stephen J. Baker. All Rights Reserved.
+ * Copied for Platform code by Evan Felix <karcaw at gmail.com>
+ * Creation date: Thur Feb 2 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA OR STEPHEN J. BAKER BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#    include "config.h"
+#endif
+
+#include <GL/freeglut.h>
+#include "freeglut_internal.h"
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#include <sys/ioctl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <termios.h>
+#include <fcntl.h>
+
+struct _serialport {
+   int fd;
+   struct termios termio, termio_save;
+};
+
+typedef struct _serialport SERIALPORT;
+
+void serial_flush ( SERIALPORT *port );
+
+/* local variables */
+static SERIALPORT *dialbox_port=NULL;
+
+/*****************************************************************/
+
+/*
+ * Try initializing the input device(s)
+ */
+void fgPlatformRegisterDialDevice ( const char *dial_device )
+{
+}
+
+SERIALPORT *serial_open ( const char *device )
+{
+    int fd;
+    struct termios termio;
+    SERIALPORT *port;
+
+    fd = open(device, O_RDWR | O_NONBLOCK );
+    if (fd <0) {
+        perror(device);
+        return NULL;
+    }
+
+    port = malloc(sizeof(SERIALPORT));
+    memset(port, 0, sizeof(SERIALPORT));
+    port->fd = fd;
+
+    /* save current port settings */
+    tcgetattr(fd,&port->termio_save);
+
+    memset(&termio, 0, sizeof(termio));
+    termio.c_cflag = CS8 | CREAD | HUPCL ;
+    termio.c_iflag = IGNPAR | IGNBRK ;
+    termio.c_cc[VTIME]    = 0;   /* inter-character timer */
+    termio.c_cc[VMIN]     = 1;   /* block read until 1 chars received, when blocking I/O */
+
+    cfsetispeed(&termio, B9600);
+    cfsetospeed(&termio, B9600);
+    tcsetattr(fd,TCSANOW,&termio);
+
+    serial_flush(port);
+    return port;
+}
+
+void serial_close(SERIALPORT *port)
+{
+    if (port)
+    {
+        /* restore old port settings */
+        tcsetattr(port->fd,TCSANOW,&port->termio_save);
+        close(port->fd);
+        free(port);
+    }
+}
+
+int serial_getchar(SERIALPORT *port)
+{
+    unsigned char ch;
+    if (!port) return EOF;
+    if (read(port->fd,&ch,1)) return ch;
+    return EOF;
+}
+
+int serial_putchar(SERIALPORT *port, unsigned char ch)
+{
+    if (!port) return 0;
+    return write(port->fd,&ch,1);
+}
+
+void serial_flush ( SERIALPORT *port )
+{
+    tcflush ( port->fd, TCIOFLUSH );
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1044
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1044&view=rev
Author:   fayjf
Date:     2012-02-04 14:28:32 +0000 (Sat, 04 Feb 2012)
Log Message:
-----------
Splitting the X11-specific code from "freeglut_init.c" into its own file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_init.c
    trunk/freeglut/freeglut/src/x11/freeglut_init_x11.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_init.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-02-04 14:14:04 UTC (rev 1043)
+++ trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-02-04 14:28:32 UTC (rev 1044)
@@ -29,10 +29,6 @@
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
-#if TARGET_HOST_POSIX_X11
-#include <limits.h>  /* LONG_MAX */
-#endif
-
 /*
  * TODO BEFORE THE STABLE RELEASE:
  *
@@ -104,225 +100,7 @@
 extern void fgPlatformDeinitialiseInputDevices ( void );
 extern void fgPlatformCloseDisplay ( void );
 
-#if TARGET_HOST_POSIX_X11
 
-/* Return the atom associated with "name". */
-static Atom fghGetAtom(const char * name)
-{
-  return XInternAtom(fgDisplay.pDisplay.Display, name, False);
-}
-
-/*
- * Check if "property" is set on "window".  The property's values are returned
- * through "data".  If the property is set and is of type "type", return the
- * number of elements in "data".  Return zero otherwise.  In both cases, use
- * "Xfree()" to free "data".
- */
-static int fghGetWindowProperty(Window window,
-				Atom property,
-				Atom type,
-				unsigned char ** data)
-{
-  /*
-   * Caller always has to use "Xfree()" to free "data", since
-   * "XGetWindowProperty() always allocates one extra byte in prop_return
-   * [i.e. "data"] (even if the property is zero length) [..]".
-   */
-
-  int status;  /*  Returned by "XGetWindowProperty". */
-
-  Atom          type_returned;
-  int           temp_format;             /*  Not used. */
-  unsigned long number_of_elements;
-  unsigned long temp_bytes_after;        /*  Not used. */
-
-
-  status = XGetWindowProperty(fgDisplay.pDisplay.Display,
-			      window,
-			      property,
-			      0,
-			      LONG_MAX,
-			      False,
-			      type,
-			      &type_returned,
-			      &temp_format,
-			      &number_of_elements,
-			      &temp_bytes_after,
-			      data);
-
-  FREEGLUT_INTERNAL_ERROR_EXIT(status == Success,
-			       "XGetWindowProperty failled",
-			       "fghGetWindowProperty");
-
-  if (type_returned != type)
-    {
-      number_of_elements = 0;
-    }
-
-  return number_of_elements;
-}
-
-/*  Check if the window manager is NET WM compliant. */
-static int fghNetWMSupported(void)
-{
-  Atom wm_check;
-  Window ** window_ptr_1;
-
-  int number_of_windows;
-  int net_wm_supported;
-
-
-  net_wm_supported = 0;
-
-  wm_check = fghGetAtom("_NET_SUPPORTING_WM_CHECK");
-  window_ptr_1 = malloc(sizeof(Window *));
-
-  /*
-   * Check that the window manager has set this property on the root window.
-   * The property must be the ID of a child window.
-   */
-  number_of_windows = fghGetWindowProperty(fgDisplay.pDisplay.RootWindow,
-                                           wm_check,
-                                           XA_WINDOW,
-                                           (unsigned char **) window_ptr_1);
-  if (number_of_windows == 1)
-    {
-      Window ** window_ptr_2;
-
-      window_ptr_2 = malloc(sizeof(Window *));
-
-      /* Check that the window has the same property set to the same value. */
-      number_of_windows = fghGetWindowProperty(**window_ptr_1,
-                                               wm_check,
-                                               XA_WINDOW,
-                                               (unsigned char **) window_ptr_2);
-      if ((number_of_windows == 1) && (**window_ptr_1 == **window_ptr_2))
-      {
-        /* NET WM compliant */
-        net_wm_supported = 1;
-      }
-
-      XFree(*window_ptr_2);
-      free(window_ptr_2);
-    }
-
-        XFree(*window_ptr_1);
-        free(window_ptr_1);
-
-        return net_wm_supported;
-}
-
-/*  Check if "hint" is present in "property" for "window". */
-int fgHintPresent(Window window, Atom property, Atom hint)
-{
-  Atom *atoms;
-  int number_of_atoms;
-  int supported;
-  int i;
-
-  supported = 0;
-
-  number_of_atoms = fghGetWindowProperty(window,
-					 property,
-					 XA_ATOM,
-					 (unsigned char **) &atoms);
-  for (i = 0; i < number_of_atoms; i++)
-  {
-      if (atoms[i] == hint)
-      {
-          supported = 1;
-          break;
-      }
-  }
-
-  XFree(atoms);
-  return supported;
-}
-
-#endif /*  TARGET_HOST_POSIX_X11  */
-
-
-#if TARGET_HOST_POSIX_X11
-/*
- * A call to this function should initialize all the display stuff...
- */
-void fgPlatformInitialize( const char* displayName )
-{
-    fgDisplay.pDisplay.Display = XOpenDisplay( displayName );
-
-    if( fgDisplay.pDisplay.Display == NULL )
-        fgError( "failed to open display '%s'", XDisplayName( displayName ) );
-
-    if( !glXQueryExtension( fgDisplay.pDisplay.Display, NULL, NULL ) )
-        fgError( "OpenGL GLX extension not supported by display '%s'",
-            XDisplayName( displayName ) );
-
-    fgDisplay.pDisplay.Screen = DefaultScreen( fgDisplay.pDisplay.Display );
-    fgDisplay.pDisplay.RootWindow = RootWindow(
-        fgDisplay.pDisplay.Display,
-        fgDisplay.pDisplay.Screen
-    );
-
-    fgDisplay.ScreenWidth  = DisplayWidth(
-        fgDisplay.pDisplay.Display,
-        fgDisplay.pDisplay.Screen
-    );
-    fgDisplay.ScreenHeight = DisplayHeight(
-        fgDisplay.pDisplay.Display,
-        fgDisplay.pDisplay.Screen
-    );
-
-    fgDisplay.ScreenWidthMM = DisplayWidthMM(
-        fgDisplay.pDisplay.Display,
-        fgDisplay.pDisplay.Screen
-    );
-    fgDisplay.ScreenHeightMM = DisplayHeightMM(
-        fgDisplay.pDisplay.Display,
-        fgDisplay.pDisplay.Screen
-    );
-
-    fgDisplay.pDisplay.Connection = ConnectionNumber( fgDisplay.pDisplay.Display );
-
-    /* Create the window deletion atom */
-    fgDisplay.pDisplay.DeleteWindow = fghGetAtom("WM_DELETE_WINDOW");
-
-    /* Create the state and full screen atoms */
-    fgDisplay.pDisplay.State           = None;
-    fgDisplay.pDisplay.StateFullScreen = None;
-
-    if (fghNetWMSupported())
-    {
-      const Atom supported = fghGetAtom("_NET_SUPPORTED");
-      const Atom state     = fghGetAtom("_NET_WM_STATE");
-      
-      /* Check if the state hint is supported. */
-      if (fgHintPresent(fgDisplay.pDisplay.RootWindow, supported, state))
-      {
-        const Atom full_screen = fghGetAtom("_NET_WM_STATE_FULLSCREEN");
-        
-        fgDisplay.pDisplay.State = state;
-        
-        /* Check if the window manager supports full screen. */
-        /**  Check "_NET_WM_ALLOWED_ACTIONS" on our window instead? **/
-        if (fgHintPresent(fgDisplay.pDisplay.RootWindow, supported, full_screen))
-        {
-          fgDisplay.pDisplay.StateFullScreen = full_screen;
-        }
-      }
-    }
-
-
-    fgState.Initialised = GL_TRUE;
-
-    atexit(fgDeinitialize);
-
-    /* InputDevice uses GlutTimerFunc(), so fgState.Initialised must be TRUE */
-    fgInitialiseInputDevices();
-}
-
-#endif
-
-
 void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )
 {
 #ifndef _WIN32_WCE
@@ -436,34 +214,6 @@
 }
 
 
-#if TARGET_HOST_POSIX_X11
-void fgPlatformDeinitialiseInputDevices ( void )
-{
-	fghCloseInputDevices ();
-
-    fgState.JoysticksInitialised = GL_FALSE;
-    fgState.InputDevsInitialised = GL_FALSE;
-}
-
-
-void fgPlatformCloseDisplay ( void )
-{
-    /*
-     * Make sure all X-client data we have created will be destroyed on
-     * display closing
-     */
-    XSetCloseDownMode( fgDisplay.pDisplay.Display, DestroyAll );
-
-    /*
-     * Close the display connection, destroying all windows we have
-     * created so far
-     */
-    XCloseDisplay( fgDisplay.pDisplay.Display );
-}
-
-#endif
-
-
 /*
  * Perform the freeglut deinitialization...
  */

Modified: trunk/freeglut/freeglut/src/x11/freeglut_init_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_init_x11.c	2012-02-04 14:14:04 UTC (rev 1043)
+++ trunk/freeglut/freeglut/src/x11/freeglut_init_x11.c	2012-02-04 14:28:32 UTC (rev 1044)
@@ -0,0 +1,267 @@
+/*
+ * freeglut_init_x11.c
+ *
+ * Various freeglut initialization functions.
+ *
+ * Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved.
+ * Written by Pawel W. Olszta, <olszta@...>
+ * Copied for Platform code by Evan Felix <karcaw at gmail.com>
+ * Creation date: Thur Feb 2 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#define FREEGLUT_BUILDING_LIB
+#include <limits.h>  /* LONG_MAX */
+#include <GL/freeglut.h>
+#include "freeglut_internal.h"
+
+/* Return the atom associated with "name". */
+static Atom fghGetAtom(const char * name)
+{
+  return XInternAtom(fgDisplay.pDisplay.Display, name, False);
+}
+
+/*
+ * Check if "property" is set on "window".  The property's values are returned
+ * through "data".  If the property is set and is of type "type", return the
+ * number of elements in "data".  Return zero otherwise.  In both cases, use
+ * "Xfree()" to free "data".
+ */
+static int fghGetWindowProperty(Window window,
+				Atom property,
+				Atom type,
+				unsigned char ** data)
+{
+  /*
+   * Caller always has to use "Xfree()" to free "data", since
+   * "XGetWindowProperty() always allocates one extra byte in prop_return
+   * [i.e. "data"] (even if the property is zero length) [..]".
+   */
+
+  int status;  /*  Returned by "XGetWindowProperty". */
+
+  Atom          type_returned;
+  int           temp_format;             /*  Not used. */
+  unsigned long number_of_elements;
+  unsigned long temp_bytes_after;        /*  Not used. */
+
+
+  status = XGetWindowProperty(fgDisplay.pDisplay.Display,
+			      window,
+			      property,
+			      0,
+			      LONG_MAX,
+			      False,
+			      type,
+			      &type_returned,
+			      &temp_format,
+			      &number_of_elements,
+			      &temp_bytes_after,
+			      data);
+
+  FREEGLUT_INTERNAL_ERROR_EXIT(status == Success,
+			       "XGetWindowProperty failled",
+			       "fghGetWindowProperty");
+
+  if (type_returned != type)
+    {
+      number_of_elements = 0;
+    }
+
+  return number_of_elements;
+}
+
+/*  Check if the window manager is NET WM compliant. */
+static int fghNetWMSupported(void)
+{
+  Atom wm_check;
+  Window ** window_ptr_1;
+
+  int number_of_windows;
+  int net_wm_supported;
+
+
+  net_wm_supported = 0;
+
+  wm_check = fghGetAtom("_NET_SUPPORTING_WM_CHECK");
+  window_ptr_1 = malloc(sizeof(Window *));
+
+  /*
+   * Check that the window manager has set this property on the root window.
+   * The property must be the ID of a child window.
+   */
+  number_of_windows = fghGetWindowProperty(fgDisplay.pDisplay.RootWindow,
+                                           wm_check,
+                                           XA_WINDOW,
+                                           (unsigned char **) window_ptr_1);
+  if (number_of_windows == 1)
+    {
+      Window ** window_ptr_2;
+
+      window_ptr_2 = malloc(sizeof(Window *));
+
+      /* Check that the window has the same property set to the same value. */
+      number_of_windows = fghGetWindowProperty(**window_ptr_1,
+                                               wm_check,
+                                               XA_WINDOW,
+                                               (unsigned char **) window_ptr_2);
+      if ((number_of_windows == 1) && (**window_ptr_1 == **window_ptr_2))
+      {
+        /* NET WM compliant */
+        net_wm_supported = 1;
+      }
+
+      XFree(*window_ptr_2);
+      free(window_ptr_2);
+    }
+
+        XFree(*window_ptr_1);
+        free(window_ptr_1);
+
+        return net_wm_supported;
+}
+
+/*  Check if "hint" is present in "property" for "window". */
+int fgHintPresent(Window window, Atom property, Atom hint)
+{
+  Atom *atoms;
+  int number_of_atoms;
+  int supported;
+  int i;
+
+  supported = 0;
+
+  number_of_atoms = fghGetWindowProperty(window,
+					 property,
+					 XA_ATOM,
+					 (unsigned char **) &atoms);
+  for (i = 0; i < number_of_atoms; i++)
+  {
+      if (atoms[i] == hint)
+      {
+          supported = 1;
+          break;
+      }
+  }
+
+  XFree(atoms);
+  return supported;
+}
+
+/*
+ * A call to this function should initialize all the display stuff...
+ */
+void fgPlatformInitialize( const char* displayName )
+{
+    fgDisplay.pDisplay.Display = XOpenDisplay( displayName );
+
+    if( fgDisplay.pDisplay.Display == NULL )
+        fgError( "failed to open display '%s'", XDisplayName( displayName ) );
+
+    if( !glXQueryExtension( fgDisplay.pDisplay.Display, NULL, NULL ) )
+        fgError( "OpenGL GLX extension not supported by display '%s'",
+            XDisplayName( displayName ) );
+
+    fgDisplay.pDisplay.Screen = DefaultScreen( fgDisplay.pDisplay.Display );
+    fgDisplay.pDisplay.RootWindow = RootWindow(
+        fgDisplay.pDisplay.Display,
+        fgDisplay.pDisplay.Screen
+    );
+
+    fgDisplay.ScreenWidth  = DisplayWidth(
+        fgDisplay.pDisplay.Display,
+        fgDisplay.pDisplay.Screen
+    );
+    fgDisplay.ScreenHeight = DisplayHeight(
+        fgDisplay.pDisplay.Display,
+        fgDisplay.pDisplay.Screen
+    );
+
+    fgDisplay.ScreenWidthMM = DisplayWidthMM(
+        fgDisplay.pDisplay.Display,
+        fgDisplay.pDisplay.Screen
+    );
+    fgDisplay.ScreenHeightMM = DisplayHeightMM(
+        fgDisplay.pDisplay.Display,
+        fgDisplay.pDisplay.Screen
+    );
+
+    fgDisplay.pDisplay.Connection = ConnectionNumber( fgDisplay.pDisplay.Display );
+
+    /* Create the window deletion atom */
+    fgDisplay.pDisplay.DeleteWindow = fghGetAtom("WM_DELETE_WINDOW");
+
+    /* Create the state and full screen atoms */
+    fgDisplay.pDisplay.State           = None;
+    fgDisplay.pDisplay.StateFullScreen = None;
+
+    if (fghNetWMSupported())
+    {
+      const Atom supported = fghGetAtom("_NET_SUPPORTED");
+      const Atom state     = fghGetAtom("_NET_WM_STATE");
+      
+      /* Check if the state hint is supported. */
+      if (fgHintPresent(fgDisplay.pDisplay.RootWindow, supported, state))
+      {
+        const Atom full_screen = fghGetAtom("_NET_WM_STATE_FULLSCREEN");
+        
+        fgDisplay.pDisplay.State = state;
+        
+        /* Check if the window manager supports full screen. */
+        /**  Check "_NET_WM_ALLOWED_ACTIONS" on our window instead? **/
+        if (fgHintPresent(fgDisplay.pDisplay.RootWindow, supported, full_screen))
+        {
+          fgDisplay.pDisplay.StateFullScreen = full_screen;
+        }
+      }
+    }
+
+
+    fgState.Initialised = GL_TRUE;
+
+    atexit(fgDeinitialize);
+
+    /* InputDevice uses GlutTimerFunc(), so fgState.Initialised must be TRUE */
+    fgInitialiseInputDevices();
+}
+
+void fgPlatformDeinitialiseInputDevices ( void )
+{
+	fghCloseInputDevices ();
+
+    fgState.JoysticksInitialised = GL_FALSE;
+    fgState.InputDevsInitialised = GL_FALSE;
+}
+
+
+void fgPlatformCloseDisplay ( void )
+{
+    /*
+     * Make sure all X-client data we have created will be destroyed on
+     * display closing
+     */
+    XSetCloseDownMode( fgDisplay.pDisplay.Display, DestroyAll );
+
+    /*
+     * Close the display connection, destroying all windows we have
+     * created so far
+     */
+    XCloseDisplay( fgDisplay.pDisplay.Display );
+}
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1045
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1045&view=rev
Author:   fayjf
Date:     2012-02-04 14:29:34 +0000 (Sat, 04 Feb 2012)
Log Message:
-----------
Changing a bunch of platform-specific "fgDisplay" fields to "fgDisplay.pDisplay" -- I can't see how the X11 version built before this.

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_spaceball.c
    trunk/freeglut/freeglut/src/Common/freeglut_state.c
    trunk/freeglut/freeglut/src/Common/freeglut_window.c
    trunk/freeglut/freeglut/src/x11/freeglut_xinput_x11.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_spaceball.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_spaceball.c	2012-02-04 14:28:32 UTC (rev 1044)
+++ trunk/freeglut/freeglut/src/Common/freeglut_spaceball.c	2012-02-04 14:29:34 UTC (rev 1045)
@@ -77,7 +77,7 @@
 		}
 
         w = fgStructure.CurrentWindow->Window.Handle;
-        if(spnav_x11_open(fgDisplay.Display, w) == -1)
+        if(spnav_x11_open(fgDisplay.pDisplay.Display, w) == -1)
 		{
 			sball_initialized = -1;
             return;

Modified: trunk/freeglut/freeglut/src/Common/freeglut_state.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_state.c	2012-02-04 14:28:32 UTC (rev 1044)
+++ trunk/freeglut/freeglut/src/Common/freeglut_state.c	2012-02-04 14:29:34 UTC (rev 1045)
@@ -65,7 +65,7 @@
   int result;  /*  Not checked  */
 
   if( fgStructure.CurrentWindow )
-      result = glXGetFBConfigAttrib( fgDisplay.Display,
+      result = glXGetFBConfigAttrib( fgDisplay.pDisplay.Display,
                                      *(fgStructure.CurrentWindow->Window.pContext.FBConfig),
                                      attribute,
                                      &returnValue );
@@ -128,7 +128,7 @@
                 fgStructure.CurrentWindow->Window.pContext.FBConfig;
 
           XVisualInfo * visualInfo =
-                glXGetVisualFromFBConfig( fgDisplay.Display, *fbconfig );
+                glXGetVisualFromFBConfig( fgDisplay.pDisplay.Display, *fbconfig );
 
           const int result = visualInfo->visual->map_entries;
 
@@ -153,7 +153,7 @@
             return 0;
 
         XTranslateCoordinates(
-            fgDisplay.Display,
+            fgDisplay.pDisplay.Display,
             fgStructure.CurrentWindow->Window.Handle,
             fgDisplay.RootWindow,
             0, 0, &x, &y, &w);
@@ -167,7 +167,7 @@
         if ( w == 0 )
             return 0;
         XTranslateCoordinates(
-            fgDisplay.Display,
+            fgDisplay.pDisplay.Display,
             fgStructure.CurrentWindow->Window.Handle,
             w, 0, 0, &x, &y, &w);
 
@@ -186,7 +186,7 @@
         if( fgStructure.CurrentWindow == NULL )
             return 0;
         XGetWindowAttributes(
-            fgDisplay.Display,
+            fgDisplay.pDisplay.Display,
             fgStructure.CurrentWindow->Window.Handle,
             &winAttributes
         );
@@ -259,7 +259,7 @@
          */
         {
             unsigned char map;
-            int nbuttons = XGetPointerMapping(fgDisplay.Display, &map,0);
+            int nbuttons = XGetPointerMapping(fgDisplay.pDisplay.Display, &map,0);
             return nbuttons;
         }
 
@@ -633,8 +633,8 @@
           break;
         }
 
-      fbconfigArray = glXChooseFBConfig(fgDisplay.Display,
-                                        fgDisplay.Screen,
+      fbconfigArray = glXChooseFBConfig(fgDisplay.pDisplay.Display,
+                                        fgDisplay.pDisplay.Screen,
                                         attributes,
                                         &fbconfigArraySize);
 
@@ -652,7 +652,7 @@
             {
               int value;
 
-              result = glXGetFBConfigAttrib(fgDisplay.Display,
+              result = glXGetFBConfigAttrib(fgDisplay.pDisplay.Display,
                                             fbconfigArray[i],
                                             attribute_name,
                                             &value);

Modified: trunk/freeglut/freeglut/src/Common/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-02-04 14:28:32 UTC (rev 1044)
+++ trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-02-04 14:29:34 UTC (rev 1045)
@@ -259,8 +259,8 @@
 
 
         /*  Get all FBConfigs that match "attributes".  */
-        fbconfigArray = glXChooseFBConfig( fgDisplay.Display,
-                                           fgDisplay.Screen,
+        fbconfigArray = glXChooseFBConfig( fgDisplay.pDisplay.Display,
+                                           fgDisplay.pDisplay.Screen,
                                            attributes,
                                            &fbconfigArraySize );
 
@@ -281,13 +281,13 @@
 
                 /*  Get bufferSizeMin.  */
                 result =
-                  glXGetFBConfigAttrib( fgDisplay.Display,
+                  glXGetFBConfigAttrib( fgDisplay.pDisplay.Display,
                                         fbconfigArray[0],
                                         GLX_BUFFER_SIZE,
                                         &bufferSizeMin );
                 /*  Get bufferSizeMax.  */
                 result =
-                  glXGetFBConfigAttrib( fgDisplay.Display,
+                  glXGetFBConfigAttrib( fgDisplay.pDisplay.Display,
                                         fbconfigArray[fbconfigArraySize - 1],
                                         GLX_BUFFER_SIZE,
                                         &bufferSizeMax );
@@ -305,7 +305,7 @@
                     ATTRIB_VAL( GLX_BUFFER_SIZE, bufferSizeMax );
                     ATTRIB( None );
 
-                    fbconfigArray = glXChooseFBConfig( fgDisplay.Display,
+                    fbconfigArray = glXChooseFBConfig( fgDisplay.pDisplay.Display,
                                                        fgDisplay.Screen,
                                                        attributes,
                                                        &fbconfigArraySize );
@@ -319,7 +319,7 @@
              * int fbconfigXID;
              *
              *  - pick the XID of the FBConfig we want
-             * result = glXGetFBConfigAttrib( fgDisplay.Display,
+             * result = glXGetFBConfigAttrib( fgDisplay.pDisplay.Display,
              *                                fbconfigArray[0],
              *                                GLX_FBCONFIG_ID,
              *                                &fbconfigXID );
@@ -333,8 +333,8 @@
              * ATTRIB( None );
              *
              * - get our FBConfig only
-             * fbconfig = glXChooseFBConfig( fgDisplay.Display,
-             *                               fgDisplay.Screen,
+             * fbconfig = glXChooseFBConfig( fgDisplay.pDisplay.Display,
+             *                               fgDisplay.pDisplay.Screen,
              *                               attributes,
              *                               &fbconfigArraySize );
              *
@@ -397,7 +397,7 @@
   int index_mode = ( fgState.DisplayMode & GLUT_INDEX );
 
   /* "classic" context creation */
-  Display *dpy = fgDisplay.Display;
+  Display *dpy = fgDisplay.pDisplay.Display;
   GLXFBConfig config = *(window->Window.pContext.FBConfig);
   int render_type = ( !menu && index_mode ) ? GLX_COLOR_INDEX_TYPE : GLX_RGBA_TYPE;
   GLXContext share_list = NULL;
@@ -454,7 +454,7 @@
 
     } else {
         /* resize the window to cover the entire screen */
-        XGetWindowAttributes(fgDisplay.Display,
+        XGetWindowAttributes(fgDisplay.pDisplay.Display,
                 fgStructure.CurrentWindow->Window.Handle,
                 &attributes);
         
@@ -462,7 +462,7 @@
          * The "x" and "y" members of "attributes" are the window's coordinates
          * relative to its parent, i.e. to the decoration window.
          */
-        XMoveResizeWindow(fgDisplay.Display,
+        XMoveResizeWindow(fgDisplay.pDisplay.Display,
                 fgStructure.CurrentWindow->Window.Handle,
                 -attributes.x,
                 -attributes.y,
@@ -491,7 +491,7 @@
     xev.xclient.data.l[3] = 1;	/* source indication: application */
     xev.xclient.data.l[4] = 0;	/* unused */
 
-    if(!XSendEvent(fgDisplay.Display, fgDisplay.RootWindow, 0, evmask, &xev)) {
+    if(!XSendEvent(fgDisplay.pDisplay.Display, fgDisplay.pDisplay.RootWindow, 0, evmask, &xev)) {
         return -1;
     }
     return 0;
@@ -516,7 +516,7 @@
     if ( window )
     {
         glXMakeContextCurrent(
-            fgDisplay.Display,
+            fgDisplay.pDisplay.Display,
             window->Window.Handle,
             window->Window.Handle,
             window->Window.Context
@@ -580,7 +580,7 @@
 
     /*  Get the X visual.  */
     for (i = 0; i < num_FBConfigs; i++) {
-	    visualInfo = glXGetVisualFromFBConfig( fgDisplay.Display,
+	    visualInfo = glXGetVisualFromFBConfig( fgDisplay.pDisplay.Display,
 						   window->Window.pContext.FBConfig[i] );
 	    if (visualInfo)
 		break;
@@ -609,7 +609,7 @@
     winAttr.border_pixel      = 0;
 
     winAttr.colormap = XCreateColormap(
-        fgDisplay.Display, fgDisplay.RootWindow,
+        fgDisplay.pDisplay.Display, fgDisplay.pDisplay.RootWindow,
         visualInfo->visual, AllocNone
     );
 
@@ -627,8 +627,8 @@
         w = h = 300; /* default window size */
 
     window->Window.Handle = XCreateWindow(
-        fgDisplay.Display,
-        window->Parent == NULL ? fgDisplay.RootWindow :
+        fgDisplay.pDisplay.Display,
+        window->Parent == NULL ? fgDisplay.pDisplay.RootWindow :
         window->Parent->Window.Handle,
         x, y, w, h, 0,
         visualInfo->depth, InputOutput,
@@ -668,7 +668,7 @@
         window->Window.Context = fghCreateNewContext( window );
 
 #if !defined( __FreeBSD__ ) && !defined( __NetBSD__ )
-    if(  !glXIsDirect( fgDisplay.Display, window->Window.Context ) )
+    if(  !glXIsDirect( fgDisplay.pDisplay.Display, window->Window.Context ) )
     {
       if( fgState.DirectContext == GLUT_FORCE_DIRECT_CONTEXT )
         fgError( "Unable to force direct context rendering for window '%s'",
@@ -707,7 +707,7 @@
     XStringListToTextProperty( (char **) &title, 1, &textProperty );
 
     XSetWMProperties(
-        fgDisplay.Display,
+        fgDisplay.pDisplay.Display,
         window->Window.Handle,
         &textProperty,
         &textProperty,
@@ -719,11 +719,11 @@
     );
     XFree( textProperty.value );
 
-    XSetWMProtocols( fgDisplay.Display, window->Window.Handle,
-                     &fgDisplay.DeleteWindow, 1 );
+    XSetWMProtocols( fgDisplay.pDisplay.Display, window->Window.Handle,
+                     &fgDisplay.pDisplay.DeleteWindow, 1 );
 
     glXMakeContextCurrent(
-        fgDisplay.Display,
+        fgDisplay.pDisplay.Display,
         window->Window.Handle,
         window->Window.Handle,
         window->Window.Context
@@ -731,15 +731,15 @@
 
     /* register extension events _before_ window is mapped */
     #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
-       fgRegisterDevices( fgDisplay.Display, &(window->Window.Handle) );
+       fgRegisterDevices( fgDisplay.pDisplay.Display, &(window->Window.Handle) );
     #endif
 
-    XMapWindow( fgDisplay.Display, window->Window.Handle );
+    XMapWindow( fgDisplay.pDisplay.Display, window->Window.Handle );
 
     XFree(visualInfo);
 
     if( !isSubWindow)
-        XPeekIfEvent( fgDisplay.Display, &eventReturnBuffer, &fghWindowIsVisible, (XPointer)(window->Window.Handle) );
+        XPeekIfEvent( fgDisplay.pDisplay.Display, &eventReturnBuffer, &fghWindowIsVisible, (XPointer)(window->Window.Handle) );
 }
 
 
@@ -749,13 +749,13 @@
 void fgPlatformCloseWindow( SFG_Window* window )
 {
     if( window->Window.Context )
-        glXDestroyContext( fgDisplay.Display, window->Window.Context );
+        glXDestroyContext( fgDisplay.pDisplay.Display, window->Window.Context );
     XFree( window->Window.pContext.FBConfig );
 
     if( window->Window.Handle ) {
-        XDestroyWindow( fgDisplay.Display, window->Window.Handle );
+        XDestroyWindow( fgDisplay.pDisplay.Display, window->Window.Handle );
     }
-    /* XFlush( fgDisplay.Display ); */ /* XXX Shouldn't need this */
+    /* XFlush( fgDisplay.pDisplay.Display ); */ /* XXX Shouldn't need this */
 }
 
 
@@ -773,8 +773,8 @@
  */
 void fgPlatformGlutShowWindow( void )
 {
-    XMapWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
-    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+    XMapWindow( fgDisplay.pDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
+    XFlush( fgDisplay.pDisplay.Display ); /* XXX Shouldn't need this */
 }
 
 /*
@@ -783,13 +783,13 @@
 void fgPlatformGlutHideWindow( void )
 {
     if( fgStructure.CurrentWindow->Parent == NULL )
-        XWithdrawWindow( fgDisplay.Display,
+        XWithdrawWindow( fgDisplay.pDisplay.Display,
                          fgStructure.CurrentWindow->Window.Handle,
-                         fgDisplay.Screen );
+                         fgDisplay.pDisplay.Screen );
     else
-        XUnmapWindow( fgDisplay.Display,
+        XUnmapWindow( fgDisplay.pDisplay.Display,
                       fgStructure.CurrentWindow->Window.Handle );
-    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+    XFlush( fgDisplay.pDisplay.Display ); /* XXX Shouldn't need this */
 }
 
 /*
@@ -797,9 +797,9 @@
  */
 void fgPlatformGlutIconifyWindow( void )
 {
-    XIconifyWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle,
-                    fgDisplay.Screen );
-    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+    XIconifyWindow( fgDisplay.pDisplay.Display, fgStructure.CurrentWindow->Window.Handle,
+                    fgDisplay.pDisplay.Screen );
+    XFlush( fgDisplay.pDisplay.Display ); /* XXX Shouldn't need this */
 }
 
 /*
@@ -815,12 +815,12 @@
     text.nitems = strlen( title );
 
     XSetWMName(
-        fgDisplay.Display,
+        fgDisplay.pDisplay.Display,
         fgStructure.CurrentWindow->Window.Handle,
         &text
     );
 
-    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+    XFlush( fgDisplay.pDisplay.Display ); /* XXX Shouldn't need this */
 }
 
 /*
@@ -836,12 +836,12 @@
     text.nitems = strlen( title );
 
     XSetWMIconName(
-        fgDisplay.Display,
+        fgDisplay.pDisplay.Display,
         fgStructure.CurrentWindow->Window.Handle,
         &text
     );
 
-    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+    XFlush( fgDisplay.pDisplay.Display ); /* XXX Shouldn't need this */
 }
 
 /*
@@ -849,9 +849,9 @@
  */
 void fgPlatformGlutPositionWindow( int x, int y )
 {
-    XMoveWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle,
+    XMoveWindow( fgDisplay.pDisplay.Display, fgStructure.CurrentWindow->Window.Handle,
                  x, y );
-    XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
+    XFlush( fgDisplay.pDisplay.Display ); /* XXX Shouldn't need this */
 }
 
 /*
@@ -859,7 +859,7 @@
  */
 void fgPlatformGlutPushWindow( void )
 {
-    XLowerWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
+    XLowerWindow( fgDisplay.pDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
 }
 
 /*
@@ -867,7 +867,7 @@
  */
 void fgPlatformGlutPopWindow( void )
 {
-    XRaiseWindow( fgDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
+    XRaiseWindow( fgDisplay.pDisplay.Display, fgStructure.CurrentWindow->Window.Handle );
 }
 
 /*

Modified: trunk/freeglut/freeglut/src/x11/freeglut_xinput_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_xinput_x11.c	2012-02-04 14:28:32 UTC (rev 1044)
+++ trunk/freeglut/freeglut/src/x11/freeglut_xinput_x11.c	2012-02-04 14:29:34 UTC (rev 1045)
@@ -28,7 +28,7 @@
 	unsigned char flags[2] = { 0, 0 };
 	int event, error;
 
-	/*Display* dpy = fgDisplay.Display;
+	/*Display* dpy = fgDisplay.pDisplay.Display;
 	Window* win = glutGetXWindow();*/
 
 	/* get XInput extension opcode */
@@ -148,7 +148,7 @@
 	int i, button = 0;
 	XGenericEventCookie* cookie = (XGenericEventCookie*)&(base_ev->xcookie);
 
-	if ( XGetEventData( fgDisplay.Display, cookie ) && (cookie->type == GenericEvent) && (cookie->extension == xi_opcode) ) {
+	if ( XGetEventData( fgDisplay.pDisplay.Display, cookie ) && (cookie->type == GenericEvent) && (cookie->extension == xi_opcode) ) {
 
 		XIDeviceEvent* event = (XIDeviceEvent*)(cookie->data);
 		/*printf("XI2 event type: %d - %d\n", cookie->evtype, event->type );*/
@@ -212,7 +212,7 @@
 		}
 		fgState.Modifiers = INVALID_MODIFIERS;
 	}
-	XFreeEventData( fgDisplay.Display, cookie );
+	XFreeEventData( fgDisplay.pDisplay.Display, cookie );
 }
 
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1047
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1047&view=rev
Author:   fayjf
Date:     2012-02-04 16:47:46 +0000 (Sat, 04 Feb 2012)
Log Message:
-----------
Moving the X11-specific code from "freeglut_menu.c" into its own file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_menu.c
    trunk/freeglut/freeglut/src/x11/freeglut_menu_x11.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_menu.c	2012-02-04 14:35:46 UTC (rev 1046)
+++ trunk/freeglut/freeglut/src/Common/freeglut_menu.c	2012-02-04 16:47:46 UTC (rev 1047)
@@ -142,24 +142,6 @@
 /*
  * Private function to get the virtual maximum screen extent
  */
-#if TARGET_HOST_POSIX_X11
-GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
-{
-    int wx, wy;
-    Window w;
-
-    XTranslateCoordinates(
-        fgDisplay.pDisplay.Display,
-        window->Window.Handle,
-        fgDisplay.pDisplay.RootWindow,
-        0, 0, &wx, &wy, &w);
-
-    *x = fgState.GameModeSize.X + wx;
-    *y = fgState.GameModeSize.Y + wy;
-}
-#endif
-
-
 static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y )
 {
     if( fgStructure.GameModeWindow )

Modified: trunk/freeglut/freeglut/src/x11/freeglut_menu_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_menu_x11.c	2012-02-04 14:35:46 UTC (rev 1046)
+++ trunk/freeglut/freeglut/src/x11/freeglut_menu_x11.c	2012-02-04 16:47:46 UTC (rev 1047)
@@ -0,0 +1,49 @@
+/*
+ * freeglut_callbacks.c
+ *
+ * The callbacks setting methods.
+ *
+ * Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved.
+ * Written by Pawel W. Olszta, <olszta@...>
+ * Copied for Platform code by Evan Felix <karcaw at gmail.com>
+ * Creation date: Wed Feb 1, 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "freeglut_internal.h"
+
+/*
+ *  * Private function to get the virtual maximum screen extent
+ *   */
+GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
+{
+    int wx, wy;
+    Window w;
+
+    XTranslateCoordinates(
+        fgDisplay.pDisplay.Display,
+        window->Window.Handle,
+        fgDisplay.pDisplay.RootWindow,
+        0, 0, &wx, &wy, &w);
+
+    *x = fgState.GameModeSize.X + wx;
+    *y = fgState.GameModeSize.Y + wy;
+}
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1048
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1048&view=rev
Author:   fayjf
Date:     2012-02-04 17:11:50 +0000 (Sat, 04 Feb 2012)
Log Message:
-----------
Moving X11-specific code from "freeglut_display.c" into its own file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_display.c
    trunk/freeglut/freeglut/src/x11/freeglut_display_x11.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_display.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_display.c	2012-02-04 16:47:46 UTC (rev 1047)
+++ trunk/freeglut/freeglut/src/Common/freeglut_display.c	2012-02-04 17:11:50 UTC (rev 1048)
@@ -33,13 +33,6 @@
 extern void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow );
 
 
-#if TARGET_HOST_POSIX_X11
-void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow )
-{
-    glXSwapBuffers( pDisplayPtr->Display, CurrentWindow->Window.Handle );
-}
-#endif
-
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
 
 /*

Modified: trunk/freeglut/freeglut/src/x11/freeglut_display_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_display_x11.c	2012-02-04 16:47:46 UTC (rev 1047)
+++ trunk/freeglut/freeglut/src/x11/freeglut_display_x11.c	2012-02-04 17:11:50 UTC (rev 1048)
@@ -0,0 +1,36 @@
+/*
+ * freeglut_display_x11.c
+ *
+ * Display message posting, context buffer swapping.
+ *
+ * Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved.
+ * Written by Pawel W. Olszta, <olszta@...>
+ * Copied for Platform code by Evan Felix <karcaw at gmail.com>
+ * Creation date: Thur Feb 2 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "freeglut_internal.h"
+
+void fgPlatformGlutSwapBuffers( SFG_PlatformDisplay *pDisplayPtr, SFG_Window* CurrentWindow )
+{
+    glXSwapBuffers( pDisplayPtr->Display, CurrentWindow->Window.Handle );
+}
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1049
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1049&view=rev
Author:   fayjf
Date:     2012-02-05 00:52:55 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
Putting in changes recommended by Evan Felix to fix the X11 build per e-mail dated 2/4/12 at 1:16 PM

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_ext.c
    trunk/freeglut/freeglut/src/Common/freeglut_joystick.c
    trunk/freeglut/freeglut/src/Common/freeglut_window.c
    trunk/freeglut/freeglut/src/Makefile.am

Modified: trunk/freeglut/freeglut/src/Common/freeglut_ext.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_ext.c	2012-02-04 17:11:50 UTC (rev 1048)
+++ trunk/freeglut/freeglut/src/Common/freeglut_ext.c	2012-02-05 00:52:55 UTC (rev 1049)
@@ -204,7 +204,7 @@
 
 
 #if TARGET_HOST_POSIX_X11
-static GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )
+GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )
 {
     /* optimization: quick initial check */
     if( strncmp( procName, "glut", 4 ) != 0 )

Modified: trunk/freeglut/freeglut/src/Common/freeglut_joystick.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_joystick.c	2012-02-04 17:11:50 UTC (rev 1048)
+++ trunk/freeglut/freeglut/src/Common/freeglut_joystick.c	2012-02-05 00:52:55 UTC (rev 1049)
@@ -1037,6 +1037,7 @@
        char *cp;
 #endif
 #ifdef JS_NEW
+	int i = 0;
        unsigned char u;
 #else
 #  if defined( __linux__ ) || TARGET_HOST_SOLARIS

Modified: trunk/freeglut/freeglut/src/Common/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-02-04 17:11:50 UTC (rev 1048)
+++ trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-02-05 00:52:55 UTC (rev 1049)
@@ -525,6 +525,13 @@
 }
 
 
+static Bool fghWindowIsVisible( Display *display, XEvent *event, XPointer arg)
+{
+    Window window = (Window)arg;
+    return (event->type == MapNotify) && (event->xmap.window == window);
+}
+
+
 /*
  * Opens a window. Requires a SFG_Window object created and attached
  * to the freeglut structure. OpenGL context is created here.
@@ -759,15 +766,8 @@
 }
 
 
-static Bool fghWindowIsVisible( Display *display, XEvent *event, XPointer arg)
-{
-    Window window = (Window)arg;
-    return (event->type == MapNotify) && (event->xmap.window == window);
-}
 
 
-
-
 /*
  * This function makes the current window visible
  */

Modified: trunk/freeglut/freeglut/src/Makefile.am
===================================================================
--- trunk/freeglut/freeglut/src/Makefile.am	2012-02-04 17:11:50 UTC (rev 1048)
+++ trunk/freeglut/freeglut/src/Makefile.am	2012-02-05 00:52:55 UTC (rev 1049)
@@ -20,7 +20,6 @@
 			 Common/freeglut_display.c \
 			 Common/freeglut_ext.c \
 			 Common/freeglut_font.c \
-			 Common/freeglut_glutfont_definitions.c \
 			 Common/freeglut_font_data.c \
 			 Common/freeglut_stroke_roman.c \
 			 Common/freeglut_stroke_mono_roman.c \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1055
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1055&view=rev
Author:   fayjf
Date:     2012-02-05 03:34:09 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
Splitting the X11-specific "freeglut_state.c" code into its own file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_state.c
    trunk/freeglut/freeglut/src/Common/freeglut_window.c
    trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c
    trunk/freeglut/freeglut/src/x11/freeglut_state_x11.c
    trunk/freeglut/freeglut/src/x11/freeglut_window_x11.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_state.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_state.c	2012-02-05 03:21:45 UTC (rev 1054)
+++ trunk/freeglut/freeglut/src/Common/freeglut_state.c	2012-02-05 03:34:09 UTC (rev 1055)
@@ -44,281 +44,14 @@
 extern int fgPlatformGlutGet ( GLenum eWhat );
 extern int fgPlatformGlutDeviceGet ( GLenum eWhat );
 extern int fgPlatformGlutLayerGet ( GLenum eWhat );
+extern int *fgPlatformGlutGetModeValues(GLenum eWhat, int *size);
 
-/* A helper function to check if a display mode is possible to use */
-#if TARGET_HOST_POSIX_X11
-GLXFBConfig* fgChooseFBConfig( int* numcfgs );
-#endif
 
-
 /* -- LOCAL DEFINITIONS ---------------------------------------------------- */
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
-#if TARGET_HOST_POSIX_X11
-/*
- * Queries the GL context about some attributes
- */
-static int fghGetConfig( int attribute )
-{
-  int returnValue = 0;
-  int result;  /*  Not checked  */
 
-  if( fgStructure.CurrentWindow )
-      result = glXGetFBConfigAttrib( fgDisplay.pDisplay.Display,
-                                     *(fgStructure.CurrentWindow->Window.pContext.FBConfig),
-                                     attribute,
-                                     &returnValue );
-
-  return returnValue;
-}
-
-int fgPlatformGlutGet ( GLenum eWhat )
-{
-    int nsamples = 0;
-
-    switch( eWhat )
-    {
-    /*
-     * The window/context specific queries are handled mostly by
-     * fghGetConfig().
-     */
-    case GLUT_WINDOW_NUM_SAMPLES:
-#ifdef GLX_VERSION_1_3
-        glGetIntegerv(GL_SAMPLES, &nsamples);
-#endif
-        return nsamples;
-
-    /*
-     * The rest of GLX queries under X are general enough to use a macro to
-     * check them
-     */
-#   define GLX_QUERY(a,b) case a: return fghGetConfig( b );
-
-    GLX_QUERY( GLUT_WINDOW_RGBA,                GLX_RGBA                );
-    GLX_QUERY( GLUT_WINDOW_DOUBLEBUFFER,        GLX_DOUBLEBUFFER        );
-    GLX_QUERY( GLUT_WINDOW_BUFFER_SIZE,         GLX_BUFFER_SIZE         );
-    GLX_QUERY( GLUT_WINDOW_STENCIL_SIZE,        GLX_STENCIL_SIZE        );
-    GLX_QUERY( GLUT_WINDOW_DEPTH_SIZE,          GLX_DEPTH_SIZE          );
-    GLX_QUERY( GLUT_WINDOW_RED_SIZE,            GLX_RED_SIZE            );
-    GLX_QUERY( GLUT_WINDOW_GREEN_SIZE,          GLX_GREEN_SIZE          );
-    GLX_QUERY( GLUT_WINDOW_BLUE_SIZE,           GLX_BLUE_SIZE           );
-    GLX_QUERY( GLUT_WINDOW_ALPHA_SIZE,          GLX_ALPHA_SIZE          );
-    GLX_QUERY( GLUT_WINDOW_ACCUM_RED_SIZE,      GLX_ACCUM_RED_SIZE      );
-    GLX_QUERY( GLUT_WINDOW_ACCUM_GREEN_SIZE,    GLX_ACCUM_GREEN_SIZE    );
-    GLX_QUERY( GLUT_WINDOW_ACCUM_BLUE_SIZE,     GLX_ACCUM_BLUE_SIZE     );
-    GLX_QUERY( GLUT_WINDOW_ACCUM_ALPHA_SIZE,    GLX_ACCUM_ALPHA_SIZE    );
-    GLX_QUERY( GLUT_WINDOW_STEREO,              GLX_STEREO              );
-
-#   undef GLX_QUERY
-
-    /* Colormap size is handled in a bit different way than all the rest */
-    case GLUT_WINDOW_COLORMAP_SIZE:
-        if( (fghGetConfig( GLX_RGBA )) || (fgStructure.CurrentWindow == NULL) )
-        {
-            /*
-             * We've got a RGBA visual, so there is no colormap at all.
-             * The other possibility is that we have no current window set.
-             */
-            return 0;
-        }
-        else
-        {
-          const GLXFBConfig * fbconfig =
-                fgStructure.CurrentWindow->Window.pContext.FBConfig;
-
-          XVisualInfo * visualInfo =
-                glXGetVisualFromFBConfig( fgDisplay.pDisplay.Display, *fbconfig );
-
-          const int result = visualInfo->visual->map_entries;
-
-          XFree(visualInfo);
-
-          return result;
-        }
-
-    /*
-     * Those calls are somewhat similiar, as they use XGetWindowAttributes()
-     * function
-     */
-    case GLUT_WINDOW_X:
-    case GLUT_WINDOW_Y:
-    case GLUT_WINDOW_BORDER_WIDTH:
-    case GLUT_WINDOW_HEADER_HEIGHT:
-    {
-        int x, y;
-        Window w;
-
-        if( fgStructure.CurrentWindow == NULL )
-            return 0;
-
-        XTranslateCoordinates(
-            fgDisplay.pDisplay.Display,
-            fgStructure.CurrentWindow->Window.Handle,
-            fgDisplay.pDisplay.RootWindow,
-            0, 0, &x, &y, &w);
-
-        switch ( eWhat )
-        {
-        case GLUT_WINDOW_X: return x;
-        case GLUT_WINDOW_Y: return y;
-        }
-
-        if ( w == 0 )
-            return 0;
-        XTranslateCoordinates(
-            fgDisplay.pDisplay.Display,
-            fgStructure.CurrentWindow->Window.Handle,
-            w, 0, 0, &x, &y, &w);
-
-        switch ( eWhat )
-        {
-        case GLUT_WINDOW_BORDER_WIDTH:  return x;
-        case GLUT_WINDOW_HEADER_HEIGHT: return y;
-        }
-    }
-
-    case GLUT_WINDOW_WIDTH:
-    case GLUT_WINDOW_HEIGHT:
-    {
-        XWindowAttributes winAttributes;
-
-        if( fgStructure.CurrentWindow == NULL )
-            return 0;
-        XGetWindowAttributes(
-            fgDisplay.pDisplay.Display,
-            fgStructure.CurrentWindow->Window.Handle,
-            &winAttributes
-        );
-        switch ( eWhat )
-        {
-        case GLUT_WINDOW_WIDTH:            return winAttributes.width ;
-        case GLUT_WINDOW_HEIGHT:           return winAttributes.height ;
-        }
-    }
-
-    /* I do not know yet if there will be a fgChooseVisual() function for Win32 */
-    case GLUT_DISPLAY_MODE_POSSIBLE:
-    {
-        /*  We should not have to call fgChooseFBConfig again here.  */
-        GLXFBConfig * fbconfig;
-        int isPossible;
-
-        fbconfig = fgChooseFBConfig(NULL);
-
-        if (fbconfig == NULL)
-        {
-            isPossible = 0;
-        }
-        else
-        {
-            isPossible = 1;
-            XFree(fbconfig);
-        }
-
-        return isPossible;
-    }
-
-    /* This is system-dependant */
-    case GLUT_WINDOW_FORMAT_ID:
-        if( fgStructure.CurrentWindow == NULL )
-            return 0;
-
-        return fghGetConfig( GLX_VISUAL_ID );
-
-    default:
-        fgWarning( "glutGet(): missing enum handle %d", eWhat );
-        break;
-    }
-}
-
-
-int fgPlatformGlutDeviceGet ( GLenum eWhat )
-{
-    switch( eWhat )
-    {
-    case GLUT_HAS_KEYBOARD:
-        /*
-         * X11 has a core keyboard by definition, although it can
-         * be present as a virtual/dummy keyboard. For now, there
-         * is no reliable way to tell if a real keyboard is present.
-         */
-        return 1;
-
-    /* X11 has a mouse by definition */
-    case GLUT_HAS_MOUSE:
-        return 1 ;
-
-    case GLUT_NUM_MOUSE_BUTTONS:
-        /* We should be able to pass NULL when the last argument is zero,
-         * but at least one X server has a bug where this causes a segfault.
-         *
-         * In XFree86/Xorg servers, a mouse wheel is seen as two buttons
-         * rather than an Axis; "freeglut_main.c" expects this when
-         * checking for a wheel event.
-         */
-        {
-            unsigned char map;
-            int nbuttons = XGetPointerMapping(fgDisplay.pDisplay.Display, &map,0);
-            return nbuttons;
-        }
-
-    default:
-        fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat );
-        break;
-    }
-
-    /* And now -- the failure. */
-    return -1;
-}
-
-int fgPlatformGlutLayerGet( GLenum eWhat )
-{
-    /*
-     * This is easy as layers are not implemented ;-)
-     *
-     * XXX Can we merge the UNIX/X11 and WIN32 sections?  Or
-     * XXX is overlay support planned?
-     */
-    switch( eWhat )
-    {
-    case GLUT_OVERLAY_POSSIBLE:
-        return 0;
-
-    case GLUT_LAYER_IN_USE:
-        return GLUT_NORMAL;
-
-    case GLUT_HAS_OVERLAY:
-        return 0;
-
-    case GLUT_TRANSPARENT_INDEX:
-        /*
-         * Return just anything, which is always defined as zero
-         *
-         * XXX HUH?
-         */
-        return 0;
-
-    case GLUT_NORMAL_DAMAGED:
-        /* XXX Actually I do not know. Maybe. */
-        return 0;
-
-    case GLUT_OVERLAY_DAMAGED:
-        return -1;
-
-    default:
-        fgWarning( "glutLayerGet(): missing enum handle %d", eWhat );
-        break;
-    }
-
-    /* And fail. That's good. Programs do love failing. */
-    return -1;
-}
-
-
-
-#endif
-
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
 
 /*
@@ -574,113 +307,15 @@
     return -1;
 }
 
-int * FGAPIENTRY glutGetModeValues(GLenum eWhat, int * size)
+int * FGAPIENTRY glutGetModeValues(GLenum eWhat, int *size)
 {
-  int * array;
+  int *array;
 
-#if TARGET_HOST_POSIX_X11
-  int attributes[9];
-  GLXFBConfig * fbconfigArray;  /*  Array of FBConfigs  */
-  int fbconfigArraySize;        /*  Number of FBConfigs in the array  */
-  int attribute_name = 0;
-#endif
-
   FREEGLUT_EXIT_IF_NOT_INITIALISED("glutGetModeValues");
 
-  array = NULL;
   *size = 0;
+  array = fgPlatformGlutGetModeValues ( eWhat, size );
 
-  switch (eWhat)
-    {
-#if TARGET_HOST_POSIX_X11
-    case GLUT_AUX:
-    case GLUT_MULTISAMPLE:
-
-      attributes[0] = GLX_BUFFER_SIZE;
-      attributes[1] = GLX_DONT_CARE;
-
-      switch (eWhat)
-        {
-        case GLUT_AUX:
-          /*
-            FBConfigs are now sorted by increasing number of auxiliary
-            buffers.  We want at least one buffer.
-          */
-          attributes[2] = GLX_AUX_BUFFERS;
-          attributes[3] = 1;
-          attributes[4] = None;
-
-          attribute_name = GLX_AUX_BUFFERS;
-
-          break;
-
-
-        case GLUT_MULTISAMPLE:
-          attributes[2] = GLX_AUX_BUFFERS;
-          attributes[3] = GLX_DONT_CARE;
-          attributes[4] = GLX_SAMPLE_BUFFERS;
-          attributes[5] = 1;
-          /*
-            FBConfigs are now sorted by increasing number of samples per
-            pixel.  We want at least one sample.
-          */
-          attributes[6] = GLX_SAMPLES;
-          attributes[7] = 1;
-          attributes[8] = None;
-
-          attribute_name = GLX_SAMPLES;
-
-          break;
-        }
-
-      fbconfigArray = glXChooseFBConfig(fgDisplay.pDisplay.Display,
-                                        fgDisplay.pDisplay.Screen,
-                                        attributes,
-                                        &fbconfigArraySize);
-
-      if (fbconfigArray != NULL)
-        {
-          int * temp_array;
-          int result;   /*  Returned by glXGetFBConfigAttrib. Not checked.  */
-          int previous_value;
-          int i;
-
-          temp_array = malloc(sizeof(int) * fbconfigArraySize);
-          previous_value = 0;
-
-          for (i = 0; i < fbconfigArraySize; i++)
-            {
-              int value;
-
-              result = glXGetFBConfigAttrib(fgDisplay.pDisplay.Display,
-                                            fbconfigArray[i],
-                                            attribute_name,
-                                            &value);
-              if (value > previous_value)
-                {
-                  temp_array[*size] = value;
-                  previous_value = value;
-                  (*size)++;
-                }
-            }
-
-          array = malloc(sizeof(int) * (*size));
-          for (i = 0; i < *size; i++)
-            {
-              array[i] = temp_array[i];
-            }
-
-          free(temp_array);
-          XFree(fbconfigArray);
-        }
-
-      break;
-#endif      
-
-    default:
-      break;
-    }
-
   return array;
 }
 

Modified: trunk/freeglut/freeglut/src/Common/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-02-05 03:21:45 UTC (rev 1054)
+++ trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-02-05 03:34:09 UTC (rev 1055)
@@ -40,7 +40,6 @@
 /*
  * TODO BEFORE THE STABLE RELEASE:
  *
- *  fgChooseFBConfig()      -- OK, but what about glutInitDisplayString()?
  *  fgSetupPixelFormat      -- ignores the display mode settings
  *  fgOpenWindow()          -- check the Win32 version, -iconic handling!
  *  fgCloseWindow()         -- check the Win32 version

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c	2012-02-05 03:21:45 UTC (rev 1054)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c	2012-02-05 03:34:09 UTC (rev 1055)
@@ -1,7 +1,7 @@
 /*
  * freeglut_state_mswin.c
  *
- * The Windows-specific mouse cursor related stuff.
+ * The Windows-specific state query methods.
  *
  * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
  * Written by John F. Fay, <fayjf@...>
@@ -335,4 +335,9 @@
 }
 
 
-
+/* MSwin does not currently have any Mode values? */
+int *fgPlatformGlutGetModeValues(GLenum eWhat, int *size)
+{
+  *size = 0;
+  return NULL;
+}
\ No newline at end of file

Modified: trunk/freeglut/freeglut/src/x11/freeglut_state_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_state_x11.c	2012-02-05 03:21:45 UTC (rev 1054)
+++ trunk/freeglut/freeglut/src/x11/freeglut_state_x11.c	2012-02-05 03:34:09 UTC (rev 1055)
@@ -0,0 +1,406 @@
+/*
+ * freeglut_state_x11.c
+ *
+ * X11-specific freeglut state query methods.
+ *
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
+ * Written by John F. Fay, <fayjf@...>
+ * Creation date: Sat Feb 4 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "../Common/freeglut_internal.h"
+
+/*
+ * TODO BEFORE THE STABLE RELEASE:
+ *
+ *  fgPlatformChooseFBConfig()      -- OK, but what about glutInitDisplayString()?
+ */
+
+/* A helper function to check if a display mode is possible to use */
+#if TARGET_HOST_POSIX_X11
+GLXFBConfig* fgPlatformChooseFBConfig( int* numcfgs );
+#endif
+
+/*
+ * Queries the GL context about some attributes
+ */
+int fgPlatformGetConfig( int attribute )
+{
+  int returnValue = 0;
+  int result;  /*  Not checked  */
+
+  if( fgStructure.CurrentWindow )
+      result = glXGetFBConfigAttrib( fgDisplay.pDisplay.Display,
+                                     *(fgStructure.CurrentWindow->Window.pContext.FBConfig),
+                                     attribute,
+                                     &returnValue );
+
+  return returnValue;
+}
+
+int fgPlatformGlutGet ( GLenum eWhat )
+{
+    int nsamples = 0;
+
+    switch( eWhat )
+    {
+    /*
+     * The window/context specific queries are handled mostly by
+     * fgPlatformGetConfig().
+     */
+    case GLUT_WINDOW_NUM_SAMPLES:
+#ifdef GLX_VERSION_1_3
+        glGetIntegerv(GL_SAMPLES, &nsamples);
+#endif
+        return nsamples;
+
+    /*
+     * The rest of GLX queries under X are general enough to use a macro to
+     * check them
+     */
+#   define GLX_QUERY(a,b) case a: return fgPlatformGetConfig( b );
+
+    GLX_QUERY( GLUT_WINDOW_RGBA,                GLX_RGBA                );
+    GLX_QUERY( GLUT_WINDOW_DOUBLEBUFFER,        GLX_DOUBLEBUFFER        );
+    GLX_QUERY( GLUT_WINDOW_BUFFER_SIZE,         GLX_BUFFER_SIZE         );
+    GLX_QUERY( GLUT_WINDOW_STENCIL_SIZE,        GLX_STENCIL_SIZE        );
+    GLX_QUERY( GLUT_WINDOW_DEPTH_SIZE,          GLX_DEPTH_SIZE          );
+    GLX_QUERY( GLUT_WINDOW_RED_SIZE,            GLX_RED_SIZE            );
+    GLX_QUERY( GLUT_WINDOW_GREEN_SIZE,          GLX_GREEN_SIZE          );
+    GLX_QUERY( GLUT_WINDOW_BLUE_SIZE,           GLX_BLUE_SIZE           );
+    GLX_QUERY( GLUT_WINDOW_ALPHA_SIZE,          GLX_ALPHA_SIZE          );
+    GLX_QUERY( GLUT_WINDOW_ACCUM_RED_SIZE,      GLX_ACCUM_RED_SIZE      );
+    GLX_QUERY( GLUT_WINDOW_ACCUM_GREEN_SIZE,    GLX_ACCUM_GREEN_SIZE    );
+    GLX_QUERY( GLUT_WINDOW_ACCUM_BLUE_SIZE,     GLX_ACCUM_BLUE_SIZE     );
+    GLX_QUERY( GLUT_WINDOW_ACCUM_ALPHA_SIZE,    GLX_ACCUM_ALPHA_SIZE    );
+    GLX_QUERY( GLUT_WINDOW_STEREO,              GLX_STEREO              );
+
+#   undef GLX_QUERY
+
+    /* Colormap size is handled in a bit different way than all the rest */
+    case GLUT_WINDOW_COLORMAP_SIZE:
+        if( (fgPlatformGetConfig( GLX_RGBA )) || (fgStructure.CurrentWindow == NULL) )
+        {
+            /*
+             * We've got a RGBA visual, so there is no colormap at all.
+             * The other possibility is that we have no current window set.
+             */
+            return 0;
+        }
+        else
+        {
+          const GLXFBConfig * fbconfig =
+                fgStructure.CurrentWindow->Window.pContext.FBConfig;
+
+          XVisualInfo * visualInfo =
+                glXGetVisualFromFBConfig( fgDisplay.pDisplay.Display, *fbconfig );
+
+          const int result = visualInfo->visual->map_entries;
+
+          XFree(visualInfo);
+
+          return result;
+        }
+
+    /*
+     * Those calls are somewhat similiar, as they use XGetWindowAttributes()
+     * function
+     */
+    case GLUT_WINDOW_X:
+    case GLUT_WINDOW_Y:
+    case GLUT_WINDOW_BORDER_WIDTH:
+    case GLUT_WINDOW_HEADER_HEIGHT:
+    {
+        int x, y;
+        Window w;
+
+        if( fgStructure.CurrentWindow == NULL )
+            return 0;
+
+        XTranslateCoordinates(
+            fgDisplay.pDisplay.Display,
+            fgStructure.CurrentWindow->Window.Handle,
+            fgDisplay.pDisplay.RootWindow,
+            0, 0, &x, &y, &w);
+
+        switch ( eWhat )
+        {
+        case GLUT_WINDOW_X: return x;
+        case GLUT_WINDOW_Y: return y;
+        }
+
+        if ( w == 0 )
+            return 0;
+        XTranslateCoordinates(
+            fgDisplay.pDisplay.Display,
+            fgStructure.CurrentWindow->Window.Handle,
+            w, 0, 0, &x, &y, &w);
+
+        switch ( eWhat )
+        {
+        case GLUT_WINDOW_BORDER_WIDTH:  return x;
+        case GLUT_WINDOW_HEADER_HEIGHT: return y;
+        }
+    }
+
+    case GLUT_WINDOW_WIDTH:
+    case GLUT_WINDOW_HEIGHT:
+    {
+        XWindowAttributes winAttributes;
+
+        if( fgStructure.CurrentWindow == NULL )
+            return 0;
+        XGetWindowAttributes(
+            fgDisplay.pDisplay.Display,
+            fgStructure.CurrentWindow->Window.Handle,
+            &winAttributes
+        );
+        switch ( eWhat )
+        {
+        case GLUT_WINDOW_WIDTH:            return winAttributes.width ;
+        case GLUT_WINDOW_HEIGHT:           return winAttributes.height ;
+        }
+    }
+
+    /* I do not know yet if there will be a fgChooseVisual() function for Win32 */
+    case GLUT_DISPLAY_MODE_POSSIBLE:
+    {
+        /*  We should not have to call fgPlatformChooseFBConfig again here.  */
+        GLXFBConfig * fbconfig;
+        int isPossible;
+
+        fbconfig = fgPlatformChooseFBConfig(NULL);
+
+        if (fbconfig == NULL)
+        {
+            isPossible = 0;
+        }
+        else
+        {
+            isPossible = 1;
+            XFree(fbconfig);
+        }
+
+        return isPossible;
+    }
+
+    /* This is system-dependant */
+    case GLUT_WINDOW_FORMAT_ID:
+        if( fgStructure.CurrentWindow == NULL )
+            return 0;
+
+        return fgPlatformGetConfig( GLX_VISUAL_ID );
+
+    default:
+        fgWarning( "glutGet(): missing enum handle %d", eWhat );
+        break;
+    }
+}
+
+
+int fgPlatformGlutDeviceGet ( GLenum eWhat )
+{
+    switch( eWhat )
+    {
+    case GLUT_HAS_KEYBOARD:
+        /*
+         * X11 has a core keyboard by definition, although it can
+         * be present as a virtual/dummy keyboard. For now, there
+         * is no reliable way to tell if a real keyboard is present.
+         */
+        return 1;
+
+    /* X11 has a mouse by definition */
+    case GLUT_HAS_MOUSE:
+        return 1 ;
+
+    case GLUT_NUM_MOUSE_BUTTONS:
+        /* We should be able to pass NULL when the last argument is zero,
+         * but at least one X server has a bug where this causes a segfault.
+         *
+         * In XFree86/Xorg servers, a mouse wheel is seen as two buttons
+         * rather than an Axis; "freeglut_main.c" expects this when
+         * checking for a wheel event.
+         */
+        {
+            unsigned char map;
+            int nbuttons = XGetPointerMapping(fgDisplay.pDisplay.Display, &map,0);
+            return nbuttons;
+        }
+
+    default:
+        fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat );
+        break;
+    }
+
+    /* And now -- the failure. */
+    return -1;
+}
+
+int fgPlatformGlutLayerGet( GLenum eWhat )
+{
+    /*
+     * This is easy as layers are not implemented ;-)
+     *
+     * XXX Can we merge the UNIX/X11 and WIN32 sections?  Or
+     * XXX is overlay support planned?
+     */
+    switch( eWhat )
+    {
+    case GLUT_OVERLAY_POSSIBLE:
+        return 0;
+
+    case GLUT_LAYER_IN_USE:
+        return GLUT_NORMAL;
+
+    case GLUT_HAS_OVERLAY:
+        return 0;
+
+    case GLUT_TRANSPARENT_INDEX:
+        /*
+         * Return just anything, which is always defined as zero
+         *
+         * XXX HUH?
+         */
+        return 0;
+
+    case GLUT_NORMAL_DAMAGED:
+        /* XXX Actually I do not know. Maybe. */
+        return 0;
+
+    case GLUT_OVERLAY_DAMAGED:
+        return -1;
+
+    default:
+        fgWarning( "glutLayerGet(): missing enum handle %d", eWhat );
+        break;
+    }
+
+    /* And fail. That's good. Programs do love failing. */
+    return -1;
+}
+
+
+int *fgPlatformGlutGetModeValues(GLenum eWhat, int *size)
+{
+  int *array;
+
+  int attributes[9];
+  GLXFBConfig * fbconfigArray;  /*  Array of FBConfigs  */
+  int fbconfigArraySize;        /*  Number of FBConfigs in the array  */
+  int attribute_name = 0;
+
+  array = NULL;
+  *size = 0;
+
+  switch (eWhat)
+    {
+    case GLUT_AUX:
+    case GLUT_MULTISAMPLE:
+
+      attributes[0] = GLX_BUFFER_SIZE;
+      attributes[1] = GLX_DONT_CARE;
+
+      switch (eWhat)
+        {
+        case GLUT_AUX:
+          /*
+            FBConfigs are now sorted by increasing number of auxiliary
+            buffers.  We want at least one buffer.
+          */
+          attributes[2] = GLX_AUX_BUFFERS;
+          attributes[3] = 1;
+          attributes[4] = None;
+
+          attribute_name = GLX_AUX_BUFFERS;
+
+          break;
+
+
+        case GLUT_MULTISAMPLE:
+          attributes[2] = GLX_AUX_BUFFERS;
+          attributes[3] = GLX_DONT_CARE;
+          attributes[4] = GLX_SAMPLE_BUFFERS;
+          attributes[5] = 1;
+          /*
+            FBConfigs are now sorted by increasing number of samples per
+            pixel.  We want at least one sample.
+          */
+          attributes[6] = GLX_SAMPLES;
+          attributes[7] = 1;
+          attributes[8] = None;
+
+          attribute_name = GLX_SAMPLES;
+
+          break;
+        }
+
+      fbconfigArray = glXChooseFBConfig(fgDisplay.pDisplay.Display,
+                                        fgDisplay.pDisplay.Screen,
+                                        attributes,
+                                        &fbconfigArraySize);
+
+      if (fbconfigArray != NULL)
+        {
+          int * temp_array;
+          int result;   /*  Returned by glXGetFBConfigAttrib. Not checked.  */
+          int previous_value;
+          int i;
+
+          temp_array = malloc(sizeof(int) * fbconfigArraySize);
+          previous_value = 0;
+
+          for (i = 0; i < fbconfigArraySize; i++)
+            {
+              int value;
+
+              result = glXGetFBConfigAttrib(fgDisplay.pDisplay.Display,
+                                            fbconfigArray[i],
+                                            attribute_name,
+                                            &value);
+              if (value > previous_value)
+                {
+                  temp_array[*size] = value;
+                  previous_value = value;
+                  (*size)++;
+                }
+            }
+
+          array = malloc(sizeof(int) * (*size));
+          for (i = 0; i < *size; i++)
+            {
+              array[i] = temp_array[i];
+            }
+
+          free(temp_array);
+          XFree(fbconfigArray);
+        }
+
+      break;
+
+    default:
+      break;
+    }
+
+  return array;
+}
+
+

Modified: trunk/freeglut/freeglut/src/x11/freeglut_window_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_window_x11.c	2012-02-05 03:21:45 UTC (rev 1054)
+++ trunk/freeglut/freeglut/src/x11/freeglut_window_x11.c	2012-02-05 03:34:09 UTC (rev 1055)
@@ -86,7 +86,7 @@
  * Chooses a visual basing on the current display mode settings
  */
 
-GLXFBConfig* fgChooseFBConfig( int *numcfgs )
+GLXFBConfig* fgPlatformChooseFBConfig( int *numcfgs )
 {
   GLboolean wantIndexedMode = GL_FALSE;
   int attributes[ 100 ];
@@ -451,7 +451,7 @@
     if( window->IsMenu && ( ! fgStructure.MenuContext ) )
         fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB ;
 
-    window->Window.pContext.FBConfig = fgChooseFBConfig( &num_FBConfigs );
+    window->Window.pContext.FBConfig = fgPlatformChooseFBConfig( &num_FBConfigs );
 
     if( window->IsMenu && ( ! fgStructure.MenuContext ) )
         fgState.DisplayMode = current_DisplayMode ;
@@ -459,21 +459,21 @@
     if( ! window->Window.pContext.FBConfig )
     {
         /*
-         * The "fgChooseFBConfig" returned a null meaning that the visual
+         * The "fgPlatformChooseFBConfig" returned a null meaning that the visual
          * context is not available.
          * Try a couple of variations to see if they will work.
          */
         if( !( fgState.DisplayMode & GLUT_DOUBLE ) )
         {
             fgState.DisplayMode |= GLUT_DOUBLE ;
-            window->Window.pContext.FBConfig = fgChooseFBConfig( &num_FBConfigs );
+            window->Window.pContext.FBConfig = fgPlatformChooseFBConfig( &num_FBConfigs );
             fgState.DisplayMode &= ~GLUT_DOUBLE;
         }
 
         if( fgState.DisplayMode & GLUT_MULTISAMPLE )
         {
             fgState.DisplayMode &= ~GLUT_MULTISAMPLE ;
-            window->Window.pContext.FBConfig = fgChooseFBConfig( &num_FBConfigs );
+            window->Window.pContext.FBConfig = fgPlatformChooseFBConfig( &num_FBConfigs );
             fgState.DisplayMode |= GLUT_MULTISAMPLE;
         }
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1057
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1057&view=rev
Author:   fayjf
Date:     2012-02-05 04:04:28 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
Splitting the X11-specific "freeglut_spaceball.c" code into its own file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_spaceball.c
    trunk/freeglut/freeglut/src/mswin/freeglut_spaceball_mswin.c
    trunk/freeglut/freeglut/src/x11/freeglut_spaceball_x11.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_spaceball.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_spaceball.c	2012-02-05 03:44:03 UTC (rev 1056)
+++ trunk/freeglut/freeglut/src/Common/freeglut_spaceball.c	2012-02-05 04:04:28 UTC (rev 1057)
@@ -12,88 +12,29 @@
 
 /* -- PRIVATE FUNCTIONS --------------------------------------------------- */
 
-#if TARGET_HOST_POSIX_X11
-#include <X11/Xlib.h>
+extern void fgPlatformInitializeSpaceball(void);
+extern void fgPlatformSpaceballClose(void);
+extern int fgPlatformHasSpaceball(void);
+extern int fgPlatformSpaceballNumButtons(void);
+extern void fgPlatformSpaceballSetWindow(SFG_Window *window);
 
-enum {
-    SPNAV_EVENT_ANY,  /* used by spnav_remove_events() */
-    SPNAV_EVENT_MOTION,
-    SPNAV_EVENT_BUTTON  /* includes both press and release */
-};
 
-struct spnav_event_motion {
-    int type;
-    int x, y, z;
-    int rx, ry, rz;
-    unsigned int period;
-    int *data;
-};
+int sball_initialized = 0;
 
-struct spnav_event_button {
-    int type;
-    int press;
-    int bnum;
-};
-
-typedef union spnav_event {
-    int type;
-    struct spnav_event_motion motion;
-    struct spnav_event_button button;
-} spnav_event;
-
-
-static int spnav_x11_open(Display *dpy, Window win);
-static int spnav_x11_window(Window win);
-static int spnav_x11_event(const XEvent *xev, spnav_event *event);
-static int spnav_close(void);
-static int spnav_fd(void);
-static int spnav_remove_events(int type);
-
-static SFG_Window *spnav_win;
-#endif
-
-/* Flag telling whether we have a spaceball:
- *   0 - haven't tried initializing
- *   1 - have successfully initialized
- *  -1 - have tried to initialize but not succeeded
- */
-static int sball_initialized = 0;
-
-
 void fgInitialiseSpaceball(void)
 {
     if(sball_initialized != 0) {
         return;
     }
 
-#if TARGET_HOST_POSIX_X11
-    {
-        Window w;
+    fgPlatformInitializeSpaceball();
 
-        if(!fgStructure.CurrentWindow)
-		{
-			sball_initialized = -1;
-            return;
-		}
-
-        w = fgStructure.CurrentWindow->Window.Handle;
-        if(spnav_x11_open(fgDisplay.pDisplay.Display, w) == -1)
-		{
-			sball_initialized = -1;
-            return;
-        }
-    }
-#endif
-
     sball_initialized = 1;
 }
 
 void fgSpaceballClose(void)
 {
-#if TARGET_HOST_POSIX_X11
-    spnav_close();
-#endif
-}
+	fgPlatformSpaceballClose();}
 
 int fgHasSpaceball(void)
 {
@@ -105,14 +46,7 @@
         }
     }
 
-#if TARGET_HOST_POSIX_X11
-    /* XXX this function should somehow query the driver if there's a device
-     * plugged in, as opposed to just checking if there's a driver to talk to.
-     */
-    return spnav_fd() == -1 ? 0 : 1;
-#else
-    return 0;
-#endif
+    return fgPlatformHasSpaceball();
 }
 
 int fgSpaceballNumButtons(void)
@@ -125,11 +59,7 @@
         }
     }
 
-#if TARGET_HOST_POSIX_X11
-    return 2;  /* TODO implement this properly */
-#else
-    return 0;
-#endif
+    return fgPlatformSpaceballNumButtons();
 }
 
 void fgSpaceballSetWindow(SFG_Window *window)
@@ -141,331 +71,6 @@
         }
     }
 
-#if TARGET_HOST_POSIX_X11
-    if(spnav_win != window) {
-        spnav_x11_window(window->Window.Handle);
-        spnav_win = window;
-    }
-#endif
+    fgPlatformSpaceballSetWindow(window);
 }
 
-
-#if TARGET_HOST_POSIX_X11
-int fgIsSpaceballXEvent(const XEvent *xev)
-{
-    spnav_event sev;
-
-    if(spnav_win != fgStructure.CurrentWindow) {
-        /* this will also initialize spaceball if needed (first call) */
-        fgSpaceballSetWindow(fgStructure.CurrentWindow);
-    }
-
-    if(sball_initialized != 1) {
-        return 0;
-    }
-
-    return spnav_x11_event(xev, &sev);
-}
-
-void fgSpaceballHandleXEvent(const XEvent *xev)
-{
-    spnav_event sev;
-
-    if(sball_initialized == 0) {
-        fgInitialiseSpaceball();
-        if(sball_initialized != 1) {
-            return;
-        }
-    }
-
-    if(spnav_x11_event(xev, &sev)) {
-        switch(sev.type) {
-        case SPNAV_EVENT_MOTION:
-            if(sev.motion.x | sev.motion.y | sev.motion.z) {
-                INVOKE_WCB(*spnav_win, SpaceMotion, (sev.motion.x, sev.motion.y, sev.motion.z));
-            }
-            if(sev.motion.rx | sev.motion.ry | sev.motion.rz) {
-                INVOKE_WCB(*spnav_win, SpaceRotation, (sev.motion.rx, sev.motion.ry, sev.motion.rz));
-            }
-            spnav_remove_events(SPNAV_EVENT_MOTION);
-            break;
-
-        case SPNAV_EVENT_BUTTON:
-            INVOKE_WCB(*spnav_win, SpaceButton, (sev.button.bnum, sev.button.press ? GLUT_DOWN : GLUT_UP));
-            break;
-
-        default:
-            break;
-        }
-    }
-}
-
-/*
-The following code is part of libspnav, part of the spacenav project (spacenav.sf.net)
-Copyright (C) 2007-2009 John Tsiombikas <nuclear@...>
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-OF SUCH DAMAGE.
-*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-static Window get_daemon_window(Display *dpy);
-static int catch_badwin(Display *dpy, XErrorEvent *err);
-
-static Display *dpy;
-static Window app_win;
-static Atom motion_event, button_press_event, button_release_event, command_event;
-
-enum {
-  CMD_APP_WINDOW = 27695,
-  CMD_APP_SENS
-};
-
-#define IS_OPEN    dpy
-
-struct event_node {
-  spnav_event event;
-  struct event_node *next;
-};
-
-static int spnav_x11_open(Display *display, Window win)
-{
-  if(IS_OPEN) {
-    return -1;
-  }
-
-  dpy = display;
-
-  motion_event = XInternAtom(dpy, "MotionEvent", True);
-  button_press_event = XInternAtom(dpy, "ButtonPressEvent", True);
-  button_release_event = XInternAtom(dpy, "ButtonReleaseEvent", True);
-  command_event = XInternAtom(dpy, "CommandEvent", True);
-
-  if(!motion_event || !button_press_event || !button_release_event || !command_event) {
-    dpy = 0;
-    return -1;  /* daemon not started */
-  }
-
-  if(spnav_x11_window(win) == -1) {
-    dpy = 0;
-    return -1;  /* daemon not started */
-  }
-
-  app_win = win;
-  return 0;
-}
-
-static int spnav_close(void)
-{
-  if(dpy) {
-    spnav_x11_window(DefaultRootWindow(dpy));
-    app_win = 0;
-    dpy = 0;
-    return 0;
-  }
-  return -1;
-}
-
-static int spnav_x11_window(Window win)
-{
-  int (*prev_xerr_handler)(Display*, XErrorEvent*);
-  XEvent xev;
-  Window daemon_win;
-
-  if(!IS_OPEN) {
-    return -1;
-  }
-
-  if(!(daemon_win = get_daemon_window(dpy))) {
-    return -1;
-  }
-
-  prev_xerr_handler = XSetErrorHandler(catch_badwin);
-
-  xev.type = ClientMessage;
-  xev.xclient.send_event = False;
-  xev.xclient.display = dpy;
-  xev.xclient.window = win;
-  xev.xclient.message_type = command_event;
-  xev.xclient.format = 16;
-  xev.xclient.data.s[0] = ((unsigned int)win & 0xffff0000) >> 16;
-  xev.xclient.data.s[1] = (unsigned int)win & 0xffff;
-  xev.xclient.data.s[2] = CMD_APP_WINDOW;
-
-  XSendEvent(dpy, daemon_win, False, 0, &xev);
-  XSync(dpy, False);
-
-  XSetErrorHandler(prev_xerr_handler);
-  return 0;
-}
-
-static int spnav_fd(void)
-{
-  if(dpy) {
-    return ConnectionNumber(dpy);
-  }
-  return -1;
-}
-
-/*static int spnav_wait_event(spnav_event *event)
-{
-  if(dpy) {
-    for(;;) {
-      XEvent xev;
-      XNextEvent(dpy, &xev);
-
-      if(spnav_x11_event(&xev, event) > 0) {
-        return event->type;
-      }
-    }
-  }
-  return 0;
-}
-
-static int spnav_poll_event(spnav_event *event)
-{
-  if(dpy) {
-    if(XPending(dpy)) {
-      XEvent xev;
-      XNextEvent(dpy, &xev);
-
-      return spnav_x11_event(&xev, event);
-    }
-  }
-  return 0;
-}*/
-
-static Bool match_events(Display *dpy, XEvent *xev, char *arg)
-{
-  int evtype = *(int*)arg;
-
-  if(xev->type != ClientMessage) {
-    return False;
-  }
-
-  if(xev->xclient.message_type == motion_event) {
-    return !evtype || evtype == SPNAV_EVENT_MOTION ? True : False;
-  }
-  if(xev->xclient.message_type == button_press_event ||
-      xev->xclient.message_type == button_release_event) {
-    return !evtype || evtype == SPNAV_EVENT_BUTTON ? True : False;
-  }
-  return False;
-}
-
-static int spnav_remove_events(int type)
-{
-  int rm_count = 0;
-
-  if(dpy) {
-    XEvent xev;
-
-    while(XCheckIfEvent(dpy, &xev, match_events, (char*)&type)) {
-      rm_count++;
-    }
-    return rm_count;
-  }
-  return 0;
-}
-
-static int spnav_x11_event(const XEvent *xev, spnav_event *event)
-{
-  int i;
-  int xmsg_type;
-
-  if(xev->type != ClientMessage) {
-    return 0;
-  }
-
-  xmsg_type = xev->xclient.message_type;
-
-  if(xmsg_type != motion_event && xmsg_type != button_press_event &&
-      xmsg_type != button_release_event) {
-    return 0;
-  }
-
-  if(xmsg_type == motion_event) {
-    event->type = SPNAV_EVENT_MOTION;
-    event->motion.data = &event->motion.x;
-
-    for(i=0; i<6; i++) {
-      event->motion.data[i] = xev->xclient.data.s[i + 2];
-    }
-    event->motion.period = xev->xclient.data.s[8];
-  } else {
-    event->type = SPNAV_EVENT_BUTTON;
-    event->button.press = xmsg_type == button_press_event ? 1 : 0;
-    event->button.bnum = xev->xclient.data.s[2];
-  }
-  return event->type;
-}
-
-
-static Window get_daemon_window(Display *dpy)
-{
-  Window win, root_win;
-  XTextProperty wname;
-  Atom type;
-  int fmt;
-  unsigned long nitems, bytes_after;
-  unsigned char *prop;
-
-  root_win = DefaultRootWindow(dpy);
-
-  XGetWindowProperty(dpy, root_win, command_event, 0, 1, False, AnyPropertyType, &type, &fmt, &nitems, &bytes_after, &prop);
-  if(!prop) {
-    return 0;
-  }
-
-  win = *(Window*)prop;
-  XFree(prop);
-
-  if(!XGetWMName(dpy, win, &wname) || strcmp("Magellan Window", (char*)wname.value) != 0) {
-    return 0;
-  }
-
-  return win;
-}
-
-static int catch_badwin(Display *dpy, XErrorEvent *err)
-{
-  char buf[256];
-
-  if(err->error_code == BadWindow) {
-    /* do nothing? */
-  } else {
-    XGetErrorText(dpy, err->error_code, buf, sizeof buf);
-    fprintf(stderr, "Caught unexpected X error: %s\n", buf);
-  }
-  return 0;
-}
-
-#endif  /* TARGET_HOST_POSIX_X11 */

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_spaceball_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_spaceball_mswin.c	2012-02-05 03:44:03 UTC (rev 1056)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_spaceball_mswin.c	2012-02-05 04:04:28 UTC (rev 1057)
@@ -0,0 +1,58 @@
+/*
+ * freeglut_spaceball_mswin.c
+ *
+ * Spaceball support for Windows
+ *
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
+ * Written by Evan Felix <karcaw at gmail.com>
+ * Creation date: Sat Feb 4, 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/*
+ * This code is a very complicated way of doing nothing.  
+ * But is needed for mswindows platform builds.
+ */
+
+#include <GL/freeglut.h>
+#include "../Common/freeglut_internal.h"
+
+void fgPlatformInitializeSpaceball(void)
+{
+	return;
+}
+
+void fgPlatformSpaceballClose(void)
+{
+	return;
+}
+
+int fgPlatformHasSpaceball(void)
+{
+	return 0;
+}
+
+int fgPlatformSpaceballNumButtons(void)
+{
+	return 0;
+}
+
+void fgPlatformSpaceballSetWindow(SFG_Window *window)
+{
+	return;
+}

Modified: trunk/freeglut/freeglut/src/x11/freeglut_spaceball_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_spaceball_x11.c	2012-02-05 03:44:03 UTC (rev 1056)
+++ trunk/freeglut/freeglut/src/x11/freeglut_spaceball_x11.c	2012-02-05 04:04:28 UTC (rev 1057)
@@ -0,0 +1,415 @@
+/* Spaceball support for Linux.
+ * Written by John Tsiombikas <nuclear@...>
+ * Copied for Platform code by Evan Felix <karcaw at gmail.com>
+ * Creation date: Thur Feb 2 2012
+ *
+ * This code supports 3Dconnexion's 6-dof space-whatever devices.
+ * It can communicate with either the proprietary 3Dconnexion daemon (3dxsrv)
+ * free spacenavd (http://spacenav.sourceforge.net), through the "standard"
+ * magellan X-based protocol.
+ */
+
+#include <GL/freeglut.h>
+#include "freeglut_internal.h"
+
+#include <X11/Xlib.h>
+
+extern int sball_initialized;
+
+enum {
+    SPNAV_EVENT_ANY,  /* used by spnav_remove_events() */
+    SPNAV_EVENT_MOTION,
+    SPNAV_EVENT_BUTTON  /* includes both press and release */
+};
+
+struct spnav_event_motion {
+    int type;
+    int x, y, z;
+    int rx, ry, rz;
+    unsigned int period;
+    int *data;
+};
+
+struct spnav_event_button {
+    int type;
+    int press;
+    int bnum;
+};
+
+typedef union spnav_event {
+    int type;
+    struct spnav_event_motion motion;
+    struct spnav_event_button button;
+} spnav_event;
+
+
+static int spnav_x11_open(Display *dpy, Window win);
+static int spnav_x11_window(Window win);
+static int spnav_x11_event(const XEvent *xev, spnav_event *event);
+static int spnav_close(void);
+static int spnav_fd(void);
+static int spnav_remove_events(int type);
+
+static SFG_Window *spnav_win;
+
+void fgPlatformInitializeSpaceball(void)
+{
+    Window w;
+
+    sball_initialized = 1;
+    if(!fgStructure.CurrentWindow)
+    {
+        sball_initialized = -1;
+        return;
+    }
+
+    w = fgStructure.CurrentWindow->Window.Handle;
+    if(spnav_x11_open(fgDisplay.pDisplay.Display, w) == -1)
+    {
+        sball_initialized = -1;
+        return;
+    }
+}
+
+void fgPlatformSpaceballClose(void) 
+{
+    spnav_close();
+}
+
+int fgPlatformHasSpaceball(void) 
+{
+    /* XXX this function should somehow query the driver if there's a device
+     * plugged in, as opposed to just checking if there's a driver to talk to.
+     */
+    return spnav_fd() == -1 ? 0 : 1;
+}
+
+int fgPlatformSpaceballNumButtons(void) {
+    return 2;
+}
+
+void fgPlatformSpaceballSetWindow(SFG_Window *window) 
+{
+       if(spnav_win != window) {
+        spnav_x11_window(window->Window.Handle);
+        spnav_win = window;
+    }
+}
+
+int fgIsSpaceballXEvent(const XEvent *xev)
+{
+    spnav_event sev;
+
+    if(spnav_win != fgStructure.CurrentWindow) {
+        /* this will also initialize spaceball if needed (first call) */
+        fgSpaceballSetWindow(fgStructure.CurrentWindow);
+    }
+
+    if(sball_initialized != 1) {
+        return 0;
+    }
+
+    return spnav_x11_event(xev, &sev);
+}
+
+void fgSpaceballHandleXEvent(const XEvent *xev)
+{
+    spnav_event sev;
+
+    if(sball_initialized == 0) {
+        fgInitialiseSpaceball();
+        if(sball_initialized != 1) {
+            return;
+        }
+    }
+
+    if(spnav_x11_event(xev, &sev)) {
+        switch(sev.type) {
+        case SPNAV_EVENT_MOTION:
+            if(sev.motion.x | sev.motion.y | sev.motion.z) {
+                INVOKE_WCB(*spnav_win, SpaceMotion, (sev.motion.x, sev.motion.y, sev.motion.z));
+            }
+            if(sev.motion.rx | sev.motion.ry | sev.motion.rz) {
+                INVOKE_WCB(*spnav_win, SpaceRotation, (sev.motion.rx, sev.motion.ry, sev.motion.rz));
+            }
+            spnav_remove_events(SPNAV_EVENT_MOTION);
+            break;
+
+        case SPNAV_EVENT_BUTTON:
+            INVOKE_WCB(*spnav_win, SpaceButton, (sev.button.bnum, sev.button.press ? GLUT_DOWN : GLUT_UP));
+            break;
+
+        default:
+            break;
+        }
+    }
+}
+
+/*
+The following code is part of libspnav, part of the spacenav project (spacenav.sf.net)
+Copyright (C) 2007-2009 John Tsiombikas <nuclear@...>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGE.
+*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+static Window get_daemon_window(Display *dpy);
+static int catch_badwin(Display *dpy, XErrorEvent *err);
+
+static Display *dpy;
+static Window app_win;
+static Atom motion_event, button_press_event, button_release_event, command_event;
+
+enum {
+  CMD_APP_WINDOW = 27695,
+  CMD_APP_SENS
+};
+
+#define IS_OPEN    dpy
+
+struct event_node {
+  spnav_event event;
+  struct event_node *next;
+};
+
+static int spnav_x11_open(Display *display, Window win)
+{
+  if(IS_OPEN) {
+    return -1;
+  }
+
+  dpy = display;
+
+  motion_event = XInternAtom(dpy, "MotionEvent", True);
+  button_press_event = XInternAtom(dpy, "ButtonPressEvent", True);
+  button_release_event = XInternAtom(dpy, "ButtonReleaseEvent", True);
+  command_event = XInternAtom(dpy, "CommandEvent", True);
+
+  if(!motion_event || !button_press_event || !button_release_event || !command_event) {
+    dpy = 0;
+    return -1;  /* daemon not started */
+  }
+
+  if(spnav_x11_window(win) == -1) {
+    dpy = 0;
+    return -1;  /* daemon not started */
+  }
+
+  app_win = win;
+  return 0;
+}
+
+static int spnav_close(void)
+{
+  if(dpy) {
+    spnav_x11_window(DefaultRootWindow(dpy));
+    app_win = 0;
+    dpy = 0;
+    return 0;
+  }
+  return -1;
+}
+
+static int spnav_x11_window(Window win)
+{
+  int (*prev_xerr_handler)(Display*, XErrorEvent*);
+  XEvent xev;
+  Window daemon_win;
+
+  if(!IS_OPEN) {
+    return -1;
+  }
+
+  if(!(daemon_win = get_daemon_window(dpy))) {
+    return -1;
+  }
+
+  prev_xerr_handler = XSetErrorHandler(catch_badwin);
+
+  xev.type = ClientMessage;
+  xev.xclient.send_event = False;
+  xev.xclient.display = dpy;
+  xev.xclient.window = win;
+  xev.xclient.message_type = command_event;
+  xev.xclient.format = 16;
+  xev.xclient.data.s[0] = ((unsigned int)win & 0xffff0000) >> 16;
+  xev.xclient.data.s[1] = (unsigned int)win & 0xffff;
+  xev.xclient.data.s[2] = CMD_APP_WINDOW;
+
+  XSendEvent(dpy, daemon_win, False, 0, &xev);
+  XSync(dpy, False);
+
+  XSetErrorHandler(prev_xerr_handler);
+  return 0;
+}
+
+static int spnav_fd(void)
+{
+  if(dpy) {
+    return ConnectionNumber(dpy);
+  }
+  return -1;
+}
+
+/*static int spnav_wait_event(spnav_event *event)
+{
+  if(dpy) {
+    for(;;) {
+      XEvent xev;
+      XNextEvent(dpy, &xev);
+
+      if(spnav_x11_event(&xev, event) > 0) {
+        return event->type;
+      }
+    }
+  }
+  return 0;
+}
+
+static int spnav_poll_event(spnav_event *event)
+{
+  if(dpy) {
+    if(XPending(dpy)) {
+      XEvent xev;
+      XNextEvent(dpy, &xev);
+
+      return spnav_x11_event(&xev, event);
+    }
+  }
+  return 0;
+}*/
+
+static Bool match_events(Display *dpy, XEvent *xev, char *arg)
+{
+  int evtype = *(int*)arg;
+
+  if(xev->type != ClientMessage) {
+    return False;
+  }
+
+  if(xev->xclient.message_type == motion_event) {
+    return !evtype || evtype == SPNAV_EVENT_MOTION ? True : False;
+  }
+  if(xev->xclient.message_type == button_press_event ||
+      xev->xclient.message_type == button_release_event) {
+    return !evtype || evtype == SPNAV_EVENT_BUTTON ? True : False;
+  }
+  return False;
+}
+
+static int spnav_remove_events(int type)
+{
+  int rm_count = 0;
+
+  if(dpy) {
+    XEvent xev;
+
+    while(XCheckIfEvent(dpy, &xev, match_events, (char*)&type)) {
+      rm_count++;
+    }
+    return rm_count;
+  }
+  return 0;
+}
+
+static int spnav_x11_event(const XEvent *xev, spnav_event *event)
+{
+  int i;
+  int xmsg_type;
+
+  if(xev->type != ClientMessage) {
+    return 0;
+  }
+
+  xmsg_type = xev->xclient.message_type;
+
+  if(xmsg_type != motion_event && xmsg_type != button_press_event &&
+      xmsg_type != button_release_event) {
+    return 0;
+  }
+
+  if(xmsg_type == motion_event) {
+    event->type = SPNAV_EVENT_MOTION;
+    event->motion.data = &event->motion.x;
+
+    for(i=0; i<6; i++) {
+      event->motion.data[i] = xev->xclient.data.s[i + 2];
+    }
+    event->motion.period = xev->xclient.data.s[8];
+  } else {
+    event->type = SPNAV_EVENT_BUTTON;
+    event->button.press = xmsg_type == button_press_event ? 1 : 0;
+    event->button.bnum = xev->xclient.data.s[2];
+  }
+  return event->type;
+}
+
+
+static Window get_daemon_window(Display *dpy)
+{
+  Window win, root_win;
+  XTextProperty wname;
+  Atom type;
+  int fmt;
+  unsigned long nitems, bytes_after;
+  unsigned char *prop;
+
+  root_win = DefaultRootWindow(dpy);
+
+  XGetWindowProperty(dpy, root_win, command_event, 0, 1, False, AnyPropertyType, &type, &fmt, &nitems, &bytes_after, &prop);
+  if(!prop) {
+    return 0;
+  }
+
+  win = *(Window*)prop;
+  XFree(prop);
+
+  if(!XGetWMName(dpy, win, &wname) || strcmp("Magellan Window", (char*)wname.value) != 0) {
+    return 0;
+  }
+
+  return win;
+}
+
+static int catch_badwin(Display *dpy, XErrorEvent *err)
+{
+  char buf[256];
+
+  if(err->error_code == BadWindow) {
+    /* do nothing? */
+  } else {
+    XGetErrorText(dpy, err->error_code, buf, sizeof buf);
+    fprintf(stderr, "Caught unexpected X error: %s\n", buf);
+  }
+  return 0;
+}
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1059
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1059&view=rev
Author:   fayjf
Date:     2012-02-05 04:13:31 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
Splitting the X11-specific "freeglut_joystick.c" code into its own file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_joystick.c
    trunk/freeglut/freeglut/src/x11/freeglut_joystick_x11.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_joystick.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_joystick.c	2012-02-05 04:08:55 UTC (rev 1058)
+++ trunk/freeglut/freeglut/src/Common/freeglut_joystick.c	2012-02-05 04:13:31 UTC (rev 1059)
@@ -314,7 +314,7 @@
  * The static joystick structure pointer
  */
 #define MAX_NUM_JOYSTICKS  2
-static SFG_Joystick *fgJoystick [ MAX_NUM_JOYSTICKS ];
+SFG_Joystick *fgJoystick [ MAX_NUM_JOYSTICKS ];
 
 /*
  * Read the raw joystick data
@@ -854,432 +854,9 @@
 }
 #endif
 
-#if TARGET_HOST_POSIX_X11
-void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
-{
-    int status;
 
-    int i;
 
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-    int len;
 
-    if ( joy->pJoystick.os->is_analog )
-    {
-        int status = read ( joy->pJoystick.os->fd, &joy->pJoystick.os->ajs, sizeof(joy->pJoystick.os->ajs) );
-        if ( status != sizeof(joy->pJoystick.os->ajs) ) {
-            perror ( joy->pJoystick.os->fname );
-            joy->error = GL_TRUE;
-            return;
-        }
-        if ( buttons != NULL )
-            *buttons = ( joy->pJoystick.os->ajs.b1 ? 1 : 0 ) | ( joy->pJoystick.os->ajs.b2 ? 2 : 0 );
-
-        if ( axes != NULL )
-        {
-            axes[0] = (float) joy->pJoystick.os->ajs.x;
-            axes[1] = (float) joy->pJoystick.os->ajs.y;
-        }
-
-        return;
-    }
-
-#  ifdef HAVE_USB_JS
-    while ( ( len = read ( joy->pJoystick.os->fd, joy->pJoystick.os->hid_data_buf, joy->pJoystick.os->hid_dlen ) ) == joy->pJoystick.os->hid_dlen )
-    {
-        struct hid_item *h;
-
-        for  ( h = joy->pJoystick.os->hids; h; h = h->next )
-        {
-            int d = hid_get_data ( joy->pJoystick.os->hid_data_buf, h );
-
-            int page = HID_PAGE ( h->usage );
-            int usage = HID_USAGE ( h->usage );
-
-            if ( page == HUP_GENERIC_DESKTOP )
-            {
-                int i;
-                for ( i = 0; i < joy->num_axes; i++ )
-                    if (joy->pJoystick.os->axes_usage[i] == usage)
-                    {
-                        if (usage == HUG_HAT_SWITCH)
-                        {
-                            if (d < 0 || d > 8)
-                                d = 0;  /* safety */
-                            joy->pJoystick.os->cache_axes[i] = (float)hatmap_x[d];
-                            joy->pJoystick.os->cache_axes[i + 1] = (float)hatmap_y[d];
-                        }
-                        else
-                        {
-                            joy->pJoystick.os->cache_axes[i] = (float)d;
-                        }
-                        break;
-                    }
-            }
-            else if (page == HUP_BUTTON)
-            {
-               if (usage > 0 && usage < _JS_MAX_BUTTONS + 1)
-               {
-                   if (d)
-                       joy->pJoystick.os->cache_buttons |=  (1 << ( usage - 1 ));
-                   else
-                       joy->pJoystick.os->cache_buttons &= ~(1 << ( usage - 1 ));
-               }
-            }
-        }
-    }
-#    ifdef HAVE_ERRNO_H
-    if ( len < 0 && errno != EAGAIN )
-#    else
-    if ( len < 0 )
-#    endif
-    {
-        perror( joy->pJoystick.os->fname );
-        joy->error = 1;
-    }
-    if ( buttons != NULL ) *buttons = joy->pJoystick.os->cache_buttons;
-    if ( axes    != NULL )
-        memcpy ( axes, joy->pJoystick.os->cache_axes, sizeof(float) * joy->num_axes );
-#  endif
-#endif
-
-#ifdef JS_NEW
-
-    while ( 1 )
-    {
-        status = read ( joy->pJoystick.fd, &joy->pJoystick.js, sizeof(struct js_event) );
-
-        if ( status != sizeof( struct js_event ) )
-        {
-#  ifdef HAVE_ERRNO_H
-            if ( errno == EAGAIN )
-            {
-                /* Use the old values */
-                if ( buttons )
-                    *buttons = joy->pJoystick.tmp_buttons;
-                if ( axes )
-                    memcpy( axes, joy->pJoystick.tmp_axes,
-                            sizeof( float ) * joy->num_axes );
-                return;
-            }
-#  endif
-
-            fgWarning ( "%s", joy->pJoystick.fname );
-            joy->error = GL_TRUE;
-            return;
-        }
-
-        switch ( joy->pJoystick.js.type & ~JS_EVENT_INIT )
-        {
-        case JS_EVENT_BUTTON:
-            if( joy->pJoystick.js.value == 0 ) /* clear the flag */
-                joy->pJoystick.tmp_buttons &= ~( 1 << joy->pJoystick.js.number );
-            else
-                joy->pJoystick.tmp_buttons |= ( 1 << joy->pJoystick.js.number );
-            break;
-
-        case JS_EVENT_AXIS:
-            if ( joy->pJoystick.js.number < joy->num_axes )
-            {
-                joy->pJoystick.tmp_axes[ joy->pJoystick.js.number ] = ( float )joy->pJoystick.js.value;
-
-                if( axes )
-                    memcpy( axes, joy->pJoystick.tmp_axes, sizeof(float) * joy->num_axes );
-            }
-            break;
-
-        default:
-            fgWarning ( "PLIB_JS: Unrecognised /dev/js return!?!" );
-
-            /* use the old values */
-
-            if ( buttons != NULL ) *buttons = joy->pJoystick.tmp_buttons;
-            if ( axes    != NULL )
-                memcpy ( axes, joy->pJoystick.tmp_axes, sizeof(float) * joy->num_axes );
-
-            return;
-        }
-
-        if( buttons )
-            *buttons = joy->pJoystick.tmp_buttons;
-    }
-#else
-
-    status = read( joy->pJoystick.fd, &joy->pJoystick.js, JS_RETURN );
-
-    if ( status != JS_RETURN )
-    {
-        fgWarning( "%s", joy->pJoystick.fname );
-        joy->error = GL_TRUE;
-        return;
-    }
-
-    if ( buttons )
-#    if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-        *buttons = ( joy->pJoystick.js.b1 ? 1 : 0 ) | ( joy->pJoystick.js.b2 ? 2 : 0 );  /* XXX Should not be here -- BSD is handled earlier */
-#    else
-        *buttons = joy->pJoystick.js.buttons;
-#    endif
-
-    if ( axes )
-    {
-        axes[ 0 ] = (float) joy->pJoystick.js.x;
-        axes[ 1 ] = (float) joy->pJoystick.js.y;
-    }
-#endif
-}
-
-
-void fgPlatformJoystickOpen( SFG_Joystick* joy )
-{
-#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-	int i = 0;
-       char *cp;
-#endif
-#ifdef JS_NEW
-	int i = 0;
-       unsigned char u;
-#else
-#  if defined( __linux__ ) || TARGET_HOST_SOLARIS
-	int i = 0;
-    int counter = 0;
-#  endif
-#endif
-
-#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-    for( i = 0; i < _JS_MAX_AXES; i++ )
-        joy->pJoystick.os->cache_axes[ i ] = 0.0f;
-
-    joy->pJoystick.os->cache_buttons = 0;
-
-    joy->pJoystick.os->fd = open( joy->pJoystick.os->fname, O_RDONLY | O_NONBLOCK);
-
-#ifdef HAVE_ERRNO_H
-    if( joy->pJoystick.os->fd < 0 && errno == EACCES )
-        fgWarning ( "%s exists but is not readable by you", joy->pJoystick.os->fname );
-#endif
-
-    joy->error =( joy->pJoystick.os->fd < 0 );
-
-    if( joy->error )
-        return;
-
-    joy->num_axes = 0;
-    joy->num_buttons = 0;
-    if( joy->pJoystick.os->is_analog )
-    {
-        FILE *joyfile;
-        char joyfname[ 1024 ];
-        int noargs, in_no_axes;
-
-        float axes [ _JS_MAX_AXES ];
-        int buttons[ _JS_MAX_AXES ];
-
-        joy->num_axes    =  2;
-        joy->num_buttons = 32;
-
-        fghJoystickRawRead( joy, buttons, axes );
-        joy->error = axes[ 0 ] < -1000000000.0f;
-        if( joy->error )
-            return;
-
-        snprintf( joyfname, sizeof(joyfname), "%s/.joy%drc", getenv( "HOME" ), joy->id );
-
-        joyfile = fopen( joyfname, "r" );
-        joy->error =( joyfile == NULL );
-        if( joy->error )
-            return;
-
-        noargs = fscanf( joyfile, "%d%f%f%f%f%f%f", &in_no_axes,
-                         &joy->min[ 0 ], &joy->center[ 0 ], &joy->max[ 0 ],
-                         &joy->min[ 1 ], &joy->center[ 1 ], &joy->max[ 1 ] );
-        joy->error = noargs != 7 || in_no_axes != _JS_MAX_AXES;
-        fclose( joyfile );
-        if( joy->error )
-            return;
-
-        for( i = 0; i < _JS_MAX_AXES; i++ )
-        {
-            joy->dead_band[ i ] = 0.0f;
-            joy->saturate [ i ] = 1.0f;
-        }
-
-        return;    /* End of analog code */
-    }
-
-#    ifdef HAVE_USB_JS
-    if( ! fghJoystickInitializeHID( joy->pJoystick.os, &joy->num_axes,
-                                    &joy->num_buttons ) )
-    {
-        close( joy->pJoystick.os->fd );
-        joy->error = GL_TRUE;
-        return;
-    }
-
-    cp = strrchr( joy->pJoystick.os->fname, '/' );
-    if( cp )
-    {
-        if( fghJoystickFindUSBdev( &cp[1], joy->name, sizeof( joy->name ) ) ==
-            0 )
-            strcpy( joy->name, &cp[1] );
-    }
-
-    if( joy->num_axes > _JS_MAX_AXES )
-        joy->num_axes = _JS_MAX_AXES;
-
-    for( i = 0; i < _JS_MAX_AXES; i++ )
-    {
-        /* We really should get this from the HID, but that data seems
-         * to be quite unreliable for analog-to-USB converters. Punt for
-         * now.
-         */
-        if( joy->pJoystick.os->axes_usage[ i ] == HUG_HAT_SWITCH )
-        {
-            joy->max   [ i ] = 1.0f;
-            joy->center[ i ] = 0.0f;
-            joy->min   [ i ] = -1.0f;
-        }
-        else
-        {
-            joy->max   [ i ] = 255.0f;
-            joy->center[ i ] = 127.0f;
-            joy->min   [ i ] = 0.0f;
-        }
-
-        joy->dead_band[ i ] = 0.0f;
-        joy->saturate[ i ] = 1.0f;
-    }
-#    endif
-#endif
-
-#if defined( __linux__ ) || TARGET_HOST_SOLARIS
-    /* Default for older Linux systems. */
-    joy->num_axes    =  2;
-    joy->num_buttons = 32;
-
-#    ifdef JS_NEW
-    for( i = 0; i < _JS_MAX_AXES; i++ )
-        joy->pJoystick.tmp_axes[ i ] = 0.0f;
-
-    joy->pJoystick.tmp_buttons = 0;
-#    endif
-
-    joy->pJoystick.fd = open( joy->pJoystick.fname, O_RDONLY );
-
-    joy->error =( joy->pJoystick.fd < 0 );
-
-    if( joy->error )
-        return;
-
-    /* Set the correct number of axes for the linux driver */
-#    ifdef JS_NEW
-    /* Melchior Franz's fixes for big-endian Linuxes since writing
-     *  to the upper byte of an uninitialized word doesn't work.
-     *  9 April 2003
-     */
-    ioctl( joy->pJoystick.fd, JSIOCGAXES, &u );
-    joy->num_axes = u;
-    ioctl( joy->pJoystick.fd, JSIOCGBUTTONS, &u );
-    joy->num_buttons = u;
-    ioctl( joy->pJoystick.fd, JSIOCGNAME( sizeof( joy->name ) ), joy->name );
-    fcntl( joy->pJoystick.fd, F_SETFL, O_NONBLOCK );
-#    endif
-
-    /*
-     * The Linux driver seems to return 512 for all axes
-     * when no stick is present - but there is a chance
-     * that could happen by accident - so it's gotta happen
-     * on both axes for at least 100 attempts.
-     *
-     * PWO: shouldn't be that done somehow wiser on the kernel level?
-     */
-#    ifndef JS_NEW
-    counter = 0;
-
-    do
-    {
-        fghJoystickRawRead( joy, NULL, joy->center );
-        counter++;
-    } while( !joy->error &&
-             counter < 100 &&
-             joy->center[ 0 ] == 512.0f &&
-             joy->center[ 1 ] == 512.0f );
-
-    if ( counter >= 100 )
-        joy->error = GL_TRUE;
-#    endif
-
-    for( i = 0; i < _JS_MAX_AXES; i++ )
-    {
-#    ifdef JS_NEW
-        joy->max   [ i ] =  32767.0f;
-        joy->center[ i ] =      0.0f;
-        joy->min   [ i ] = -32767.0f;
-#    else
-        joy->max[ i ] = joy->center[ i ] * 2.0f;
-        joy->min[ i ] = 0.0f;
-#    endif
-        joy->dead_band[ i ] = 0.0f;
-        joy->saturate [ i ] = 1.0f;
-    }
-#endif
-}
-
-
-void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
-{
-#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-    fgJoystick[ ident ]->id = ident;
-    fgJoystick[ ident ]->error = GL_FALSE;
-
-    fgJoystick[ ident ]->pJoystick.os = calloc( 1, sizeof( struct os_specific_s ) );
-    memset( fgJoystick[ ident ]->pJoystick.os, 0, sizeof( struct os_specific_s ) );
-    if( ident < USB_IDENT_OFFSET )
-        fgJoystick[ ident ]->pJoystick.os->is_analog = 1;
-    if( fgJoystick[ ident ]->pJoystick.os->is_analog )
-        snprintf( fgJoystick[ ident ]->pJoystick.os->fname, sizeof(fgJoystick[ ident ]->pJoystick.os->fname), "%s%d", AJSDEV, ident );
-    else
-        snprintf( fgJoystick[ ident ]->pJoystick.os->fname, sizeof(fgJoystick[ ident ]->pJoystick.os->fname), "%s%d", UHIDDEV,
-                 ident - USB_IDENT_OFFSET );
-#elif defined( __linux__ )
-    fgJoystick[ ident ]->id = ident;
-    fgJoystick[ ident ]->error = GL_FALSE;
-
-    snprintf( fgJoystick[ident]->pJoystick.fname, sizeof(fgJoystick[ident]->pJoystick.fname), "/dev/input/js%d", ident );
-
-    if( access( fgJoystick[ ident ]->pJoystick.fname, F_OK ) != 0 )
-        snprintf( fgJoystick[ ident ]->pJoystick.fname, sizeof(fgJoystick[ ident ]->pJoystick.fname), "/dev/js%d", ident );
-#endif
-}
-
-
-void fgPlatformJoystickClose ( int ident )
-{
-#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
-    if( fgJoystick[ident]->pJoystick.os )
-    {
-        if( ! fgJoystick[ ident ]->error )
-            close( fgJoystick[ ident ]->pJoystick.os->fd );
-#ifdef HAVE_USB_JS
-        if( fgJoystick[ ident ]->pJoystick.os->hids )
-            free (fgJoystick[ ident ]->pJoystick.os->hids);
-        if( fgJoystick[ ident ]->pJoystick.os->hid_data_buf )
-            free( fgJoystick[ ident ]->pJoystick.os->hid_data_buf );
-#endif
-        free( fgJoystick[ident]->pJoystick.os );
-	}
-#endif
-
-    if( ! fgJoystick[ident]->error )
-         close( fgJoystick[ ident ]->pJoystick.fd );
-}
-#endif
-
-
-
-
-
-
 static void fghJoystickOpen( SFG_Joystick* joy )
 {
     /*

Modified: trunk/freeglut/freeglut/src/x11/freeglut_joystick_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_joystick_x11.c	2012-02-05 04:08:55 UTC (rev 1058)
+++ trunk/freeglut/freeglut/src/x11/freeglut_joystick_x11.c	2012-02-05 04:13:31 UTC (rev 1059)
@@ -0,0 +1,465 @@
+/*
+ * freeglut_joystick_x11.c
+ *
+ * Joystick handling code
+ *
+ * Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved.
+ * Written by Steve Baker, <sjbaker1@...>
+ * Copied for Platform code by Evan Felix <karcaw at gmail.com>
+ * Creation date: Thur Feb 2 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * FreeBSD port by Stephen Montgomery-Smith <stephen@...>
+ *
+ * Redone by John Fay 2/4/04 with another look from the PLIB "js" library.
+ *  Many thanks for Steve Baker for permission to pull from that library.
+ */
+
+#include <GL/freeglut.h>
+#include "freeglut_internal.h"
+#ifdef HAVE_SYS_PARAM_H
+#    include <sys/param.h>
+#endif
+
+
+/*this should be defined in a header file */
+#define MAX_NUM_JOYSTICKS  2   
+extern SFG_Joystick *fgJoystick [ MAX_NUM_JOYSTICKS ];
+
+void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
+{
+    int status;
+
+    int i;
+
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+    int len;
+
+    if ( joy->pJoystick.os->is_analog )
+    {
+        int status = read ( joy->pJoystick.os->fd, &joy->pJoystick.os->ajs, sizeof(joy->pJoystick.os->ajs) );
+        if ( status != sizeof(joy->pJoystick.os->ajs) ) {
+            perror ( joy->pJoystick.os->fname );
+            joy->error = GL_TRUE;
+            return;
+        }
+        if ( buttons != NULL )
+            *buttons = ( joy->pJoystick.os->ajs.b1 ? 1 : 0 ) | ( joy->pJoystick.os->ajs.b2 ? 2 : 0 );
+
+        if ( axes != NULL )
+        {
+            axes[0] = (float) joy->pJoystick.os->ajs.x;
+            axes[1] = (float) joy->pJoystick.os->ajs.y;
+        }
+
+        return;
+    }
+
+#  ifdef HAVE_USB_JS
+    while ( ( len = read ( joy->pJoystick.os->fd, joy->pJoystick.os->hid_data_buf, joy->pJoystick.os->hid_dlen ) ) == joy->pJoystick.os->hid_dlen )
+    {
+        struct hid_item *h;
+
+        for  ( h = joy->pJoystick.os->hids; h; h = h->next )
+        {
+            int d = hid_get_data ( joy->pJoystick.os->hid_data_buf, h );
+
+            int page = HID_PAGE ( h->usage );
+            int usage = HID_USAGE ( h->usage );
+
+            if ( page == HUP_GENERIC_DESKTOP )
+            {
+                int i;
+                for ( i = 0; i < joy->num_axes; i++ )
+                    if (joy->pJoystick.os->axes_usage[i] == usage)
+                    {
+                        if (usage == HUG_HAT_SWITCH)
+                        {
+                            if (d < 0 || d > 8)
+                                d = 0;  /* safety */
+                            joy->pJoystick.os->cache_axes[i] = (float)hatmap_x[d];
+                            joy->pJoystick.os->cache_axes[i + 1] = (float)hatmap_y[d];
+                        }
+                        else
+                        {
+                            joy->pJoystick.os->cache_axes[i] = (float)d;
+                        }
+                        break;
+                    }
+            }
+            else if (page == HUP_BUTTON)
+            {
+               if (usage > 0 && usage < _JS_MAX_BUTTONS + 1)
+               {
+                   if (d)
+                       joy->pJoystick.os->cache_buttons |=  (1 << ( usage - 1 ));
+                   else
+                       joy->pJoystick.os->cache_buttons &= ~(1 << ( usage - 1 ));
+               }
+            }
+        }
+    }
+#    ifdef HAVE_ERRNO_H
+    if ( len < 0 && errno != EAGAIN )
+#    else
+    if ( len < 0 )
+#    endif
+    {
+        perror( joy->pJoystick.os->fname );
+        joy->error = 1;
+    }
+    if ( buttons != NULL ) *buttons = joy->pJoystick.os->cache_buttons;
+    if ( axes    != NULL )
+        memcpy ( axes, joy->pJoystick.os->cache_axes, sizeof(float) * joy->num_axes );
+#  endif
+#endif
+
+#ifdef JS_NEW
+
+    while ( 1 )
+    {
+        status = read ( joy->pJoystick.fd, &joy->pJoystick.js, sizeof(struct js_event) );
+
+        if ( status != sizeof( struct js_event ) )
+        {
+#  ifdef HAVE_ERRNO_H
+            if ( errno == EAGAIN )
+            {
+                /* Use the old values */
+                if ( buttons )
+                    *buttons = joy->pJoystick.tmp_buttons;
+                if ( axes )
+                    memcpy( axes, joy->pJoystick.tmp_axes,
+                            sizeof( float ) * joy->num_axes );
+                return;
+            }
+#  endif
+
+            fgWarning ( "%s", joy->pJoystick.fname );
+            joy->error = GL_TRUE;
+            return;
+        }
+
+        switch ( joy->pJoystick.js.type & ~JS_EVENT_INIT )
+        {
+        case JS_EVENT_BUTTON:
+            if( joy->pJoystick.js.value == 0 ) /* clear the flag */
+                joy->pJoystick.tmp_buttons &= ~( 1 << joy->pJoystick.js.number );
+            else
+                joy->pJoystick.tmp_buttons |= ( 1 << joy->pJoystick.js.number );
+            break;
+
+        case JS_EVENT_AXIS:
+            if ( joy->pJoystick.js.number < joy->num_axes )
+            {
+                joy->pJoystick.tmp_axes[ joy->pJoystick.js.number ] = ( float )joy->pJoystick.js.value;
+
+                if( axes )
+                    memcpy( axes, joy->pJoystick.tmp_axes, sizeof(float) * joy->num_axes );
+            }
+            break;
+
+        default:
+            fgWarning ( "PLIB_JS: Unrecognised /dev/js return!?!" );
+
+            /* use the old values */
+
+            if ( buttons != NULL ) *buttons = joy->pJoystick.tmp_buttons;
+            if ( axes    != NULL )
+                memcpy ( axes, joy->pJoystick.tmp_axes, sizeof(float) * joy->num_axes );
+
+            return;
+        }
+
+        if( buttons )
+            *buttons = joy->pJoystick.tmp_buttons;
+    }
+#else
+
+    status = read( joy->pJoystick.fd, &joy->pJoystick.js, JS_RETURN );
+
+    if ( status != JS_RETURN )
+    {
+        fgWarning( "%s", joy->pJoystick.fname );
+        joy->error = GL_TRUE;
+        return;
+    }
+
+    if ( buttons )
+#    if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
+        *buttons = ( joy->pJoystick.js.b1 ? 1 : 0 ) | ( joy->pJoystick.js.b2 ? 2 : 0 );  /* XXX Should not be here -- BSD is handled earlier */
+#    else
+        *buttons = joy->pJoystick.js.buttons;
+#    endif
+
+    if ( axes )
+    {
+        axes[ 0 ] = (float) joy->pJoystick.js.x;
+        axes[ 1 ] = (float) joy->pJoystick.js.y;
+    }
+#endif
+}
+
+
+void fgPlatformJoystickOpen( SFG_Joystick* joy )
+{
+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
+	int i = 0;
+       char *cp;
+#endif
+#ifdef JS_NEW
+       unsigned char u;
+	int i=0;
+#else
+#  if defined( __linux__ ) || TARGET_HOST_SOLARIS
+	int i = 0;
+    int counter = 0;
+#  endif
+#endif
+
+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
+    for( i = 0; i < _JS_MAX_AXES; i++ )
+        joy->pJoystick.os->cache_axes[ i ] = 0.0f;
+
+    joy->pJoystick.os->cache_buttons = 0;
+
+    joy->pJoystick.os->fd = open( joy->pJoystick.os->fname, O_RDONLY | O_NONBLOCK);
+
+#ifdef HAVE_ERRNO_H
+    if( joy->pJoystick.os->fd < 0 && errno == EACCES )
+        fgWarning ( "%s exists but is not readable by you", joy->pJoystick.os->fname );
+#endif
+
+    joy->error =( joy->pJoystick.os->fd < 0 );
+
+    if( joy->error )
+        return;
+
+    joy->num_axes = 0;
+    joy->num_buttons = 0;
+    if( joy->pJoystick.os->is_analog )
+    {
+        FILE *joyfile;
+        char joyfname[ 1024 ];
+        int noargs, in_no_axes;
+
+        float axes [ _JS_MAX_AXES ];
+        int buttons[ _JS_MAX_AXES ];
+
+        joy->num_axes    =  2;
+        joy->num_buttons = 32;
+
+        fghJoystickRawRead( joy, buttons, axes );
+        joy->error = axes[ 0 ] < -1000000000.0f;
+        if( joy->error )
+            return;
+
+        snprintf( joyfname, sizeof(joyfname), "%s/.joy%drc", getenv( "HOME" ), joy->id );
+
+        joyfile = fopen( joyfname, "r" );
+        joy->error =( joyfile == NULL );
+        if( joy->error )
+            return;
+
+        noargs = fscanf( joyfile, "%d%f%f%f%f%f%f", &in_no_axes,
+                         &joy->min[ 0 ], &joy->center[ 0 ], &joy->max[ 0 ],
+                         &joy->min[ 1 ], &joy->center[ 1 ], &joy->max[ 1 ] );
+        joy->error = noargs != 7 || in_no_axes != _JS_MAX_AXES;
+        fclose( joyfile );
+        if( joy->error )
+            return;
+
+        for( i = 0; i < _JS_MAX_AXES; i++ )
+        {
+            joy->dead_band[ i ] = 0.0f;
+            joy->saturate [ i ] = 1.0f;
+        }
+
+        return;    /* End of analog code */
+    }
+
+#    ifdef HAVE_USB_JS
+    if( ! fghJoystickInitializeHID( joy->pJoystick.os, &joy->num_axes,
+                                    &joy->num_buttons ) )
+    {
+        close( joy->pJoystick.os->fd );
+        joy->error = GL_TRUE;
+        return;
+    }
+
+    cp = strrchr( joy->pJoystick.os->fname, '/' );
+    if( cp )
+    {
+        if( fghJoystickFindUSBdev( &cp[1], joy->name, sizeof( joy->name ) ) ==
+            0 )
+            strcpy( joy->name, &cp[1] );
+    }
+
+    if( joy->num_axes > _JS_MAX_AXES )
+        joy->num_axes = _JS_MAX_AXES;
+
+    for( i = 0; i < _JS_MAX_AXES; i++ )
+    {
+        /* We really should get this from the HID, but that data seems
+         * to be quite unreliable for analog-to-USB converters. Punt for
+         * now.
+         */
+        if( joy->pJoystick.os->axes_usage[ i ] == HUG_HAT_SWITCH )
+        {
+            joy->max   [ i ] = 1.0f;
+            joy->center[ i ] = 0.0f;
+            joy->min   [ i ] = -1.0f;
+        }
+        else
+        {
+            joy->max   [ i ] = 255.0f;
+            joy->center[ i ] = 127.0f;
+            joy->min   [ i ] = 0.0f;
+        }
+
+        joy->dead_band[ i ] = 0.0f;
+        joy->saturate[ i ] = 1.0f;
+    }
+#    endif
+#endif
+
+#if defined( __linux__ ) || TARGET_HOST_SOLARIS
+    /* Default for older Linux systems. */
+    joy->num_axes    =  2;
+    joy->num_buttons = 32;
+
+#    ifdef JS_NEW
+    for( i = 0; i < _JS_MAX_AXES; i++ )
+        joy->pJoystick.tmp_axes[ i ] = 0.0f;
+
+    joy->pJoystick.tmp_buttons = 0;
+#    endif
+
+    joy->pJoystick.fd = open( joy->pJoystick.fname, O_RDONLY );
+
+    joy->error =( joy->pJoystick.fd < 0 );
+
+    if( joy->error )
+        return;
+
+    /* Set the correct number of axes for the linux driver */
+#    ifdef JS_NEW
+    /* Melchior Franz's fixes for big-endian Linuxes since writing
+     *  to the upper byte of an uninitialized word doesn't work.
+     *  9 April 2003
+     */
+    ioctl( joy->pJoystick.fd, JSIOCGAXES, &u );
+    joy->num_axes = u;
+    ioctl( joy->pJoystick.fd, JSIOCGBUTTONS, &u );
+    joy->num_buttons = u;
+    ioctl( joy->pJoystick.fd, JSIOCGNAME( sizeof( joy->name ) ), joy->name );
+    fcntl( joy->pJoystick.fd, F_SETFL, O_NONBLOCK );
+#    endif
+
+    /*
+     * The Linux driver seems to return 512 for all axes
+     * when no stick is present - but there is a chance
+     * that could happen by accident - so it's gotta happen
+     * on both axes for at least 100 attempts.
+     *
+     * PWO: shouldn't be that done somehow wiser on the kernel level?
+     */
+#    ifndef JS_NEW
+    counter = 0;
+
+    do
+    {
+        fghJoystickRawRead( joy, NULL, joy->center );
+        counter++;
+    } while( !joy->error &&
+             counter < 100 &&
+             joy->center[ 0 ] == 512.0f &&
+             joy->center[ 1 ] == 512.0f );
+
+    if ( counter >= 100 )
+        joy->error = GL_TRUE;
+#    endif
+
+    for( i = 0; i < _JS_MAX_AXES; i++ )
+    {
+#    ifdef JS_NEW
+        joy->max   [ i ] =  32767.0f;
+        joy->center[ i ] =      0.0f;
+        joy->min   [ i ] = -32767.0f;
+#    else
+        joy->max[ i ] = joy->center[ i ] * 2.0f;
+        joy->min[ i ] = 0.0f;
+#    endif
+        joy->dead_band[ i ] = 0.0f;
+        joy->saturate [ i ] = 1.0f;
+    }
+#endif
+}
+
+
+void fgPlatformJoystickInit( SFG_Joystick *fgJoystick[], int ident )
+{
+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
+    fgJoystick[ ident ]->id = ident;
+    fgJoystick[ ident ]->error = GL_FALSE;
+
+    fgJoystick[ ident ]->pJoystick.os = calloc( 1, sizeof( struct os_specific_s ) );
+    memset( fgJoystick[ ident ]->pJoystick.os, 0, sizeof( struct os_specific_s ) );
+    if( ident < USB_IDENT_OFFSET )
+        fgJoystick[ ident ]->pJoystick.os->is_analog = 1;
+    if( fgJoystick[ ident ]->pJoystick.os->is_analog )
+        snprintf( fgJoystick[ ident ]->pJoystick.os->fname, sizeof(fgJoystick[ ident ]->pJoystick.os->fname), "%s%d", AJSDEV, ident );
+    else
+        snprintf( fgJoystick[ ident ]->pJoystick.os->fname, sizeof(fgJoystick[ ident ]->pJoystick.os->fname), "%s%d", UHIDDEV,
+                 ident - USB_IDENT_OFFSET );
+#elif defined( __linux__ )
+    fgJoystick[ ident ]->id = ident;
+    fgJoystick[ ident ]->error = GL_FALSE;
+
+    snprintf( fgJoystick[ident]->pJoystick.fname, sizeof(fgJoystick[ident]->pJoystick.fname), "/dev/input/js%d", ident );
+
+    if( access( fgJoystick[ ident ]->pJoystick.fname, F_OK ) != 0 )
+        snprintf( fgJoystick[ ident ]->pJoystick.fname, sizeof(fgJoystick[ ident ]->pJoystick.fname), "/dev/js%d", ident );
+#endif
+}
+
+
+void fgPlatformJoystickClose ( int ident )
+{
+#if defined( __FreeBSD__ ) || defined(__FreeBSD_kernel__) || defined( __NetBSD__ )
+    if( fgJoystick[ident]->pJoystick.os )
+    {
+        if( ! fgJoystick[ ident ]->error )
+            close( fgJoystick[ ident ]->pJoystick.os->fd );
+#ifdef HAVE_USB_JS
+        if( fgJoystick[ ident ]->pJoystick.os->hids )
+            free (fgJoystick[ ident ]->pJoystick.os->hids);
+        if( fgJoystick[ ident ]->pJoystick.os->hid_data_buf )
+            free( fgJoystick[ ident ]->pJoystick.os->hid_data_buf );
+#endif
+        free( fgJoystick[ident]->pJoystick.os );
+	}
+#endif
+
+    if( ! fgJoystick[ident]->error )
+         close( fgJoystick[ ident ]->pJoystick.fd );
+}
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1060
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1060&view=rev
Author:   fayjf
Date:     2012-02-05 04:16:37 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
Splitting the X11-specific "freeglut_ext.c" code into its own file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_ext.c
    trunk/freeglut/freeglut/src/x11/freeglut_ext_x11.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_ext.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_ext.c	2012-02-05 04:13:31 UTC (rev 1059)
+++ trunk/freeglut/freeglut/src/Common/freeglut_ext.c	2012-02-05 04:16:37 UTC (rev 1060)
@@ -203,37 +203,7 @@
 }
 
 
-#if TARGET_HOST_POSIX_X11
-GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )
-{
-    /* optimization: quick initial check */
-    if( strncmp( procName, "glut", 4 ) != 0 )
-        return NULL;
 
-#define CHECK_NAME(x) if( strcmp( procName, #x ) == 0) return (GLUTproc)x;
-    CHECK_NAME(glutJoystickFunc);
-    CHECK_NAME(glutForceJoystickFunc);
-    CHECK_NAME(glutGameModeString);
-    CHECK_NAME(glutEnterGameMode);
-    CHECK_NAME(glutLeaveGameMode);
-    CHECK_NAME(glutGameModeGet);
-#undef CHECK_NAME
-
-    return NULL;
-}
-
-
-SFG_Proc fgPlatformGetProcAddress( const char *procName )
-{
-#if defined( GLX_ARB_get_proc_address )
-    return (SFG_Proc)glXGetProcAddressARB( ( const GLubyte * )procName );
-#else
-    return NULL;
-#endif
-}
-#endif
-
-
 GLUTproc FGAPIENTRY
 glutGetProcAddress( const char *procName )
 {

Modified: trunk/freeglut/freeglut/src/x11/freeglut_ext_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_ext_x11.c	2012-02-05 04:13:31 UTC (rev 1059)
+++ trunk/freeglut/freeglut/src/x11/freeglut_ext_x11.c	2012-02-05 04:16:37 UTC (rev 1060)
@@ -0,0 +1,60 @@
+/*
+ * freeglut_ext.c
+ *
+ * Functions related to OpenGL extensions.
+ *
+ * Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved.
+ * Written by Pawel W. Olszta, <olszta@...>
+ * Copied for Platform code by Evan Felix <karcaw at gmail.com>
+ * Creation date: Thur Feb 2 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#define GLX_GLXEXT_PROTOTYPES
+#include <GL/freeglut.h>
+#include "freeglut_internal.h"
+
+GLUTproc fgPlatformGlutGetProcAddress( const char* procName )
+{
+    /* optimization: quick initial check */
+    if( strncmp( procName, "glut", 4 ) != 0 )
+        return NULL;
+
+#define CHECK_NAME(x) if( strcmp( procName, #x ) == 0) return (GLUTproc)x;
+    CHECK_NAME(glutJoystickFunc);
+    CHECK_NAME(glutForceJoystickFunc);
+    CHECK_NAME(glutGameModeString);
+    CHECK_NAME(glutEnterGameMode);
+    CHECK_NAME(glutLeaveGameMode);
+    CHECK_NAME(glutGameModeGet);
+#undef CHECK_NAME
+
+    return NULL;
+}
+
+
+SFG_Proc fgPlatformGetProcAddress( const char *procName )
+{
+#if defined( GLX_ARB_get_proc_address )
+    return (SFG_Proc)glXGetProcAddressARB( ( const GLubyte * )procName );
+#else
+    return NULL;
+#endif
+}
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1061
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1061&view=rev
Author:   fayjf
Date:     2012-02-05 04:18:13 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
Splitting the X11-specific "freeglut_structure.c" code into its own file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_structure.c
    trunk/freeglut/freeglut/src/x11/freeglut_structure_x11.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_structure.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_structure.c	2012-02-05 04:16:37 UTC (rev 1060)
+++ trunk/freeglut/freeglut/src/Common/freeglut_structure.c	2012-02-05 04:18:13 UTC (rev 1061)
@@ -60,15 +60,6 @@
     }
 }
 
-#if TARGET_HOST_POSIX_X11
-void fgPlatformCreateWindow ( SFG_Window *window )
-{
-    window->Window.pContext.FBConfig = NULL;
-
-    window->State.pWState.OldHeight = window->State.pWState.OldWidth = -1;
-}
-#endif
-
 /*
  * This private function creates, opens and adds to the hierarchy
  * a freeglut window complete with OpenGL context and stuff...

Modified: trunk/freeglut/freeglut/src/x11/freeglut_structure_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_structure_x11.c	2012-02-05 04:16:37 UTC (rev 1060)
+++ trunk/freeglut/freeglut/src/x11/freeglut_structure_x11.c	2012-02-05 04:18:13 UTC (rev 1061)
@@ -0,0 +1,40 @@
+/*
+ * freeglut_structure.c
+ *
+ * Windows and menus need tree structure
+ *
+ * Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved.
+ * Written by Pawel W. Olszta, <olszta@...>
+ * Copied for Platform code by Evan Felix <karcaw at gmail.com>
+ * Creation date: Thur Feb 2 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "../Common/freeglut_internal.h"
+
+extern SFG_Structure fgStructure;
+
+void fgPlatformCreateWindow ( SFG_Window *window )
+{
+    window->Window.pContext.FBConfig = NULL;
+
+    window->State.pWState.OldHeight = window->State.pWState.OldWidth = -1;
+}
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1063
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1063&view=rev
Author:   fayjf
Date:     2012-02-05 05:54:30 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
Splitting the X11-specific stuff out of "freeglut_internal.h" into its own file per e-mail from Diederick Niehorster dated 2/4/12 at 11:31 PM (he sent it on 2/5/12)

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_internal.h
    trunk/freeglut/freeglut/src/x11/freeglut_internal_x11.h

Modified: trunk/freeglut/freeglut/src/Common/freeglut_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-02-05 04:21:26 UTC (rev 1062)
+++ trunk/freeglut/freeglut/src/Common/freeglut_internal.h	2012-02-05 05:54:30 UTC (rev 1063)
@@ -86,31 +86,6 @@
 
 #define  FREEGLUT_MAX_MENUS         3
 
-/* -- PLATFORM-SPECIFIC INCLUDES ------------------------------------------- */
-
-#if TARGET_HOST_POSIX_X11
-#    include <GL/glx.h>
-#    include <X11/Xlib.h>
-#    include <X11/Xatom.h>
-#    include <X11/keysym.h>
-#    include <X11/extensions/XInput.h>
-#    ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
-#        include <X11/extensions/xf86vmode.h>
-#    endif
-#    ifdef HAVE_X11_EXTENSIONS_XRANDR_H
-#        include <X11/extensions/Xrandr.h>
-#    endif
-/* If GLX is too old, we will fail during runtime when multisampling
-   is requested, but at least freeglut compiles. */
-#    ifndef GLX_SAMPLE_BUFFERS
-#        define GLX_SAMPLE_BUFFERS 0x80A8
-#    endif
-#    ifndef GLX_SAMPLES
-#        define GLX_SAMPLES 0x80A9
-#    endif
-
-#endif
-
 /* These files should be available on every platform. */
 #include <stdio.h>
 #include <string.h>
@@ -183,55 +158,7 @@
 
 /* Platform-specific includes */
 #if TARGET_HOST_POSIX_X11
-
-typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay;
-struct tagSFG_PlatformDisplay
-{
-    Display*        Display;            /* The display we are being run in.  */
-    int             Screen;             /* The screen we are about to use.   */
-    Window          RootWindow;         /* The screen's root window.         */
-    int             Connection;         /* The display's connection number   */
-    Atom            DeleteWindow;       /* The window deletion atom          */
-    Atom            State;              /* The state atom                    */
-    Atom            StateFullScreen;    /* The full screen atom              */
-
-#ifdef HAVE_X11_EXTENSIONS_XRANDR_H
-    int prev_xsz, prev_ysz;
-    int prev_refresh;
-    int prev_size_valid;
-#endif	/* HAVE_X11_EXTENSIONS_XRANDR_H */
-
-#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
-    /*
-     * XF86VidMode may be compilable even if it fails at runtime.  Therefore,
-     * the validity of the VidMode has to be tracked
-     */
-    int             DisplayModeValid;   /* Flag that indicates runtime status*/
-    XF86VidModeModeLine DisplayMode;    /* Current screen's display settings */
-    int             DisplayModeClock;   /* The display mode's refresh rate   */
-    int             DisplayViewPortX;   /* saved X location of the viewport  */
-    int             DisplayViewPortY;   /* saved Y location of the viewport  */
-#endif /* HAVE_X11_EXTENSIONS_XF86VMODE_H */
-
-    int             DisplayPointerX;    /* saved X location of the pointer   */
-    int             DisplayPointerY;    /* saved Y location of the pointer   */
-};
-
-
-/*
- * Make "freeglut" window handle and context types so that we don't need so
- * much conditionally-compiled code later in the library.
- */
-typedef Window     SFG_WindowHandleType ;
-typedef GLXContext SFG_WindowContextType ;
-typedef struct tagSFG_PlatformContext SFG_PlatformContext;
-struct tagSFG_PlatformContext
-{
-    GLXFBConfig*    FBConfig;        /* The window's FBConfig               */
-};
-
-
-
+#include "../x11/freeglut_internal_x11.h"
 #endif
 #if TARGET_HOST_MS_WINDOWS
 #include "../mswin/freeglut_internal_mswin.h"
@@ -418,17 +345,7 @@
     int             DoubleBuffered;  /* Treat the window as double-buffered */
 };
 
-/* Window's state description. This structure should be kept portable. */
-#if TARGET_HOST_POSIX_X11
-typedef struct tagSFG_PlatformWindowState SFG_PlatformWindowState;
-struct tagSFG_PlatformWindowState
-{
-    int             OldWidth;           /* Window width from before a resize */
-    int             OldHeight;          /*   "    height  "    "    "   "    */
-};
-#endif
 
-
 typedef struct tagSFG_WindowState SFG_WindowState;
 struct tagSFG_WindowState
 {
@@ -770,67 +687,6 @@
 #    include <IOKit/hid/IOHIDLib.h>
 #endif
 
-#if TARGET_HOST_POSIX_X11
-#    ifdef HAVE_SYS_IOCTL_H
-#        include <sys/ioctl.h>
-#    endif
-#    ifdef HAVE_FCNTL_H
-#        include <fcntl.h>
-#    endif
-#    ifdef HAVE_ERRNO_H
-#        include <errno.h>
-#        include <string.h>
-#    endif
-#    if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-/* XXX The below hack is done until freeglut's autoconf is updated. */
-#        define HAVE_USB_JS    1
-
-#        if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#            include <sys/joystick.h>
-#        else
-/*
- * XXX NetBSD/amd64 systems may find that they have to steal the
- * XXX /usr/include/machine/joystick.h from a NetBSD/i386 system.
- * XXX I cannot comment whether that works for the interface, but
- * XXX it lets you compile...(^&  I do not think that we can do away
- * XXX with this header.
- */
-#            include <machine/joystick.h>         /* For analog joysticks */
-#        endif
-#        define JS_DATA_TYPE joystick
-#        define JS_RETURN (sizeof(struct JS_DATA_TYPE))
-#    endif
-
-#    if defined(__linux__)
-#        include <linux/joystick.h>
-
-/* check the joystick driver version */
-#        if defined(JS_VERSION) && JS_VERSION >= 0x010000
-#            define JS_NEW
-#        endif
-#    else  /* Not BSD or Linux */
-#        ifndef JS_RETURN
-
-  /*
-   * We'll put these values in and that should
-   * allow the code to at least compile when there is
-   * no support. The JS open routine should error out
-   * and shut off all the code downstream anyway and if
-   * the application doesn't use a joystick we'll be fine.
-   */
-
-  struct JS_DATA_TYPE
-  {
-    int buttons;
-    int x;
-    int y;
-  };
-
-#            define JS_RETURN (sizeof(struct JS_DATA_TYPE))
-#        endif
-#    endif
-#endif
-
 /* XXX It might be better to poll the operating system for the numbers of buttons and
  * XXX axes and then dynamically allocate the arrays.
  */
@@ -863,28 +719,7 @@
 };
 #endif
 
-#if TARGET_HOST_POSIX_X11
-#    define _JS_MAX_AXES 16
-typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;
-struct tagSFG_PlatformJoystick
-{
-#   if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-       struct os_specific_s *os;
-#   endif
 
-#   ifdef JS_NEW
-       struct js_event     js;
-       int          tmp_buttons;
-       float        tmp_axes [ _JS_MAX_AXES ];
-#   else
-       struct JS_DATA_TYPE js;
-#   endif
-
-    char         fname [ 128 ];
-    int          fd;
-};
-#endif
-
 /*
  * Definition of "SFG_Joystick" structure -- based on JS's "jsJoystick" object class.
  * See "js.h" lines 80-178.
@@ -1028,11 +863,6 @@
 int         fgHasSpaceball( void );
 int         fgSpaceballNumButtons( void );
 
-#if TARGET_HOST_POSIX_X11
-int         fgIsSpaceballXEvent( const XEvent *ev );
-void        fgSpaceballHandleXEvent( const XEvent *ev );
-#endif
-
 /* Setting the cursor for a given window */
 void fgSetCursor ( SFG_Window *window, int cursorID );
 
@@ -1105,20 +935,6 @@
 void fgError( const char *fmt, ... );
 void fgWarning( const char *fmt, ... );
 
-/*
- * Check if "hint" is present in "property" for "window".  See freeglut_init.c
- */
-#if TARGET_HOST_POSIX_X11
-int fgHintPresent(Window window, Atom property, Atom hint);
-
-/* Handler for X extension Events */
-#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
-  void fgHandleExtensionEvents( XEvent * ev );
-  void fgRegisterDevices( Display* dpy, Window* win );
-#endif
-
-#endif
-
 SFG_Proc fgPlatformGetProcAddress( const char *procName );
 
 /* Window functions needed for Platform implementations */

Modified: trunk/freeglut/freeglut/src/x11/freeglut_internal_x11.h
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_internal_x11.h	2012-02-05 04:21:26 UTC (rev 1062)
+++ trunk/freeglut/freeglut/src/x11/freeglut_internal_x11.h	2012-02-05 05:54:30 UTC (rev 1063)
@@ -0,0 +1,218 @@
+/*
+ * freeglut_internal_x11.h
+ *
+ * The freeglut library private include file.
+ *
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
+ * Written by Diederick C. Niehorster, <dcnieho@...>
+ * Creation date: Fri Jan 20, 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef  FREEGLUT_INTERNAL_X11_H
+#define  FREEGLUT_INTERNAL_X11_H
+
+
+/* -- PLATFORM-SPECIFIC INCLUDES ------------------------------------------- */
+#include <GL/glx.h>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <X11/keysym.h>
+#include <X11/extensions/XInput.h>
+#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
+#    include <X11/extensions/xf86vmode.h>
+#endif
+#ifdef HAVE_X11_EXTENSIONS_XRANDR_H
+#    include <X11/extensions/Xrandr.h>
+#endif
+/* If GLX is too old, we will fail during runtime when multisampling
+   is requested, but at least freeglut compiles. */
+#ifndef GLX_SAMPLE_BUFFERS
+#    define GLX_SAMPLE_BUFFERS 0x80A8
+#endif
+#ifndef GLX_SAMPLES
+#    define GLX_SAMPLES 0x80A9
+#endif
+
+
+
+/* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */
+/* The structure used by display initialization in freeglut_init.c */
+typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay;
+struct tagSFG_PlatformDisplay
+{
+    Display*        Display;            /* The display we are being run in.  */
+    int             Screen;             /* The screen we are about to use.   */
+    Window          RootWindow;         /* The screen's root window.         */
+    int             Connection;         /* The display's connection number   */
+    Atom            DeleteWindow;       /* The window deletion atom          */
+    Atom            State;              /* The state atom                    */
+    Atom            StateFullScreen;    /* The full screen atom              */
+
+#ifdef HAVE_X11_EXTENSIONS_XRANDR_H
+    int prev_xsz, prev_ysz;
+    int prev_refresh;
+    int prev_size_valid;
+#endif	/* HAVE_X11_EXTENSIONS_XRANDR_H */
+
+#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
+    /*
+     * XF86VidMode may be compilable even if it fails at runtime.  Therefore,
+     * the validity of the VidMode has to be tracked
+     */
+    int             DisplayModeValid;   /* Flag that indicates runtime status*/
+    XF86VidModeModeLine DisplayMode;    /* Current screen's display settings */
+    int             DisplayModeClock;   /* The display mode's refresh rate   */
+    int             DisplayViewPortX;   /* saved X location of the viewport  */
+    int             DisplayViewPortY;   /* saved Y location of the viewport  */
+#endif /* HAVE_X11_EXTENSIONS_XF86VMODE_H */
+
+    int             DisplayPointerX;    /* saved X location of the pointer   */
+    int             DisplayPointerY;    /* saved Y location of the pointer   */
+};
+
+
+/*
+ * Make "freeglut" window handle and context types so that we don't need so
+ * much conditionally-compiled code later in the library.
+ */
+typedef Window     SFG_WindowHandleType ;
+typedef GLXContext SFG_WindowContextType ;
+typedef struct tagSFG_PlatformContext SFG_PlatformContext;
+struct tagSFG_PlatformContext
+{
+    GLXFBConfig*    FBConfig;        /* The window's FBConfig               */
+};
+
+
+/* Window's state description. This structure should be kept portable. */
+typedef struct tagSFG_PlatformWindowState SFG_PlatformWindowState;
+struct tagSFG_PlatformWindowState
+{
+    int             OldWidth;           /* Window width from before a resize */
+    int             OldHeight;          /*   "    height  "    "    "   "    */
+};
+
+
+/* -- JOYSTICK-SPECIFIC STRUCTURES AND TYPES ------------------------------- */
+/*
+ * Initial defines from "js.h" starting around line 33 with the existing "freeglut_joystick.c"
+ * interspersed
+ */
+#    ifdef HAVE_SYS_IOCTL_H
+#        include <sys/ioctl.h>
+#    endif
+#    ifdef HAVE_FCNTL_H
+#        include <fcntl.h>
+#    endif
+#    ifdef HAVE_ERRNO_H
+#        include <errno.h>
+#        include <string.h>
+#    endif
+#    if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+/* XXX The below hack is done until freeglut's autoconf is updated. */
+#        define HAVE_USB_JS    1
+
+#        if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#            include <sys/joystick.h>
+#        else
+/*
+ * XXX NetBSD/amd64 systems may find that they have to steal the
+ * XXX /usr/include/machine/joystick.h from a NetBSD/i386 system.
+ * XXX I cannot comment whether that works for the interface, but
+ * XXX it lets you compile...(^&  I do not think that we can do away
+ * XXX with this header.
+ */
+#            include <machine/joystick.h>         /* For analog joysticks */
+#        endif
+#        define JS_DATA_TYPE joystick
+#        define JS_RETURN (sizeof(struct JS_DATA_TYPE))
+#    endif
+
+#    if defined(__linux__)
+#        include <linux/joystick.h>
+
+/* check the joystick driver version */
+#        if defined(JS_VERSION) && JS_VERSION >= 0x010000
+#            define JS_NEW
+#        endif
+#    else  /* Not BSD or Linux */
+#        ifndef JS_RETURN
+
+  /*
+   * We'll put these values in and that should
+   * allow the code to at least compile when there is
+   * no support. The JS open routine should error out
+   * and shut off all the code downstream anyway and if
+   * the application doesn't use a joystick we'll be fine.
+   */
+
+  struct JS_DATA_TYPE
+  {
+    int buttons;
+    int x;
+    int y;
+  };
+
+#            define JS_RETURN (sizeof(struct JS_DATA_TYPE))
+#        endif
+#    endif
+
+/* XXX It might be better to poll the operating system for the numbers of buttons and
+ * XXX axes and then dynamically allocate the arrays.
+ */
+#    define _JS_MAX_AXES 16
+typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;
+struct tagSFG_PlatformJoystick
+{
+#   if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+       struct os_specific_s *os;
+#   endif
+
+#   ifdef JS_NEW
+       struct js_event     js;
+       int          tmp_buttons;
+       float        tmp_axes [ _JS_MAX_AXES ];
+#   else
+       struct JS_DATA_TYPE js;
+#   endif
+
+    char         fname [ 128 ];
+    int          fd;
+};
+
+
+/* -- PRIVATE FUNCTION DECLARATIONS ---------------------------------------- */
+/* spaceball device functions, defined in freeglut_spaceball.c */
+int             fgIsSpaceballXEvent( const XEvent *ev );
+void            fgSpaceballHandleXEvent( const XEvent *ev );
+
+/*
+ * Check if "hint" is present in "property" for "window".  See freeglut_init.c
+ */
+int             fgHintPresent(Window window, Atom property, Atom hint);
+
+/* Handler for X extension Events */
+#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
+  void          fgHandleExtensionEvents( XEvent * ev );
+  void          fgRegisterDevices( Display* dpy, Window* win );
+#endif
+
+
+#endif  /* FREEGLUT_INTERNAL_X11_H */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1064
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1064&view=rev
Author:   fayjf
Date:     2012-02-05 13:53:00 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
Moving an X11-specific function call to destroy a context to the X11-specific file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_init.c
    trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c
    trunk/freeglut/freeglut/src/x11/freeglut_init_x11.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_init.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-02-05 05:54:30 UTC (rev 1063)
+++ trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-02-05 13:53:00 UTC (rev 1064)
@@ -99,6 +99,7 @@
 extern void fgPlatformInitialize( const char* displayName );
 extern void fgPlatformDeinitialiseInputDevices ( void );
 extern void fgPlatformCloseDisplay ( void );
+extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext );
 
 
 void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )
@@ -234,10 +235,7 @@
     /* If there was a menu created, destroy the rendering context */
     if( fgStructure.MenuContext )
     {
-#if TARGET_HOST_POSIX_X11
-        /* Note that the MVisualInfo is not owned by the MenuContext! */
-        glXDestroyContext( fgDisplay.pDisplay.Display, fgStructure.MenuContext->MContext );
-#endif
+		fgPlatformDestroyContext (fgDisplay.pDisplay, fgStructure.MenuContext->MContext );
         free( fgStructure.MenuContext );
         fgStructure.MenuContext = NULL;
     }

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c	2012-02-05 05:54:30 UTC (rev 1063)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_init_mswin.c	2012-02-05 13:53:00 UTC (rev 1064)
@@ -158,8 +158,11 @@
     timeEndPeriod ( 1 );
 }
 
+void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext )
+{
+	/* Do nothing -- this is required for X11 */
+}
 
-
 /*
  * Everything down to the end of the next two functions is copied from the X sources.
  */

Modified: trunk/freeglut/freeglut/src/x11/freeglut_init_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_init_x11.c	2012-02-05 05:54:30 UTC (rev 1063)
+++ trunk/freeglut/freeglut/src/x11/freeglut_init_x11.c	2012-02-05 13:53:00 UTC (rev 1064)
@@ -265,3 +265,9 @@
     XCloseDisplay( fgDisplay.pDisplay.Display );
 }
 
+
+void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext )
+{
+    /* Note that the MVisualInfo is not owned by the MenuContext! */
+    glXDestroyContext( pDisplay.Display, MContext );
+}
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1066
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1066&view=rev
Author:   fayjf
Date:     2012-02-05 14:01:34 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
Moving the platform dependencies from the "freeglut_menu.c" file to the platform-specific header files

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_menu.c
    trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
    trunk/freeglut/freeglut/src/x11/freeglut_internal_x11.h

Modified: trunk/freeglut/freeglut/src/Common/freeglut_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_menu.c	2012-02-05 13:53:31 UTC (rev 1065)
+++ trunk/freeglut/freeglut/src/Common/freeglut_menu.c	2012-02-05 14:01:34 UTC (rev 1066)
@@ -53,11 +53,7 @@
  * that that wasn't the original intent...if not, perhaps we need another
  * symbolic constant, FREEGLUT_MENU_ITEM_BORDER, or such.)
  */
-#if TARGET_HOST_MS_WINDOWS
-#define  FREEGLUT_MENU_FONT    GLUT_BITMAP_8_BY_13
-#else
-#define  FREEGLUT_MENU_FONT    GLUT_BITMAP_HELVETICA_18
-#endif
+/* See platform-specific header files for menu font and color definitions */
 
 #define  FREEGLUT_MENU_HEIGHT  (glutBitmapHeight(FREEGLUT_MENU_FONT) + \
                                 FREEGLUT_MENU_BORDER)
@@ -72,17 +68,10 @@
  * too.  These variables should be stuffed into global state and initialized
  * via the glutInit*() system.
  */
-#if TARGET_HOST_MS_WINDOWS
-static float menu_pen_fore  [4] = {0.0f,  0.0f,  0.0f,  1.0f};
-static float menu_pen_back  [4] = {0.85f, 0.85f, 0.85f, 1.0f};
-static float menu_pen_hfore [4] = {1.0f,  1.0f,  1.0f,  1.0f};
-static float menu_pen_hback [4] = {0.15f, 0.15f, 0.45f, 1.0f};
-#else
-static float menu_pen_fore  [4] = {0.0f,  0.0f,  0.0f,  1.0f};
-static float menu_pen_back  [4] = {0.70f, 0.70f, 0.70f, 1.0f};
-static float menu_pen_hfore [4] = {0.0f,  0.0f,  0.0f,  1.0f};
-static float menu_pen_hback [4] = {1.0f,  1.0f,  1.0f,  1.0f};
-#endif
+static float menu_pen_fore  [4] = FREEGLUT_MENU_PEN_FORE_COLORS ;
+static float menu_pen_back  [4] = FREEGLUT_MENU_PEN_BACK_COLORS ;
+static float menu_pen_hfore [4] = FREEGLUT_MENU_PEN_HFORE_COLORS;
+static float menu_pen_hback [4] = FREEGLUT_MENU_PEN_HBACK_COLORS;
 
 
 extern GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y );

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-02-05 13:53:31 UTC (rev 1065)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-02-05 14:01:34 UTC (rev 1066)
@@ -108,7 +108,15 @@
 #endif
 
 
+/* Menu font and color definitions */
+#define  FREEGLUT_MENU_FONT    GLUT_BITMAP_8_BY_13
 
+#define  FREEGLUT_MENU_PEN_FORE_COLORS   {0.0f,  0.0f,  0.0f,  1.0f}
+#define  FREEGLUT_MENU_PEN_BACK_COLORS   {0.85f, 0.85f, 0.85f, 1.0f}
+#define  FREEGLUT_MENU_PEN_HFORE_COLORS  {1.0f,  1.0f,  1.0f,  1.0f}
+#define  FREEGLUT_MENU_PEN_HBACK_COLORS  {0.15f, 0.15f, 0.45f, 1.0f}
+
+
 /* Function to be called on exit */
 extern void (__cdecl *__glutExitFunc)( int return_value );
 

Modified: trunk/freeglut/freeglut/src/x11/freeglut_internal_x11.h
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_internal_x11.h	2012-02-05 13:53:31 UTC (rev 1065)
+++ trunk/freeglut/freeglut/src/x11/freeglut_internal_x11.h	2012-02-05 14:01:34 UTC (rev 1066)
@@ -198,6 +198,17 @@
 };
 
 
+/* Menu font and color definitions */
+#define  FREEGLUT_MENU_FONT    GLUT_BITMAP_HELVETICA_18
+
+#define  FREEGLUT_MENU_PEN_FORE_COLORS   {0.0f,  0.0f,  0.0f,  1.0f}
+#define  FREEGLUT_MENU_PEN_BACK_COLORS   {0.70f, 0.70f, 0.70f, 1.0f}
+#define  FREEGLUT_MENU_PEN_HFORE_COLORS  {0.0f,  0.0f,  0.0f,  1.0f}
+#define  FREEGLUT_MENU_PEN_HBACK_COLORS  {1.0f,  1.0f,  1.0f,  1.0f}
+
+
+
+
 /* -- PRIVATE FUNCTION DECLARATIONS ---------------------------------------- */
 /* spaceball device functions, defined in freeglut_spaceball.c */
 int             fgIsSpaceballXEvent( const XEvent *ev );

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1067
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1067&view=rev
Author:   fayjf
Date:     2012-02-05 14:04:48 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
Splitting the X11-specific "freeglut_cursor.c" code into its own file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_cursor.c
    trunk/freeglut/freeglut/src/x11/freeglut_cursor_x11.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_cursor.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_cursor.c	2012-02-05 14:01:34 UTC (rev 1066)
+++ trunk/freeglut/freeglut/src/Common/freeglut_cursor.c	2012-02-05 14:04:48 UTC (rev 1067)
@@ -42,129 +42,8 @@
 extern void fgPlatformSetCursor ( SFG_Window *window, int cursorID );
 extern void fgPlatformWarpPointer ( int x, int y );
 
-#if TARGET_HOST_POSIX_X11 || TARGET_HOST_MAC_OSX || TARGET_HOST_SOLARIS
-  #include <X11/cursorfont.h>
 
-/*
- * A factory method for an empty cursor
- */
-static Cursor getEmptyCursor( void )
-{
-    static Cursor cursorNone = None;
-    if( cursorNone == None ) {
-        char cursorNoneBits[ 32 ];
-        XColor dontCare;
-        Pixmap cursorNonePixmap;
-        memset( cursorNoneBits, 0, sizeof( cursorNoneBits ) );
-        memset( &dontCare, 0, sizeof( dontCare ) );
-        cursorNonePixmap = XCreateBitmapFromData ( fgDisplay.pDisplay.Display,
-                                                   fgDisplay.pDisplay.RootWindow,
-                                                   cursorNoneBits, 16, 16 );
-        if( cursorNonePixmap != None ) {
-            cursorNone = XCreatePixmapCursor( fgDisplay.pDisplay.Display,
-                                              cursorNonePixmap, cursorNonePixmap,
-                                              &dontCare, &dontCare, 0, 0 );
-            XFreePixmap( fgDisplay.pDisplay.Display, cursorNonePixmap );
-        }
-    }
-    return cursorNone;
-}
 
-typedef struct tag_cursorCacheEntry cursorCacheEntry;
-struct tag_cursorCacheEntry {
-    unsigned int cursorShape;    /* an XC_foo value */
-    Cursor cachedCursor;         /* None if the corresponding cursor has
-                                    not been created yet */
-};
-
-/*
- * Note: The arrangement of the table below depends on the fact that
- * the "normal" GLUT_CURSOR_* values start a 0 and are consecutive.
- */ 
-static cursorCacheEntry cursorCache[] = {
-    { XC_arrow,               None }, /* GLUT_CURSOR_RIGHT_ARROW */
-    { XC_top_left_arrow,      None }, /* GLUT_CURSOR_LEFT_ARROW */
-    { XC_hand1,               None }, /* GLUT_CURSOR_INFO */
-    { XC_pirate,              None }, /* GLUT_CURSOR_DESTROY */
-    { XC_question_arrow,      None }, /* GLUT_CURSOR_HELP */
-    { XC_exchange,            None }, /* GLUT_CURSOR_CYCLE */
-    { XC_spraycan,            None }, /* GLUT_CURSOR_SPRAY */
-    { XC_watch,               None }, /* GLUT_CURSOR_WAIT */
-    { XC_xterm,               None }, /* GLUT_CURSOR_TEXT */
-    { XC_crosshair,           None }, /* GLUT_CURSOR_CROSSHAIR */
-    { XC_sb_v_double_arrow,   None }, /* GLUT_CURSOR_UP_DOWN */
-    { XC_sb_h_double_arrow,   None }, /* GLUT_CURSOR_LEFT_RIGHT */
-    { XC_top_side,            None }, /* GLUT_CURSOR_TOP_SIDE */
-    { XC_bottom_side,         None }, /* GLUT_CURSOR_BOTTOM_SIDE */
-    { XC_left_side,           None }, /* GLUT_CURSOR_LEFT_SIDE */
-    { XC_right_side,          None }, /* GLUT_CURSOR_RIGHT_SIDE */
-    { XC_top_left_corner,     None }, /* GLUT_CURSOR_TOP_LEFT_CORNER */
-    { XC_top_right_corner,    None }, /* GLUT_CURSOR_TOP_RIGHT_CORNER */
-    { XC_bottom_right_corner, None }, /* GLUT_CURSOR_BOTTOM_RIGHT_CORNER */
-    { XC_bottom_left_corner,  None }  /* GLUT_CURSOR_BOTTOM_LEFT_CORNER */
-};
-
-void fgPlatformSetCursor ( SFG_Window *window, int cursorID )
-{
-    Cursor cursor;
-    /*
-     * XXX FULL_CROSSHAIR demotes to plain CROSSHAIR. Old GLUT allows
-     * for this, but if there is a system that easily supports a full-
-     * window (or full-screen) crosshair, we might consider it.
-     */
-    int cursorIDToUse =
-        ( cursorID == GLUT_CURSOR_FULL_CROSSHAIR ) ? GLUT_CURSOR_CROSSHAIR : cursorID;
-
-    if( ( cursorIDToUse >= 0 ) &&
-        ( cursorIDToUse < sizeof( cursorCache ) / sizeof( cursorCache[0] ) ) ) {
-        cursorCacheEntry *entry = &cursorCache[ cursorIDToUse ];
-        if( entry->cachedCursor == None ) {
-            entry->cachedCursor =
-                XCreateFontCursor( fgDisplay.pDisplay.Display, entry->cursorShape );
-        }
-        cursor = entry->cachedCursor;
-    } else {
-        switch( cursorIDToUse )
-        {
-        case GLUT_CURSOR_NONE:
-            cursor = getEmptyCursor( );
-            break;
-
-        case GLUT_CURSOR_INHERIT:
-            cursor = None;
-            break;
-
-        default:
-            fgError( "Unknown cursor type: %d", cursorIDToUse );
-            return;
-        }
-    }
-
-    if ( cursorIDToUse == GLUT_CURSOR_INHERIT ) {
-        XUndefineCursor( fgDisplay.pDisplay.Display, window->Window.Handle );
-    } else if ( cursor != None ) {
-        XDefineCursor( fgDisplay.pDisplay.Display, window->Window.Handle, cursor );
-    } else if ( cursorIDToUse != GLUT_CURSOR_NONE ) {
-        fgError( "Failed to create cursor" );
-    }
-}
-
-
-void fgPlatformWarpPointer ( int x, int y )
-{
-    XWarpPointer(
-        fgDisplay.pDisplay.Display,
-        None,
-        fgStructure.CurrentWindow->Window.Handle,
-        0, 0, 0, 0,
-        x, y
-    );
-    /* Make the warp visible immediately. */
-    XFlush( fgDisplay.pDisplay.Display );
-}
-#endif
-
-
 /* -- INTERNAL FUNCTIONS ---------------------------------------------------- */
 void fgSetCursor ( SFG_Window *window, int cursorID )
 {

Modified: trunk/freeglut/freeglut/src/x11/freeglut_cursor_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_cursor_x11.c	2012-02-05 14:01:34 UTC (rev 1066)
+++ trunk/freeglut/freeglut/src/x11/freeglut_cursor_x11.c	2012-02-05 14:04:48 UTC (rev 1067)
@@ -0,0 +1,151 @@
+/*
+ * freeglut_cursor_x11.c
+ *
+ * The Windows-specific mouse cursor related stuff.
+ *
+ * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
+ * Written by John F. Fay, <fayjf@...>
+ * Creation date: Sun Feb 5, 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "../Common/freeglut_internal.h"
+
+/* This code is for Posix/X11, Solaris, and OSX */
+#include <X11/cursorfont.h>
+
+/*
+ * A factory method for an empty cursor
+ */
+static Cursor getEmptyCursor( void )
+{
+    static Cursor cursorNone = None;
+    if( cursorNone == None ) {
+        char cursorNoneBits[ 32 ];
+        XColor dontCare;
+        Pixmap cursorNonePixmap;
+        memset( cursorNoneBits, 0, sizeof( cursorNoneBits ) );
+        memset( &dontCare, 0, sizeof( dontCare ) );
+        cursorNonePixmap = XCreateBitmapFromData ( fgDisplay.pDisplay.Display,
+                                                   fgDisplay.pDisplay.RootWindow,
+                                                   cursorNoneBits, 16, 16 );
+        if( cursorNonePixmap != None ) {
+            cursorNone = XCreatePixmapCursor( fgDisplay.pDisplay.Display,
+                                              cursorNonePixmap, cursorNonePixmap,
+                                              &dontCare, &dontCare, 0, 0 );
+            XFreePixmap( fgDisplay.pDisplay.Display, cursorNonePixmap );
+        }
+    }
+    return cursorNone;
+}
+
+typedef struct tag_cursorCacheEntry cursorCacheEntry;
+struct tag_cursorCacheEntry {
+    unsigned int cursorShape;    /* an XC_foo value */
+    Cursor cachedCursor;         /* None if the corresponding cursor has
+                                    not been created yet */
+};
+
+/*
+ * Note: The arrangement of the table below depends on the fact that
+ * the "normal" GLUT_CURSOR_* values start a 0 and are consecutive.
+ */ 
+static cursorCacheEntry cursorCache[] = {
+    { XC_arrow,               None }, /* GLUT_CURSOR_RIGHT_ARROW */
+    { XC_top_left_arrow,      None }, /* GLUT_CURSOR_LEFT_ARROW */
+    { XC_hand1,               None }, /* GLUT_CURSOR_INFO */
+    { XC_pirate,              None }, /* GLUT_CURSOR_DESTROY */
+    { XC_question_arrow,      None }, /* GLUT_CURSOR_HELP */
+    { XC_exchange,            None }, /* GLUT_CURSOR_CYCLE */
+    { XC_spraycan,            None }, /* GLUT_CURSOR_SPRAY */
+    { XC_watch,               None }, /* GLUT_CURSOR_WAIT */
+    { XC_xterm,               None }, /* GLUT_CURSOR_TEXT */
+    { XC_crosshair,           None }, /* GLUT_CURSOR_CROSSHAIR */
+    { XC_sb_v_double_arrow,   None }, /* GLUT_CURSOR_UP_DOWN */
+    { XC_sb_h_double_arrow,   None }, /* GLUT_CURSOR_LEFT_RIGHT */
+    { XC_top_side,            None }, /* GLUT_CURSOR_TOP_SIDE */
+    { XC_bottom_side,         None }, /* GLUT_CURSOR_BOTTOM_SIDE */
+    { XC_left_side,           None }, /* GLUT_CURSOR_LEFT_SIDE */
+    { XC_right_side,          None }, /* GLUT_CURSOR_RIGHT_SIDE */
+    { XC_top_left_corner,     None }, /* GLUT_CURSOR_TOP_LEFT_CORNER */
+    { XC_top_right_corner,    None }, /* GLUT_CURSOR_TOP_RIGHT_CORNER */
+    { XC_bottom_right_corner, None }, /* GLUT_CURSOR_BOTTOM_RIGHT_CORNER */
+    { XC_bottom_left_corner,  None }  /* GLUT_CURSOR_BOTTOM_LEFT_CORNER */
+};
+
+void fgPlatformSetCursor ( SFG_Window *window, int cursorID )
+{
+    Cursor cursor;
+    /*
+     * XXX FULL_CROSSHAIR demotes to plain CROSSHAIR. Old GLUT allows
+     * for this, but if there is a system that easily supports a full-
+     * window (or full-screen) crosshair, we might consider it.
+     */
+    int cursorIDToUse =
+        ( cursorID == GLUT_CURSOR_FULL_CROSSHAIR ) ? GLUT_CURSOR_CROSSHAIR : cursorID;
+
+    if( ( cursorIDToUse >= 0 ) &&
+        ( cursorIDToUse < sizeof( cursorCache ) / sizeof( cursorCache[0] ) ) ) {
+        cursorCacheEntry *entry = &cursorCache[ cursorIDToUse ];
+        if( entry->cachedCursor == None ) {
+            entry->cachedCursor =
+                XCreateFontCursor( fgDisplay.pDisplay.Display, entry->cursorShape );
+        }
+        cursor = entry->cachedCursor;
+    } else {
+        switch( cursorIDToUse )
+        {
+        case GLUT_CURSOR_NONE:
+            cursor = getEmptyCursor( );
+            break;
+
+        case GLUT_CURSOR_INHERIT:
+            cursor = None;
+            break;
+
+        default:
+            fgError( "Unknown cursor type: %d", cursorIDToUse );
+            return;
+        }
+    }
+
+    if ( cursorIDToUse == GLUT_CURSOR_INHERIT ) {
+        XUndefineCursor( fgDisplay.pDisplay.Display, window->Window.Handle );
+    } else if ( cursor != None ) {
+        XDefineCursor( fgDisplay.pDisplay.Display, window->Window.Handle, cursor );
+    } else if ( cursorIDToUse != GLUT_CURSOR_NONE ) {
+        fgError( "Failed to create cursor" );
+    }
+}
+
+
+void fgPlatformWarpPointer ( int x, int y )
+{
+    XWarpPointer(
+        fgDisplay.pDisplay.Display,
+        None,
+        fgStructure.CurrentWindow->Window.Handle,
+        0, 0, 0, 0,
+        x, y
+    );
+    /* Make the warp visible immediately. */
+    XFlush( fgDisplay.pDisplay.Display );
+}
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1077
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1077&view=rev
Author:   fayjf
Date:     2012-02-12 04:41:32 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
Moving some Windows-specific preprocessor stuff and a prototype from "freeglut_init.c" to the Windows header file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_init.c
    trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h

Modified: trunk/freeglut/freeglut/src/Common/freeglut_init.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-02-08 02:39:29 UTC (rev 1076)
+++ trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-02-12 04:41:32 UTC (rev 1077)
@@ -314,24 +314,6 @@
 }
 
 
-#if TARGET_HOST_MS_WINDOWS
-#define NoValue         0x0000
-#define XValue          0x0001
-#define YValue          0x0002
-#define WidthValue      0x0004
-#define HeightValue     0x0008
-#define AllValues       0x000F
-#define XNegative       0x0010
-#define YNegative       0x0020
-
-extern int XParseGeometry (
-    const char *string,
-    int *x,
-    int *y,
-    unsigned int *width,    /* RETURN */
-    unsigned int *height);    /* RETURN */
-#endif
-
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
 
 /*

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-02-08 02:39:29 UTC (rev 1076)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_internal_mswin.h	2012-02-12 04:41:32 UTC (rev 1077)
@@ -95,6 +95,25 @@
 
 
 
+/* For "freeglut_init.c", some definitions of symbols and a prototype to emulate the X11 functionality */
+#define NoValue         0x0000
+#define XValue          0x0001
+#define YValue          0x0002
+#define WidthValue      0x0004
+#define HeightValue     0x0008
+#define AllValues       0x000F
+#define XNegative       0x0010
+#define YNegative       0x0020
+
+extern int XParseGeometry (
+    const char *string,
+    int *x,
+    int *y,
+    unsigned int *width,    /* RETURN */
+    unsigned int *height);    /* RETURN */
+
+
+
 /* Joystick-Specific Definitions */
 #if !defined(_WIN32_WCE)
 #    define _JS_MAX_AXES  8

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1096
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1096&view=rev
Author:   dcnieho
Date:     2012-03-10 03:07:13 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
moved some windows only code from common to windows specific
got rid of fgPlatformGlutLayerGet as we'll never implement layer support
(added some notes too)
added note about implementability of glutGetModeValues
Moved joystick function from misc to Joystick code file

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_joystick.c
    trunk/freeglut/freeglut/src/Common/freeglut_main.c
    trunk/freeglut/freeglut/src/Common/freeglut_misc.c
    trunk/freeglut/freeglut/src/Common/freeglut_state.c
    trunk/freeglut/freeglut/src/Common/freeglut_window.c
    trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c
    trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c
    trunk/freeglut/freeglut/src/x11/freeglut_state_x11.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_joystick.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_joystick.c	2012-03-10 02:03:32 UTC (rev 1095)
+++ trunk/freeglut/freeglut/src/Common/freeglut_joystick.c	2012-03-10 03:07:13 UTC (rev 1096)
@@ -976,8 +976,21 @@
 }
 
 /*
- * Joystick information functions
+ * Joystick information, setup and execution functions
  */
+
+/*
+ * Forces the joystick callback to be executed
+ */
+void FGAPIENTRY glutForceJoystickFunc( void )
+{
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutForceJoystickFunc" );
+#if !defined(_WIN32_WCE)
+    freeglut_return_if_fail( fgStructure.CurrentWindow != NULL );
+    freeglut_return_if_fail( FETCH_WCB( *( fgStructure.CurrentWindow ), Joystick ) );
+    fgJoystickPollWindow( fgStructure.CurrentWindow );
+#endif /* !defined(_WIN32_WCE) */
+}
 int  glutJoystickGetNumAxes( int ident )
 {
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutJoystickGetNumAxes" );

Modified: trunk/freeglut/freeglut/src/Common/freeglut_main.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_main.c	2012-03-10 02:03:32 UTC (rev 1095)
+++ trunk/freeglut/freeglut/src/Common/freeglut_main.c	2012-03-10 03:07:13 UTC (rev 1096)
@@ -39,22 +39,6 @@
 #    define VFPRINTF(s,f,a)
 #endif
 
-#ifdef _WIN32_WCE
-
-typedef struct GXDisplayProperties GXDisplayProperties;
-typedef struct GXKeyList GXKeyList;
-#include <gx.h>
-
-typedef struct GXKeyList (*GXGETDEFAULTKEYS)(int);
-typedef int (*GXOPENINPUT)();
-
-GXGETDEFAULTKEYS GXGetDefaultKeys_ = NULL;
-GXOPENINPUT GXOpenInput_ = NULL;
-
-struct GXKeyList gxKeyList;
-
-#endif /* _WIN32_WCE */
-
 /*
  * Try to get the maximum value allowed for ints, falling back to the minimum
  * guaranteed by ISO C99 if there is no suitable header.

Modified: trunk/freeglut/freeglut/src/Common/freeglut_misc.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_misc.c	2012-03-10 02:03:32 UTC (rev 1095)
+++ trunk/freeglut/freeglut/src/Common/freeglut_misc.c	2012-03-10 03:07:13 UTC (rev 1096)
@@ -171,19 +171,6 @@
 }
 
 /*
- * Forces the joystick callback to be executed
- */
-void FGAPIENTRY glutForceJoystickFunc( void )
-{
-    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutForceJoystickFunc" );
-#if !defined(_WIN32_WCE)
-    freeglut_return_if_fail( fgStructure.CurrentWindow != NULL );
-    freeglut_return_if_fail( FETCH_WCB( *( fgStructure.CurrentWindow ), Joystick ) );
-    fgJoystickPollWindow( fgStructure.CurrentWindow );
-#endif /* !defined(_WIN32_WCE) */
-}
-
-/*
  *
  */
 void FGAPIENTRY glutSetColor( int nColor, GLfloat red, GLfloat green, GLfloat blue )

Modified: trunk/freeglut/freeglut/src/Common/freeglut_state.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_state.c	2012-03-10 02:03:32 UTC (rev 1095)
+++ trunk/freeglut/freeglut/src/Common/freeglut_state.c	2012-03-10 03:07:13 UTC (rev 1096)
@@ -43,7 +43,6 @@
 
 extern int fgPlatformGlutGet ( GLenum eWhat );
 extern int fgPlatformGlutDeviceGet ( GLenum eWhat );
-extern int fgPlatformGlutLayerGet ( GLenum eWhat );
 extern int *fgPlatformGlutGetModeValues(GLenum eWhat, int *size);
 
 
@@ -291,16 +290,41 @@
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutLayerGet" );
 
     /*
-     * This is easy as layers are not implemented ;-)
-     *
-     * XXX Can we merge the UNIX/X11 and WIN32 sections?  Or
-     * XXX is overlay support planned?
+     * This is easy as layers are not implemented and
+     * overlay support is not planned. E.g. on Windows,
+     * overlay requests in PFDs are ignored
+     * (see iLayerType at http://msdn.microsoft.com/en-us/library/dd368826(v=vs.85).aspx)
      */
     switch( eWhat )
     {
 
+    case GLUT_OVERLAY_POSSIBLE:
+        return 0 ;
+
+    case GLUT_LAYER_IN_USE:
+        return GLUT_NORMAL;
+
+    case GLUT_HAS_OVERLAY:
+        return 0;
+
+    case GLUT_TRANSPARENT_INDEX:
+        /*
+        * Return just anything, which is always defined as zero
+        *
+        * XXX HUH?
+        */
+        return 0;
+
+    case GLUT_NORMAL_DAMAGED:
+        /* XXX Actually I do not know. Maybe. */
+        return 0;
+
+    case GLUT_OVERLAY_DAMAGED:
+        return -1;
+
     default:
-        return fgPlatformGlutLayerGet( eWhat );
+        fgWarning( "glutLayerGet(): missing enum handle %d", eWhat );
+        break;
     }
 
     /* And fail. That's good. Programs do love failing. */

Modified: trunk/freeglut/freeglut/src/Common/freeglut_window.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-03-10 02:03:32 UTC (rev 1095)
+++ trunk/freeglut/freeglut/src/Common/freeglut_window.c	2012-03-10 03:07:13 UTC (rev 1096)
@@ -29,14 +29,6 @@
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
-#if defined(_WIN32_WCE)
-#   include <Aygshell.h>
-#   ifdef FREEGLUT_LIB_PRAGMAS
-#       pragma comment( lib, "Aygshell.lib" )
-#   endif
-#endif /* defined(_WIN32_WCE) */
-
-
 /*
  * TODO BEFORE THE STABLE RELEASE:
  *

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c	2012-03-10 02:03:32 UTC (rev 1095)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_main_mswin.c	2012-03-10 03:07:13 UTC (rev 1096)
@@ -42,6 +42,20 @@
 static pCloseTouchInputHandle fghCloseTouchInputHandle = (pCloseTouchInputHandle)0xDEADBEEF;
 #endif
 
+#ifdef _WIN32_WCE
+typedef struct GXDisplayProperties GXDisplayProperties;
+typedef struct GXKeyList GXKeyList;
+#include <gx.h>
+
+typedef struct GXKeyList (*GXGETDEFAULTKEYS)(int);
+typedef int (*GXOPENINPUT)();
+
+GXGETDEFAULTKEYS GXGetDefaultKeys_ = NULL;
+GXOPENINPUT GXOpenInput_ = NULL;
+
+struct GXKeyList gxKeyList;
+#endif /* _WIN32_WCE */
+
 /* 
  * Helper functions for getting client area from the window rect
  * and the window rect from the client area given the style of the window

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c	2012-03-10 02:03:32 UTC (rev 1095)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_state_mswin.c	2012-03-10 03:07:13 UTC (rev 1096)
@@ -47,8 +47,15 @@
  */
 #define WGL_SAMPLES_ARB                0x2042
 
+#if defined(_WIN32_WCE)
+#   include <Aygshell.h>
+#   ifdef FREEGLUT_LIB_PRAGMAS
+#       pragma comment( lib, "Aygshell.lib" )
+#   endif
+#endif /* defined(_WIN32_WCE) */
 
 
+
 int fgPlatformGlutGet ( GLenum eWhat )
 {
     int returnValue ;
@@ -283,55 +290,15 @@
     return -1;
 }
 
-
-int fgPlatformGlutLayerGet( GLenum eWhat )
-{
-    /*
-     * This is easy as layers are not implemented ;-)
-     *
-     * XXX Can we merge the UNIX/X11 and WIN32 sections?  Or
-     * XXX is overlay support planned?
-     */
-    switch( eWhat )
-    {
-
-    case GLUT_OVERLAY_POSSIBLE:
-/*      return fgSetupPixelFormat( fgStructure.CurrentWindow, GL_TRUE,
-                                   PFD_OVERLAY_PLANE ); */
-      return 0 ;
-
-    case GLUT_LAYER_IN_USE:
-        return GLUT_NORMAL;
-
-    case GLUT_HAS_OVERLAY:
-        return 0;
-
-    case GLUT_TRANSPARENT_INDEX:
-        /*
-         * Return just anything, which is always defined as zero
-         *
-         * XXX HUH?
-         */
-        return 0;
-
-    case GLUT_NORMAL_DAMAGED:
-        /* XXX Actually I do not know. Maybe. */
-        return 0;
-
-    case GLUT_OVERLAY_DAMAGED:
-        return -1;
-
-    default:
-        fgWarning( "glutLayerGet(): missing enum handle %d", eWhat );
-        break;
-    }
-
-    /* And fail. That's good. Programs do love failing. */
-    return -1;
-}
-
-
-/* MSwin does not currently have any Mode values? */
+/*
+ * This is for querying the number of supported auxiliary or multisample
+ * buffers for a (the current?) display mode.
+ * see http://old.nabble.com/-GLX--glutGetModeValues-to13514723.html#a13514723
+ * Not currently implemented, but we should be able to query the relevant
+ * info using
+ * http://www.opengl.org/registry/specs/ARB/wgl_pixel_format.txt
+ * (if supported on the executing machine!)
+ */
 int *fgPlatformGlutGetModeValues(GLenum eWhat, int *size)
 {
   *size = 0;

Modified: trunk/freeglut/freeglut/src/x11/freeglut_state_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/freeglut_state_x11.c	2012-03-10 02:03:32 UTC (rev 1095)
+++ trunk/freeglut/freeglut/src/x11/freeglut_state_x11.c	2012-03-10 03:07:13 UTC (rev 1096)
@@ -255,50 +255,7 @@
     return -1;
 }
 
-int fgPlatformGlutLayerGet( GLenum eWhat )
-{
-    /*
-     * This is easy as layers are not implemented ;-)
-     *
-     * XXX Can we merge the UNIX/X11 and WIN32 sections?  Or
-     * XXX is overlay support planned?
-     */
-    switch( eWhat )
-    {
-    case GLUT_OVERLAY_POSSIBLE:
-        return 0;
 
-    case GLUT_LAYER_IN_USE:
-        return GLUT_NORMAL;
-
-    case GLUT_HAS_OVERLAY:
-        return 0;
-
-    case GLUT_TRANSPARENT_INDEX:
-        /*
-         * Return just anything, which is always defined as zero
-         *
-         * XXX HUH?
-         */
-        return 0;
-
-    case GLUT_NORMAL_DAMAGED:
-        /* XXX Actually I do not know. Maybe. */
-        return 0;
-
-    case GLUT_OVERLAY_DAMAGED:
-        return -1;
-
-    default:
-        fgWarning( "glutLayerGet(): missing enum handle %d", eWhat );
-        break;
-    }
-
-    /* And fail. That's good. Programs do love failing. */
-    return -1;
-}
-
-
 int *fgPlatformGlutGetModeValues(GLenum eWhat, int *size)
 {
   int *array;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1097
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1097&view=rev
Author:   dcnieho
Date:     2012-03-10 03:17:55 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
in freeglut_init set gamemode defaults to -1 (no change from current
display mode) so that it is not attempted to change the display mode
to some arbitrary default when entering gamemode (only applies if
glutGameModeString is never called)

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/Common/freeglut_init.c
    trunk/freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c

Modified: trunk/freeglut/freeglut/src/Common/freeglut_init.c
===================================================================
--- trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-03-10 03:07:13 UTC (rev 1096)
+++ trunk/freeglut/freeglut/src/Common/freeglut_init.c	2012-03-10 03:17:55 UTC (rev 1097)
@@ -73,9 +73,9 @@
                       0,                      /* ActiveMenus */
                       NULL,                   /* MenuStateCallback */
                       NULL,                   /* MenuStatusCallback */
-                      { 640, 480, GL_TRUE },  /* GameModeSize */
-                      16,                     /* GameModeDepth */
-                      72,                     /* GameModeRefresh */
+                      { -1, -1, GL_TRUE },    /* GameModeSize */
+                      -1,                     /* GameModeDepth */
+                      -1,                     /* GameModeRefresh */
                       GLUT_ACTION_EXIT,       /* ActionOnWindowClose */
                       GLUT_EXEC_STATE_INIT,   /* ExecState */
                       NULL,                   /* ProgramName */
@@ -286,10 +286,10 @@
     fgState.KeyRepeat       = GLUT_KEY_REPEAT_ON;
     fgState.Modifiers       = INVALID_MODIFIERS;
 
-    fgState.GameModeSize.X  = 640;
-    fgState.GameModeSize.Y  = 480;
-    fgState.GameModeDepth   =  16;
-    fgState.GameModeRefresh =  72;
+    fgState.GameModeSize.X  = -1;
+    fgState.GameModeSize.Y  = -1;
+    fgState.GameModeDepth   = -1;
+    fgState.GameModeRefresh = -1;
 
     fgListInit( &fgState.Timers );
     fgListInit( &fgState.FreeTimers );

Modified: trunk/freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c	2012-03-10 03:07:13 UTC (rev 1096)
+++ trunk/freeglut/freeglut/src/mswin/freeglut_gamemode_mswin.c	2012-03-10 03:17:55 UTC (rev 1097)
@@ -34,12 +34,10 @@
  */
 void fgPlatformRememberState( void )
 {
-/*    DEVMODE devMode; */
-
     /* Grab the current desktop settings... */
 
-/* hack to get around my stupid cross-gcc headers */
-#define FREEGLUT_ENUM_CURRENT_SETTINGS -1
+    /* hack to get around my stupid cross-gcc headers */
+    #define FREEGLUT_ENUM_CURRENT_SETTINGS -1
 
     EnumDisplaySettings( fgDisplay.pDisplay.DisplayName, FREEGLUT_ENUM_CURRENT_SETTINGS,
                          &fgDisplay.pDisplay.DisplayMode );
@@ -57,7 +55,6 @@
 {
     /* Restore the previously remembered desktop display settings */
     ChangeDisplaySettingsEx( fgDisplay.pDisplay.DisplayName,&fgDisplay.pDisplay.DisplayMode, 0,0,0 );
-
 }
 
 
@@ -154,4 +151,3 @@
 void fgPlatformLeaveGameMode( void ) 
 {
 }
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1173
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1173&view=rev
Author:   beuc
Date:     2012-03-17 10:09:19 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
EGL: separate config and context code

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/android/fg_window_android.c
    trunk/freeglut/freeglut/src/egl/fg_init_egl.c
    trunk/freeglut/freeglut/src/egl/fg_internal_egl.h
    trunk/freeglut/freeglut/src/egl/fg_structure_egl.c
    trunk/freeglut/freeglut/src/egl/fg_window_egl.c

Modified: trunk/freeglut/freeglut/src/android/fg_window_android.c
===================================================================
--- trunk/freeglut/freeglut/src/android/fg_window_android.c	2012-03-17 07:05:25 UTC (rev 1172)
+++ trunk/freeglut/freeglut/src/android/fg_window_android.c	2012-03-17 10:09:19 UTC (rev 1173)
@@ -52,6 +52,7 @@
     return;
   }
 
+  fghChooseConfigEGL(&window->Window.pContext.egl.Config);
   fghCreateNewContextEGL(window);
 
   /* Wait until window is available and OpenGL context is created */
@@ -67,8 +68,16 @@
   }
 
   EGLDisplay display = fgDisplay.pDisplay.egl.Display;
-  EGLint format = fgDisplay.pDisplay.single_window->Window.pContext.egl.ContextFormat;
-  ANativeWindow_setBuffersGeometry(window->Window.Handle, 0, 0, format);
+
+  /* EGL_NATIVE_VISUAL_ID is an attribute of the EGLConfig that is
+   * guaranteed to be accepted by ANativeWindow_setBuffersGeometry().
+   * As soon as we picked a EGLConfig, we can safely reconfigure the
+   * ANativeWindow buffers to match, using EGL_NATIVE_VISUAL_ID. */
+  EGLint vid;
+  eglGetConfigAttrib(display, window->Window.pContext.egl.Config,
+		     EGL_NATIVE_VISUAL_ID, &vid);
+
+  ANativeWindow_setBuffersGeometry(window->Window.Handle, 0, 0, vid);
   fghPlatformOpenWindowEGL(window);
 
   window->State.Visible = GL_TRUE;

Modified: trunk/freeglut/freeglut/src/egl/fg_init_egl.c
===================================================================
--- trunk/freeglut/freeglut/src/egl/fg_init_egl.c	2012-03-17 07:05:25 UTC (rev 1172)
+++ trunk/freeglut/freeglut/src/egl/fg_init_egl.c	2012-03-17 10:09:19 UTC (rev 1173)
@@ -47,6 +47,12 @@
   if (!eglInitialize(fgDisplay.pDisplay.egl.Display, NULL, NULL))
     fgError("eglInitialize: error %x\n", eglGetError());
 
+# ifdef GL_VERSION_1_1  /* or later */
+  eglBindAPI(EGL_OPENGL_API);
+# else
+  eglBindAPI(EGL_OPENGL_ES_API);
+# endif
+
   // fgDisplay.ScreenWidth = ...;
   // fgDisplay.ScreenHeight = ...;
   // fgDisplay.ScreenWidthMM = ...;

Modified: trunk/freeglut/freeglut/src/egl/fg_internal_egl.h
===================================================================
--- trunk/freeglut/freeglut/src/egl/fg_internal_egl.h	2012-03-17 07:05:25 UTC (rev 1172)
+++ trunk/freeglut/freeglut/src/egl/fg_internal_egl.h	2012-03-17 10:09:19 UTC (rev 1173)
@@ -47,8 +47,7 @@
 struct tagSFG_PlatformContextEGL
 {
   EGLSurface          Surface;
-  EGLConfig           ContextConfig;
-  EGLint              ContextFormat;
+  EGLConfig           Config;
 };
 
 

Modified: trunk/freeglut/freeglut/src/egl/fg_structure_egl.c
===================================================================
--- trunk/freeglut/freeglut/src/egl/fg_structure_egl.c	2012-03-17 07:05:25 UTC (rev 1172)
+++ trunk/freeglut/freeglut/src/egl/fg_structure_egl.c	2012-03-17 10:09:19 UTC (rev 1173)
@@ -31,5 +31,5 @@
 void fgPlatformCreateWindow ( SFG_Window *window )
 {
   window->Window.pContext.egl.Surface = EGL_NO_SURFACE;
-  window->Window.pContext.egl.ContextConfig = NULL;
+  window->Window.pContext.egl.Config = NULL;
 }

Modified: trunk/freeglut/freeglut/src/egl/fg_window_egl.c
===================================================================
--- trunk/freeglut/freeglut/src/egl/fg_window_egl.c	2012-03-17 07:05:25 UTC (rev 1172)
+++ trunk/freeglut/freeglut/src/egl/fg_window_egl.c	2012-03-17 10:09:19 UTC (rev 1173)
@@ -26,20 +26,16 @@
 #include <GL/freeglut.h>
 #include "fg_internal.h"
 
-/**
- * Initialize an EGL context for the current display.
- */
-void fghCreateNewContextEGL( SFG_Window* window ) {
-  /*
-   * Here specify the attributes of the desired configuration.
-   * Below, we select an EGLConfig with at least 8 bits per color
-   * component compatible with on-screen windows
-   */
-  /* Ensure OpenGLES 2.0 context */
-  printf("DisplayMode: %d (DEPTH %d)\n", fgState.DisplayMode, (fgState.DisplayMode & GLUT_DEPTH));
+void fghChooseConfigEGL(EGLConfig* config) {
   const EGLint attribs[] = {
     EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+#ifdef GL_ES_VERSION_2_0
     EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+#elif GL_VERSION_ES_CM_1_0 || GL_VERSION_ES_CL_1_0 || GL_VERSION_ES_CM_1_1 || GL_VERSION_ES_CL_1_1
+    EGL_RENDERABLE_TYPE, EGL_OPENGL_ES_BIT,
+#else
+    EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+#endif
     EGL_BLUE_SIZE, 1,
     EGL_GREEN_SIZE, 1,
     EGL_RED_SIZE, 1,
@@ -50,34 +46,32 @@
     EGL_SAMPLES, (fgState.DisplayMode & GLUT_MULTISAMPLE) ? fgState.SampleNumber : 0,
     EGL_NONE
   };
+  
+  EGLint num_config;
+  if (!eglChooseConfig(fgDisplay.pDisplay.egl.Display,
+		       attribs, config, 1, &num_config))
+    fgError("eglChooseConfig: error %x\n", eglGetError());
+}
 
-  EGLint format;
-  EGLint numConfigs;
-  EGLConfig config;
+/**
+ * Initialize an EGL context for the current display.
+ */
+void fghCreateNewContextEGL( SFG_Window* window ) {
   EGLContext context;
 
   EGLDisplay eglDisplay = fgDisplay.pDisplay.egl.Display;
+  EGLConfig eglConfig = window->Window.pContext.egl.Config;
 
-  /* Here, the application chooses the configuration it desires. In this
-   * sample, we have a very simplified selection process, where we pick
-   * the first EGLConfig that matches our criteria */
-  eglChooseConfig(eglDisplay, attribs, &config, 1, &numConfigs);
-
-  /* EGL_NATIVE_VISUAL_ID is an attribute of the EGLConfig that is
-   * guaranteed to be accepted by ANativeWindow_setBuffersGeometry().
-   * As soon as we picked a EGLConfig, we can safely reconfigure the
-   * ANativeWindow buffers to match, using EGL_NATIVE_VISUAL_ID. */
-  eglGetConfigAttrib(eglDisplay, config, EGL_NATIVE_VISUAL_ID, &format);
-
-  /* Default, but doesn't hurt */
-  eglBindAPI(EGL_OPENGL_ES_API);
-
   /* Ensure OpenGLES 2.0 context */
   static const EGLint ctx_attribs[] = {
+#ifdef GL_ES_VERSION_2_0
     EGL_CONTEXT_CLIENT_VERSION, 2,
+#elif GL_VERSION_ES_CM_1_0 || GL_VERSION_ES_CL_1_0 || GL_VERSION_ES_CM_1_1 || GL_VERSION_ES_CL_1_1
+    EGL_CONTEXT_CLIENT_VERSION, 1,
+#endif
     EGL_NONE
   };
-  context = eglCreateContext(eglDisplay, config, EGL_NO_CONTEXT, ctx_attribs);
+  context = eglCreateContext(eglDisplay, eglConfig, EGL_NO_CONTEXT, ctx_attribs);
   if (context == EGL_NO_CONTEXT) {
     fgWarning("Cannot initialize EGL context, err=%x\n", eglGetError());
     fghContextCreationError();
@@ -88,8 +82,6 @@
     fgError("Wrong GLES major version: %d\n", ver);
 
   window->Window.Context = context;
-  window->Window.pContext.egl.ContextConfig = config;
-  window->Window.pContext.egl.ContextFormat = format;
 }
 
 /*
@@ -98,7 +90,7 @@
 void fghPlatformOpenWindowEGL( SFG_Window* window )
 {
   EGLDisplay display = fgDisplay.pDisplay.egl.Display;
-  EGLConfig  config  = window->Window.pContext.egl.ContextConfig;
+  EGLConfig  config  = window->Window.pContext.egl.Config;
 
   EGLSurface surface = eglCreateWindowSurface(display, config, window->Window.Handle, NULL);
   if (surface == EGL_NO_SURFACE)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1176
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1176&view=rev
Author:   beuc
Date:     2012-03-17 11:21:56 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
Move tagSFG_PlatformWindowState from EGL to Android

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/android/fg_internal_android.h
    trunk/freeglut/freeglut/src/egl/fg_internal_egl.h

Modified: trunk/freeglut/freeglut/src/android/fg_internal_android.h
===================================================================
--- trunk/freeglut/freeglut/src/android/fg_internal_android.h	2012-03-17 10:33:28 UTC (rev 1175)
+++ trunk/freeglut/freeglut/src/android/fg_internal_android.h	2012-03-17 11:21:56 UTC (rev 1176)
@@ -100,4 +100,10 @@
     int          fd;
 };
 
+/* Window's state description. This structure should be kept portable. */
+typedef struct tagSFG_PlatformWindowState SFG_PlatformWindowState;
+struct tagSFG_PlatformWindowState
+{
+};
+
 #endif  /* FREEGLUT_INTERNAL_ANDROID_H */

Modified: trunk/freeglut/freeglut/src/egl/fg_internal_egl.h
===================================================================
--- trunk/freeglut/freeglut/src/egl/fg_internal_egl.h	2012-03-17 10:33:28 UTC (rev 1175)
+++ trunk/freeglut/freeglut/src/egl/fg_internal_egl.h	2012-03-17 11:21:56 UTC (rev 1176)
@@ -50,13 +50,4 @@
   EGLConfig           Config;
 };
 
-
-/* Window's state description. This structure should be kept portable. */
-typedef struct tagSFG_PlatformWindowState SFG_PlatformWindowState;
-struct tagSFG_PlatformWindowState
-{
-    int             OldWidth;           /* Window width from before a resize */
-    int             OldHeight;          /*   "    height  "    "    "   "    */
-};
-
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1179
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1179&view=rev
Author:   beuc
Date:     2012-03-17 13:29:51 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
Context can be used for a menu rather than the current window

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/android/fg_window_android.c
    trunk/freeglut/freeglut/src/egl/fg_window_egl.c
    trunk/freeglut/freeglut/src/egl/fg_window_egl.h

Modified: trunk/freeglut/freeglut/src/android/fg_window_android.c
===================================================================
--- trunk/freeglut/freeglut/src/android/fg_window_android.c	2012-03-17 12:34:22 UTC (rev 1178)
+++ trunk/freeglut/freeglut/src/android/fg_window_android.c	2012-03-17 13:29:51 UTC (rev 1179)
@@ -53,7 +53,7 @@
   }
 
   fghChooseConfigEGL(&window->Window.pContext.egl.Config);
-  fghCreateNewContextEGL(window);
+  window->Window.Context = fghCreateNewContextEGL(window);
 
   /* Wait until window is available and OpenGL context is created */
   /* Normally events are processed through glutMainLoop(), but the

Modified: trunk/freeglut/freeglut/src/egl/fg_window_egl.c
===================================================================
--- trunk/freeglut/freeglut/src/egl/fg_window_egl.c	2012-03-17 12:34:22 UTC (rev 1178)
+++ trunk/freeglut/freeglut/src/egl/fg_window_egl.c	2012-03-17 13:29:51 UTC (rev 1179)
@@ -60,7 +60,7 @@
 /**
  * Initialize an EGL context for the current display.
  */
-void fghCreateNewContextEGL( SFG_Window* window ) {
+EGLContext fghCreateNewContextEGL( SFG_Window* window ) {
   EGLContext context;
 
   EGLDisplay eglDisplay = fgDisplay.pDisplay.egl.Display;
@@ -85,7 +85,7 @@
   if (ver != 2)
     fgError("Wrong GLES major version: %d\n", ver);
 
-  window->Window.Context = context;
+  return context;
 }
 
 /*

Modified: trunk/freeglut/freeglut/src/egl/fg_window_egl.h
===================================================================
--- trunk/freeglut/freeglut/src/egl/fg_window_egl.h	2012-03-17 12:34:22 UTC (rev 1178)
+++ trunk/freeglut/freeglut/src/egl/fg_window_egl.h	2012-03-17 13:29:51 UTC (rev 1179)
@@ -28,7 +28,7 @@
 
 extern int fghChooseConfigEGL(EGLConfig* config);
 extern void fghPlatformOpenWindowEGL( SFG_Window* window );
-extern void fghCreateNewContextEGL( SFG_Window* window );
+extern EGLConfig fghCreateNewContextEGL( SFG_Window* window );
 extern void fghPlatformCloseWindowEGL( SFG_Window* window );
 
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1182
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1182&view=rev
Author:   beuc
Date:     2012-03-17 14:24:42 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
EGL: implement fgPlatformSetWindow

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/android/fg_window_android.c
    trunk/freeglut/freeglut/src/egl/fg_window_egl.c
    trunk/freeglut/freeglut/src/egl/fg_window_egl.h

Modified: trunk/freeglut/freeglut/src/android/fg_window_android.c
===================================================================
--- trunk/freeglut/freeglut/src/android/fg_window_android.c	2012-03-17 14:18:33 UTC (rev 1181)
+++ trunk/freeglut/freeglut/src/android/fg_window_android.c	2012-03-17 14:24:42 UTC (rev 1182)
@@ -92,11 +92,6 @@
   /* Window pre-created by Android, no way to delete it */
 }
 
-void fgPlatformSetWindow ( SFG_Window *window )
-{
-  /* TODO: only a single window possible? */
-}
-
 /*
  * This function makes the current window visible
  */

Modified: trunk/freeglut/freeglut/src/egl/fg_window_egl.c
===================================================================
--- trunk/freeglut/freeglut/src/egl/fg_window_egl.c	2012-03-17 14:18:33 UTC (rev 1181)
+++ trunk/freeglut/freeglut/src/egl/fg_window_egl.c	2012-03-17 14:24:42 UTC (rev 1182)
@@ -125,3 +125,13 @@
     window->Window.pContext.egl.Surface = EGL_NO_SURFACE;
   }
 }
+
+void fgPlatformSetWindow ( SFG_Window *window )
+{
+  if (!eglMakeCurrent(
+		      fgDisplay.pDisplay.egl.Display,
+		      window->Window.pContext.egl.Surface,
+		      window->Window.pContext.egl.Surface,
+		      window->Window.Context))
+    fgError("eglMakeCurrent: err=%x\n", eglGetError());
+}

Modified: trunk/freeglut/freeglut/src/egl/fg_window_egl.h
===================================================================
--- trunk/freeglut/freeglut/src/egl/fg_window_egl.h	2012-03-17 14:18:33 UTC (rev 1181)
+++ trunk/freeglut/freeglut/src/egl/fg_window_egl.h	2012-03-17 14:24:42 UTC (rev 1182)
@@ -30,5 +30,6 @@
 extern void fghPlatformOpenWindowEGL( SFG_Window* window );
 extern EGLConfig fghCreateNewContextEGL( SFG_Window* window );
 extern void fghPlatformCloseWindowEGL( SFG_Window* window );
+extern void fgPlatformSetWindow ( SFG_Window *window );
 
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1187
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1187&view=rev
Author:   beuc
Date:     2012-03-17 19:29:49 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
Rename fghChooseConfigEGL -> fghChooseConfig (not a specialization of an existing function)

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/android/fg_window_android.c
    trunk/freeglut/freeglut/src/egl/fg_state_egl.c
    trunk/freeglut/freeglut/src/egl/fg_window_egl.c
    trunk/freeglut/freeglut/src/egl/fg_window_egl.h

Modified: trunk/freeglut/freeglut/src/android/fg_window_android.c
===================================================================
--- trunk/freeglut/freeglut/src/android/fg_window_android.c	2012-03-17 16:26:00 UTC (rev 1186)
+++ trunk/freeglut/freeglut/src/android/fg_window_android.c	2012-03-17 19:29:49 UTC (rev 1187)
@@ -52,7 +52,7 @@
     return;
   }
 
-  fghChooseConfigEGL(&window->Window.pContext.egl.Config);
+  fghChooseConfig(&window->Window.pContext.egl.Config);
   window->Window.Context = fghCreateNewContextEGL(window);
 
   /* Wait until window is available and OpenGL context is created */

Modified: trunk/freeglut/freeglut/src/egl/fg_state_egl.c
===================================================================
--- trunk/freeglut/freeglut/src/egl/fg_state_egl.c	2012-03-17 16:26:00 UTC (rev 1186)
+++ trunk/freeglut/freeglut/src/egl/fg_state_egl.c	2012-03-17 19:29:49 UTC (rev 1187)
@@ -76,9 +76,9 @@
     /* I do not know yet if there will be a fgChooseVisual() function for Win32 */
     case GLUT_DISPLAY_MODE_POSSIBLE:
     {
-        /*  We should not have to call fgPlatformChooseFBConfig again here.  */
+        /*  We should not have to call fghChooseConfig again here.  */
         EGLConfig config;
-        return fghChooseConfigEGL(&config);
+        return fghChooseConfig(&config);
     }
 
     /* This is system-dependant */

Modified: trunk/freeglut/freeglut/src/egl/fg_window_egl.c
===================================================================
--- trunk/freeglut/freeglut/src/egl/fg_window_egl.c	2012-03-17 16:26:00 UTC (rev 1186)
+++ trunk/freeglut/freeglut/src/egl/fg_window_egl.c	2012-03-17 19:29:49 UTC (rev 1187)
@@ -26,7 +26,7 @@
 #include <GL/freeglut.h>
 #include "fg_internal.h"
 
-int fghChooseConfigEGL(EGLConfig* config) {
+int fghChooseConfig(EGLConfig* config) {
   const EGLint attribs[] = {
     EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
 #ifdef GL_ES_VERSION_2_0

Modified: trunk/freeglut/freeglut/src/egl/fg_window_egl.h
===================================================================
--- trunk/freeglut/freeglut/src/egl/fg_window_egl.h	2012-03-17 16:26:00 UTC (rev 1186)
+++ trunk/freeglut/freeglut/src/egl/fg_window_egl.h	2012-03-17 19:29:49 UTC (rev 1187)
@@ -26,7 +26,7 @@
 #ifndef __FG_WINDOW_EGL_H__
 #define __FG_WINDOW_EGL_H__
 
-extern int fghChooseConfigEGL(EGLConfig* config);
+extern int fghChooseConfig(EGLConfig* config);
 extern void fghPlatformOpenWindowEGL( SFG_Window* window );
 extern EGLConfig fghCreateNewContextEGL( SFG_Window* window );
 extern void fghPlatformCloseWindowEGL( SFG_Window* window );

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1198
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1198&view=rev
Author:   dcnieho
Date:     2012-03-19 00:31:00 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
simplified check for whether opengl 2.1+ context is requested.
Flags or profile set are now ignored unless opengl 2.1+ context is
requested

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_internal.h
    trunk/freeglut/freeglut/src/fg_window.c
    trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c
    trunk/freeglut/freeglut/src/x11/fg_window_x11_glx.c

Modified: trunk/freeglut/freeglut/src/fg_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/fg_internal.h	2012-03-18 14:54:33 UTC (rev 1197)
+++ trunk/freeglut/freeglut/src/fg_internal.h	2012-03-19 00:31:00 UTC (rev 1198)
@@ -956,7 +956,6 @@
 #define ATTRIB(a) attributes[where++]=(a)
 #define ATTRIB_VAL(a,v) {ATTRIB(a); ATTRIB(v);}
 
-int fghIsLegacyContextVersionRequested( void );
 int fghMapBit( int mask, int from, int to );
 int fghIsLegacyContextRequested( void );
 void fghContextCreationError( void );

Modified: trunk/freeglut/freeglut/src/fg_window.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_window.c	2012-03-18 14:54:33 UTC (rev 1197)
+++ trunk/freeglut/freeglut/src/fg_window.c	2012-03-19 00:31:00 UTC (rev 1198)
@@ -70,16 +70,9 @@
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
-int fghIsLegacyContextVersionRequested( void )
-{
-  return fgState.MajorVersion < 2 || (fgState.MajorVersion == 2 && fgState.MinorVersion <= 1);
-}
-
 int fghIsLegacyContextRequested( void )
 {
-  return fghIsLegacyContextVersionRequested() &&
-         fgState.ContextFlags == 0 &&
-         fgState.ContextProfile == 0;
+    return fgState.MajorVersion < 2 || (fgState.MajorVersion == 2 && fgState.MinorVersion <= 1);
 }
 
 int fghNumberOfAuxBuffersRequested( void )

Modified: trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c	2012-03-18 14:54:33 UTC (rev 1197)
+++ trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c	2012-03-19 00:31:00 UTC (rev 1198)
@@ -113,10 +113,8 @@
 static void fghFillContextAttributes( int *attributes ) {
   int where = 0, contextFlags, contextProfile;
 
-  if ( !fghIsLegacyContextVersionRequested() ) {
-    ATTRIB_VAL( WGL_CONTEXT_MAJOR_VERSION_ARB, fgState.MajorVersion );
-    ATTRIB_VAL( WGL_CONTEXT_MINOR_VERSION_ARB, fgState.MinorVersion );
-  }
+  ATTRIB_VAL( WGL_CONTEXT_MAJOR_VERSION_ARB, fgState.MajorVersion );
+  ATTRIB_VAL( WGL_CONTEXT_MINOR_VERSION_ARB, fgState.MinorVersion );
 
   contextFlags =
     fghMapBit( fgState.ContextFlags, GLUT_DEBUG, WGL_CONTEXT_DEBUG_BIT_ARB ) |

Modified: trunk/freeglut/freeglut/src/x11/fg_window_x11_glx.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/fg_window_x11_glx.c	2012-03-18 14:54:33 UTC (rev 1197)
+++ trunk/freeglut/freeglut/src/x11/fg_window_x11_glx.c	2012-03-19 00:31:00 UTC (rev 1198)
@@ -177,10 +177,8 @@
 static void fghFillContextAttributes( int *attributes ) {
   int where = 0, contextFlags, contextProfile;
 
-  if ( !fghIsLegacyContextVersionRequested() ) {
-    ATTRIB_VAL( GLX_CONTEXT_MAJOR_VERSION_ARB, fgState.MajorVersion );
-    ATTRIB_VAL( GLX_CONTEXT_MINOR_VERSION_ARB, fgState.MinorVersion );
-  }
+  ATTRIB_VAL( GLX_CONTEXT_MAJOR_VERSION_ARB, fgState.MajorVersion );
+  ATTRIB_VAL( GLX_CONTEXT_MINOR_VERSION_ARB, fgState.MinorVersion );
 
   contextFlags =
     fghMapBit( fgState.ContextFlags, GLUT_DEBUG, GLX_CONTEXT_DEBUG_BIT_ARB ) |

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1225
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1225&view=rev
Author:   beuc
Date:     2012-04-01 12:55:39 +0000 (Sun, 01 Apr 2012)
Log Message:
-----------
Fix OpenGL 2.0 declarations so code builds on Windows & Android

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_geometry.c
    trunk/freeglut/freeglut/src/fg_gl2.c
    trunk/freeglut/freeglut/src/fg_gl2.h

Modified: trunk/freeglut/freeglut/src/fg_geometry.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_geometry.c	2012-03-31 21:50:55 UTC (rev 1224)
+++ trunk/freeglut/freeglut/src/fg_geometry.c	2012-04-01 12:55:39 UTC (rev 1225)
@@ -28,6 +28,7 @@
 #include <GL/freeglut.h>
 #include "fg_internal.h"
 #include "fg_gl2.h"
+#include <math.h>
 
 /*
  * Need more types of polyhedra? See CPolyhedron in MRPT
@@ -74,21 +75,21 @@
     
     if (numVertices > 0 && attribute_v_coord != -1) {
 	    fghGenBuffers(1, &vbo_coords);
-	    fghBindBuffer(GL_ARRAY_BUFFER, vbo_coords);
-	    fghBufferData(GL_ARRAY_BUFFER, numVertices * 3 * sizeof(vertices[0]),
-			  vertices, GL_STATIC_DRAW);
+	    fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords);
+	    fghBufferData(FGH_ARRAY_BUFFER, numVertices * 3 * sizeof(vertices[0]),
+			  vertices, FGH_STATIC_DRAW);
     }
     
     if (numVertices > 0 && attribute_v_normal != -1) {
 	fghGenBuffers(1, &vbo_normals);
-	fghBindBuffer(GL_ARRAY_BUFFER, vbo_normals);
-	fghBufferData(GL_ARRAY_BUFFER, numVertices * 3 * sizeof(normals[0]),
-		      normals, GL_STATIC_DRAW);
+	fghBindBuffer(FGH_ARRAY_BUFFER, vbo_normals);
+	fghBufferData(FGH_ARRAY_BUFFER, numVertices * 3 * sizeof(normals[0]),
+		      normals, FGH_STATIC_DRAW);
     }
     
     if (vbo_coords) {
         fghEnableVertexAttribArray(attribute_v_coord);
-        fghBindBuffer(GL_ARRAY_BUFFER, vbo_coords);
+        fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords);
         fghVertexAttribPointer(
             attribute_v_coord,  // attribute
             3,                  // number of elements per vertex, here (x,y,z)
@@ -101,7 +102,7 @@
 
     if (vbo_normals) {
         fghEnableVertexAttribArray(attribute_v_normal);
-        fghBindBuffer(GL_ARRAY_BUFFER, vbo_normals);
+        fghBindBuffer(FGH_ARRAY_BUFFER, vbo_normals);
         fghVertexAttribPointer(
             attribute_v_normal, // attribute
             3,                  // number of elements per vertex, here (x,y,z)
@@ -185,28 +186,28 @@
     
     if (numVertices > 0 && attribute_v_coord != -1) {
 	fghGenBuffers(1, &vbo_coords);
-	fghBindBuffer(GL_ARRAY_BUFFER, vbo_coords);
-	fghBufferData(GL_ARRAY_BUFFER, numVertices * 3 * sizeof(vertices[0]),
-		      vertices, GL_STATIC_DRAW);
+	fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords);
+	fghBufferData(FGH_ARRAY_BUFFER, numVertices * 3 * sizeof(vertices[0]),
+		      vertices, FGH_STATIC_DRAW);
 	}
     
     if (numVertices > 0 && attribute_v_normal != -1) {
 	fghGenBuffers(1, &vbo_normals);
-	fghBindBuffer(GL_ARRAY_BUFFER, vbo_normals);
-	fghBufferData(GL_ARRAY_BUFFER, numVertices * 3 * sizeof(normals[0]),
-		      normals, GL_STATIC_DRAW);
+	fghBindBuffer(FGH_ARRAY_BUFFER, vbo_normals);
+	fghBufferData(FGH_ARRAY_BUFFER, numVertices * 3 * sizeof(normals[0]),
+		      normals, FGH_STATIC_DRAW);
     }
     
     if (vertIdxs != NULL) {
 	fghGenBuffers(1, &ibo_elements);
-	fghBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo_elements);
-	fghBufferData(GL_ELEMENT_ARRAY_BUFFER, numVertIdxs * sizeof(vertIdxs[0]),
-		      vertIdxs, GL_STATIC_DRAW);
+	fghBindBuffer(FGH_ELEMENT_ARRAY_BUFFER, ibo_elements);
+	fghBufferData(FGH_ELEMENT_ARRAY_BUFFER, numVertIdxs * sizeof(vertIdxs[0]),
+		      vertIdxs, FGH_STATIC_DRAW);
     }
     
     if (vbo_coords) {
 	fghEnableVertexAttribArray(attribute_v_coord);
-	fghBindBuffer(GL_ARRAY_BUFFER, vbo_coords);
+	fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords);
 	fghVertexAttribPointer(
             attribute_v_coord,  // attribute
             3,                  // number of elements per vertex, here (x,y,z)
@@ -219,7 +220,7 @@
     
     if (vbo_normals) {
 	fghEnableVertexAttribArray(attribute_v_normal);
-	fghBindBuffer(GL_ARRAY_BUFFER, vbo_normals);
+	fghBindBuffer(FGH_ARRAY_BUFFER, vbo_normals);
 	fghVertexAttribPointer(
             attribute_v_normal, // attribute
             3,                  // number of elements per vertex, here (x,y,z)
@@ -233,7 +234,7 @@
     if (vertIdxs == NULL) {
 	glDrawArrays(GL_TRIANGLES, 0, numVertices);
     } else {
-	fghBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo_elements);
+	fghBindBuffer(FGH_ELEMENT_ARRAY_BUFFER, ibo_elements);
 	glDrawElements(GL_TRIANGLES, numVertIdxs, GL_UNSIGNED_BYTE, 0);
     }
     

Modified: trunk/freeglut/freeglut/src/fg_gl2.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_gl2.c	2012-03-31 21:50:55 UTC (rev 1224)
+++ trunk/freeglut/freeglut/src/fg_gl2.c	2012-04-01 12:55:39 UTC (rev 1225)
@@ -27,32 +27,16 @@
 #include "fg_internal.h"
 #include "fg_gl2.h"
 
-void glutSetVertexAttribCoord3(GLint attrib) {
+void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
   if (fgStructure.CurrentWindow != NULL)
     fgStructure.CurrentWindow->Window.attribute_v_coord = attrib;
 }
 
-void glutSetVertexAttribNormal(GLint attrib) {
+void FGAPIENTRY glutSetVertexAttribNormal(GLint attrib) {
   if (fgStructure.CurrentWindow != NULL)
     fgStructure.CurrentWindow->Window.attribute_v_normal = attrib;
 }
 
-typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
-typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, fghGLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRY *PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint* buffers);
-typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRY *PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
-typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-
-PFNGLGENBUFFERSPROC fghGenBuffers = NULL;
-PFNGLDELETEBUFFERSPROC fghDeleteBuffers = NULL;
-PFNGLBINDBUFFERPROC fghBindBuffer = NULL;
-PFNGLBUFFERDATAPROC fghBufferData = NULL;
-PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray = NULL;
-PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray = NULL;
-PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer = NULL;
-
 void fgInitGL2() {
     fgState.HasOpenGL20 = 0;
 #define CHECK(func, a) if ((a) == NULL) { fgWarning("fgInitGL2: " func " is NULL"); return; }

Modified: trunk/freeglut/freeglut/src/fg_gl2.h
===================================================================
--- trunk/freeglut/freeglut/src/fg_gl2.h	2012-03-31 21:50:55 UTC (rev 1224)
+++ trunk/freeglut/freeglut/src/fg_gl2.h	2012-04-01 12:55:39 UTC (rev 1225)
@@ -30,6 +30,12 @@
 #    define APIENTRY
 #endif
 
+/* extension #defines, types and entries, avoiding a dependency on additional
+   libraries like GLEW or the GL/glext.h header */
+#define FGH_ARRAY_BUFFER 0x8892
+#define FGH_STATIC_DRAW 0x88E4
+#define FGH_ELEMENT_ARRAY_BUFFER 0x8893
+
 typedef ptrdiff_t fghGLsizeiptr;
 typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
 typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1226
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1226&view=rev
Author:   beuc
Date:     2012-04-01 13:39:12 +0000 (Sun, 01 Apr 2012)
Log Message:
-----------
GLsizei: ptrdiff_t -> int (like GLEW); add missing FGH_ prefix for OpenGL 2.0 prototype typedef's

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_gl2.c
    trunk/freeglut/freeglut/src/fg_gl2.h

Modified: trunk/freeglut/freeglut/src/fg_gl2.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_gl2.c	2012-04-01 12:55:39 UTC (rev 1225)
+++ trunk/freeglut/freeglut/src/fg_gl2.c	2012-04-01 13:39:12 UTC (rev 1226)
@@ -40,13 +40,13 @@
 void fgInitGL2() {
     fgState.HasOpenGL20 = 0;
 #define CHECK(func, a) if ((a) == NULL) { fgWarning("fgInitGL2: " func " is NULL"); return; }
-    CHECK("fghGenBuffers", fghGenBuffers = (PFNGLGENBUFFERSPROC) glutGetProcAddress ("glGenBuffers"));
-    CHECK("fghDeleteBuffers", fghDeleteBuffers = (PFNGLDELETEBUFFERSPROC) glutGetProcAddress ("glDeleteBuffers"));
-    CHECK("fghBindBuffer", fghBindBuffer = (PFNGLBINDBUFFERPROC) glutGetProcAddress ("glBindBuffer"));
-    CHECK("fghBufferData", fghBufferData = (PFNGLBUFFERDATAPROC) glutGetProcAddress ("glBufferData"));
-    CHECK("fghVertexAttribPointer", fghVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC) glutGetProcAddress ("glVertexAttribPointer"));
-    CHECK("fghEnableVertexAttribArray", fghEnableVertexAttribArray = (PFNGLENABLEVERTEXATTRIBARRAYPROC) glutGetProcAddress ("glEnableVertexAttribArray"));
-    CHECK("fghDisableVertexAttribArray", fghDisableVertexAttribArray = (PFNGLDISABLEVERTEXATTRIBARRAYPROC) glutGetProcAddress ("glDisnableVertexAttribArray"));
+    CHECK("fghGenBuffers", fghGenBuffers = (FGH_PFNGLGENBUFFERSPROC) glutGetProcAddress ("glGenBuffers"));
+    CHECK("fghDeleteBuffers", fghDeleteBuffers = (FGH_PFNGLDELETEBUFFERSPROC) glutGetProcAddress ("glDeleteBuffers"));
+    CHECK("fghBindBuffer", fghBindBuffer = (FGH_PFNGLBINDBUFFERPROC) glutGetProcAddress ("glBindBuffer"));
+    CHECK("fghBufferData", fghBufferData = (FGH_PFNGLBUFFERDATAPROC) glutGetProcAddress ("glBufferData"));
+    CHECK("fghVertexAttribPointer", fghVertexAttribPointer = (FGH_PFNGLVERTEXATTRIBPOINTERPROC) glutGetProcAddress ("glVertexAttribPointer"));
+    CHECK("fghEnableVertexAttribArray", fghEnableVertexAttribArray = (FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) glutGetProcAddress ("glEnableVertexAttribArray"));
+    CHECK("fghDisableVertexAttribArray", fghDisableVertexAttribArray = (FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) glutGetProcAddress ("glDisnableVertexAttribArray"));
 #undef CHECK
     fgState.HasOpenGL20 = 1;
 }

Modified: trunk/freeglut/freeglut/src/fg_gl2.h
===================================================================
--- trunk/freeglut/freeglut/src/fg_gl2.h	2012-04-01 12:55:39 UTC (rev 1225)
+++ trunk/freeglut/freeglut/src/fg_gl2.h	2012-04-01 13:39:12 UTC (rev 1226)
@@ -36,21 +36,21 @@
 #define FGH_STATIC_DRAW 0x88E4
 #define FGH_ELEMENT_ARRAY_BUFFER 0x8893
 
-typedef ptrdiff_t fghGLsizeiptr;
-typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
-typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, fghGLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRY *PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint* buffers);
-typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRY *PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
-typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+typedef int fghGLsizeiptr;
+typedef void (APIENTRY *FGH_PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef void (APIENTRY *FGH_PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRY *FGH_PFNGLBUFFERDATAPROC) (GLenum target, fghGLsizeiptr size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRY *FGH_PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint* buffers);
+typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
+typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
 
-PFNGLGENBUFFERSPROC fghGenBuffers;
-PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
-PFNGLBINDBUFFERPROC fghBindBuffer;
-PFNGLBUFFERDATAPROC fghBufferData;
-PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
-PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
-PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
+FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
+FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
+FGH_PFNGLBUFFERDATAPROC fghBufferData;
+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
 
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1231
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1231&view=rev
Author:   fayjf
Date:     2012-04-01 20:09:51 +0000 (Sun, 01 Apr 2012)
Log Message:
-----------
Removing the build errors and a build warning that crept in for MSVC 6.0.  There remain the undefined functions "sinf" and "cosf".

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_geometry.c
    trunk/freeglut/freeglut/src/fg_init.c

Modified: trunk/freeglut/freeglut/src/fg_geometry.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_geometry.c	2012-04-01 20:00:08 UTC (rev 1230)
+++ trunk/freeglut/freeglut/src/fg_geometry.c	2012-04-01 20:09:51 UTC (rev 1231)
@@ -72,7 +72,9 @@
 {
     GLuint vbo_coords, vbo_normals;
     GLuint numVertices = numFaces * numEdgePerFace;
-    
+
+    int i;
+
     if (numVertices > 0 && attribute_v_coord != -1) {
 	    fghGenBuffers(1, &vbo_coords);
 	    fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords);
@@ -113,9 +115,6 @@
         );
     }
 
-
-    int i;
-    
     /* Draw per face (TODO: could use glMultiDrawArrays if available) */
     for (i=0; i<numFaces; i++)
 	glDrawArrays(GL_LINE_LOOP, i*numEdgePerFace, numEdgePerFace);

Modified: trunk/freeglut/freeglut/src/fg_init.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_init.c	2012-04-01 20:00:08 UTC (rev 1230)
+++ trunk/freeglut/freeglut/src/fg_init.c	2012-04-01 20:09:51 UTC (rev 1231)
@@ -102,6 +102,7 @@
 extern void fgPlatformDeinitialiseInputDevices ( void );
 extern void fgPlatformCloseDisplay ( void );
 extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext );
+extern void fgInitGL2();
 
 
 void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1253
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1253&view=rev
Author:   beuc
Date:     2012-04-21 16:45:46 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
fg_gl2: Use GLES2 functions directly

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_gl2.c
    trunk/freeglut/freeglut/src/fg_gl2.h

Modified: trunk/freeglut/freeglut/src/fg_gl2.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_gl2.c	2012-04-21 16:20:19 UTC (rev 1252)
+++ trunk/freeglut/freeglut/src/fg_gl2.c	2012-04-21 16:45:46 UTC (rev 1253)
@@ -38,17 +38,19 @@
 }
 
 void fgInitGL2() {
+#ifndef GL_ES_VERSION_2_0
     fgState.HasOpenGL20 = 0;
     // TODO: Mesa returns a valid stub function, rather than NULL,
     // when we request a non-existent function
 #define CHECK(func, a) if ((a) == NULL) { fgWarning("fgInitGL2: " func " is NULL"); return; }
-    CHECK("fghGenBuffers", fghGenBuffers = (FGH_PFNGLGENBUFFERSPROC) glutGetProcAddress ("glGenBuffers"));
-    CHECK("fghDeleteBuffers", fghDeleteBuffers = (FGH_PFNGLDELETEBUFFERSPROC) glutGetProcAddress ("glDeleteBuffers"));
-    CHECK("fghBindBuffer", fghBindBuffer = (FGH_PFNGLBINDBUFFERPROC) glutGetProcAddress ("glBindBuffer"));
-    CHECK("fghBufferData", fghBufferData = (FGH_PFNGLBUFFERDATAPROC) glutGetProcAddress ("glBufferData"));
-    CHECK("fghVertexAttribPointer", fghVertexAttribPointer = (FGH_PFNGLVERTEXATTRIBPOINTERPROC) glutGetProcAddress ("glVertexAttribPointer"));
-    CHECK("fghEnableVertexAttribArray", fghEnableVertexAttribArray = (FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) glutGetProcAddress ("glEnableVertexAttribArray"));
-    CHECK("fghDisableVertexAttribArray", fghDisableVertexAttribArray = (FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) glutGetProcAddress ("glDisableVertexAttribArray"));
+    CHECK("fghGenBuffers", fghGenBuffers = (FGH_PFNGLGENBUFFERSPROC)glutGetProcAddress("glGenBuffers"));
+    CHECK("fghDeleteBuffers", fghDeleteBuffers = (FGH_PFNGLDELETEBUFFERSPROC)glutGetProcAddress("glDeleteBuffers"));
+    CHECK("fghBindBuffer", fghBindBuffer = (FGH_PFNGLBINDBUFFERPROC)glutGetProcAddress("glBindBuffer"));
+    CHECK("fghBufferData", fghBufferData = (FGH_PFNGLBUFFERDATAPROC)glutGetProcAddress("glBufferData"));
+    CHECK("fghVertexAttribPointer", fghVertexAttribPointer = (FGH_PFNGLVERTEXATTRIBPOINTERPROC)glutGetProcAddress("glVertexAttribPointer"));
+    CHECK("fghEnableVertexAttribArray", fghEnableVertexAttribArray = (FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC)glutGetProcAddress("glEnableVertexAttribArray"));
+    CHECK("fghDisableVertexAttribArray", fghDisableVertexAttribArray = (FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC)glutGetProcAddress("glDisableVertexAttribArray"));
 #undef CHECK
+#endif
     fgState.HasOpenGL20 = 1;
 }

Modified: trunk/freeglut/freeglut/src/fg_gl2.h
===================================================================
--- trunk/freeglut/freeglut/src/fg_gl2.h	2012-04-21 16:20:19 UTC (rev 1252)
+++ trunk/freeglut/freeglut/src/fg_gl2.h	2012-04-21 16:45:46 UTC (rev 1253)
@@ -26,10 +26,32 @@
 #ifndef  FG_GL2_H
 #define  FG_GL2_H
 
-#ifndef APIENTRY
-#    define APIENTRY
-#endif
+#include <GL/freeglut.h>
+#include "fg_internal.h"
 
+#ifdef GL_ES_VERSION_2_0
+/* Use existing functions on GLES 2.0 */
+
+#define FGH_ARRAY_BUFFER GL_ARRAY_BUFFER
+#define FGH_STATIC_DRAW GL_STATIC_DRAW
+#define FGH_ELEMENT_ARRAY_BUFFER GL_ELEMENT_ARRAY_BUFFER
+
+#define fghGenBuffers glGenBuffers
+#define fghDeleteBuffers glDeleteBuffers
+#define fghBindBuffer glBindBuffer
+#define fghBufferData glBufferData
+#define fghEnableVertexAttribArray glEnableVertexAttribArray
+#define fghDisableVertexAttribArray glDisableVertexAttribArray
+#define fghVertexAttribPointer glVertexAttribPointer
+
+#else
+/* Load functions dynamically, they are not defined in e.g. win32's
+   OpenGL headers */
+
+#    ifndef APIENTRY
+#        define APIENTRY
+#    endif
+
 /* extension #defines, types and entries, avoiding a dependency on additional
    libraries like GLEW or the GL/glext.h header */
 #define FGH_ARRAY_BUFFER 0x8892
@@ -53,4 +75,6 @@
 FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
 FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
 
+#    endif
+
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1275
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1275&view=rev
Author:   beuc
Date:     2012-05-01 13:13:14 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Initialize OpenGL 2.0 after OpenGL context is created (otherwise initialization fails under mswin)

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_init.c
    trunk/freeglut/freeglut/src/fg_window.c

Modified: trunk/freeglut/freeglut/src/fg_init.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_init.c	2012-05-01 10:37:06 UTC (rev 1274)
+++ trunk/freeglut/freeglut/src/fg_init.c	2012-05-01 13:13:14 UTC (rev 1275)
@@ -28,7 +28,6 @@
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
 #include "fg_internal.h"
-#include "fg_gl2.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
@@ -381,8 +380,6 @@
         if( (mask & (XValue|YValue)) == (XValue|YValue) )
             fgState.Position.Use = GL_TRUE;
     }
-
-    fgInitGL2();
 }
 
 /*

Modified: trunk/freeglut/freeglut/src/fg_window.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_window.c	2012-05-01 10:37:06 UTC (rev 1274)
+++ trunk/freeglut/freeglut/src/fg_window.c	2012-05-01 13:13:14 UTC (rev 1275)
@@ -28,6 +28,7 @@
 #define FREEGLUT_BUILDING_LIB
 #include <GL/freeglut.h>
 #include "fg_internal.h"
+#include "fg_gl2.h"
 
 /*
  * TODO BEFORE THE STABLE RELEASE:
@@ -147,6 +148,8 @@
 #endif
     window->Window.attribute_v_coord = -1;
     window->Window.attribute_v_normal = -1;
+
+    fgInitGL2();
 }
 
 /*

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1285
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1285&view=rev
Author:   beuc
Date:     2012-05-02 18:27:57 +0000 (Wed, 02 May 2012)
Log Message:
-----------
Fix misleading comment

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/android/fg_main_android.c
    trunk/freeglut/freeglut/src/x11/fg_main_x11.c

Modified: trunk/freeglut/freeglut/src/android/fg_main_android.c
===================================================================
--- trunk/freeglut/freeglut/src/android/fg_main_android.c	2012-05-02 17:28:52 UTC (rev 1284)
+++ trunk/freeglut/freeglut/src/android/fg_main_android.c	2012-05-02 18:27:57 UTC (rev 1285)
@@ -138,9 +138,7 @@
 }
 
 /*
- * Handle a window configuration change. When no reshape
- * callback is hooked, the viewport size is updated to
- * match the new window size.
+ * Request a window resize
  */
 void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )
 {

Modified: trunk/freeglut/freeglut/src/x11/fg_main_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/fg_main_x11.c	2012-05-02 17:28:52 UTC (rev 1284)
+++ trunk/freeglut/freeglut/src/x11/fg_main_x11.c	2012-05-02 18:27:57 UTC (rev 1285)
@@ -73,9 +73,7 @@
  
  
 /*
- * Handle a window configuration change. When no reshape
- * callback is hooked, the viewport size is updated to
- * match the new window size.
+ * Request a window resize
  */
 void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )
 {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1300
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1300&view=rev
Author:   beuc
Date:     2012-05-04 14:52:52 +0000 (Fri, 04 May 2012)
Log Message:
-----------
Add documentation for geometry (ML rip-off) and Android corner-cases

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/android/fg_main_android.c
    trunk/freeglut/freeglut/src/fg_geometry.c

Modified: trunk/freeglut/freeglut/src/android/fg_main_android.c
===================================================================
--- trunk/freeglut/freeglut/src/android/fg_main_android.c	2012-05-04 11:21:47 UTC (rev 1299)
+++ trunk/freeglut/freeglut/src/android/fg_main_android.c	2012-05-04 14:52:52 UTC (rev 1300)
@@ -185,10 +185,13 @@
   if (window == NULL)
     return EVENT_NOT_HANDLED;
 
-  /* FIXME: in Android, when key is repeated, down and up events
-     happen most often at the exact same time.  This makes it
-     impossible to animate based on key press time. */
-  /* e.g. down/up/wait/down/up rather than down/wait/down/wait/up */
+  /* FIXME: in Android, when a key is repeated, down
+     and up events happen most often at the exact same time.  This
+     makes it impossible to animate based on key press time. */
+  /* e.g. down/up/wait/down/up rather than down/wait/down/wait/up */ 
+  /* This looks like a bug in the virtual keyboard system :/  Real
+     buttons such as the Back button appear to work correctly (series
+     of down events with proper getRepeatCount value */
   
   if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_KEY) {
     /* LOGI("action: %d", AKeyEvent_getAction(event)); */
@@ -317,10 +320,10 @@
     break;
   case APP_CMD_INIT_WINDOW: /* surfaceCreated */
     /* The window is being shown, get it ready. */
-    LOGI("handle_cmd: APP_CMD_INIT_WINDOW");
+    LOGI("handle_cmd: APP_CMD_INIT_WINDOW %p", app->window);
     fgDisplay.pDisplay.single_native_window = app->window;
-    /* glPlatformOpenWindow was waiting for Handle to be defined and
-       will now return from fgPlatformProcessSingleEvent() */
+    /* start|resume: glPlatformOpenWindow was waiting for Handle to be
+       defined and will now continue processing */
     break;
   case APP_CMD_GAINED_FOCUS:
     LOGI("handle_cmd: APP_CMD_GAINED_FOCUS");
@@ -450,6 +453,9 @@
     if (app->destroyRequested != 1) {
       /* Android is full-screen only, simplified call.. */
       /* Ideally we'd have a fgPlatformReopenWindow() */
+      /* If we're hidden by a non-fullscreen or translucent activity,
+         we'll be paused but not stopped, and keep the current
+         surface; in which case fgPlatformOpenWindow will no-op. */
       fgPlatformOpenWindow(window, "", GL_FALSE, 0, 0, GL_FALSE, 0, 0, GL_FALSE, GL_FALSE);
       /* TODO: INVOKE_WCB(*window, Pause?); */
       /* TODO: INVOKE_WCB(*window, LoadResources/ContextLost/...?); */

Modified: trunk/freeglut/freeglut/src/fg_geometry.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_geometry.c	2012-05-04 11:21:47 UTC (rev 1299)
+++ trunk/freeglut/freeglut/src/fg_geometry.c	2012-05-04 14:52:52 UTC (rev 1300)
@@ -55,6 +55,8 @@
  * from face to face.
  */
 
+/** See comment for fghDrawGeometryWire **/
+
 /* Version for OpenGL (ES) 1.1 */
 #ifndef GL_ES_VERSION_2_0
 static void fghDrawGeometryWire11(GLfloat *vertices, GLfloat *normals,
@@ -198,6 +200,20 @@
         fghDeleteBuffers(1, &ibo_elements2);
 }
 
+/**
+ * Draw geometric shape in wire mode (only edges)
+ *
+ * Arguments: the sphere, in wire mode, consists of multiple line
+ * loops for the stacks, and for the slices. The vertex indices for
+ * all slices are thrown together. numParts is how many separate loops
+ * are in the array, numVertIdxsPerPart is how many vertices there are
+ * per loop.  For those suffixed with 2, its exactly the same
+ * principle, the number of stacks and slices is not the same.
+ *
+ * Feel free to contribute better naming ;)
+ *
+ * See comment for fghDrawGeometrySolid
+ */
 static void fghDrawGeometryWire(GLfloat *vertices, GLfloat *normals, GLsizei numVertices,
     GLushort *vertIdxs, GLsizei numParts, GLsizei numVertPerPart, GLenum vertexMode,
     GLushort *vertIdxs2, GLsizei numParts2, GLsizei numVertPerPart2
@@ -221,15 +237,6 @@
 }
 
 
-/* Draw the geometric shape with filled triangles
- *
- * - If the shape is naturally triangulated (numEdgePerFace==3), each
- *   vertex+normal pair is used only once, so no vertex indices.
- * 
- * - If the shape was triangulated (DECOMPOSE_TO_TRIANGLE), some
- *   vertex+normal pairs are reused, so use vertex indices.
- */
-
 /* Version for OpenGL (ES) 1.1 */
 #ifndef GL_ES_VERSION_2_0
 static void fghDrawGeometrySolid11(GLfloat *vertices, GLfloat *normals, GLushort *vertIdxs,
@@ -346,6 +353,14 @@
         fghDeleteBuffers(1, &ibo_elements);
 }
 
+/* Draw the geometric shape with filled triangles
+ *
+ * - If the shape is naturally triangulated (numEdgePerFace==3), each
+ *   vertex+normal pair is used only once, so no vertex indices.
+ * 
+ * - If the shape was triangulated (DECOMPOSE_TO_TRIANGLE), some
+ *   vertex+normal pairs are reused, so use vertex indices.
+ */
 static void fghDrawGeometrySolid(GLfloat *vertices, GLfloat *normals, GLushort *vertIdxs,
                                  GLsizei numVertices, GLsizei numParts, GLsizei numVertIdxsPerPart)
 {
@@ -364,6 +379,8 @@
 #endif
 }
 
+
+
 /* Shape decomposition to triangles
  * We'll use glDrawElements to draw all shapes that are not naturally
  * composed of triangles, so generate an index vector here, using the

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1354
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1354&view=rev
Author:   dcnieho
Date:     2012-07-21 04:04:45 +0000 (Sat, 21 Jul 2012)
Log Message:
-----------
can now also handle the case where menus is opened, client area of
window with menu is clicked and then user switches to another window.

Implemented menu enumerator and a function for getting currently active
menu, if any

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_internal.h
    trunk/freeglut/freeglut/src/fg_menu.c
    trunk/freeglut/freeglut/src/fg_structure.c
    trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c

Modified: trunk/freeglut/freeglut/src/fg_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/fg_internal.h	2012-07-21 03:58:04 UTC (rev 1353)
+++ trunk/freeglut/freeglut/src/fg_internal.h	2012-07-21 04:04:45 UTC (rev 1354)
@@ -661,7 +661,8 @@
     GLboolean   found;                          /* Used to terminate search  */
     void*       data;                           /* Custom data pointer       */
 };
-typedef void (* FGCBenumerator  )( SFG_Window *, SFG_Enumerator * );
+typedef void (* FGCBWindowEnumerator  )( SFG_Window *, SFG_Enumerator * );
+typedef void (* FGCBMenuEnumerator  )( SFG_Menu *, SFG_Enumerator * );
 
 /* The bitmap font structure */
 typedef struct tagSFG_Font SFG_Font;
@@ -915,8 +916,8 @@
  * and userData is the a custom user-supplied pointer. Functions
  * are defined and exported from freeglut_structure.c file.
  */
-void fgEnumWindows( FGCBenumerator enumCallback, SFG_Enumerator* enumerator );
-void fgEnumSubWindows( SFG_Window* window, FGCBenumerator enumCallback,
+void fgEnumWindows( FGCBWindowEnumerator enumCallback, SFG_Enumerator* enumerator );
+void fgEnumSubWindows( SFG_Window* window, FGCBWindowEnumerator enumCallback,
                        SFG_Enumerator* enumerator );
 
 /*
@@ -940,6 +941,12 @@
 SFG_Menu* fgMenuByID( int menuID );
 
 /*
+ * Returns active menu, if any. Assumption: only one menu active throughout application at any one time.
+ * This is easier than fgWindowByXXX as all menus are placed in one doubly linked list...
+ */
+SFG_Menu* fgGetActiveMenu( );
+
+/*
  * The menu activation and deactivation the code. This is the meat
  * of the menu user interface handling code...
  */

Modified: trunk/freeglut/freeglut/src/fg_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_menu.c	2012-07-21 03:58:04 UTC (rev 1353)
+++ trunk/freeglut/freeglut/src/fg_menu.c	2012-07-21 04:04:45 UTC (rev 1354)
@@ -512,7 +512,7 @@
     SFG_Menu* menu = window->Menu[ button ];
     SFG_Window* current_window = fgStructure.CurrentWindow;
 
-    /* If the menu is already active in another window, deactivate it (and any submenu's) there */
+    /* If the menu is already active in another window, deactivate it (and any submenus) there */
     if ( menu->ParentWindow )
       fgDeactivateMenu(menu->ParentWindow);
 

Modified: trunk/freeglut/freeglut/src/fg_structure.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_structure.c	2012-07-21 03:58:04 UTC (rev 1353)
+++ trunk/freeglut/freeglut/src/fg_structure.c	2012-07-21 04:04:45 UTC (rev 1354)
@@ -378,7 +378,7 @@
 /*
  * Helper function to enumerate through all registered top-level windows
  */
-void fgEnumWindows( FGCBenumerator enumCallback, SFG_Enumerator* enumerator )
+void fgEnumWindows( FGCBWindowEnumerator enumCallback, SFG_Enumerator* enumerator )
 {
     SFG_Window *window;
 
@@ -398,10 +398,32 @@
 }
 
 /*
+* Helper function to enumerate through all registered top-level windows
+*/
+void fgEnumMenus( FGCBMenuEnumerator enumCallback, SFG_Enumerator* enumerator )
+{
+    SFG_Menu *menu;
+
+    FREEGLUT_INTERNAL_ERROR_EXIT ( enumCallback && enumerator,
+        "Enumerator or callback missing from window enumerator call",
+        "fgEnumWindows" );
+
+    /* It's enough to check all entries in fgStructure.Menus... */
+    for( menu = (SFG_Menu *)fgStructure.Menus.First;
+        menu;
+        menu = (SFG_Menu *)menu->Node.Next )
+    {
+        enumCallback( menu, enumerator );
+        if( enumerator->found )
+            return;
+    }
+}
+
+/*
  * Helper function to enumerate through all a window's subwindows
  * (single level descent)
  */
-void fgEnumSubWindows( SFG_Window* window, FGCBenumerator enumCallback,
+void fgEnumSubWindows( SFG_Window* window, FGCBWindowEnumerator enumCallback,
                        SFG_Enumerator* enumerator )
 {
     SFG_Window *child;
@@ -485,7 +507,7 @@
 }
 
 /*
- * This function is similiar to the previous one, except it is
+ * This function is similar to the previous one, except it is
  * looking for a specified (sub)window identifier. The function
  * is defined in freeglut_structure.c file.
  */
@@ -493,7 +515,7 @@
 {
     SFG_Enumerator enumerator;
 
-    /* Uses a method very similiar for fgWindowByHandle... */
+    /* Uses a method very similar for fgWindowByHandle... */
     enumerator.found = GL_FALSE;
     enumerator.data = ( void * )&windowID;
     fgEnumWindows( fghcbWindowByID, &enumerator );
@@ -503,23 +525,81 @@
 }
 
 /*
- * Looks up a menu given its ID. This is easier that fgWindowByXXX
+ * A static helper function to look for a menu given its ID
+ */
+static void fghcbMenuByID( SFG_Menu *menu,
+    SFG_Enumerator *enumerator )
+{
+    if ( enumerator->found )
+        return;
+
+    /* Check the menu's ID. */
+    if( menu->ID == (int)(enumerator->data) )
+    {
+        enumerator->found = GL_TRUE;
+        enumerator->data = menu;
+
+        return;
+    }
+}
+
+/*
+ * Looks up a menu given its ID. This is easier than fgWindowByXXX
  * as all menus are placed in one doubly linked list...
  */
 SFG_Menu* fgMenuByID( int menuID )
 {
-    SFG_Menu *menu = NULL;
+    SFG_Enumerator enumerator;
 
-    /* It's enough to check all entries in fgStructure.Menus... */
-    for( menu = (SFG_Menu *)fgStructure.Menus.First;
-         menu;
-         menu = (SFG_Menu *)menu->Node.Next )
-        if( menu->ID == menuID )
-            return menu;
+    /* This is easy and makes use of the menus enumeration defined above */
+    enumerator.found = GL_FALSE;
+    enumerator.data = (void *)menuID;
+    fgEnumMenus( fghcbMenuByID, &enumerator );
+
+    if( enumerator.found )
+        return( SFG_Menu *) enumerator.data;
+
     return NULL;
 }
 
 /*
+ * A static helper function to look for an active menu
+ */
+static void fghcbGetActiveMenu( SFG_Menu *menu,
+    SFG_Enumerator *enumerator )
+{
+    if ( enumerator->found )
+        return;
+
+    /* Check the menu's ID. */
+    if( menu->IsActive )
+    {
+        enumerator->found = GL_TRUE;
+        enumerator->data = menu;
+
+        return;
+    }
+}
+
+/*
+ * Returns active menu, if any. Assumption: only one menu active throughout application at any one time.
+ * This is easier than fgWindowByXXX as all menus are placed in one doubly linked list...
+ */
+SFG_Menu* fgGetActiveMenu( )
+{
+    SFG_Enumerator enumerator;
+
+    /* This is easy and makes use of the menus enumeration defined above */
+    enumerator.found = GL_FALSE;
+    fgEnumMenus( fghcbGetActiveMenu, &enumerator );
+
+    if( enumerator.found )
+        return( SFG_Menu *) enumerator.data;
+
+    return NULL;
+}
+
+/*
  * List functions...
  */
 void fgListInit(SFG_List *list)

Modified: trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2012-07-21 03:58:04 UTC (rev 1353)
+++ trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2012-07-21 04:04:45 UTC (rev 1354)
@@ -493,34 +493,39 @@
         break;
 
     case WM_KILLFOCUS:
-/*        printf("WM_KILLFOCUS (ismenu: %i): %p\n", window->IsMenu, window ); */
-        lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
-        INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
-
-        /* If this is a menu that lost focus, see if user either switched
-           application or FreeGLUT window (if one is running multiple
-           windows). If so, close menu that lost focus.
-         */
-        if( window->IsMenu &&
-            window->ActiveMenu && window->ActiveMenu->IsActive )
         {
-            SFG_Window* wnd = NULL;
-            HWND hwnd = GetForegroundWindow();  /* Get window with current focus */
-            if (hwnd)
-                /* See if its one of our windows */
-                wnd = fgWindowByHandle(hwnd);
+            SFG_Menu* menu = NULL;
+/*            printf("WM_KILLFOCUS (ismenu: %i): %p\n", window->IsMenu, window ); */
+            lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
+            INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
 
-            if (!hwnd || !wnd)
-                /* User switched to another application*/
-                fgDeactivateMenu(window->ActiveMenu->ParentWindow);
-            else if (
-                ( wnd->IsMenu && wnd->ActiveMenu->ParentWindow!=window->ActiveMenu->ParentWindow) ||    /* Make sure we don't kill the menu when trying to enter a submenu */
-                (!wnd->IsMenu && wnd!=window->ActiveMenu->ParentWindow)
-                )
-                /* User switched to another FreeGLUT window */
-                fgDeactivateMenu(window->ActiveMenu->ParentWindow);
+            /* If we have an open menu, see if the open menu should be closed
+               when focus was lost because user either switched
+               application or FreeGLUT window (if one is running multiple
+               windows). If so, close menu the active menu.
+             */
+            if ( fgStructure.CurrentMenu )
+                menu = fgGetActiveMenu();
+            
+            if ( menu )
+            {
+                SFG_Window* wnd = NULL;
+                HWND hwnd = GetForegroundWindow();  /* Get window with current focus */
+                if (hwnd)
+                    /* See if its one of our windows */
+                    wnd = fgWindowByHandle(hwnd);
+
+                if (!hwnd || !wnd)
+                    /* User switched to another application*/
+                    fgDeactivateMenu(menu->ParentWindow);
+                else if (
+                    ( wnd->IsMenu && wnd->ActiveMenu && wnd->ActiveMenu->ParentWindow!=menu->ParentWindow) ||    /* Make sure we don't kill the menu when trying to enter a submenu */
+                    (!wnd->IsMenu && wnd!=menu->ParentWindow)
+                    )
+                    /* User switched to another FreeGLUT window */
+                    fgDeactivateMenu(menu->ParentWindow);
+            }
         }
-
         break;
 
 #if 0

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1359
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1359&view=rev
Author:   dcnieho
Date:     2012-07-22 10:54:39 +0000 (Sun, 22 Jul 2012)
Log Message:
-----------
now checking for NULL window in fgDeactivateMenu (thanks for Ioannis to
point out this occurs)
now dealing with the aftermath of the corner case bugs of different
menus in main and child windows both being open at the same time (which
is a bug in itself, but can't figure out a fix). No more crash at least!

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_menu.c
    trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c

Modified: trunk/freeglut/freeglut/src/fg_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_menu.c	2012-07-22 10:03:36 UTC (rev 1358)
+++ trunk/freeglut/freeglut/src/fg_menu.c	2012-07-22 10:54:39 UTC (rev 1359)
@@ -620,11 +620,32 @@
             /*
              * Outside the menu, deactivate if it's a downclick
              *
-             * XXX This isn't enough.  A downclick outside of
-             * XXX the interior of our freeglut windows should also
-             * XXX deactivate the menu.  This is more complicated.
+             * A downclick outside of the interior of our freeglut windows
+             * is dealt with in the WM_KILLFOCUS handler of fgPlatformWindowProc
              */
-            fgDeactivateMenu( window->ActiveMenu->ParentWindow );
+        {
+            if (window->ActiveMenu->ParentWindow)
+                fgDeactivateMenu( window->ActiveMenu->ParentWindow );
+            else
+            {
+                /* 
+                 * Its a rare occasion that a window has an ActiveMenu but
+                 * that menus does not have a parent window. It happens
+                 * however in the corner case bug when one opens a menu in
+                 * a main window, then opens a different menu in this main
+                 * window's child (you now have two menus open
+                 * simultaneously, thats the bug) and then click somewhere
+                 * else that causes both menus to close. One of them is
+                 * then not properly cleaned up. This finishes the cleaning
+                 * and minimizes the impact on the user, he only needs one
+                 * extra mouse click.
+                 */
+                fghSetMenuParentWindow ( NULL, window->ActiveMenu );
+                window->ActiveMenu->IsActive = GL_FALSE;
+                window->ActiveMenu->ActiveEntry = NULL;
+                window->ActiveMenu = NULL;
+            }
+        }
 
         /*
          * XXX Why does an active menu require a redisplay at
@@ -659,11 +680,12 @@
 void fgDeactivateMenu( SFG_Window *window )
 {
     SFG_Window *parent_window = NULL;
+    SFG_Menu* menu;
+    SFG_MenuEntry *menuEntry;
 
     /* Check if there is an active menu attached to this window... */
-    SFG_Menu* menu = window->ActiveMenu;
-    SFG_MenuEntry *menuEntry;
-
+    freeglut_return_if_fail( window );
+    menu = window->ActiveMenu;
     /* Did we find an active window? */
     freeglut_return_if_fail( menu );
 

Modified: trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2012-07-22 10:03:36 UTC (rev 1358)
+++ trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2012-07-22 10:54:39 UTC (rev 1359)
@@ -518,7 +518,7 @@
                 if (!hwnd || !wnd)
                     /* User switched to another application*/
                     fgDeactivateMenu(menu->ParentWindow);
-                else if (!wnd->IsMenu && wnd!=menu->ParentWindow)
+                else if (!wnd->IsMenu && wnd!=menu->ParentWindow)   /* Make sure we don't kill the menu when trying to enter a submenu */
                     /* User switched to another FreeGLUT window */
                     fgDeactivateMenu(menu->ParentWindow);
             }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1361
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1361&view=rev
Author:   dcnieho
Date:     2012-07-23 07:00:14 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
When receiving WM_SETFOCUS, check if its child window that should
actually get focus
That fixes corner case issue with menus in main and child windows being
open at the same time

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_menu.c
    trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
    trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c

Modified: trunk/freeglut/freeglut/src/fg_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_menu.c	2012-07-23 06:55:45 UTC (rev 1360)
+++ trunk/freeglut/freeglut/src/fg_menu.c	2012-07-23 07:00:14 UTC (rev 1361)
@@ -29,6 +29,7 @@
 #include <GL/freeglut.h>
 #include "fg_internal.h"
 
+
 /* -- DEFINITIONS ---------------------------------------------------------- */
 
 /*
@@ -403,7 +404,7 @@
 
 /*
  * Private static function to set the parent window of a submenu and all
- * of its submenus
+ * of its submenus.
  */
 static void fghSetMenuParentWindow( SFG_Window *window, SFG_Menu *menu )
 {
@@ -624,27 +625,7 @@
              * is dealt with in the WM_KILLFOCUS handler of fgPlatformWindowProc
              */
         {
-            if (window->ActiveMenu->ParentWindow)
-                fgDeactivateMenu( window->ActiveMenu->ParentWindow );
-            else
-            {
-                /* 
-                 * Its a rare occasion that a window has an ActiveMenu but
-                 * that menus does not have a parent window. It happens
-                 * however in the corner case bug when one opens a menu in
-                 * a main window, then opens a different menu in this main
-                 * window's child (you now have two menus open
-                 * simultaneously, thats the bug) and then click somewhere
-                 * else that causes both menus to close. One of them is
-                 * then not properly cleaned up. This finishes the cleaning
-                 * and minimizes the impact on the user, he only needs one
-                 * extra mouse click.
-                 */
-                fghSetMenuParentWindow ( NULL, window->ActiveMenu );
-                window->ActiveMenu->IsActive = GL_FALSE;
-                window->ActiveMenu->ActiveEntry = NULL;
-                window->ActiveMenu = NULL;
-            }
+            fgDeactivateMenu( window->ActiveMenu->ParentWindow );
         }
 
         /*
@@ -683,10 +664,10 @@
     SFG_Menu* menu;
     SFG_MenuEntry *menuEntry;
 
-    /* Check if there is an active menu attached to this window... */
+    /* Did we find an active window? */
     freeglut_return_if_fail( window );
+    /* Check if there is an active menu attached to this window... */
     menu = window->ActiveMenu;
-    /* Did we find an active window? */
     freeglut_return_if_fail( menu );
 
     parent_window = menu->ParentWindow;
@@ -711,7 +692,7 @@
     {
         menuEntry->IsActive = GL_FALSE;
 
-        /* Is that an active submenu by any case? */
+        /* Is that an active submenu by any chance? */
         if( menuEntry->SubMenu )
             fghDeactivateSubMenu( menuEntry );
     }

Modified: trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2012-07-23 06:55:45 UTC (rev 1360)
+++ trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2012-07-23 07:00:14 UTC (rev 1361)
@@ -228,6 +228,7 @@
     SFG_Window* window;
     PAINTSTRUCT ps;
     LRESULT lRet = 1;
+    GLboolean gotChild = GL_FALSE;
 
     FREEGLUT_INTERNAL_ERROR_EXIT_IF_NOT_INITIALISED ( "Event Handler" ) ;
 
@@ -252,7 +253,11 @@
         ScreenToClient( window->Window.Handle, &mouse_pos );
         hwnd = ChildWindowFromPoint(window->Window.Handle, mouse_pos);
         if (hwnd)   /* can be NULL if mouse outside parent by the time we get here */
+        {
             window = fgWindowByHandle(hwnd);
+            if (window->Parent)
+                gotChild = GL_TRUE;
+        }
     }
 
     if ( window )
@@ -486,10 +491,16 @@
 
     case WM_SETFOCUS:
 /*        printf("WM_SETFOCUS: %p\n", window ); */
+        if (gotChild)
+            /* If child should have focus instead, set it here. */
+            SetFocus(window->Window.Handle);
+
         lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
         INVOKE_WCB( *window, Entry, ( GLUT_ENTERED ) );
 
-		UpdateWindow ( hWnd );
+        UpdateWindow ( hWnd );
+        if (gotChild)
+            UpdateWindow ( window->Window.Handle );
         break;
 
     case WM_KILLFOCUS:
@@ -500,13 +511,13 @@
             INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
 
             /* If we have an open menu, see if the open menu should be closed
-               when focus was lost because user either switched
-               application or FreeGLUT window (if one is running multiple
-               windows). If so, close menu the active menu.
+             * when focus was lost because user either switched
+             * application or FreeGLUT window (if one is running multiple
+             * windows). If so, close menu the active menu.
              */
             if ( fgStructure.Menus.First )
                 menu = fgGetActiveMenu();
-            
+
             if ( menu )
             {
                 SFG_Window* wnd = NULL;

Modified: trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c	2012-07-23 06:55:45 UTC (rev 1360)
+++ trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c	2012-07-23 07:00:14 UTC (rev 1361)
@@ -808,7 +808,6 @@
 
     UpdateWindow( window->Window.Handle );
     ShowCursor( TRUE );  /* XXX Old comments say "hide cursor"! */
-
 }
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1376
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1376&view=rev
Author:   dcnieho
Date:     2012-07-29 05:11:53 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
some cleanup
now have function fghPlatformGetMousePos to get current mouse position
in screen coordinates
Using this in fg_menu as all that code should be platform independent

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_internal.h
    trunk/freeglut/freeglut/src/fg_menu.c
    trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c

Modified: trunk/freeglut/freeglut/src/fg_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/fg_internal.h	2012-07-29 04:11:01 UTC (rev 1375)
+++ trunk/freeglut/freeglut/src/fg_internal.h	2012-07-29 05:11:53 UTC (rev 1376)
@@ -371,8 +371,8 @@
 	SFG_PlatformContext pContext;    /* The window's FBConfig (X11) or device context (Windows) */
 
     int             DoubleBuffered;  /* Treat the window as double-buffered */
-    GLint attribute_v_coord;
-    GLint attribute_v_normal;
+    GLint           attribute_v_coord;
+    GLint           attribute_v_normal;
 };
 
 

Modified: trunk/freeglut/freeglut/src/fg_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_menu.c	2012-07-29 04:11:01 UTC (rev 1375)
+++ trunk/freeglut/freeglut/src/fg_menu.c	2012-07-29 05:11:53 UTC (rev 1376)
@@ -720,12 +720,13 @@
         if (fgState.MenuStatusCallback)
         {
             /* Get cursor position on screen and convert to relative to parent_window's client area */
-            POINT mouse_pos;
-            GetCursorPos(&mouse_pos);
-            mouse_pos.x -= glutGet( GLUT_WINDOW_X );
-            mouse_pos.y -= glutGet( GLUT_WINDOW_Y );
+            SFG_XYUse mouse_pos;
+            fghPlatformGetMousePos(&mouse_pos);
+            
+            mouse_pos.X -= glutGet( GLUT_WINDOW_X );
+            mouse_pos.Y -= glutGet( GLUT_WINDOW_Y );
 
-            fgState.MenuStatusCallback(GLUT_MENU_NOT_IN_USE, mouse_pos.x, mouse_pos.y);
+            fgState.MenuStatusCallback(GLUT_MENU_NOT_IN_USE, mouse_pos.X, mouse_pos.Y);
         }
     }
 }

Modified: trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c	2012-07-29 04:11:01 UTC (rev 1375)
+++ trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c	2012-07-29 05:11:53 UTC (rev 1376)
@@ -85,14 +85,7 @@
 static pRegisterTouchWindow fghRegisterTouchWindow = (pRegisterTouchWindow)0xDEADBEEF;
 #endif
 
-/* 
- * Helper functions for getting client area from the window rect
- * and the window rect from the client area given the style of the window
- * (or a valid window pointer from which the style can be queried).
- */
-extern void fghGetBorderWidth(const DWORD windowStyle, int* xBorderWidth, int* yBorderWidth);
 
-
 /*
  * Setup the pixel format for a Win32 window
  */
@@ -378,7 +371,39 @@
 }
 
 
+void fghPlatformGetMousePos(SFG_XYUse *mouse_pos)
+{
+    POINT pos;
+    GetCursorPos(&pos);
 
+    mouse_pos->X = pos.x;
+    mouse_pos->Y = pos.y;
+    mouse_pos->Use = GL_TRUE;
+}
+
+/* Returns the width of the window borders based on the window's style.
+*/
+void fghGetBorderWidth(const DWORD windowStyle, int* xBorderWidth, int* yBorderWidth)
+{
+    if (windowStyle & WS_THICKFRAME)
+    {
+        *xBorderWidth = GetSystemMetrics(SM_CXSIZEFRAME);
+        *yBorderWidth = GetSystemMetrics(SM_CYSIZEFRAME);
+    }
+    else if (windowStyle & WS_DLGFRAME)
+    {
+        *xBorderWidth = GetSystemMetrics(SM_CXFIXEDFRAME);
+        *yBorderWidth = GetSystemMetrics(SM_CYFIXEDFRAME);
+    }
+    else
+    {
+        *xBorderWidth = 0;
+        *yBorderWidth = 0;
+    }
+}
+
+
+
 /* Computes position of corners of window Rect (outer position including
  * decorations) based on the provided client rect and based on the style
  * of the window in question.
@@ -516,27 +541,6 @@
     return windowRect;
 }
 
-/* Returns the width of the window borders based on the window's style.
- */
-void fghGetBorderWidth(const DWORD windowStyle, int* xBorderWidth, int* yBorderWidth)
-{
-    if (windowStyle & WS_THICKFRAME)
-    {
-        *xBorderWidth = GetSystemMetrics(SM_CXSIZEFRAME);
-        *yBorderWidth = GetSystemMetrics(SM_CYSIZEFRAME);
-    }
-    else if (windowStyle & WS_DLGFRAME)
-    {
-        *xBorderWidth = GetSystemMetrics(SM_CXFIXEDFRAME);
-        *yBorderWidth = GetSystemMetrics(SM_CYFIXEDFRAME);
-    }
-    else
-    {
-        *xBorderWidth = 0;
-        *yBorderWidth = 0;
-    }
-}
-
 #if(WINVER >= 0x500)
 typedef struct
 {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1377
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1377&view=rev
Author:   dcnieho
Date:     2012-07-29 05:18:36 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
fg_cursor is a much better place for code reading the mouse position

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_menu.c
    trunk/freeglut/freeglut/src/mswin/fg_cursor_mswin.c
    trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c

Modified: trunk/freeglut/freeglut/src/fg_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_menu.c	2012-07-29 05:11:53 UTC (rev 1376)
+++ trunk/freeglut/freeglut/src/fg_menu.c	2012-07-29 05:18:36 UTC (rev 1377)
@@ -76,6 +76,7 @@
 
 
 extern GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y );
+extern void fghPlatformGetCursorPos(SFG_XYUse *mouse_pos);
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
@@ -721,7 +722,7 @@
         {
             /* Get cursor position on screen and convert to relative to parent_window's client area */
             SFG_XYUse mouse_pos;
-            fghPlatformGetMousePos(&mouse_pos);
+            fghPlatformGetCursorPos(&mouse_pos);
             
             mouse_pos.X -= glutGet( GLUT_WINDOW_X );
             mouse_pos.Y -= glutGet( GLUT_WINDOW_Y );

Modified: trunk/freeglut/freeglut/src/mswin/fg_cursor_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_cursor_mswin.c	2012-07-29 05:11:53 UTC (rev 1376)
+++ trunk/freeglut/freeglut/src/mswin/fg_cursor_mswin.c	2012-07-29 05:18:36 UTC (rev 1377)
@@ -113,3 +113,12 @@
 }
 
 
+void fghPlatformGetCursorPos(SFG_XYUse *mouse_pos)
+{
+    POINT pos;
+    GetCursorPos(&pos);
+
+    mouse_pos->X = pos.x;
+    mouse_pos->Y = pos.y;
+    mouse_pos->Use = GL_TRUE;
+}
\ No newline at end of file

Modified: trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c	2012-07-29 05:11:53 UTC (rev 1376)
+++ trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c	2012-07-29 05:18:36 UTC (rev 1377)
@@ -371,16 +371,6 @@
 }
 
 
-void fghPlatformGetMousePos(SFG_XYUse *mouse_pos)
-{
-    POINT pos;
-    GetCursorPos(&pos);
-
-    mouse_pos->X = pos.x;
-    mouse_pos->Y = pos.y;
-    mouse_pos->Use = GL_TRUE;
-}
-
 /* Returns the width of the window borders based on the window's style.
 */
 void fghGetBorderWidth(const DWORD windowStyle, int* xBorderWidth, int* yBorderWidth)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1378
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1378&view=rev
Author:   dcnieho
Date:     2012-07-29 05:28:10 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
attempt to implement fghPlatformGetCursorPos on X11

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/mswin/fg_cursor_mswin.c
    trunk/freeglut/freeglut/src/x11/fg_cursor_x11.c

Modified: trunk/freeglut/freeglut/src/mswin/fg_cursor_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_cursor_mswin.c	2012-07-29 05:18:36 UTC (rev 1377)
+++ trunk/freeglut/freeglut/src/mswin/fg_cursor_mswin.c	2012-07-29 05:28:10 UTC (rev 1378)
@@ -115,6 +115,8 @@
 
 void fghPlatformGetCursorPos(SFG_XYUse *mouse_pos)
 {
+    /* Get current pointer location in screen coordinates
+     */
     POINT pos;
     GetCursorPos(&pos);
 

Modified: trunk/freeglut/freeglut/src/x11/fg_cursor_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/fg_cursor_x11.c	2012-07-29 05:18:36 UTC (rev 1377)
+++ trunk/freeglut/freeglut/src/x11/fg_cursor_x11.c	2012-07-29 05:28:10 UTC (rev 1378)
@@ -149,3 +149,16 @@
     XFlush( fgDisplay.pDisplay.Display );
 }
 
+void fghPlatformGetCursorPos(SFG_XYUse *mouse_pos)
+{
+    /* Get current pointer location in screen coordinates
+     */
+    Window junk_window;
+    unsigned int junk_mask;
+    int junk_pos;
+
+    XQueryPointer(fgDisplay.pDisplay.Display, fgDisplay.pDisplay.RootWindow,
+            &junk_window, &junk_window,
+            &mouse_pos->X, &mouse_pos->Y,
+            &junk_pos, &junk_pos, &junk_mask);
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1502
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1502&view=rev
Author:   dcnieho
Date:     2013-02-09 11:59:32 +0000 (Sat, 09 Feb 2013)
Log Message:
-----------
now have 64bit internal time on Windows, as we deal with wrap of timeGetTime manually

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_init.c
    trunk/freeglut/freeglut/src/fg_main.c
    trunk/freeglut/freeglut/src/fg_state.c
    trunk/freeglut/freeglut/src/mswin/fg_init_mswin.c
    trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
    trunk/freeglut/freeglut/src/x11/fg_init_x11.c

Modified: trunk/freeglut/freeglut/src/fg_init.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_init.c	2013-01-27 12:38:28 UTC (rev 1501)
+++ trunk/freeglut/freeglut/src/fg_init.c	2013-02-09 11:59:32 UTC (rev 1502)
@@ -341,9 +341,6 @@
 
     fgCreateStructure( );
 
-    /* Get start time */
-    fgState.Time = fgSystemTime();
-
 	fghParseCommandLineArguments ( pargc, argv, &displayName, &geometry );
 
     /*

Modified: trunk/freeglut/freeglut/src/fg_main.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_main.c	2013-01-27 12:38:28 UTC (rev 1501)
+++ trunk/freeglut/freeglut/src/fg_main.c	2013-02-09 11:59:32 UTC (rev 1502)
@@ -224,12 +224,8 @@
 /* Platform-dependent time in milliseconds, as an unsigned 64-bit integer.
  * This doesn't overflow in any reasonable time, so no need to worry about
  * that. The GLUT API return value will however overflow after 49.7 days,
- * and on Windows we (currently) do not have access to a 64-bit timestamp,
- * which means internal time will still get in trouble when running the
+ * which means you will still get in trouble when running the
  * application for more than 49.7 days.
- * This value wraps every 49.7 days, but integer overflows cancel
- * when subtracting an initial start time, unless the total time exceeds
- * 32-bit, where the GLUT API return value is also overflowed.
  */  
 fg_time_t fgSystemTime(void)
 {

Modified: trunk/freeglut/freeglut/src/fg_state.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_state.c	2013-01-27 12:38:28 UTC (rev 1501)
+++ trunk/freeglut/freeglut/src/fg_state.c	2013-02-09 11:59:32 UTC (rev 1502)
@@ -136,6 +136,12 @@
     case GLUT_INIT_STATE:
         return fgState.Initialised;
 
+    /* Although internally the time store is 64bits wide, the return value
+     * here still wraps every 49.7 days. Integer overflows cancel however
+     * when subtracting an initial start time, unless the total time exceeds
+     * 32-bit, so you can still work with this.
+     * XXX: a glutGet64 to return the time might be an idea...
+     */
     case GLUT_ELAPSED_TIME:
         return (int) fgElapsedTime();
     }

Modified: trunk/freeglut/freeglut/src/mswin/fg_init_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_init_mswin.c	2013-01-27 12:38:28 UTC (rev 1501)
+++ trunk/freeglut/freeglut/src/mswin/fg_init_mswin.c	2013-02-09 11:59:32 UTC (rev 1502)
@@ -33,6 +33,7 @@
 
 extern LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg,
                                WPARAM wParam, LPARAM lParam );
+extern void fgPlatformInitSystemTime();
 
 
 /*
@@ -117,6 +118,10 @@
     }
     /* Set the timer granularity to 1 ms */
     timeBeginPeriod ( 1 );
+    /* Init setup to deal with timer wrap, can't query system time before this is done */
+    fgPlatformInitSystemTime();
+    /* Get start time */
+    fgState.Time = fgSystemTime();
 
 
     fgState.Initialised = GL_TRUE;

Modified: trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-01-27 12:38:28 UTC (rev 1501)
+++ trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-02-09 11:59:32 UTC (rev 1502)
@@ -135,21 +135,38 @@
 }
 
 
+/* Get system time, taking special precautions against 32bit timer wrap.
+   We use timeGetTime and not GetTickCount because of its better stability,
+   and because we can increase its granularity (to 1 ms in
+   fgPlatformInitialize). For that reason we can't use GetTickCount64 which
+   wouldn't have the wrap issue.
+   Credit: this is based on code in glibc (https://mail.gnome.org/archives/commits-list/2011-November/msg04588.html)
+   */
+static fg_time_t lastTime32 = 0;
+static fg_time_t timeEpoch = 0;
+void fgPlatformInitSystemTime()
+{
+#if defined(_WIN32_WCE)
+    lastTime32 = GetTickCount();
+#else
+    lastTime32 = timeGetTime();
+#endif
+}
 fg_time_t fgPlatformSystemTime ( void )
 {
+    fg_time_t currTime32;
 #if defined(_WIN32_WCE)
-    return GetTickCount();
+    currTime32 = GetTickCount();
 #else
-    /* TODO: do this with QueryPerformanceCounter as timeGetTime has
-     * insufficient resolution (only about 5 ms on system under low load).
-     * See:
-     * http://msdn.microsoft.com/en-us/library/windows/desktop/dd757629(v=vs.85).aspx
-     * Or maybe QueryPerformanceCounter is not a good idea either, see
-     * http://old.nabble.com/Re%3A-glutTimerFunc-does-not-detect-if-system-time-moved-backward-p33479674.html
-     * for some other ideas (at bottom)...
-     */
-    return timeGetTime();
+    currTime32 = timeGetTime();
 #endif
+    /* Check if we just wrapped */
+    if (currTime32 < lastTime32)
+        timeEpoch++;
+    
+    lastTime32 = currTime32;
+
+    return currTime32 | timeEpoch << 32;
 }
 
 

Modified: trunk/freeglut/freeglut/src/x11/fg_init_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/fg_init_x11.c	2013-01-27 12:38:28 UTC (rev 1501)
+++ trunk/freeglut/freeglut/src/x11/fg_init_x11.c	2013-02-09 11:59:32 UTC (rev 1502)
@@ -238,6 +238,9 @@
       }
     }
 
+    /* Get start time */
+    fgState.Time = fgSystemTime();
+    
 
     fgState.Initialised = GL_TRUE;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1520
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1520&view=rev
Author:   dcnieho
Date:     2013-02-27 07:52:55 +0000 (Wed, 27 Feb 2013)
Log Message:
-----------
Now implemented properly working mouse entry and exit (EntryFunc callback) support on windows

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_internal.h
    trunk/freeglut/freeglut/src/mswin/fg_internal_mswin.h
    trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c

Modified: trunk/freeglut/freeglut/src/fg_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/fg_internal.h	2013-02-27 07:07:55 UTC (rev 1519)
+++ trunk/freeglut/freeglut/src/fg_internal.h	2013-02-27 07:52:55 UTC (rev 1520)
@@ -383,7 +383,7 @@
     int             Width;              /* Window's width in pixels          */
     int             Height;             /* The same about the height         */
 
-	SFG_PlatformWindowState pWState;    /* Window width/height (X11) or rectangle/style (Windows) from before a resize */
+	SFG_PlatformWindowState pWState;    /* Window width/height (X11) or rectangle/style (Windows) from before a resize, and other stuff only needed on specific platforms */
 
     GLboolean       Redisplay;          /* Do we have to redisplay?          */
     GLboolean       Visible;            /* Is the window visible now         */

Modified: trunk/freeglut/freeglut/src/mswin/fg_internal_mswin.h
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_internal_mswin.h	2013-02-27 07:07:55 UTC (rev 1519)
+++ trunk/freeglut/freeglut/src/mswin/fg_internal_mswin.h	2013-02-27 07:52:55 UTC (rev 1520)
@@ -95,6 +95,8 @@
     DWORD           OldStyle;           /* window style    - stored before the window is made fullscreen */
     DWORD           OldStyleEx;         /* window Ex style - stored before the window is made fullscreen */
     BOOL            OldMaximized;       /* window maximized state - stored before the window is made fullscreen */
+
+    GLboolean       MouseTracking;      /* Needed for generating GLUT_ENTERED and GLUT_LEFT entry func callbacks on windows */
 };
 
 

Modified: trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-02-27 07:07:55 UTC (rev 1519)
+++ trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-02-27 07:52:55 UTC (rev 1520)
@@ -518,18 +518,14 @@
         lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
 
         SetActiveWindow( window->Window.Handle );
-        INVOKE_WCB( *window, Entry, ( GLUT_ENTERED ) );
         UpdateWindow ( hWnd );
 
         break;
 
     case WM_KILLFOCUS:
         {
-            SFG_Window* saved_window = fgStructure.CurrentWindow;
 /*            printf("WM_KILLFOCUS: %p\n", window ); */
             lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
-            INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
-            fgSetWindow(saved_window);
 
             /* Check if there are any open menus that need to be closed */
             fgPlatformCheckMenuDeactivate();
@@ -553,11 +549,39 @@
     case WM_SETCURSOR:
 /*      printf ( "Cursor event %x %x %x %x\n", window, window->State.Cursor, lParam, wParam ) ; */
         if( LOWORD( lParam ) == HTCLIENT )
-            fgSetCursor ( window, window->State.Cursor ) ;
+        {
+            if (!window->State.pWState.MouseTracking)
+            {
+                TRACKMOUSEEVENT tme;
+
+                /* Cursor just entered window, set cursor look, invoke callback and start tracking so that we get a WM_MOUSELEAVE message */
+                fgSetCursor ( window, window->State.Cursor ) ;
+                INVOKE_WCB( *window, Entry, ( GLUT_ENTERED ) );
+
+                tme.cbSize = sizeof(TRACKMOUSEEVENT);
+                tme.dwFlags = TME_LEAVE;
+                tme.hwndTrack = window->Window.Handle;
+                TrackMouseEvent(&tme);
+
+                window->State.pWState.MouseTracking = GL_TRUE;
+            }
+        }
         else
+            /* Only pass non-client WM_SETCURSOR to DefWindowProc, or we get WM_SETCURSOR on parents of children as well */
             lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
         break;
 
+    case WM_MOUSELEAVE:
+        {
+            SFG_Window* saved_window = fgStructure.CurrentWindow;
+            INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
+            fgSetWindow(saved_window);
+
+            window->State.pWState.MouseTracking = GL_FALSE;
+            lRet = 0;   /* As per docs, must return zero */
+        }
+        break;
+
     case WM_SHOWWINDOW:
         window->State.Visible = GL_TRUE;
         window->State.Redisplay = GL_TRUE;
@@ -828,8 +852,7 @@
     case WM_CAPTURECHANGED:
         /* User has finished resizing the window, force a redraw */
         INVOKE_WCB( *window, Display, ( ) );
-
-        /*lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); */
+        lRet = 0;   /* Per docs, should return zero */
         break;
 
         /* Other messages that I have seen and which are not handled already */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1526
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1526&view=rev
Author:   dcnieho
Date:     2013-02-27 11:36:14 +0000 (Wed, 27 Feb 2013)
Log Message:
-----------
now that mouse capture was properly implemented, menus could be opened
outside the window when the window had capture because another mouse
button was depressed. fixed
Also implemented WM_CANCELMODE, which could be important as we should
cancel capture when it comes in

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_menu.c
    trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c

Modified: trunk/freeglut/freeglut/src/fg_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_menu.c	2013-02-27 10:46:13 UTC (rev 1525)
+++ trunk/freeglut/freeglut/src/fg_menu.c	2013-02-27 11:36:14 UTC (rev 1526)
@@ -667,10 +667,18 @@
         ( window->Menu[ button ] ) &&
         pressed )
     {
-        /* XXX Posting a requisite Redisplay seems bogus. */
-        window->State.Redisplay = GL_TRUE;
-        fghActivateMenu( window, button );
-        return GL_TRUE;
+        /* If mouseclick was outside the parent window, ignore. This can
+         * happen when another mouse button is already depressed and the
+         * window thus has mouse capture
+         */
+        if (window->State.MouseX>0 && window->State.MouseY>0 &&
+            window->State.MouseX<window->State.Width && window->State.MouseX<window->State.Height)
+        {
+            /* XXX Posting a requisite Redisplay seems bogus. */
+            window->State.Redisplay = GL_TRUE;
+            fghActivateMenu( window, button );
+            return GL_TRUE;
+        }
     }
 
     return GL_FALSE;

Modified: trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-02-27 10:46:13 UTC (rev 1525)
+++ trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-02-27 11:36:14 UTC (rev 1526)
@@ -361,6 +361,7 @@
 {
     SFG_Window *window;
     LRESULT lRet = 1;
+    static int setCaptureActive = 0;
 
     FREEGLUT_INTERNAL_ERROR_EXIT_IF_NOT_INITIALISED ( "Event Handler" ) ;
 
@@ -623,6 +624,17 @@
          */
         return 0;
 
+    case WM_CANCELMODE:
+        /*
+         * The window manager sends this message when it detects a change
+         * that requires that an application cancel any modal state it has
+         * entered. If we've called SetCapture in the mouse button handler,
+         * call ReleaseCapture.
+         */
+        if (setCaptureActive)
+            ReleaseCapture();
+        break;
+
     case WM_MOUSEMOVE:
     {
 #if defined(_WIN32_WCE)
@@ -743,7 +755,11 @@
          * This is consistent with the behavior on X11.
          */
         if ( pressed == GL_TRUE )
-          SetCapture ( window->Window.Handle ) ;
+        {
+            if (!setCaptureActive)
+                SetCapture ( window->Window.Handle ) ;
+            setCaptureActive = 1; /* Set to false in WM_CAPTURECHANGED handler */
+        }
         else if (!GetAsyncKeyState(VK_LBUTTON) && !GetAsyncKeyState(VK_MBUTTON) && !GetAsyncKeyState(VK_RBUTTON))
           /* Make sure all mouse buttons are released before releasing capture */
           ReleaseCapture () ;
@@ -864,6 +880,9 @@
     break;
 
     case WM_CAPTURECHANGED:
+        if (!lParam || !fgWindowByHandle((HWND)lParam))
+            /* Capture released or capture taken by non-FreeGLUT window */
+            setCaptureActive = 0;
         /* User has finished resizing the window, force a redraw */
         INVOKE_WCB( *window, Display, ( ) );
         lRet = 0;   /* Per docs, should return zero */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1544
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1544&view=rev
Author:   dcnieho
Date:     2013-03-01 17:22:34 +0000 (Fri, 01 Mar 2013)
Log Message:
-----------
some cleanup: on window creation, don't have to zero variables that
already set to zero by calloc
in windowproc, don't have handlers that only forward the message to
defwindowproc

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_structure.c
    trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c

Modified: trunk/freeglut/freeglut/src/fg_structure.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_structure.c	2013-03-01 17:20:47 UTC (rev 1543)
+++ trunk/freeglut/freeglut/src/fg_structure.c	2013-03-01 17:22:34 UTC (rev 1544)
@@ -72,7 +72,7 @@
                             GLboolean gameMode, GLboolean isMenu )
 {
     /* Have the window object created */
-    SFG_Window *window = (SFG_Window *)calloc( sizeof(SFG_Window), 1 );
+    SFG_Window *window = (SFG_Window *)calloc( 1, sizeof(SFG_Window) );
 
 	fgPlatformCreateWindow ( window );
 
@@ -90,17 +90,10 @@
     else
         fgListAppend( &fgStructure.Windows, &window->Node );
 
-    /* Set the default mouse cursor and reset the modifiers value */
+    /* Set the default mouse cursor */
     window->State.Cursor    = GLUT_CURSOR_INHERIT;
-    
-    window->State.IgnoreKeyRepeat = GL_FALSE;
-    window->State.KeyRepeating    = GL_FALSE;
-    window->State.IsFullscreen    = GL_FALSE;
-    window->State.VisualizeNormals= GL_FALSE;
 
-    window->State.pWState.WindowTitle   = NULL;
-    window->State.pWState.IconTitle     = NULL;
-
+    /* Mark window as menu if a menu is to be created */
     window->IsMenu = isMenu;
 
     /*

Modified: trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-03-01 17:20:47 UTC (rev 1543)
+++ trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-03-01 17:22:34 UTC (rev 1544)
@@ -928,30 +928,6 @@
         lRet = 0;   /* Per docs, should return zero */
         break;
 
-        /* Other messages that I have seen and which are not handled already */
-    case WM_SETTEXT:  /* 0x000c */
-        lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
-        /* Pass it on to "DefWindowProc" to set the window text */
-        break;
-
-    case WM_GETTEXT:  /* 0x000d */
-        /* Ideally we would copy the title of the window into "lParam" */
-        /* strncpy ( (char *)lParam, "Window Title", wParam );
-           lRet = ( wParam > 12 ) ? 12 : wParam;  */
-        /* the number of characters copied */
-        lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
-        break;
-
-    case WM_GETTEXTLENGTH:  /* 0x000e */
-        /* Ideally we would get the length of the title of the window */
-        lRet = 12;
-        /* the number of characters in "Window Title\0" (see above) */
-        break;
-
-    case WM_ERASEBKGND:  /* 0x0014 */
-        lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
-        break;
-
 #if !defined(_WIN32_WCE)
     case WM_SYNCPAINT:  /* 0x0088 */
         /* Another window has moved, need to update this one */
@@ -960,12 +936,6 @@
         /* Help screen says this message must be passed to "DefWindowProc" */
         break;
 
-    case WM_NCPAINT:  /* 0x0085 */
-      /* Need to update the border of this window */
-        lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
-        /* Pass it on to "DefWindowProc" to repaint a standard border */
-        break;
-
     case WM_SYSCOMMAND :  /* 0x0112 */
         {
           /*

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1550
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1550&view=rev
Author:   dcnieho
Date:     2013-03-04 09:54:55 +0000 (Mon, 04 Mar 2013)
Log Message:
-----------
MenuStatusCallback when menu was closed did not return location of pointer relative to child window's top-left, it only worked for top level windows.
To make this work, fghPlatformGetCursorPos now can return cursor pos relative to top-left of a specified window's client area (this is untested on X11)

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_menu.c
    trunk/freeglut/freeglut/src/mswin/fg_cursor_mswin.c
    trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
    trunk/freeglut/freeglut/src/x11/fg_cursor_x11.c

Modified: trunk/freeglut/freeglut/src/fg_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_menu.c	2013-03-04 09:25:15 UTC (rev 1549)
+++ trunk/freeglut/freeglut/src/fg_menu.c	2013-03-04 09:54:55 UTC (rev 1550)
@@ -76,7 +76,7 @@
 
 
 extern GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y );
-extern void fghPlatformGetCursorPos(SFG_XYUse *mouse_pos);
+extern void fghPlatformGetCursorPos(const SFG_Window *window, GLboolean client, SFG_XYUse *mouse_pos);
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
@@ -534,7 +534,7 @@
      * origin when looking at a child window
      * for parent windows: window->State.MouseX + glutGet( GLUT_WINDOW_X ) == mouse_pos.X
      */
-    fghPlatformGetCursorPos(&mouse_pos);
+    fghPlatformGetCursorPos(NULL, GL_FALSE, &mouse_pos);
     menu->X = mouse_pos.X;
     menu->Y = mouse_pos.Y;
 
@@ -744,12 +744,9 @@
             fgState.MenuStateCallback(GLUT_MENU_NOT_IN_USE);
         if (fgState.MenuStatusCallback)
         {
-            /* Get cursor position on screen and convert to relative to parent_window's client area */
+            /* Get cursor position relative to parent_window's client area */
             SFG_XYUse mouse_pos;
-            fghPlatformGetCursorPos(&mouse_pos);
-            
-            mouse_pos.X -= glutGet( GLUT_WINDOW_X );
-            mouse_pos.Y -= glutGet( GLUT_WINDOW_Y );
+            fghPlatformGetCursorPos(parent_window, GL_TRUE, &mouse_pos);
 
             fgState.MenuStatusCallback(GLUT_MENU_NOT_IN_USE, mouse_pos.X, mouse_pos.Y);
         }

Modified: trunk/freeglut/freeglut/src/mswin/fg_cursor_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_cursor_mswin.c	2013-03-04 09:25:15 UTC (rev 1549)
+++ trunk/freeglut/freeglut/src/mswin/fg_cursor_mswin.c	2013-03-04 09:54:55 UTC (rev 1550)
@@ -128,13 +128,18 @@
 }
 
 
-void fghPlatformGetCursorPos(SFG_XYUse *mouse_pos)
+void fghPlatformGetCursorPos(const SFG_Window *window, GLboolean client, SFG_XYUse *mouse_pos)
 {
-    /* Get current pointer location in screen coordinates
+    /* Get current pointer location in screen coordinates (if client is false or window is NULL), else
+     * Get current pointer location relative to top-left of client area of window (if client is true and window is not NULL)
      */
     POINT pos;
     GetCursorPos(&pos);
 
+    /* convert to client coords if wanted */
+    if (client && window && window->Window.Handle)
+        ScreenToClient(window->Window.Handle,&pos);
+
     mouse_pos->X = pos.x;
     mouse_pos->Y = pos.y;
     mouse_pos->Use = GL_TRUE;

Modified: trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-03-04 09:25:15 UTC (rev 1549)
+++ trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-03-04 09:54:55 UTC (rev 1550)
@@ -349,7 +349,7 @@
      */
     if (window && window->Children.First)   /* This window has childs */
     {
-        SFG_WindowHandleType hwnd;
+        HWND hwnd;
         SFG_Window* child_window;
 
         /* Get mouse position at time of message */

Modified: trunk/freeglut/freeglut/src/x11/fg_cursor_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/fg_cursor_x11.c	2013-03-04 09:25:15 UTC (rev 1549)
+++ trunk/freeglut/freeglut/src/x11/fg_cursor_x11.c	2013-03-04 09:54:55 UTC (rev 1550)
@@ -149,18 +149,27 @@
     XFlush( fgDisplay.pDisplay.Display );
 }
 
-void fghPlatformGetCursorPos(SFG_XYUse *mouse_pos)
+void fghPlatformGetCursorPos(const SFG_Window *window, GLboolean client, SFG_XYUse *mouse_pos)
 {
-    /* Get current pointer location in screen coordinates
+    /* Get current pointer location in screen coordinates (if client is false or window is NULL), else
+     * Get current pointer location relative to top-left of client area of window (if client is true and window is not NULL)
      */
+    Window w = (client && window && window->Window.Handle)? window->Window.Handle: fgDisplay.pDisplay.RootWindow;
     Window junk_window;
     unsigned int junk_mask;
-    int junk_pos;
+    int clientX, clientY;
 
-    XQueryPointer(fgDisplay.pDisplay.Display, fgDisplay.pDisplay.RootWindow,
+    XQueryPointer(fgDisplay.pDisplay.Display, w,
             &junk_window, &junk_window,
-            &mouse_pos->X, &mouse_pos->Y,
-            &junk_pos, &junk_pos, &junk_mask);
+            &mouse_pos->X, &mouse_pos->Y, /* Screen coords relative to root window's top-left */
+            &clientX, &clientY,           /* Client coords relative to window's top-left */
+            &junk_mask);
 
+    if (client && window && window->Window.Handle)
+    {
+        mouse_pos->X = clientX;
+        mouse_pos->Y = clientY;
+    }
+
     mouse_pos->Use = GL_TRUE;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1554
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1554&view=rev
Author:   dcnieho
Date:     2013-03-06 03:39:00 +0000 (Wed, 06 Mar 2013)
Log Message:
-----------
joystick:
- only poll joysticks if we have an active joystick
- active joystick is defined as having callback and having positive (NON-ZERO!) pollInterval, as per GLUT sources
- use fgState.NumActiveJoysticks instead of fghHaveJoystick to save bunch of unnecessary function calls etc
- fghcbCheckJoystickPolls more concervative, per window we first check if a joystick is active (per above definition)

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_callbacks.c
    trunk/freeglut/freeglut/src/fg_internal.h
    trunk/freeglut/freeglut/src/fg_main.c

Modified: trunk/freeglut/freeglut/src/fg_callbacks.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_callbacks.c	2013-03-05 17:08:32 UTC (rev 1553)
+++ trunk/freeglut/freeglut/src/fg_callbacks.c	2013-03-06 03:39:00 UTC (rev 1554)
@@ -213,13 +213,21 @@
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutJoystickFunc" );
     fgInitialiseJoysticks ();
 
-    if ( ( ( fgStructure.CurrentWindow->State.JoystickPollRate < 0 ) ||
-           !FETCH_WCB(*fgStructure.CurrentWindow,Joystick) ) &&  /* Joystick callback was disabled */
-         ( callback && ( pollInterval >= 0 ) ) )               /* but is now enabled */
+    if ( (
+           fgStructure.CurrentWindow->State.JoystickPollRate <= 0 ||        /* Joystick callback was disabled */
+           !FETCH_WCB(*fgStructure.CurrentWindow,Joystick)
+         ) &&
+         ( 
+           callback && ( pollInterval > 0 )                                 /* but is now enabled */
+         ) )
         ++fgState.NumActiveJoysticks;
-    else if ( ( ( fgStructure.CurrentWindow->State.JoystickPollRate >= 0 ) &&
-                FETCH_WCB(*fgStructure.CurrentWindow,Joystick) ) &&  /* Joystick callback was enabled */
-              ( !callback || ( pollInterval < 0 ) ) )              /* but is now disabled */
+    else if ( ( 
+                fgStructure.CurrentWindow->State.JoystickPollRate > 0 &&    /* Joystick callback was enabled */
+                FETCH_WCB(*fgStructure.CurrentWindow,Joystick)
+              ) &&  
+              ( 
+                !callback || ( pollInterval <= 0 )                          /* but is now disabled */
+              ) )
         --fgState.NumActiveJoysticks;
 
     SET_CALLBACK( Joystick );

Modified: trunk/freeglut/freeglut/src/fg_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/fg_internal.h	2013-03-05 17:08:32 UTC (rev 1553)
+++ trunk/freeglut/freeglut/src/fg_internal.h	2013-03-06 03:39:00 UTC (rev 1554)
@@ -316,7 +316,7 @@
     fgExecutionState ExecState;           /* Used for GLUT termination       */
     char            *ProgramName;         /* Name of the invoking program    */
     GLboolean        JoysticksInitialised;  /* Only initialize if application calls for them */
-    int              NumActiveJoysticks;    /* Number of active joysticks -- if zero, don't poll joysticks */
+    int              NumActiveJoysticks;    /* Number of active joysticks (callback defined and positive pollrate) -- if zero, don't poll joysticks */
     GLboolean        InputDevsInitialised;  /* Only initialize if application calls for them */
 
 	int              MouseWheelTicks;      /* Number of ticks the mouse wheel has turned */

Modified: trunk/freeglut/freeglut/src/fg_main.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_main.c	2013-03-05 17:08:32 UTC (rev 1553)
+++ trunk/freeglut/freeglut/src/fg_main.c	2013-03-06 03:39:00 UTC (rev 1554)
@@ -172,15 +172,21 @@
 static void fghcbCheckJoystickPolls( SFG_Window *window,
                                      SFG_Enumerator *enumerator )
 {
-    fg_time_t checkTime = fgElapsedTime( );
-
-    if( window->State.JoystickLastPoll + window->State.JoystickPollRate <=
-        checkTime )
+    fg_time_t checkTime;
+    
+    if (window->State.JoystickPollRate > 0 && FETCH_WCB( *window, Joystick ))
     {
+        /* This window has a joystick to be polled (if pollrate <= 0, user needs to poll manually with glutForceJoystickFunc */
+        checkTime= fgElapsedTime( );
+
+        if( window->State.JoystickLastPoll + window->State.JoystickPollRate <=
+            checkTime )
+        {
 #if !defined(_WIN32_WCE)
-        fgJoystickPollWindow( window );
+            fgJoystickPollWindow( window );
 #endif /* !defined(_WIN32_WCE) */
-        window->State.JoystickLastPoll = checkTime;
+            window->State.JoystickLastPoll = checkTime;
+        }
     }
 
     fgEnumSubWindows( window, fghcbCheckJoystickPolls, enumerator );
@@ -188,6 +194,10 @@
 
 /*
  * Check all windows for joystick polling
+ * 
+ * The real way to do this is to make use of the glutTimer() API
+ * to more cleanly re-implement the joystick API.  Then, this code
+ * and all other "joystick timer" code can be yanked.
  */
 static void fghCheckJoystickPolls( void )
 {
@@ -312,29 +322,8 @@
  * there is a joystick callback.  We have a short-circuit early
  * return if we find any joystick handler registered.
  *
- * The real way to do this is to make use of the glutTimer() API
- * to more cleanly re-implement the joystick API.  Then, this code
- * and all other "joystick timer" code can be yanked.
  *
  */
-static void fghCheckJoystickCallback( SFG_Window* w, SFG_Enumerator* e)
-{
-    if( FETCH_WCB( *w, Joystick ) )
-    {
-        e->found = GL_TRUE;
-        e->data = w;
-    }
-    fgEnumSubWindows( w, fghCheckJoystickCallback, e );
-}
-static int fghHaveJoystick( void )
-{
-    SFG_Enumerator enumerator;
-
-    enumerator.found = GL_FALSE;
-    enumerator.data = NULL;
-    fgEnumWindows( fghCheckJoystickCallback, &enumerator );
-    return !!enumerator.data;
-}
 static void fghHavePendingRedisplaysCallback( SFG_Window* w, SFG_Enumerator* e)
 {
     if( w->State.Redisplay && w->State.Visible )
@@ -353,6 +342,7 @@
     fgEnumWindows( fghHavePendingRedisplaysCallback, &enumerator );
     return !!enumerator.data;
 }
+
 /*
  * Returns the number of GLUT ticks (milliseconds) till the next timer event.
  */
@@ -378,9 +368,9 @@
         return;
 
     msec = fghNextTimer( );
-    /* XXX Use GLUT timers for joysticks... */
+    /* XXX Should use GLUT timers for joysticks... */
     /* XXX Dumb; forces granularity to .01sec */
-    if( fghHaveJoystick( ) && ( msec > 10 ) )     
+    if( fgState.NumActiveJoysticks>0 && ( msec > 10 ) )     
         msec = 10;
 
 	fgPlatformSleepForEvents ( msec );
@@ -398,7 +388,8 @@
 
     if( fgState.Timers.First )
         fghCheckTimers( );
-    fghCheckJoystickPolls( );
+    if (fgState.NumActiveJoysticks>0)   /* If zero, don't poll joysticks */
+        fghCheckJoystickPolls( );
     fghDisplayAll( );
 
     fgCloseWindows( );

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1557
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1557&view=rev
Author:   dcnieho
Date:     2013-03-06 09:17:13 +0000 (Wed, 06 Mar 2013)
Log Message:
-----------
now have a default reshape callback function that is used if the user didn't set any, instead of having what to do spread out over the code

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_callbacks.c
    trunk/freeglut/freeglut/src/fg_main.c
    trunk/freeglut/freeglut/src/fg_structure.c
    trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c
    trunk/freeglut/freeglut/src/x11/fg_main_x11.c

Modified: trunk/freeglut/freeglut/src/fg_callbacks.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_callbacks.c	2013-03-06 03:51:01 UTC (rev 1556)
+++ trunk/freeglut/freeglut/src/fg_callbacks.c	2013-03-06 09:17:13 UTC (rev 1557)
@@ -121,7 +121,6 @@
 #define IMPLEMENT_CALLBACK_FUNC(a) IMPLEMENT_CALLBACK_FUNC_2NAME(a,a)
 
 /* Implement all these callback setter functions... */
-IMPLEMENT_CALLBACK_FUNC(Reshape);
 IMPLEMENT_CALLBACK_FUNC(Position);
 IMPLEMENT_CALLBACK_FUNC(Keyboard);
 IMPLEMENT_CALLBACK_FUNC(KeyboardUp);
@@ -163,6 +162,21 @@
     SET_CALLBACK( Display );
 }
 
+void fghDefaultReshape(int width, int height)
+{
+    glViewport( 0, 0, width, height );
+}
+
+void FGAPIENTRY glutReshapeFunc( FGCBReshape callback )
+{
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutReshapeFunc" );
+    
+    if( !callback )
+        callback = fghDefaultReshape;
+
+    SET_CALLBACK( Reshape );
+}
+
 /*
  * Sets the Visibility callback for the current window.
  * NB: the Visibility func is deprecated in favor of the WindowStatus func,

Modified: trunk/freeglut/freeglut/src/fg_main.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_main.c	2013-03-06 03:51:01 UTC (rev 1556)
+++ trunk/freeglut/freeglut/src/fg_main.c	2013-03-06 09:17:13 UTC (rev 1557)
@@ -74,13 +74,7 @@
 
 	fgPlatformReshapeWindow ( window, width, height );
 
-    if( FETCH_WCB( *window, Reshape ) )
-        INVOKE_WCB( *window, Reshape, ( width, height ) );
-    else
-    {
-        fgSetWindow( window );
-        glViewport( 0, 0, width, height );
-    }
+    INVOKE_WCB( *window, Reshape, ( width, height ) );
 
     /*
      * Force a window redraw.  In Windows at least this is only a partial

Modified: trunk/freeglut/freeglut/src/fg_structure.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_structure.c	2013-03-06 03:51:01 UTC (rev 1556)
+++ trunk/freeglut/freeglut/src/fg_structure.c	2013-03-06 09:17:13 UTC (rev 1557)
@@ -49,6 +49,7 @@
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
 extern void fgPlatformCreateWindow ( SFG_Window *window );
+extern void fghDefaultReshape(int width, int height);
 
 static void fghClearCallBacks( SFG_Window *window )
 {
@@ -77,6 +78,7 @@
 	fgPlatformCreateWindow ( window );
 
     fghClearCallBacks( window );
+    SET_WCB( *window, Reshape, fghDefaultReshape);
 
     /* Initialize the object properties */
     window->ID = ++fgStructure.WindowID;
@@ -94,7 +96,7 @@
     window->State.Cursor    = GLUT_CURSOR_INHERIT;
 
     /* Mark window as menu if a menu is to be created */
-    window->IsMenu = isMenu;
+    window->IsMenu          = isMenu;
 
     /*
      * Open the window now. The fgOpenWindow() function is system

Modified: trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c	2013-03-06 03:51:01 UTC (rev 1556)
+++ trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c	2013-03-06 09:17:13 UTC (rev 1557)
@@ -742,6 +742,7 @@
 
 void fgPlatformDisplayWindow ( SFG_Window *window )
 {
+    /* This immediately generates a WM_PAINT message upon which we call the display callbacks to redraw the window */
     RedrawWindow(
         window->Window.Handle, NULL, NULL,
         RDW_NOERASE | RDW_INTERNALPAINT | RDW_INVALIDATE | RDW_UPDATENOW

Modified: trunk/freeglut/freeglut/src/x11/fg_main_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/fg_main_x11.c	2013-03-06 03:51:01 UTC (rev 1556)
+++ trunk/freeglut/freeglut/src/x11/fg_main_x11.c	2013-03-06 09:17:13 UTC (rev 1557)
@@ -662,13 +662,7 @@
 
                     window->State.pWState.OldWidth = width;
                     window->State.pWState.OldHeight = height;
-                    if( FETCH_WCB( *window, Reshape ) )
-                        INVOKE_WCB( *window, Reshape, ( width, height ) );
-                    else
-                    {
-                        fgSetWindow( window );
-                        glViewport( 0, 0, width, height );
-                    }
+                    INVOKE_WCB( *window, Reshape, ( width, height ) );
                     glutPostRedisplay( );
                     if( window->IsMenu )
                         fgSetWindow( current_window );

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1558
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1558&view=rev
Author:   dcnieho
Date:     2013-03-06 09:17:52 +0000 (Wed, 06 Mar 2013)
Log Message:
-----------
gamemode: just go fullscreen

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_gamemode.c
    trunk/freeglut/freeglut/src/fg_window.c

Modified: trunk/freeglut/freeglut/src/fg_gamemode.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_gamemode.c	2013-03-06 09:17:13 UTC (rev 1557)
+++ trunk/freeglut/freeglut/src/fg_gamemode.c	2013-03-06 09:17:52 UTC (rev 1558)
@@ -112,9 +112,7 @@
         GL_TRUE, GL_FALSE
     );
 
-    fgStructure.GameModeWindow->State.Width  = fgState.GameModeSize.X;
-    fgStructure.GameModeWindow->State.Height = fgState.GameModeSize.Y;
-    fgStructure.GameModeWindow->State.NeedToResize = GL_TRUE;
+    glutFullScreen();
 
     fgPlatformEnterGameMode();
 

Modified: trunk/freeglut/freeglut/src/fg_window.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_window.c	2013-03-06 09:17:13 UTC (rev 1557)
+++ trunk/freeglut/freeglut/src/fg_window.c	2013-03-06 09:17:52 UTC (rev 1558)
@@ -437,9 +437,11 @@
         fgWarning("glutFullScreen called on a child window, ignoring...");
         return;
     }
-    else if (fgStructure.GameModeWindow != NULL && fgStructure.GameModeWindow->ID==win->ID)
+    else if (fgStructure.GameModeWindow != NULL && fgStructure.GameModeWindow->ID==win->ID && win->State.IsFullscreen)
     {
-        /* Ignore fullscreen call on GameMode window, those are always fullscreen already */
+        /* Ignore fullscreen call on GameMode window, those are always fullscreen already
+         * only exception is during first entering GameMode
+         */
         return;
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1559
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1559&view=rev
Author:   dcnieho
Date:     2013-03-06 09:27:18 +0000 (Wed, 06 Mar 2013)
Log Message:
-----------
on windows too: call resize callback only in response to WM message
(yes, on both platform we now don't have an initial resize callback call, it'll be back later)

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_main.c
    trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c

Modified: trunk/freeglut/freeglut/src/fg_main.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_main.c	2013-03-06 09:17:52 UTC (rev 1558)
+++ trunk/freeglut/freeglut/src/fg_main.c	2013-03-06 09:27:18 UTC (rev 1559)
@@ -74,8 +74,6 @@
 
 	fgPlatformReshapeWindow ( window, width, height );
 
-    INVOKE_WCB( *window, Reshape, ( width, height ) );
-
     /*
      * Force a window redraw.  In Windows at least this is only a partial
      * solution:  if the window is increasing in size in either dimension,

Modified: trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-03-06 09:17:52 UTC (rev 1558)
+++ trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-03-06 09:27:18 UTC (rev 1559)
@@ -506,8 +506,15 @@
 #endif /* defined(_WIN32_WCE) */
             
             if (width!=window->State.Width || height!=window->State.Height)
-                /* Something changed, need to resize */
-                window->State.NeedToResize = GL_TRUE;
+            {
+                SFG_Window* saved_window = fgStructure.CurrentWindow;
+                
+                /* size changed, call reshape callback */
+                INVOKE_WCB( *window, Reshape, ( width, height ) );
+                glutPostRedisplay( );
+                if( window->IsMenu )
+                    fgSetWindow( saved_window );
+            }
         }
 
         /* according to docs, should return 0 */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1579
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1579&view=rev
Author:   dcnieho
Date:     2013-04-04 04:28:53 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
don't show window when creating menu (better fix then making it very small and hiding it asap...

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_structure.c
    trunk/freeglut/freeglut/src/fg_window.c
    trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c
    trunk/freeglut/freeglut/src/x11/fg_window_x11.c

Modified: trunk/freeglut/freeglut/src/fg_structure.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_structure.c	2013-04-04 02:08:55 UTC (rev 1578)
+++ trunk/freeglut/freeglut/src/fg_structure.c	2013-04-04 04:28:53 UTC (rev 1579)
@@ -113,7 +113,6 @@
  */
 SFG_Menu* fgCreateMenu( FGCBMenu menuCallback )
 {
-    int x = 100, y = 100, w = 1, h = 1;
     SFG_Window *current_window = fgStructure.CurrentWindow;
 
     /* Have the menu object created */
@@ -122,13 +121,11 @@
     menu->ParentWindow = NULL;
 
     /* Create a window for the menu to reside in. */
-
-    fgCreateWindow( NULL, "freeglut menu", GL_TRUE, x, y, GL_TRUE, w, h,
+    fgCreateWindow( NULL, "freeglut menu", GL_FALSE, 0, 0, GL_FALSE, 0, 0,
                     GL_FALSE, GL_TRUE );
     menu->Window = fgStructure.CurrentWindow;
     glutDisplayFunc( fgDisplayMenu );
 
-    glutHideWindow( );  /* Hide the window for now */
     fgSetWindow( current_window );
 
     /* Initialize the object properties: */

Modified: trunk/freeglut/freeglut/src/fg_window.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_window.c	2013-04-04 02:08:55 UTC (rev 1578)
+++ trunk/freeglut/freeglut/src/fg_window.c	2013-04-04 04:28:53 UTC (rev 1579)
@@ -120,10 +120,10 @@
                    GLboolean sizeUse, int w, int h,
                    GLboolean gameMode, GLboolean isSubWindow )
 {
-	fgPlatformOpenWindow( window, title,
-                   positionUse, x, y,
-                   sizeUse, w, h,
-                   gameMode, isSubWindow );
+    fgPlatformOpenWindow( window, title,
+                          positionUse, x, y,
+                          sizeUse, w, h,
+                          gameMode, isSubWindow );
 
     fgSetWindow( window );
 

Modified: trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c	2013-04-04 02:08:55 UTC (rev 1578)
+++ trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c	2013-04-04 04:28:53 UTC (rev 1579)
@@ -636,17 +636,11 @@
     }
     if( !sizeUse )
     {
-        if( !window->IsMenu )
-        {
-            w = CW_USEDEFAULT;
-            h = CW_USEDEFAULT;
-        }
-        else /* fail safe - Windows can make a window of size (0, 0) */
-            w = h = 300; /* default window size */
+        w = CW_USEDEFAULT;
+        h = CW_USEDEFAULT;
     }
-
-#if !defined(_WIN32_WCE)    /* no decorations for windows CE */
-    if( sizeUse )
+#if !defined(_WIN32_WCE)    /* no decorations for windows CE, so nothing to do */
+    else
     {
         RECT windowRect;
         /*
@@ -742,8 +736,9 @@
 #if defined(_WIN32_WCE)
     ShowWindow( window->Window.Handle, SW_SHOW );
 #else
+    if (!window->IsMenu)    /* Don't show window after creation if its a menu */
     {
-        BOOL iconic = fgState.ForceIconic && !window->IsMenu && !gameMode && !isSubWindow;
+        BOOL iconic = fgState.ForceIconic && !gameMode && !isSubWindow;
         ShowWindow( window->Window.Handle,
                     iconic ? SW_SHOWMINIMIZED : SW_SHOWNORMAL );
     }

Modified: trunk/freeglut/freeglut/src/x11/fg_window_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/fg_window_x11.c	2013-04-04 02:08:55 UTC (rev 1578)
+++ trunk/freeglut/freeglut/src/x11/fg_window_x11.c	2013-04-04 04:28:53 UTC (rev 1579)
@@ -300,12 +300,6 @@
     }
 #endif
 
-    /*
-     * XXX Assume the new window is visible by default
-     * XXX Is this a  safe assumption?
-     */
-    window->State.Visible = GL_TRUE;
-
     sizeHints.flags = 0;
     if ( positionUse )
         sizeHints.flags |= USPosition;
@@ -362,7 +356,11 @@
        fgRegisterDevices( fgDisplay.pDisplay.Display, &(window->Window.Handle) );
     #endif
 
-    XMapWindow( fgDisplay.pDisplay.Display, window->Window.Handle );
+    if (!window->IsMenu)    /* Don't show window after creation if its a menu */
+    {
+        XMapWindow( fgDisplay.pDisplay.Display, window->Window.Handle );
+        window->State.Visible = GL_TRUE;
+    }
 
     XFree(visualInfo);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1583
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1583&view=rev
Author:   dcnieho
Date:     2013-04-04 10:13:45 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
menu changes based on patch by Jason Wilkins:
- when menu window is shown, the menu's window no longer becomes the active window on windows (we thus don't steal focus from the active window).
- when menu is active and mouse is pressed outside the active menu and if the pressed button is bound to a menu, the old menu is now closed while a new one immediately appears
- menus now hide before their callback is executed, so they don't linger around if callback execution takes a while

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_menu.c
    trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
    trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c

Modified: trunk/freeglut/freeglut/src/fg_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_menu.c	2013-04-04 10:13:04 UTC (rev 1582)
+++ trunk/freeglut/freeglut/src/fg_menu.c	2013-04-04 10:13:45 UTC (rev 1583)
@@ -78,6 +78,7 @@
 extern GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y );
 extern void fghPlatformGetCursorPos(const SFG_Window *window, GLboolean client, SFG_XYUse *mouse_pos);
 extern SFG_Font* fghFontByID( void* font );
+extern void fgPlatformHideWindow( SFG_Window* window );
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
@@ -108,8 +109,7 @@
 {
     SFG_MenuEntry *subMenuIter;
     /* Hide the present menu's window */
-    fgSetWindow( menuEntry->SubMenu->Window );
-    glutHideWindow( );
+    fgPlatformHideWindow( menuEntry->SubMenu->Window );
 
     /* Forget about having that menu active anymore, now: */
     menuEntry->SubMenu->Window->ActiveMenu = NULL;
@@ -127,8 +127,6 @@
         if( subMenuIter->SubMenu )
             fghDeactivateSubMenu( subMenuIter );
     }
-
-    fgSetWindow ( menuEntry->SubMenu->ParentWindow ) ;
 }
 
 /*
@@ -421,37 +419,7 @@
             fghSetMenuParentWindow( window, menuEntry->SubMenu );
 }
 
-/*
- * Function to check for menu entry selection on menu deactivation
- */
-static void fghExecuteMenuCallback( SFG_Menu* menu )
-{
-    SFG_MenuEntry *menuEntry;
 
-    /* First of all check any of the active sub menus... */
-    for( menuEntry = (SFG_MenuEntry *)menu->Entries.First;
-         menuEntry;
-         menuEntry = (SFG_MenuEntry *)menuEntry->Node.Next)
-    {
-        if( menuEntry->IsActive )
-        {
-            if( menuEntry->SubMenu )
-                fghExecuteMenuCallback( menuEntry->SubMenu );
-            else
-                if( menu->Callback )
-                {
-                    SFG_Menu *save_menu = fgStructure.CurrentMenu;
-                    fgStructure.CurrentMenu = menu;
-                    menu->Callback( menuEntry->ID );
-                    fgStructure.CurrentMenu = save_menu;
-                }
-
-            return;
-        }
-    }
-}
-
-
 /*
  * Displays the currently active menu for the current window
  */
@@ -592,13 +560,16 @@
 GLboolean fgCheckActiveMenu ( SFG_Window *window, int button, GLboolean pressed,
                               int mouse_x, int mouse_y )
 {
+    GLboolean is_handled = GL_FALSE;
+    GLboolean is_clicked = GL_FALSE;
     /*
      * Near as I can tell, this is the menu behaviour:
      *  - Down-click the menu button, menu not active:  activate
      *    the menu with its upper left-hand corner at the mouse
      *    location.
      *  - Down-click any button outside the menu, menu active:
-     *    deactivate the menu
+     *    deactivate the menu, and potentially activate a new menu
+     *    at the new mouse location
      *  - Down-click any button inside the menu, menu active:
      *    select the menu entry and deactivate the menu
      *  - Up-click the menu button, menu not active:  nothing happens
@@ -618,7 +589,7 @@
                                        mouse_y - window->ActiveMenu->Y;
         }
 
-        /* In the menu, invoke the callback and deactivate the menu */
+        /* In the menu, deactivate the menu and invoke the callback */
         if( fghCheckMenuStatus( window->ActiveMenu ) )
         {
             /*
@@ -626,18 +597,29 @@
              * window to the window whose menu this is
              */
             SFG_Window *save_window = fgStructure.CurrentWindow;
-            SFG_Menu *save_menu = fgStructure.CurrentMenu;
+            SFG_Menu *save_menu = fgStructure.CurrentMenu, *active_menu = window->ActiveMenu;
+            SFG_MenuEntry *active_entry = active_menu->ActiveEntry;
             SFG_Window *parent_window = window->ActiveMenu->ParentWindow;
+
+            /* get clicked entry */
+            while (active_entry->SubMenu)
+            {
+                active_menu  = active_entry->SubMenu;
+                active_entry = active_menu->ActiveEntry;
+            }
+
             fgSetWindow( parent_window );
-            fgStructure.CurrentMenu = window->ActiveMenu;
+            fgStructure.CurrentMenu = active_menu;
 
-            /* Execute the menu callback */
-            fghExecuteMenuCallback( window->ActiveMenu );
+            /* Deactivate menu and then call callback (we don't want menu to stay in view while callback is executing) */
             fgDeactivateMenu( parent_window );
+            active_menu->Callback( active_entry->ID );
 
             /* Restore the current window and menu */
             fgSetWindow( save_window );
             fgStructure.CurrentMenu = save_menu;
+
+            is_clicked = GL_TRUE;   /* Don't reopen... */
         }
         else if( pressed )
             /*
@@ -648,6 +630,7 @@
              */
         {
             fgDeactivateMenu( window->ActiveMenu->ParentWindow );
+            /* Could reopen again in different location, as is_clicked remains false */
         }
 
         /*
@@ -659,11 +642,12 @@
         if( ! window->IsMenu )
             window->State.Redisplay = GL_TRUE;
 
-        return GL_TRUE;
+        is_handled = GL_TRUE;
     }
 
     /* No active menu, let's check whether we need to activate one. */
-    if( ( 0 <= button ) &&
+    if( !is_clicked &&
+        ( 0 <= button ) &&
         ( FREEGLUT_MAX_MENUS > button ) &&
         ( window->Menu[ button ] ) &&
         pressed )
@@ -678,11 +662,11 @@
             /* XXX Posting a requisite Redisplay seems bogus. */
             window->State.Redisplay = GL_TRUE;
             fghActivateMenu( window, button );
-            return GL_TRUE;
+            is_handled = GL_TRUE;
         }
     }
 
-    return GL_FALSE;
+    return is_handled;
 }
 
 /*
@@ -708,8 +692,7 @@
     parent_window = menu->ParentWindow;
 
     /* Hide the present menu's window */
-    fgSetWindow( menu->Window );
-    glutHideWindow( );
+    fgPlatformHideWindow( menu->Window );
 
     /* Forget about having that menu active anymore, now: */
     menu->Window->ActiveMenu = NULL;
@@ -734,8 +717,6 @@
     /* Done deactivating menu */
     menuDeactivating = NULL;
 
-    fgSetWindow ( parent_window ) ;
-
     /* Menu status callback */
     if (fgState.MenuStateCallback || fgState.MenuStatusCallback)
     {

Modified: trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-04-04 10:13:04 UTC (rev 1582)
+++ trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-04-04 10:13:45 UTC (rev 1583)
@@ -1345,7 +1345,7 @@
         {
         case DesireHiddenState:
             cmdShow = SW_HIDE;
-        	break;
+            break;
         case DesireIconicState:
             cmdShow = SW_MINIMIZE;
             /* Call on top-level window */
@@ -1353,7 +1353,10 @@
                 win = win->Parent;
             break;
         case DesireNormalState:
-            cmdShow = SW_SHOW;
+            if (win->IsMenu)
+                cmdShow = SW_SHOWNOACTIVATE;    /* Just show, don't activate if its a menu */
+            else
+                cmdShow = SW_SHOW;
             break;
         }
 

Modified: trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c	2013-04-04 10:13:04 UTC (rev 1582)
+++ trunk/freeglut/freeglut/src/mswin/fg_window_mswin.c	2013-04-04 10:13:45 UTC (rev 1583)
@@ -787,7 +787,16 @@
         free(window->State.pWState.IconTitle);
 }
 
+/*
+ * Hide's specified window. For windows, currently only used
+ * to immediately hide menu windows...
+ */
+void fgPlatformHideWindow( SFG_Window* window )
+{
+    ShowWindow(window->Window.Handle, SW_HIDE);
+}
 
+
 /*
  * Set the current window's title
  */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1585
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1585&view=rev
Author:   dcnieho
Date:     2013-04-04 10:36:44 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
some cleanup

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_menu.c
    trunk/freeglut/freeglut/src/fg_state.c
    trunk/freeglut/freeglut/src/mswin/fg_init_mswin.c

Modified: trunk/freeglut/freeglut/src/fg_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_menu.c	2013-04-04 10:20:43 UTC (rev 1584)
+++ trunk/freeglut/freeglut/src/fg_menu.c	2013-04-04 10:36:44 UTC (rev 1585)
@@ -213,10 +213,10 @@
         }
 
         menu->ActiveEntry = menuEntry;
-        menu->IsActive = GL_TRUE;  /* XXX Do we need this? */
+        menu->IsActive = GL_TRUE;
 
         /*
-         * OKi, we have marked that entry as active, but it would be also
+         * OK, we have marked that entry as active, but it would be also
          * nice to have its contents updated, in case it's a sub menu.
          * Also, ignore the return value of the check function:
          */
@@ -633,15 +633,6 @@
             /* Could reopen again in different location, as is_clicked remains false */
         }
 
-        /*
-         * XXX Why does an active menu require a redisplay at
-         * XXX this point?  If this can come out cleanly, then
-         * XXX it probably should do so; if not, a comment should
-         * XXX explain it.
-         */
-        if( ! window->IsMenu )
-            window->State.Redisplay = GL_TRUE;
-
         is_handled = GL_TRUE;
     }
 
@@ -659,8 +650,6 @@
         if (window->State.MouseX>0 && window->State.MouseY>0 &&
             window->State.MouseX<window->State.Width && window->State.MouseY<window->State.Height)
         {
-            /* XXX Posting a requisite Redisplay seems bogus. */
-            window->State.Redisplay = GL_TRUE;
             fghActivateMenu( window, button );
             is_handled = GL_TRUE;
         }

Modified: trunk/freeglut/freeglut/src/fg_state.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_state.c	2013-04-04 10:20:43 UTC (rev 1584)
+++ trunk/freeglut/freeglut/src/fg_state.c	2013-04-04 10:36:44 UTC (rev 1585)
@@ -61,9 +61,6 @@
 {
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetOption" );
 
-    /*
-     * XXX In chronological code add order.  (WHY in that order?)
-     */
     switch( eWhat )
     {
     case GLUT_INIT_WINDOW_X:
@@ -161,7 +158,6 @@
 
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGet" );
 
-    /* XXX In chronological code add order.  (WHY in that order?) */
     switch( eWhat )
     {
     /* Following values are stored in fgState and fgDisplay global structures */

Modified: trunk/freeglut/freeglut/src/mswin/fg_init_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_init_mswin.c	2013-04-04 10:20:43 UTC (rev 1584)
+++ trunk/freeglut/freeglut/src/mswin/fg_init_mswin.c	2013-04-04 10:36:44 UTC (rev 1585)
@@ -57,9 +57,6 @@
          * Each of the windows should have its own device context, and we
          * want redraw events during Vertical and Horizontal Resizes by
          * the user.
-         *
-         * XXX Old code had "| CS_DBCLCKS" commented out.  Plans for the
-         * XXX future?  Dead-end idea?
          */
         wc.lpfnWndProc    = fgPlatformWindowProc;
         wc.cbClsExtra     = 0;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1610
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1610&view=rev
Author:   dcnieho
Date:     2013-04-06 10:17:04 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
clicking in another window also no longer closed the menu unless focus was changed. Fixed in click checker in general menu code, so it'll improve menus on X11 as well. Our Windows part now only needed for when losing focus because switching to a non-FreeGLUT window

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_menu.c
    trunk/freeglut/freeglut/src/mswin/fg_menu_mswin.c

Modified: trunk/freeglut/freeglut/src/fg_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_menu.c	2013-04-06 10:16:27 UTC (rev 1609)
+++ trunk/freeglut/freeglut/src/fg_menu.c	2013-04-06 10:17:04 UTC (rev 1610)
@@ -568,7 +568,8 @@
      *    location.
      *  - Down-click any button outside the menu, menu active:
      *    deactivate the menu, and potentially activate a new menu
-     *    at the new mouse location
+     *    at the new mouse location. This includes clicks in
+     *    different windows of course
      *  - Down-click any button inside the menu, menu active:
      *    select the menu entry and deactivate the menu
      *  - Up-click the menu button, menu not active:  nothing happens
@@ -631,7 +632,16 @@
 
         is_handled = GL_TRUE;
     }
+    else if ( fgStructure.Menus.First ) /* Don't have to check whether this was a downpress or an uppress, there is no way to get an uppress in another window before a downpress... */
+    {
+        /* if another window than the one clicked in has an open menu, close it */
+        SFG_Menu *menu = fgGetActiveMenu();
+        if ( menu ) /* any open menu? */
+            fgDeactivateMenu( menu->ParentWindow );
 
+        /* Leave is_handled to false, we didn't do anything relevant from the perspective of the window that was clicked */
+    }
+
     /* No active menu, let's check whether we need to activate one. */
     if( !is_clicked &&
         ( 0 <= button ) &&

Modified: trunk/freeglut/freeglut/src/mswin/fg_menu_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_menu_mswin.c	2013-04-06 10:16:27 UTC (rev 1609)
+++ trunk/freeglut/freeglut/src/mswin/fg_menu_mswin.c	2013-04-06 10:17:04 UTC (rev 1610)
@@ -29,8 +29,6 @@
 #include <GL/freeglut.h>
 #include "../fg_internal.h"
 
-extern void fghGetClientArea( RECT *clientRect, const SFG_Window *window, BOOL posIsOutside );
-extern SFG_Window* fghWindowUnderCursor(SFG_Window *window);
 
 
 GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
@@ -41,10 +39,8 @@
 
 void fgPlatformCheckMenuDeactivate()
 {
-    /* If we have an open menu, see if the open menu should be closed
-     * when focus was lost because user either switched
-     * application or FreeGLUT window (if one is running multiple
-     * windows). If so, close menu the active menu.
+    /* User/system switched application focus.
+     * If we have an open menu, close it.
      */
     SFG_Menu* menu = NULL;
 
@@ -53,36 +49,8 @@
 
     if ( menu )
     {
-        SFG_Window* wnd = NULL;
-        HWND hwnd = GetFocus();  /* Get window with current focus - NULL for non freeglut windows */
-        if (hwnd)
-            /* See which of our windows it is */
-            wnd = fgWindowByHandle(hwnd);
-
-        if (!hwnd || !wnd)
-            /* User switched to another application*/
-            fgDeactivateMenu(menu->ParentWindow);
-        else if (!wnd->IsMenu)      /* Make sure we don't kill the menu when trying to enter a submenu */
-        {
-            /* we need to know if user clicked a child window, any displayable area clicked that is not the menu's parent window should close the menu */
-            wnd = fghWindowUnderCursor(wnd);
-            if (wnd!=menu->ParentWindow)
-                /* User switched to another FreeGLUT window */
-                fgDeactivateMenu(menu->ParentWindow);
-            else
-            {
-                /* Check if focus lost because non-client area of
-                 * window was pressed (pressing on client area is
-                 * handled in fgCheckActiveMenu)
-                 */
-                POINT mouse_pos;
-                RECT clientArea;
-                fghGetClientArea(&clientArea,menu->ParentWindow, FALSE);
-                GetCursorPos(&mouse_pos);
-                if ( !PtInRect( &clientArea, mouse_pos ) )
-                    fgDeactivateMenu(menu->ParentWindow);
-            }
-        }
+        printf("focus menu close\n");
+        fgDeactivateMenu(menu->ParentWindow);
     }
 };
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1612
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1612&view=rev
Author:   dcnieho
Date:     2013-04-06 14:08:59 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
Menu's work again in gamemode too now. We have to do a normal ShowWindow in gamemode, or the menu won't pop up over the gamemode window.
Also now using fgState.ActiveMenus instead of enumerating to see if there is an active menu

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_menu.c
    trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
    trunk/freeglut/freeglut/src/mswin/fg_menu_mswin.c

Modified: trunk/freeglut/freeglut/src/fg_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_menu.c	2013-04-06 10:20:42 UTC (rev 1611)
+++ trunk/freeglut/freeglut/src/fg_menu.c	2013-04-06 14:08:59 UTC (rev 1612)
@@ -632,7 +632,7 @@
 
         is_handled = GL_TRUE;
     }
-    else if ( fgStructure.Menus.First ) /* Don't have to check whether this was a downpress or an uppress, there is no way to get an uppress in another window before a downpress... */
+    else if ( fgState.ActiveMenus ) /* Don't have to check whether this was a downpress or an uppress, there is no way to get an uppress in another window before a downpress... */
     {
         /* if another window than the one clicked in has an open menu, close it */
         SFG_Menu *menu = fgGetActiveMenu();
@@ -784,7 +784,7 @@
 {
     /* The menu object creation code resides in freeglut_structure.c */
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutCreateMenu" );
-    if (fgGetActiveMenu())
+    if (fgState.ActiveMenus)
         fgError("Menu manipulation not allowed while menus in use.");
 
     return fgCreateMenu( callback )->ID;
@@ -801,7 +801,7 @@
     menu = fgMenuByID( menuID );
 
     freeglut_return_if_fail( menu );
-    if (fgGetActiveMenu())
+    if (fgState.ActiveMenus)
         fgError("Menu manipulation not allowed while menus in use.");
 
     /* The menu object destruction code resides in freeglut_structure.c */
@@ -846,7 +846,7 @@
     menuEntry = (SFG_MenuEntry *)calloc( sizeof(SFG_MenuEntry), 1 );
 
     freeglut_return_if_fail( fgStructure.CurrentMenu );
-    if (fgGetActiveMenu())
+    if (fgState.ActiveMenus)
         fgError("Menu manipulation not allowed while menus in use.");
 
     menuEntry->Text = strdup( label );
@@ -871,7 +871,7 @@
     subMenu = fgMenuByID( subMenuID );
 
     freeglut_return_if_fail( fgStructure.CurrentMenu );
-    if (fgGetActiveMenu())
+    if (fgState.ActiveMenus)
         fgError("Menu manipulation not allowed while menus in use.");
 
     freeglut_return_if_fail( subMenu );
@@ -895,7 +895,7 @@
     menu = fgMenuByID( menuID );
     freeglut_return_if_fail( menu );
 
-    if (fgGetActiveMenu())
+    if (fgState.ActiveMenus)
         fgError("Menu manipulation not allowed while menus in use.");
 
     font = fghFontByID( fontID );
@@ -919,7 +919,7 @@
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutChangeToMenuEntry" );
 
     freeglut_return_if_fail( fgStructure.CurrentMenu );
-    if (fgGetActiveMenu())
+    if (fgState.ActiveMenus)
         fgError("Menu manipulation not allowed while menus in use.");
 
     /* Get n-th menu entry in the current menu, starting from one: */
@@ -949,7 +949,7 @@
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutChangeToSubMenu" );
 
     freeglut_return_if_fail( fgStructure.CurrentMenu );
-    if (fgGetActiveMenu())
+    if (fgState.ActiveMenus)
         fgError("Menu manipulation not allowed while menus in use.");
 
     /* Get handle to sub menu */
@@ -982,7 +982,7 @@
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutRemoveMenuItem" );
 
     freeglut_return_if_fail( fgStructure.CurrentMenu );
-    if (fgGetActiveMenu())
+    if (fgState.ActiveMenus)
         fgError("Menu manipulation not allowed while menus in use.");
 
     /* Get n-th menu entry in the current menu, starting from one: */
@@ -1008,7 +1008,7 @@
     freeglut_return_if_fail( fgStructure.CurrentWindow );
 
     freeglut_return_if_fail( fgStructure.CurrentMenu );
-    if (fgGetActiveMenu())
+    if (fgState.ActiveMenus)
         fgError("Menu manipulation not allowed while menus in use.");
 
     freeglut_return_if_fail( button >= 0 );
@@ -1027,7 +1027,7 @@
     freeglut_return_if_fail( fgStructure.CurrentWindow );
 
     freeglut_return_if_fail( fgStructure.CurrentMenu );
-    if (fgGetActiveMenu())
+    if (fgState.ActiveMenus)
         fgError("Menu manipulation not allowed while menus in use.");
 
     freeglut_return_if_fail( button >= 0 );

Modified: trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-04-06 10:20:42 UTC (rev 1611)
+++ trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-04-06 14:08:59 UTC (rev 1612)
@@ -39,7 +39,7 @@
 extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
                                      unsigned char layer_type );
 
-extern void fgPlatformCheckMenuDeactivate();
+extern void fgPlatformCheckMenuDeactivate(HWND newFocusWnd);
 
 #ifdef WM_TOUCH
 typedef BOOL (WINAPI *pGetTouchInputInfo)(HTOUCHINPUT,UINT,PTOUCHINPUT,int);
@@ -969,14 +969,14 @@
         lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
 
         /* Check if there are any open menus that need to be closed */
-        fgPlatformCheckMenuDeactivate();
+        fgPlatformCheckMenuDeactivate((HWND)wParam);
         break;
 
     case WM_MOUSEACTIVATE:
         /* Clicks should not activate the menu.
          * Especially important when clicking on a menu's submenu item which has no effect.
          */
-        printf("WM_MOUSEACTIVATE\n");
+        /*printf("WM_MOUSEACTIVATE\n");*/
         if (window->IsMenu)
             lRet = MA_NOACTIVATEANDEAT;
         else
@@ -988,7 +988,7 @@
     case WM_NCRBUTTONDOWN:
         {
             SFG_Menu *menu;
-            if (fgStructure.Menus.First && (menu = fgGetActiveMenu()))
+            if (fgState.ActiveMenus && (menu = fgGetActiveMenu()))
                 /* user clicked non-client area of window while a menu is open. Close menu */
                 fgDeactivateMenu(menu->ParentWindow);
 
@@ -1767,8 +1767,8 @@
                 win = win->Parent;
             break;
         case DesireNormalState:
-            if (win->IsMenu)
-                cmdShow = SW_SHOWNA;    /* Just show, don't activate if its a menu */
+            if (win->IsMenu && (!fgStructure.GameModeWindow || win->ActiveMenu->ParentWindow != fgStructure.GameModeWindow))
+                cmdShow = SW_SHOWNA;    /* Just show, don't activate window if its a menu. Only exception is when the parent is a gamemode window as the menu would pop under it when we do this... */
             else
                 cmdShow = SW_SHOW;
             break;

Modified: trunk/freeglut/freeglut/src/mswin/fg_menu_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_menu_mswin.c	2013-04-06 10:20:42 UTC (rev 1611)
+++ trunk/freeglut/freeglut/src/mswin/fg_menu_mswin.c	2013-04-06 14:08:59 UTC (rev 1612)
@@ -37,18 +37,25 @@
     *y = glutGet ( GLUT_SCREEN_HEIGHT );
 }
 
-void fgPlatformCheckMenuDeactivate()
+void fgPlatformCheckMenuDeactivate(HWND newFocusWnd)
 {
     /* User/system switched application focus.
      * If we have an open menu, close it.
      */
     SFG_Menu* menu = NULL;
 
-    if ( fgStructure.Menus.First )
+    if ( fgState.ActiveMenus )
         menu = fgGetActiveMenu();
 
     if ( menu )
-        fgDeactivateMenu(menu->ParentWindow);
+    {
+        if (newFocusWnd != menu->Window->Window.Handle)
+            /* When in GameMode, the menu's parent window will lose focus when the menu is opened.
+             * This is sadly necessary as we need to do an activating ShowWindow() for the menu
+             * to pop up over the gamemode window
+             */
+            fgDeactivateMenu(menu->ParentWindow);
+    }
 };
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1613
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1613&view=rev
Author:   dcnieho
Date:     2013-04-07 08:03:48 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
doc that timers are sorted by endtime + don't call fgElapsedTime() if no timers to check, its a waste

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/fg_callbacks.c
    trunk/freeglut/freeglut/src/fg_main.c

Modified: trunk/freeglut/freeglut/src/fg_callbacks.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_callbacks.c	2013-04-06 14:08:59 UTC (rev 1612)
+++ trunk/freeglut/freeglut/src/fg_callbacks.c	2013-04-07 08:03:48 UTC (rev 1613)
@@ -63,6 +63,7 @@
     timer->ID        = timerID;
     timer->TriggerTime = fgElapsedTime() + timeOut;
 
+    /* Insert such that timers are sorted by end-time */
     for( node = fgState.Timers.First; node; node = node->Node.Next )
     {
         if( node->TriggerTime > timer->TriggerTime )

Modified: trunk/freeglut/freeglut/src/fg_main.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_main.c	2013-04-06 14:08:59 UTC (rev 1612)
+++ trunk/freeglut/freeglut/src/fg_main.c	2013-04-07 08:03:48 UTC (rev 1613)
@@ -261,7 +261,7 @@
         SFG_Timer *timer = fgState.Timers.First;
 
         if( timer->TriggerTime > checkTime )
-            /* XXX: are timers always sorted by triggerTime? If not, this and fghNextTimer are wrong */
+            /* Timers are sorted by triggerTime */
             break;
 
         fgListRemove( &fgState.Timers, &timer->Node );
@@ -388,12 +388,13 @@
  */
 static fg_time_t fghNextTimer( void )
 {
-    fg_time_t currentTime = fgElapsedTime();
-    SFG_Timer *timer = fgState.Timers.First;
+    fg_time_t currentTime;
+    SFG_Timer *timer = fgState.Timers.First;    /* timers are sorted by trigger time, so only have to check the first */
 
     if( !timer )
         return INT_MAX;
 
+    currentTime = fgElapsedTime();
     if( timer->TriggerTime < currentTime )
         return 0;
     else

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1614
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1614&view=rev
Author:   dcnieho
Date:     2013-04-07 08:04:46 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
redisplay is now also on the work list instead of handled separately

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/android/fg_main_android.c
    trunk/freeglut/freeglut/src/fg_display.c
    trunk/freeglut/freeglut/src/fg_internal.h
    trunk/freeglut/freeglut/src/fg_main.c
    trunk/freeglut/freeglut/src/fg_menu.c
    trunk/freeglut/freeglut/src/fg_window.c
    trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
    trunk/freeglut/freeglut/src/x11/fg_main_x11.c

Modified: trunk/freeglut/freeglut/src/android/fg_main_android.c
===================================================================
--- trunk/freeglut/freeglut/src/android/fg_main_android.c	2013-04-07 08:03:48 UTC (rev 1613)
+++ trunk/freeglut/freeglut/src/android/fg_main_android.c	2013-04-07 08:04:46 UTC (rev 1614)
@@ -495,6 +495,8 @@
     /* Now clear it so that any callback generated by the actions below can set work again */
     window->State.WorkMask = 0;
 
+    if (workMask&~GLUT_DISPLAY_WORK)    /* Display work is the common case, skip all the below at once */
+    {
     /* This is before the first display callback: call a few callbacks to inform user of window size, position, etc
      * we know this is before the first display callback of a window as for all windows GLUT_INIT_WORK is set when
      * they are opened, and work is done before displaying in the mainloop.
@@ -562,5 +564,15 @@
             break;
         }
     }
+    }
+
+    if (workMask & GLUT_DISPLAY_WORK)
+    {
+        if( window->State.Visible )
+            fghRedrawWindow ( window );
+
+        /* Strip out display work that might have ended up on work list now as some of the above genereates callbacks */
+        window->State.WorkMask &= ~GLUT_DISPLAY_WORK;
+    }
 }
 

Modified: trunk/freeglut/freeglut/src/fg_display.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_display.c	2013-04-07 08:03:48 UTC (rev 1613)
+++ trunk/freeglut/freeglut/src/fg_display.c	2013-04-07 08:04:46 UTC (rev 1614)
@@ -47,7 +47,7 @@
                 " with no current window defined.", "glutPostRedisplay" ) ;
 	}
 
-    fgStructure.CurrentWindow->State.Redisplay = GL_TRUE;
+    fgStructure.CurrentWindow->State.WorkMask |= GLUT_DISPLAY_WORK;
 }
 
 /*
@@ -98,7 +98,7 @@
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutPostWindowRedisplay" );
     window = fgWindowByID( windowID );
     freeglut_return_if_fail( window );
-    window->State.Redisplay = GL_TRUE;
+    window->State.WorkMask |= GLUT_DISPLAY_WORK;
 }
 
 /*** END OF FILE ***/

Modified: trunk/freeglut/freeglut/src/fg_internal.h
===================================================================
--- trunk/freeglut/freeglut/src/fg_internal.h	2013-04-07 08:03:48 UTC (rev 1613)
+++ trunk/freeglut/freeglut/src/fg_internal.h	2013-04-07 08:04:46 UTC (rev 1614)
@@ -392,6 +392,7 @@
 #define GLUT_SIZE_WORK        (1<<3)
 #define GLUT_ZORDER_WORK      (1<<4)
 #define GLUT_FULL_SCREEN_WORK (1<<5)
+#define GLUT_DISPLAY_WORK     (1<<6)
 
 /*
  * An enumeration containing the state of the GLUT execution:
@@ -457,12 +458,8 @@
     int             DesiredZOrder;      /* desired window Z Order position */
     fgDesiredVisibility DesiredVisibility;/* desired visibility (hidden, iconic, shown/normal) */
 
-
 	SFG_PlatformWindowState pWState;    /* Window width/height (X11) or rectangle/style (Windows) from before a resize, and other stuff only needed on specific platforms */
 
-    GLboolean       Redisplay;          /* Do we have to redisplay?          */
-
-
     long            JoystickPollRate;   /* The joystick polling rate         */
     fg_time_t       JoystickLastPoll;   /* When the last poll happened       */
 

Modified: trunk/freeglut/freeglut/src/fg_main.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_main.c	2013-04-07 08:03:48 UTC (rev 1613)
+++ trunk/freeglut/freeglut/src/fg_main.c	2013-04-07 08:04:46 UTC (rev 1614)
@@ -92,7 +92,7 @@
          * window.
          * DN: Hmm.. the above sounds like a concern only in single buffered mode...
          */
-        glutPostRedisplay( );
+        window->State.WorkMask |= GLUT_DISPLAY_WORK;
         if( window->IsMenu )
             fgSetWindow( saved_window );
     }
@@ -179,34 +179,7 @@
     fgEnumWindows( fghcbProcessWork, &enumerator );
 }
 
-
-static void fghcbDisplayWindow( SFG_Window *window,
-                                SFG_Enumerator *enumerator )
-{
-    if( window->State.Redisplay &&
-        window->State.Visible )
-    {
-        window->State.Redisplay = GL_FALSE;
-		fghRedrawWindow ( window );
-    }
-
-    fgEnumSubWindows( window, fghcbDisplayWindow, enumerator );
-}
-
 /*
- * Make all windows perform a display call
- */
-static void fghDisplayAll( void )
-{
-    SFG_Enumerator enumerator;
-
-    enumerator.found = GL_FALSE;
-    enumerator.data  =  NULL;
-
-    fgEnumWindows( fghcbDisplayWindow, &enumerator );
-}
-
-/*
  * Window enumerator callback to check for the joystick polling code
  */
 static void fghcbCheckJoystickPolls( SFG_Window *window,
@@ -357,29 +330,28 @@
 
 
 /*
- * Indicates whether a redisplay is pending for ANY window.
+ * Indicates whether work is pending for ANY window.
  *
  * The current mechanism is to walk all of the windows and ask if
- * a redisplay is pending. We have a short-circuit early
- * return if we find any.
+ * work is pending. We have a short-circuit early return if we find any.
  */
-static void fghHavePendingRedisplaysCallback( SFG_Window* w, SFG_Enumerator* e)
+static void fghHavePendingWorkCallback( SFG_Window* w, SFG_Enumerator* e)
 {
-    if( w->State.Redisplay && w->State.Visible )
+    if( w->State.WorkMask )
     {
         e->found = GL_TRUE;
         e->data = w;
         return;
     }
-    fgEnumSubWindows( w, fghHavePendingRedisplaysCallback, e );
+    fgEnumSubWindows( w, fghHavePendingWorkCallback, e );
 }
-static int fghHavePendingRedisplays (void)
+static int fghHavePendingWork (void)
 {
     SFG_Enumerator enumerator;
 
     enumerator.found = GL_FALSE;
     enumerator.data = NULL;
-    fgEnumWindows( fghHavePendingRedisplaysCallback, &enumerator );
+    fgEnumWindows( fghHavePendingWorkCallback, &enumerator );
     return !!enumerator.data;
 }
 
@@ -405,7 +377,7 @@
 {
     fg_time_t msec;
 
-    if( fghHavePendingRedisplays( ) )
+    if( fghHavePendingWork( ) )
         return;
 
     msec = fghNextTimer( );
@@ -433,12 +405,9 @@
     if (fgState.NumActiveJoysticks>0)   /* If zero, don't poll joysticks */
         fghCheckJoystickPolls( );
 
-    /* Perform work on the window (position, reshape, etc) */
+    /* Perform work on the window (position, reshape, display, etc) */
     fghProcessWork( );
 
-    /* Display */
-    fghDisplayAll( );
-
     fgCloseWindows( );
 }
 

Modified: trunk/freeglut/freeglut/src/fg_menu.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_menu.c	2013-04-07 08:03:48 UTC (rev 1613)
+++ trunk/freeglut/freeglut/src/fg_menu.c	2013-04-07 08:04:46 UTC (rev 1614)
@@ -207,7 +207,7 @@
 
         if( menuEntry != menu->ActiveEntry )
         {
-            menu->Window->State.Redisplay = GL_TRUE;
+            menu->Window->State.WorkMask |= GLUT_DISPLAY_WORK;
             if( menu->ActiveEntry )
                 menu->ActiveEntry->IsActive = GL_FALSE;
         }
@@ -277,7 +277,7 @@
         ( !menu->ActiveEntry->SubMenu ||
           !menu->ActiveEntry->SubMenu->IsActive ) )
     {
-        menu->Window->State.Redisplay = GL_TRUE;
+        menu->Window->State.WorkMask |= GLUT_DISPLAY_WORK;
         menu->ActiveEntry->IsActive = GL_FALSE;
         menu->ActiveEntry = NULL;
     }

Modified: trunk/freeglut/freeglut/src/fg_window.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_window.c	2013-04-07 08:03:48 UTC (rev 1613)
+++ trunk/freeglut/freeglut/src/fg_window.c	2013-04-07 08:04:46 UTC (rev 1614)
@@ -295,7 +295,7 @@
     fgStructure.CurrentWindow->State.WorkMask |= GLUT_VISIBILITY_WORK;
     fgStructure.CurrentWindow->State.DesiredVisibility = DesireNormalState;
 
-    fgStructure.CurrentWindow->State.Redisplay = GL_TRUE;
+    fgStructure.CurrentWindow->State.WorkMask |= GLUT_DISPLAY_WORK;
 }
 
 /*
@@ -309,7 +309,7 @@
     fgStructure.CurrentWindow->State.WorkMask |= GLUT_VISIBILITY_WORK;
     fgStructure.CurrentWindow->State.DesiredVisibility = DesireHiddenState;
 
-    fgStructure.CurrentWindow->State.Redisplay = GL_FALSE;
+    fgStructure.CurrentWindow->State.WorkMask &= ~GLUT_DISPLAY_WORK;
 }
 
 /*
@@ -323,7 +323,7 @@
     fgStructure.CurrentWindow->State.WorkMask |= GLUT_VISIBILITY_WORK;
     fgStructure.CurrentWindow->State.DesiredVisibility = DesireIconicState;
 
-    fgStructure.CurrentWindow->State.Redisplay = GL_FALSE;
+    fgStructure.CurrentWindow->State.WorkMask &= ~GLUT_DISPLAY_WORK;
 }
 
 /*

Modified: trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-04-07 08:03:48 UTC (rev 1613)
+++ trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-04-07 08:04:46 UTC (rev 1614)
@@ -893,9 +893,9 @@
              * force redisplay so display keeps running during dragging.
              * Screen still wont update when not moving the cursor though...
              */
-            /* PRECT prect = (PRECT) lParam; */
             RECT rect;
-            /* printf("WM_SIZING: nc-area: %i,%i\n",prect->right-prect->left,prect->bottom-prect->top); */
+            /* PRECT prect = (PRECT) lParam;
+               printf("WM_SIZING: nc-area: %i,%i\n",prect->right-prect->left,prect->bottom-prect->top); */
             /* Get client area, the rect in lParam is including non-client area. */
             fghGetClientArea(&rect,window,FALSE);
 
@@ -1066,12 +1066,12 @@
         if (wParam)
         {
             fghPlatformOnWindowStatusNotify(window, GL_TRUE, GL_FALSE);
-            window->State.Redisplay = GL_TRUE;
+            window->State.WorkMask |= GLUT_DISPLAY_WORK;
         }
         else
         {
             fghPlatformOnWindowStatusNotify(window, GL_FALSE, GL_FALSE);
-            window->State.Redisplay = GL_FALSE;
+            window->State.WorkMask &= ~GLUT_DISPLAY_WORK;
         }
         break;
 
@@ -1092,7 +1092,7 @@
             BeginPaint( hWnd, &ps );
             EndPaint( hWnd, &ps );
 
-            window->State.Redisplay = GL_TRUE;
+            window->State.WorkMask |= GLUT_DISPLAY_WORK;
         }
         lRet = 0;   /* As per docs, should return 0 */
     }
@@ -1384,7 +1384,7 @@
 #if !defined(_WIN32_WCE)
     case WM_SYNCPAINT:  /* 0x0088 */
         /* Another window has moved, need to update this one */
-        window->State.Redisplay = GL_TRUE;
+        window->State.WorkMask |= GLUT_DISPLAY_WORK;
         lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
         /* Help screen says this message must be passed to "DefWindowProc" */
         break;
@@ -1548,6 +1548,8 @@
     /* Now clear it so that any callback generated by the actions below can set work again */
     window->State.WorkMask = 0;
 
+    if (workMask&~GLUT_DISPLAY_WORK)    /* Display work is the common case, skip all the below at once */
+    {
     /* This is before the first display callback: call a few callbacks to inform user of window size, position, etc
      * we know this is before the first display callback of a window as for all windows GLUT_INIT_WORK is set when
      * they are opened, and work is done before displaying in the mainloop.
@@ -1776,4 +1778,14 @@
 
         ShowWindow( win->Window.Handle, cmdShow );
     }
+    }
+
+    if (workMask & GLUT_DISPLAY_WORK)
+    {
+        if( window->State.Visible )
+            fghRedrawWindow ( window );
+
+        /* Strip out display work that might have ended up on work list now as some of the above genereates callbacks */
+        window->State.WorkMask &= ~GLUT_DISPLAY_WORK;
+    }
 }
\ No newline at end of file

Modified: trunk/freeglut/freeglut/src/x11/fg_main_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/fg_main_x11.c	2013-04-07 08:03:48 UTC (rev 1613)
+++ trunk/freeglut/freeglut/src/x11/fg_main_x11.c	2013-04-07 08:04:46 UTC (rev 1614)
@@ -698,7 +698,7 @@
             if( event.xexpose.count == 0 )
             {
                 GETWINDOW( xexpose );
-                window->State.Redisplay = GL_TRUE;
+                window->State.WorkMask |= GLUT_DISPLAY_WORK;
             }
             break;
 
@@ -1085,6 +1085,8 @@
     /* Now clear it so that any callback generated by the actions below can set work again */
     window->State.WorkMask = 0;
 
+    if (workMask&~GLUT_DISPLAY_WORK)    /* Display work is the common case, skip all the below at once */
+    {    
     /* This is before the first display callback: call a few callbacks to inform user of window size, position, etc
      * we know this is before the first display callback of a window as for all windows GLUT_INIT_WORK is set when
      * they are opened, and work is done before displaying in the mainloop.
@@ -1144,5 +1146,15 @@
             break;
         }
     }
+    }
+
+    if (workMask & GLUT_DISPLAY_WORK)
+    {
+        if( window->State.Visible )
+            fghRedrawWindow ( window );
+
+        /* Strip out display work that might have ended up on work list now as some of the above genereates callbacks */
+        window->State.WorkMask &= ~GLUT_DISPLAY_WORK;
+    }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1615
          http://freeglut.svn.sourceforge.net/freeglut/?rev=1615&view=rev
Author:   dcnieho
Date:     2013-04-07 12:21:03 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
part of dealing with work is platform independent, so moved it to platform independent part of code

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/android/fg_main_android.c
    trunk/freeglut/freeglut/src/fg_main.c
    trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
    trunk/freeglut/freeglut/src/x11/fg_main_x11.c

Modified: trunk/freeglut/freeglut/src/android/fg_main_android.c
===================================================================
--- trunk/freeglut/freeglut/src/android/fg_main_android.c	2013-04-07 08:04:46 UTC (rev 1614)
+++ trunk/freeglut/freeglut/src/android/fg_main_android.c	2013-04-07 12:21:03 UTC (rev 1615)
@@ -488,45 +488,24 @@
 }
 
 
-/* Step through the work list */
-void fgPlatformProcessWork(SFG_Window *window)
+/* deal with work list items */
+void fgPlatformInitWork(SFG_Window* window)
 {
-    unsigned int workMask = window->State.WorkMask;
-    /* Now clear it so that any callback generated by the actions below can set work again */
-    window->State.WorkMask = 0;
+    /* notify windowStatus/visibility */
+    INVOKE_WCB( *window, WindowStatus, ( GLUT_FULLY_RETAINED ) );
 
-    if (workMask&~GLUT_DISPLAY_WORK)    /* Display work is the common case, skip all the below at once */
-    {
-    /* This is before the first display callback: call a few callbacks to inform user of window size, position, etc
-     * we know this is before the first display callback of a window as for all windows GLUT_INIT_WORK is set when
-     * they are opened, and work is done before displaying in the mainloop.
+    /* Position callback, always at 0,0 */
+    fghOnPositionNotify(window, 0, 0, GL_TRUE);
+
+    /* Size gets notified on window creation with size detection in mainloop above
+     * XXX CHECK: does this messages happen too early like on windows,
+     * so client code cannot have registered a callback yet and the message
+     * is thus never received by client?
      */
-    if (workMask & GLUT_INIT_WORK)
-    {
-        /* notify windowStatus/visibility */
-        INVOKE_WCB( *window, WindowStatus, ( GLUT_FULLY_RETAINED ) );
+}
 
-        /* Position callback, always at 0,0 */
-        fghOnPositionNotify(window, 0, 0, GL_TRUE);
-
-        /* Size gets notified on window creation with size detection in mainloop above
-         * XXX CHECK: does this messages happen too early like on windows,
-         * so client code cannot have registered a callback yet and the message
-         * is thus never received by client?
-         */
-
-        /* Call init context callback */
-        INVOKE_WCB( *window, InitContext, ());
-
-        /* Lastly, check if we have a display callback, error out if not
-         * This is the right place to do it, as the redisplay will be
-         * next right after we exit this function, so there is no more
-         * opportunity for the user to register a callback for this window.
-         */
-        if (!FETCH_WCB(*window, Display))
-            fgError ( "ERROR:  No display callback registered for window %d\n", window->ID );
-    }
-
+void fgPlatformPosResZordWork(SFG_Window* window, unsigned int workMask)
+{
     if (workMask & GLUT_FULL_SCREEN_WORK)
         fgPlatformFullScreenToggle( window );
     if (workMask & GLUT_POSITION_WORK)
@@ -540,39 +519,29 @@
         else
             fgPlatformPopWindow( window );
     }
+}
 
-    if (workMask & GLUT_VISIBILITY_WORK)
+void fgPlatformVisibilityWork(SFG_Window* window)
+{
+    /* Visibility status of window should get updated in the window message handlers
+     * For now, none of these functions called below do anything, so don't worry
+     * about it
+     */
+    SFG_Window *win = window;
+    switch (window->State.DesiredVisibility)
     {
-        /* Visibility status of window should get updated in the window message handlers
-         * For now, none of these functions called below do anything, so don't worry
-         * about it
-         */
-        SFG_Window *win = window;
-        switch (window->State.DesiredVisibility)
-        {
-        case DesireHiddenState:
-            fgPlatformHideWindow( window );
-            break;
-        case DesireIconicState:
-            /* Call on top-level window */
-            while (win->Parent)
-                win = win->Parent;
-            fgPlatformIconifyWindow( win );
-            break;
-        case DesireNormalState:
-            fgPlatformShowWindow( window );
-            break;
-        }
+    case DesireHiddenState:
+        fgPlatformHideWindow( window );
+        break;
+    case DesireIconicState:
+        /* Call on top-level window */
+        while (win->Parent)
+            win = win->Parent;
+        fgPlatformIconifyWindow( win );
+        break;
+    case DesireNormalState:
+        fgPlatformShowWindow( window );
+        break;
     }
-    }
-
-    if (workMask & GLUT_DISPLAY_WORK)
-    {
-        if( window->State.Visible )
-            fghRedrawWindow ( window );
-
-        /* Strip out display work that might have ended up on work list now as some of the above genereates callbacks */
-        window->State.WorkMask &= ~GLUT_DISPLAY_WORK;
-    }
 }
 

Modified: trunk/freeglut/freeglut/src/fg_main.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_main.c	2013-04-07 08:04:46 UTC (rev 1614)
+++ trunk/freeglut/freeglut/src/fg_main.c	2013-04-07 12:21:03 UTC (rev 1615)
@@ -60,9 +60,11 @@
 extern void fgPlatformProcessSingleEvent ( void );
 extern void fgPlatformMainLoopPreliminaryWork ( void );
 
+extern void fgPlatformInitWork(SFG_Window* window);
+extern void fgPlatformPosResZordWork(SFG_Window* window, unsigned int workMask);
+extern void fgPlatformVisibilityWork(SFG_Window* window);
 
 
-
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
 void fghOnReshapeNotify(SFG_Window *window, int width, int height, GLboolean forceNotify)
@@ -390,6 +392,57 @@
 }
 
 
+/* Step through the work list */
+void fgPlatformProcessWork(SFG_Window *window)
+{
+    unsigned int workMask = window->State.WorkMask;
+    /* Now clear it so that any callback generated by the actions below can set work again */
+    window->State.WorkMask = 0;
+
+    if (workMask&~GLUT_DISPLAY_WORK)    /* Display work is the common case, skip all the below at once */
+    {
+        if (workMask & GLUT_INIT_WORK)
+        {
+            /* This is before the first display callback: if needed for the platform,
+             * call a few callbacks to inform user of window size, position, etc
+             */
+            fgPlatformInitWork(window);
+
+            /* Call init context callback */
+            INVOKE_WCB( *window, InitContext, ());
+
+            /* Lastly, check if we have a display callback, error out if not
+             * This is the right place to do it, as the redisplay will be
+             * next right after we exit this function, so there is no more
+             * opportunity for the user to register a callback for this window.
+             */
+            if (!FETCH_WCB(*window, Display))
+                fgError ( "ERROR:  No display callback registered for window %d\n", window->ID );
+        }
+
+        /* On windows we can position, resize and change z order at the same time */
+        if (workMask & (GLUT_POSITION_WORK|GLUT_SIZE_WORK|GLUT_ZORDER_WORK|GLUT_FULL_SCREEN_WORK))
+        {
+            fgPlatformPosResZordWork(window,workMask);
+        }
+
+        if (workMask & GLUT_VISIBILITY_WORK)
+        {
+            fgPlatformVisibilityWork(window);
+        }
+    }
+
+    if (workMask & GLUT_DISPLAY_WORK)
+    {
+        if( window->State.Visible )
+            fghRedrawWindow ( window );
+
+        /* Strip out display work that might have ended up on work list now as some of the above genereates callbacks */
+        window->State.WorkMask &= ~GLUT_DISPLAY_WORK;
+    }
+}
+
+
 /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
 
 /*

Modified: trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c
===================================================================
--- trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-04-07 08:04:46 UTC (rev 1614)
+++ trunk/freeglut/freeglut/src/mswin/fg_main_mswin.c	2013-04-07 12:21:03 UTC (rev 1615)
@@ -1541,251 +1541,218 @@
 }
 
 
-/* Step through the work list */
-void fgPlatformProcessWork(SFG_Window *window)
+/* deal with work list items */
+void fgPlatformInitWork(SFG_Window* window)
 {
-    unsigned int workMask = window->State.WorkMask;
-    /* Now clear it so that any callback generated by the actions below can set work again */
-    window->State.WorkMask = 0;
+    RECT windowRect;
 
-    if (workMask&~GLUT_DISPLAY_WORK)    /* Display work is the common case, skip all the below at once */
-    {
-    /* This is before the first display callback: call a few callbacks to inform user of window size, position, etc
-     * we know this is before the first display callback of a window as for all windows GLUT_INIT_WORK is set when
-     * they are opened, and work is done before displaying in the mainloop.
-     */
-    if (workMask & GLUT_INIT_WORK)
-    {
-        RECT windowRect;
+    /* Notify windowStatus/visibility */
+    fghPlatformOnWindowStatusNotify(window, window->State.Visible, GL_TRUE);
 
-        /* Notify windowStatus/visibility */
-        fghPlatformOnWindowStatusNotify(window, window->State.Visible, GL_TRUE);
+    /* get and notify window's position */
+    GetWindowRect(window->Window.Handle,&windowRect);
+    fghOnPositionNotify(window, windowRect.left, windowRect.top, GL_TRUE);
 
-        /* get and notify window's position */
-        GetWindowRect(window->Window.Handle,&windowRect);
-        fghOnPositionNotify(window, windowRect.left, windowRect.top, GL_TRUE);
+    /* get and notify window's size */
+    GetClientRect(window->Window.Handle,&windowRect);
+    fghOnReshapeNotify(window, windowRect.right-windowRect.left, windowRect.bottom-windowRect.top, GL_TRUE);
+}
 
-        /* get and notify window's size */
-        GetClientRect(window->Window.Handle,&windowRect);
-        fghOnReshapeNotify(window, windowRect.right-windowRect.left, windowRect.bottom-windowRect.top, GL_TRUE);
+/* On windows we can position, resize and change z order at the same time */
+void fgPlatformPosResZordWork(SFG_Window* window, unsigned int workMask)
+{
+    UINT flags = SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING | SWP_NOSIZE | SWP_NOZORDER;
+    HWND insertAfter = HWND_TOP;
+    RECT clientRect;
 
-        /* Call init context callback */
-        INVOKE_WCB( *window, InitContext, ());
-
-        /* Lastly, check if we have a display callback, error out if not
-         * This is the right place to do it, as the redisplay will be
-         * next right after we exit this function, so there is no more
-         * opportunity for the user to register a callback for this window.
-         */
-        if (!FETCH_WCB(*window, Display))
-            fgError ( "ERROR:  No display callback registered for window %d\n", window->ID );
-    }
-
-    /* On windows we can position, resize and change z order at the same time */
-    if (workMask & (GLUT_POSITION_WORK|GLUT_SIZE_WORK|GLUT_ZORDER_WORK|GLUT_FULL_SCREEN_WORK))
+#if !defined(_WIN32_WCE) /* FIXME: what about WinCE */
+    if (workMask & GLUT_FULL_SCREEN_WORK)
     {
-        UINT flags = SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING | SWP_NOSIZE | SWP_NOZORDER;
-        HWND insertAfter = HWND_TOP;
-        RECT clientRect;
+        /* This asks us to toggle fullscreen mode */
+        flags |= SWP_FRAMECHANGED;
 
-#if !defined(_WIN32_WCE) /* FIXME: what about WinCE */
-        if (workMask & GLUT_FULL_SCREEN_WORK)
+        if (window->State.IsFullscreen)
         {
-            /* This asks us to toggle fullscreen mode */
-            flags |= SWP_FRAMECHANGED;
+            /* If we are fullscreen, resize the current window back to its original size */
+            /* printf("OldRect %i,%i to %i,%i\n",window->State.pWState.OldRect.left,window->State.pWState.OldRect.top,window->State.pWState.OldRect.right,window->State.pWState.OldRect.bottom); */
 
-            if (window->State.IsFullscreen)
-            {
-                /* If we are fullscreen, resize the current window back to its original size */
-                /* printf("OldRect %i,%i to %i,%i\n",window->State.pWState.OldRect.left,window->State.pWState.OldRect.top,window->State.pWState.OldRect.right,window->State.pWState.OldRect.bottom); */
+            /* restore style of window before making it fullscreen */
+            SetWindowLong(window->Window.Handle, GWL_STYLE, window->State.pWState.OldStyle);
+            SetWindowLong(window->Window.Handle, GWL_EXSTYLE, window->State.pWState.OldStyleEx);
 
-                /* restore style of window before making it fullscreen */
-                SetWindowLong(window->Window.Handle, GWL_STYLE, window->State.pWState.OldStyle);
-                SetWindowLong(window->Window.Handle, GWL_EXSTYLE, window->State.pWState.OldStyleEx);
-
-                /* Then set up resize/reposition, unless user already queued up reshape/position work */
-                if (!(workMask & GLUT_POSITION_WORK))
-                {
-                    workMask |= GLUT_POSITION_WORK;
-                    window->State.DesiredXpos   = window->State.pWState.OldRect.left;
-                    window->State.DesiredYpos   = window->State.pWState.OldRect.top;
-                }
-                if (!(workMask & GLUT_SIZE_WORK))
-                {
-                    workMask |= GLUT_SIZE_WORK;
-                    window->State.DesiredWidth  = window->State.pWState.OldRect.right  - window->State.pWState.OldRect.left;
-                    window->State.DesiredHeight = window->State.pWState.OldRect.bottom - window->State.pWState.OldRect.top;
-                }
-                
-                /* We'll finish off the fullscreen operation below after the other GLUT_POSITION_WORK|GLUT_SIZE_WORK|GLUT_ZORDER_WORK */
+            /* Then set up resize/reposition, unless user already queued up reshape/position work */
+            if (!(workMask & GLUT_POSITION_WORK))
+            {
+                workMask |= GLUT_POSITION_WORK;
+                window->State.DesiredXpos   = window->State.pWState.OldRect.left;
+                window->State.DesiredYpos   = window->State.pWState.OldRect.top;
             }
-            else
+            if (!(workMask & GLUT_SIZE_WORK))
             {
-                /* we are currently not fullscreen, go to fullscreen:
-                 * remove window decoration and then maximize
-                 */
-                RECT rect;
-                HMONITOR hMonitor;
-                MONITORINFO mi;
+                workMask |= GLUT_SIZE_WORK;
+                window->State.DesiredWidth  = window->State.pWState.OldRect.right  - window->State.pWState.OldRect.left;
+                window->State.DesiredHeight = window->State.pWState.OldRect.bottom - window->State.pWState.OldRect.top;
+            }
+                
+            /* We'll finish off the fullscreen operation below after the other GLUT_POSITION_WORK|GLUT_SIZE_WORK|GLUT_ZORDER_WORK */
+        }
+        else
+        {
+            /* we are currently not fullscreen, go to fullscreen:
+                * remove window decoration and then maximize
+                */
+            RECT rect;
+            HMONITOR hMonitor;
+            MONITORINFO mi;
         
-                /* save current window rect, style, exstyle and maximized state */
-                window->State.pWState.OldMaximized = !!IsZoomed(window->Window.Handle);
-                if (window->State.pWState.OldMaximized)
-                    /* We force the window into restored mode before going
-                     * fullscreen because Windows doesn't seem to hide the
-                     * taskbar if the window is in the maximized state.
-                     */
-                    SendMessage(window->Window.Handle, WM_SYSCOMMAND, SC_RESTORE, 0);
+            /* save current window rect, style, exstyle and maximized state */
+            window->State.pWState.OldMaximized = !!IsZoomed(window->Window.Handle);
+            if (window->State.pWState.OldMaximized)
+                /* We force the window into restored mode before going
+                    * fullscreen because Windows doesn't seem to hide the
+                    * taskbar if the window is in the maximized state.
+                    */
+                SendMessage(window->Window.Handle, WM_SYSCOMMAND, SC_RESTORE, 0);
 
-                fghGetClientArea( &window->State.pWState.OldRect, window, GL_TRUE );
-                window->State.pWState.OldStyle   = GetWindowLong(window->Window.Handle, GWL_STYLE);
-                window->State.pWState.OldStyleEx = GetWindowLong(window->Window.Handle, GWL_EXSTYLE);
+            fghGetClientArea( &window->State.pWState.OldRect, window, GL_TRUE );
+            window->State.pWState.OldStyle   = GetWindowLong(window->Window.Handle, GWL_STYLE);
+            window->State.pWState.OldStyleEx = GetWindowLong(window->Window.Handle, GWL_EXSTYLE);
 
-                /* remove decorations from style */
-                SetWindowLong(window->Window.Handle, GWL_STYLE,
-                              window->State.pWState.OldStyle & ~(WS_CAPTION | WS_THICKFRAME));
-                SetWindowLong(window->Window.Handle, GWL_EXSTYLE,
-                              window->State.pWState.OldStyleEx & ~(WS_EX_DLGMODALFRAME |
-                              WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE | WS_EX_STATICEDGE));
+            /* remove decorations from style */
+            SetWindowLong(window->Window.Handle, GWL_STYLE,
+                            window->State.pWState.OldStyle & ~(WS_CAPTION | WS_THICKFRAME));
+            SetWindowLong(window->Window.Handle, GWL_EXSTYLE,
+                            window->State.pWState.OldStyleEx & ~(WS_EX_DLGMODALFRAME |
+                            WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE | WS_EX_STATICEDGE));
 
-                /* For fullscreen mode, find the monitor that is covered the most
-                 * by the window and get its rect as the resize target.
-	             */
-                GetWindowRect(window->Window.Handle, &rect);
-                hMonitor= MonitorFromRect(&rect, MONITOR_DEFAULTTONEAREST);
-                mi.cbSize = sizeof(mi);
-                GetMonitorInfo(hMonitor, &mi);
-                rect = mi.rcMonitor;
+            /* For fullscreen mode, find the monitor that is covered the most
+                * by the window and get its rect as the resize target.
+	            */
+            GetWindowRect(window->Window.Handle, &rect);
+            hMonitor= MonitorFromRect(&rect, MONITOR_DEFAULTTONEAREST);
+            mi.cbSize = sizeof(mi);
+            GetMonitorInfo(hMonitor, &mi);
+            rect = mi.rcMonitor;
 
-                /* then setup window resize, overwriting other work queued on the window */
-                window->State.WorkMask |= GLUT_POSITION_WORK | GLUT_SIZE_WORK;
-                window->State.WorkMask &= ~GLUT_ZORDER_WORK;
-                window->State.DesiredXpos   = rect.left;
-                window->State.DesiredYpos   = rect.top;
-                window->State.DesiredWidth  = rect.right  - rect.left;
-                window->State.DesiredHeight = rect.bottom - rect.top;
-            }
+            /* then setup window resize, overwriting other work queued on the window */
+            window->State.WorkMask |= GLUT_POSITION_WORK | GLUT_SIZE_WORK;
+            window->State.WorkMask &= ~GLUT_ZORDER_WORK;
+            window->State.DesiredXpos   = rect.left;
+            window->State.DesiredYpos   = rect.top;
+            window->State.DesiredWidth  = rect.right  - rect.left;
+            window->State.DesiredHeight = rect.bottom - rect.top;
         }
+    }
 #endif /*!defined(_WIN32_WCE) */
 
-        /* Now deal with normal position, reshape and z order requests (some might have been set when handling GLUT_FULLSCREEN_WORK above */
-        {
-            /* get rect describing window's current position and size, 
-             * in screen coordinates and in FreeGLUT format
-             * (size (right-left, bottom-top) is client area size, top and left
-             * are outside of window including decorations).
-             */
-            fghGetClientArea( &clientRect, window, TRUE );
+    /* Now deal with normal position, reshape and z order requests (some might have been set when handling GLUT_FULLSCREEN_WORK above */
+    {
+        /* get rect describing window's current position and size, 
+            * in screen coordinates and in FreeGLUT format
+            * (size (right-left, bottom-top) is client area size, top and left
+            * are outside of window including decorations).
+            */
+        fghGetClientArea( &clientRect, window, TRUE );
 
-            if (workMask & GLUT_POSITION_WORK)
-            {
-                flags &= ~SWP_NOMOVE;
+        if (workMask & GLUT_POSITION_WORK)
+        {
+            flags &= ~SWP_NOMOVE;
                 
-                /* Move rect so that top-left is at requested position */
-                /* This also automatically makes sure that child window requested coordinates are relative
-                 * to top-left of parent's client area (needed input for SetWindowPos on child windows),
-                 * so no need to further correct rect for child windows below (childs don't have decorations either).
-                 */
-                OffsetRect(&clientRect,window->State.DesiredXpos-clientRect.left,window->State.DesiredYpos-clientRect.top);
-            }
-            if (workMask & GLUT_SIZE_WORK)
-            {
-                flags &= ~SWP_NOSIZE;
+            /* Move rect so that top-left is at requested position */
+            /* This also automatically makes sure that child window requested coordinates are relative
+                * to top-left of parent's client area (needed input for SetWindowPos on child windows),
+                * so no need to further correct rect for child windows below (childs don't have decorations either).
+                */
+            OffsetRect(&clientRect,window->State.DesiredXpos-clientRect.left,window->State.DesiredYpos-clientRect.top);
+        }
+        if (workMask & GLUT_SIZE_WORK)
+        {
+            flags &= ~SWP_NOSIZE;
                 
-                /* Note on maximizing behavior of Windows: the resize borders are off
-                 * the screen such that the client area extends all the way from the
-                 * leftmost corner to the rightmost corner to maximize screen real
-                 * estate. A caption is still shown however to allow interaction with
-                 * the window controls. This is default behavior of Windows that
-                 * FreeGLUT sticks with. To alter, one would have to check if
-                 * WS_MAXIMIZE style is set when a resize event is triggered, and
-                 * then manually correct the windowRect to put the borders back on
-                 * screen.
-                 */
+            /* Note on maximizing behavior of Windows: the resize borders are off
+                * the screen such that the client area extends all the way from the
+                * leftmost corner to the rightmost corner to maximize screen real
+                * estate. A caption is still shown however to allow interaction with
+                * the window controls. This is default behavior of Windows that
+                * FreeGLUT sticks with. To alter, one would have to check if
+                * WS_MAXIMIZE style is set when a resize event is triggered, and
+                * then manually correct the windowRect to put the borders back on
+                * screen.
+                */
 
-                /* Set new size of window, WxH specify client area */
-                clientRect.right    = clientRect.left + window->State.DesiredWidth;
-                clientRect.bottom   = clientRect.top  + window->State.DesiredHeight;
-            }
-            if (workMask & GLUT_ZORDER_WORK)
-            {
-                flags &= ~SWP_NOZORDER;
-
-                /* Could change this to push it down or up one window at a time with some
-                 * more code using GetWindow with GW_HWNDPREV and GW_HWNDNEXT.
-                 * What would be consistent with X11? Win32 GLUT does what we do here...
-                 */
-                if (window->State.DesiredZOrder < 0)
-                    insertAfter = HWND_BOTTOM;
-            }
+            /* Set new size of window, WxH specify client area */
+            clientRect.right    = clientRect.left + window->State.DesiredWidth;
+            clientRect.bottom   = clientRect.top  + window->State.DesiredHeight;
         }
-
-        /* Adjust for window decorations
-         * Child windows don't have decoration, so no need to correct
-         */
-        if (!window->Parent)
-            /* get the window rect from this to feed to SetWindowPos, correct for window decorations */
-            fghComputeWindowRectFromClientArea_QueryWindow(&clientRect,window,TRUE);
-    
-        /* Do the requested positioning, moving, and z order push/pop. */
-        SetWindowPos( window->Window.Handle,
-                      insertAfter,
-                      clientRect.left, clientRect.top,
-                      clientRect.right - clientRect.left,
-                      clientRect.bottom- clientRect.top,
-                      flags
-        );
-
-        /* Finish off the fullscreen operation we were doing, if any */
-        if (workMask & GLUT_FULL_SCREEN_WORK)
+        if (workMask & GLUT_ZORDER_WORK)
         {
-            if (window->State.IsFullscreen)
-            {
-                /* leaving fullscreen, restore maximized state, if any */
-                if (window->State.pWState.OldMaximized)
-                    SendMessage(window->Window.Handle, WM_SYSCOMMAND, SC_MAXIMIZE, 0);
+            flags &= ~SWP_NOZORDER;
 
-                window->State.IsFullscreen = GL_FALSE;
-            }
-            else
-                window->State.IsFullscreen = GL_TRUE;
+            /* Could change this to push it down or up one window at a time with some
+                * more code using GetWindow with GW_HWNDPREV and GW_HWNDNEXT.
+                * What would be consistent with X11? Win32 GLUT does what we do here...
+                */
+            if (window->State.DesiredZOrder < 0)
+                insertAfter = HWND_BOTTOM;
         }
     }
 
-    if (workMask & GLUT_VISIBILITY_WORK)
+    /* Adjust for window decorations
+        * Child windows don't have decoration, so no need to correct
+        */
+    if (!window->Parent)
+        /* get the window rect from this to feed to SetWindowPos, correct for window decorations */
+        fghComputeWindowRectFromClientArea_QueryWindow(&clientRect,window,TRUE);
+    
+    /* Do the requested positioning, moving, and z order push/pop. */
+    SetWindowPos( window->Window.Handle,
+                    insertAfter,
+                    clientRect.left, clientRect.top,
+                    clientRect.right - clientRect.left,
+                    clientRect.bottom- clientRect.top,
+                    flags
+    );
+
+    /* Finish off the fullscreen operation we were doing, if any */
+    if (workMask & GLUT_FULL_SCREEN_WORK)
     {
-        /* Visibility status of window gets updated in the WM_SHOWWINDOW and WM_SIZE handlers */
-        int cmdShow = 0;
-        SFG_Window *win = window;
-        switch (window->State.DesiredVisibility)
+        if (window->State.IsFullscreen)
         {
-        case DesireHiddenState:
-            cmdShow = SW_HIDE;
-            break;
-        case DesireIconicState:
-            cmdShow = SW_MINIMIZE;
-            /* Call on top-level window */
-            while (win->Parent)
-                win = win->Parent;
-            break;
-        case DesireNormalState:
-            if (win->IsMenu && (!fgStructure.GameModeWindow || win->ActiveMenu->ParentWindow != fgStructure.GameModeWindow))
-                cmdShow = SW_SHOWNA;    /* Just show, don't activate window if its a menu. Only exception is when the parent is a gamemode window as the menu would pop under it when we do this... */
-            else
-                cmdShow = SW_SHOW;
-            break;
-        }
+            /* leaving fullscreen, restore maximized state, if any */
+            if (window->State.pWState.OldMaximized)
+                SendMessage(window->Window.Handle, WM_SYSCOMMAND, SC_MAXIMIZE, 0);
 
-        ShowWindow( win->Window.Handle, cmdShow );
+            window->State.IsFullscreen = GL_FALSE;
+        }
+        else
+            window->State.IsFullscreen = GL_TRUE;
     }
-    }
+}
 
-    if (workMask & GLUT_DISPLAY_WORK)
-    {
-        if( window->State.Visible )
-            fghRedrawWindow ( window );
 
-        /* Strip out display work that might have ended up on work list now as some of the above genereates callbacks */
-        window->State.WorkMask &= ~GLUT_DISPLAY_WORK;
+void fgPlatformVisibilityWork(SFG_Window* window)
+{
+    /* Visibility status of window gets updated in the WM_SHOWWINDOW and WM_SIZE handlers */
+    int cmdShow = 0;
+    SFG_Window *win = window;
+    switch (window->State.DesiredVisibility)
+    {
+    case DesireHiddenState:
+        cmdShow = SW_HIDE;
+        break;
+    case DesireIconicState:
+        cmdShow = SW_MINIMIZE;
+        /* Call on top-level window */
+        while (win->Parent)
+            win = win->Parent;
+        break;
+    case DesireNormalState:
+        if (win->IsMenu && (!fgStructure.GameModeWindow || win->ActiveMenu->ParentWindow != fgStructure.GameModeWindow))
+            cmdShow = SW_SHOWNA;    /* Just show, don't activate window if its a menu. Only exception is when the parent is a gamemode window as the menu would pop under it when we do this... */
+        else
+            cmdShow = SW_SHOW;
+        break;
     }
+
+    ShowWindow( win->Window.Handle, cmdShow );
 }
\ No newline at end of file

Modified: trunk/freeglut/freeglut/src/x11/fg_main_x11.c
===================================================================
--- trunk/freeglut/freeglut/src/x11/fg_main_x11.c	2013-04-07 08:04:46 UTC (rev 1614)
+++ trunk/freeglut/freeglut/src/x11/fg_main_x11.c	2013-04-07 12:21:03 UTC (rev 1615)
@@ -1078,38 +1078,19 @@
 }
 
 
-/* Step through the work list */
-void fgPlatformProcessWork(SFG_Window *window)
+/* deal with work list items */
+void fgPlatformInitWork(SFG_Window* window)
 {
-    unsigned int workMask = window->State.WorkMask;
-    /* Now clear it so that any callback generated by the actions below can set work again */
-    window->State.WorkMask = 0;
-
-    if (workMask&~GLUT_DISPLAY_WORK)    /* Display work is the common case, skip all the below at once */
-    {    
-    /* This is before the first display callback: call a few callbacks to inform user of window size, position, etc
-     * we know this is before the first display callback of a window as for all windows GLUT_INIT_WORK is set when
-     * they are opened, and work is done before displaying in the mainloop.
+    /* Notify windowStatus/visibility, position and size get notified on window creation with message handlers above 
+     * XXX CHECK: do the messages happen too early like on windows, so client code cannot have registered
+     * a callback yet and the message is thus never received by client?
+     * -> this is a no-op
      */
-    if (workMask & GLUT_INIT_WORK)
-    {
-        /* Notify windowStatus/visibility, position and size get notified on window creation with message handlers above 
-         * XXX CHECK: do the messages happen too early like on windows, so client code cannot have registered
-         * a callback yet and the message is thus never received by client?
-         */
+     return;
+}
 
-        /* Call init context callback */
-        INVOKE_WCB( *window, InitContext, ());
-
-        /* Lastly, check if we have a display callback, error out if not
-         * This is the right place to do it, as the redisplay will be
-         * next right after we exit this function, so there is no more
-         * opportunity for the user to register a callback for this window.
-         */
-        if (!FETCH_WCB(*window, Display))
-            fgError ( "ERROR:  No display callback registered for window %d\n", window->ID );
-    }
-
+void fgPlatformPosResZordWork(SFG_Window* window, unsigned int workMask)
+{
     if (workMask & GLUT_FULL_SCREEN_WORK)
         fgPlatformFullScreenToggle( window );
     if (workMask & GLUT_POSITION_WORK)
@@ -1123,38 +1104,28 @@
         else
             fgPlatformPopWindow( window );
     }
+}
 
-    if (workMask & GLUT_VISIBILITY_WORK)
+void fgPlatformVisibilityWork(SFG_Window* window)
+{
+    /* Visibility status of window gets updated in the window message handlers above 
+     * XXX: is this really the case? check
+     */
+    SFG_Window *win = window;
+    switch (window->State.DesiredVisibility)
     {
-        /* Visibility status of window gets updated in the window message handlers above 
-         * XXX: is this really the case? check
-         */
-        SFG_Window *win = window;
-        switch (window->State.DesiredVisibility)
-        {
-        case DesireHiddenState:
-            fgPlatformHideWindow( window );
-            break;
-        case DesireIconicState:
-            /* Call on top-level window */
-            while (win->Parent)
-                win = win->Parent;
-            fgPlatformIconifyWindow( win );
-            break;
-        case DesireNormalState:
-            fgPlatformShowWindow( window );
-            break;
-        }
+    case DesireHiddenState:
+        fgPlatformHideWindow( window );
+        break;
+    case DesireIconicState:
+        /* Call on top-level window */
+        while (win->Parent)
+            win = win->Parent;
+        fgPlatformIconifyWindow( win );
+        break;
+    case DesireNormalState:
+        fgPlatformShowWindow( window );
+        break;
     }
-    }
-
-    if (workMask & GLUT_DISPLAY_WORK)
-    {
-        if( window->State.Visible )
-            fghRedrawWindow ( window );
-
-        /* Strip out display work that might have ended up on work list now as some of the above genereates callbacks */
-        window->State.WorkMask &= ~GLUT_DISPLAY_WORK;
-    }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1618
          http://sourceforge.net/p/freeglut/code/1618
Author:   dcnieho
Date:     2013-04-20 14:04:21 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
fgProcessWork, not fgPlatformProcessWork

Modified Paths:
--------------
    trunk/freeglut/freeglut/src/android/fg_main_android.c
    trunk/freeglut/freeglut/src/fg_main.c

Modified: trunk/freeglut/freeglut/src/android/fg_main_android.c
===================================================================
--- trunk/freeglut/freeglut/src/android/fg_main_android.c	2013-04-20 14:04:06 UTC (rev 1617)
+++ trunk/freeglut/freeglut/src/android/fg_main_android.c	2013-04-20 14:04:21 UTC (rev 1618)
@@ -465,7 +465,7 @@
        * be not possible to ensure InitContext CB gets called before
        * Resume CB like that.. so maybe just force calling initContext CB
        * here is best. Or we could force work on the window in question..
-       * 1) save old work mask, 2) set mask to init only, 3) call fgPlatformProcessWork directly
+       * 1) save old work mask, 2) set mask to init only, 3) call fgProcessWork directly
        * 4) set work mask back to the one saved in step 1.
        */
       if (!FETCH_WCB(*window, InitContext))

Modified: trunk/freeglut/freeglut/src/fg_main.c
===================================================================
--- trunk/freeglut/freeglut/src/fg_main.c	2013-04-20 14:04:06 UTC (rev 1617)
+++ trunk/freeglut/freeglut/src/fg_main.c	2013-04-20 14:04:21 UTC (rev 1618)
@@ -54,7 +54,7 @@
 #    define MIN(a,b) (((a)<(b)) ? (a) : (b))
 #endif
 
-extern void fgPlatformProcessWork   ( SFG_Window *window );
+extern void fgProcessWork   ( SFG_Window *window );
 extern fg_time_t fgPlatformSystemTime ( void );
 extern void fgPlatformSleepForEvents( fg_time_t msec );
 extern void fgPlatformProcessSingleEvent ( void );
@@ -163,7 +163,7 @@
                               SFG_Enumerator *enumerator )
 {
     if( window->State.WorkMask )
-		fgPlatformProcessWork ( window );
+		fgProcessWork ( window );
 
     fgEnumSubWindows( window, fghcbProcessWork, enumerator );
 }
@@ -393,7 +393,7 @@
 
 
 /* Step through the work list */
-void fgPlatformProcessWork(SFG_Window *window)
+void fgProcessWork(SFG_Window *window)
 {
     unsigned int workMask = window->State.WorkMask;
     /* Now clear it so that any callback generated by the actions below can set work again */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.