X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2FCommon%2Ffreeglut_window.c;h=1052c25e7962b1124077bb8a098226a71dc9333c;hb=0cd6817079c9f545bbff65d6ac86d9fac6b92db9;hp=1d409b36c6a9047176fc738f1fc5004a436d1565;hpb=f08f8f9f43e88afba1dd52ca0f79ce9506b81e4f;p=freeglut

diff --git a/src/Common/freeglut_window.c b/src/Common/freeglut_window.c
index 1d409b3..1052c25 100644
--- a/src/Common/freeglut_window.c
+++ b/src/Common/freeglut_window.c
@@ -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);}
@@ -403,7 +398,7 @@ static GLXContext fghCreateNewContext( SFG_Window* window )
 
   /* "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 );
@@ -454,8 +449,8 @@ static int fghResizeFullscrToggle(void)
         /* 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 */
@@ -553,12 +548,12 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
     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
@@ -568,25 +563,25 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
         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;
     }
@@ -755,7 +750,7 @@ void fgPlatformCloseWindow( SFG_Window* window )
 {
     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 );
@@ -991,14 +986,6 @@ int FGAPIENTRY glutCreateWindow( const char* title )
                            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.
  */