X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=src%2FCommon%2Ffreeglut_init.c;h=eab4ac68cf62c9ce5c637ab0ed51df3dbd8c4a56;hb=474daf255eabd124b1023c199c3c7b98f242325c;hp=0543840da71bd57749ce61e7af43ac55ff876c30;hpb=d7c65149e8416abadd0437fabfdf527091bf1bfe;p=freeglut diff --git a/src/Common/freeglut_init.c b/src/Common/freeglut_init.c index 0543840..eab4ac6 100644 --- a/src/Common/freeglut_init.c +++ b/src/Common/freeglut_init.c @@ -100,9 +100,9 @@ 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 @@ -246,7 +246,7 @@ 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 ); @@ -437,7 +437,7 @@ void fghCloseInputDevices ( void ) #if TARGET_HOST_POSIX_X11 -static void fghDeinitialiseInputDevices ( void ) +void fgPlatformDeinitialiseInputDevices ( void ) { fghCloseInputDevices (); @@ -446,7 +446,7 @@ static void fghDeinitialiseInputDevices ( void ) } -static void fghCloseDisplay ( void ) +void fgPlatformCloseDisplay ( void ) { /* * Make sure all X-client data we have created will be destroyed on @@ -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