X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2FCommon%2Ffreeglut_init.c;h=07f7528952980b249abff3a06a8fdffe9a2661f8;hb=eadfac5750a4b83b7054b528006d9abb2fa5696f;hp=0543840da71bd57749ce61e7af43ac55ff876c30;hpb=d7c65149e8416abadd0437fabfdf527091bf1bfe;p=freeglut

diff --git a/src/Common/freeglut_init.c b/src/Common/freeglut_init.c
index 0543840..07f7528 100644
--- a/src/Common/freeglut_init.c
+++ b/src/Common/freeglut_init.c
@@ -100,16 +100,16 @@ SFG_State fgState = { { -1, -1, GL_FALSE },  /* Position */
 
 /* -- 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
 
 /* Return the atom associated with "name". */
 static Atom fghGetAtom(const char * name)
 {
-  return XInternAtom(fgDisplay.Display, name, False);
+  return XInternAtom(fgDisplay.pDisplay.Display, name, False);
 }
 
 /*
@@ -137,7 +137,7 @@ static int fghGetWindowProperty(Window window,
   unsigned long temp_bytes_after;        /*  Not used. */
 
 
-  status = XGetWindowProperty(fgDisplay.Display,
+  status = XGetWindowProperty(fgDisplay.pDisplay.Display,
 			      window,
 			      property,
 			      0,
@@ -181,7 +181,7 @@ static int fghNetWMSupported(void)
    * 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.RootWindow,
+  number_of_windows = fghGetWindowProperty(fgDisplay.pDisplay.RootWindow,
                                            wm_check,
                                            XA_WINDOW,
                                            (unsigned char **) window_ptr_1);
@@ -246,49 +246,49 @@ int fgHintPresent(Window window, Atom property, Atom hint)
 /*
  * A call to this function should initialize all the display stuff...
  */
-static void fghInitialize( const char* displayName )
+void fgPlatformInitialize( const char* displayName )
 {
-    fgDisplay.Display = XOpenDisplay( displayName );
+    fgDisplay.pDisplay.Display = XOpenDisplay( displayName );
 
-    if( fgDisplay.Display == NULL )
+    if( fgDisplay.pDisplay.Display == NULL )
         fgError( "failed to open display '%s'", XDisplayName( displayName ) );
 
-    if( !glXQueryExtension( fgDisplay.Display, NULL, NULL ) )
+    if( !glXQueryExtension( fgDisplay.pDisplay.Display, NULL, NULL ) )
         fgError( "OpenGL GLX extension not supported by display '%s'",
             XDisplayName( displayName ) );
 
-    fgDisplay.Screen = DefaultScreen( fgDisplay.Display );
-    fgDisplay.RootWindow = RootWindow(
-        fgDisplay.Display,
-        fgDisplay.Screen
+    fgDisplay.pDisplay.Screen = DefaultScreen( fgDisplay.pDisplay.Display );
+    fgDisplay.pDisplay.RootWindow = RootWindow(
+        fgDisplay.pDisplay.Display,
+        fgDisplay.pDisplay.Screen
     );
 
     fgDisplay.ScreenWidth  = DisplayWidth(
-        fgDisplay.Display,
-        fgDisplay.Screen
+        fgDisplay.pDisplay.Display,
+        fgDisplay.pDisplay.Screen
     );
     fgDisplay.ScreenHeight = DisplayHeight(
-        fgDisplay.Display,
-        fgDisplay.Screen
+        fgDisplay.pDisplay.Display,
+        fgDisplay.pDisplay.Screen
     );
 
     fgDisplay.ScreenWidthMM = DisplayWidthMM(
-        fgDisplay.Display,
-        fgDisplay.Screen
+        fgDisplay.pDisplay.Display,
+        fgDisplay.pDisplay.Screen
     );
     fgDisplay.ScreenHeightMM = DisplayHeightMM(
-        fgDisplay.Display,
-        fgDisplay.Screen
+        fgDisplay.pDisplay.Display,
+        fgDisplay.pDisplay.Screen
     );
 
-    fgDisplay.Connection = ConnectionNumber( fgDisplay.Display );
+    fgDisplay.pDisplay.Connection = ConnectionNumber( fgDisplay.pDisplay.Display );
 
     /* Create the window deletion atom */
-    fgDisplay.DeleteWindow = fghGetAtom("WM_DELETE_WINDOW");
+    fgDisplay.pDisplay.DeleteWindow = fghGetAtom("WM_DELETE_WINDOW");
 
     /* Create the state and full screen atoms */
-    fgDisplay.State           = None;
-    fgDisplay.StateFullScreen = None;
+    fgDisplay.pDisplay.State           = None;
+    fgDisplay.pDisplay.StateFullScreen = None;
 
     if (fghNetWMSupported())
     {
@@ -296,17 +296,17 @@ static void fghInitialize( const char* displayName )
       const Atom state     = fghGetAtom("_NET_WM_STATE");
       
       /* Check if the state hint is supported. */
-      if (fgHintPresent(fgDisplay.RootWindow, supported, state))
+      if (fgHintPresent(fgDisplay.pDisplay.RootWindow, supported, state))
       {
         const Atom full_screen = fghGetAtom("_NET_WM_STATE_FULLSCREEN");
         
-        fgDisplay.State = state;
+        fgDisplay.pDisplay.State = state;
         
         /* Check if the window manager supports full screen. */
         /**  Check "_NET_WM_ALLOWED_ACTIONS" on our window instead? **/
-        if (fgHintPresent(fgDisplay.RootWindow, supported, full_screen))
+        if (fgHintPresent(fgDisplay.pDisplay.RootWindow, supported, full_screen))
         {
-          fgDisplay.StateFullScreen = full_screen;
+          fgDisplay.pDisplay.StateFullScreen = full_screen;
         }
       }
     }
@@ -437,7 +437,7 @@ void fghCloseInputDevices ( void )
 
 
 #if TARGET_HOST_POSIX_X11
-static void fghDeinitialiseInputDevices ( void )
+void fgPlatformDeinitialiseInputDevices ( void )
 {
 	fghCloseInputDevices ();
 
@@ -446,19 +446,19 @@ static void fghDeinitialiseInputDevices ( void )
 }
 
 
-static void fghCloseDisplay ( void )
+void fgPlatformCloseDisplay ( void )
 {
     /*
      * Make sure all X-client data we have created will be destroyed on
      * display closing
      */
-    XSetCloseDownMode( fgDisplay.Display, DestroyAll );
+    XSetCloseDownMode( fgDisplay.pDisplay.Display, DestroyAll );
 
     /*
      * Close the display connection, destroying all windows we have
      * created so far
      */
-    XCloseDisplay( fgDisplay.Display );
+    XCloseDisplay( fgDisplay.pDisplay.Display );
 }
 
 #endif
@@ -486,7 +486,7 @@ void fgDeinitialize( void )
     {
 #if TARGET_HOST_POSIX_X11
         /* Note that the MVisualInfo is not owned by the MenuContext! */
-        glXDestroyContext( fgDisplay.Display, fgStructure.MenuContext->MContext );
+        glXDestroyContext( fgDisplay.pDisplay.Display, fgStructure.MenuContext->MContext );
 #endif
         free( fgStructure.MenuContext );
         fgStructure.MenuContext = NULL;
@@ -506,7 +506,7 @@ void fgDeinitialize( void )
         free( timer );
     }
 
-	fghDeinitialiseInputDevices ();
+	fgPlatformDeinitialiseInputDevices ();
 
 	fgState.MouseWheelTicks = 0;
 
@@ -560,13 +560,13 @@ void fgDeinitialize( void )
         fgState.ProgramName = NULL;
     }
 
-	fghCloseDisplay ();
+	fgPlatformCloseDisplay ();
 
     fgState.Initialised = GL_FALSE;
 }
 
 
-#if defined TARGET_HOST_MS_WINDOWS
+#if TARGET_HOST_MS_WINDOWS
 #define NoValue         0x0000
 #define XValue          0x0001
 #define YValue          0x0002
@@ -617,7 +617,7 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
      * 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
@@ -648,16 +648,6 @@ void FGAPIENTRY glutInit( int* pargc, char** argv )
     }
 }
 
-#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
  */