Removing a bunch of "static" declarations from the "fgPlatform" function definitions to remove a raft of Linux errors
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1007 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
2b2e9a9644
commit
8389adce0b
@ -104,7 +104,7 @@ static cursorCacheEntry cursorCache[] = {
|
|||||||
{ XC_bottom_left_corner, None } /* GLUT_CURSOR_BOTTOM_LEFT_CORNER */
|
{ XC_bottom_left_corner, None } /* GLUT_CURSOR_BOTTOM_LEFT_CORNER */
|
||||||
};
|
};
|
||||||
|
|
||||||
static void fgPlatformSetCursor ( SFG_Window *window, int cursorID )
|
void fgPlatformSetCursor ( SFG_Window *window, int cursorID )
|
||||||
{
|
{
|
||||||
Cursor cursor;
|
Cursor cursor;
|
||||||
/*
|
/*
|
||||||
@ -150,7 +150,7 @@ static void fgPlatformSetCursor ( SFG_Window *window, int cursorID )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void fgPlatformWarpPointer ( int x, int y )
|
void fgPlatformWarpPointer ( int x, int y )
|
||||||
{
|
{
|
||||||
XWarpPointer(
|
XWarpPointer(
|
||||||
fgDisplay.Display,
|
fgDisplay.Display,
|
||||||
|
@ -223,7 +223,7 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static GLUTproc fgPlatformGlutGetProcAddress( const char* procName )
|
GLUTproc fgPlatformGlutGetProcAddress( const char* procName )
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -163,7 +163,7 @@ static int xrandr_resize(int xsz, int ysz, int rate, int just_checking)
|
|||||||
* Remembers the current visual settings, so that
|
* Remembers the current visual settings, so that
|
||||||
* we can change them and restore later...
|
* we can change them and restore later...
|
||||||
*/
|
*/
|
||||||
static void fgPlatformRememberState( void )
|
void fgPlatformRememberState( void )
|
||||||
{
|
{
|
||||||
int event_base, error_base;
|
int event_base, error_base;
|
||||||
|
|
||||||
@ -248,7 +248,7 @@ static void fgPlatformRememberState( void )
|
|||||||
/*
|
/*
|
||||||
* Restores the previously remembered visual settings
|
* Restores the previously remembered visual settings
|
||||||
*/
|
*/
|
||||||
static void fgPlatformRestoreState( void )
|
void fgPlatformRestoreState( void )
|
||||||
{
|
{
|
||||||
/* Restore the remembered pointer position: */
|
/* Restore the remembered pointer position: */
|
||||||
XWarpPointer(
|
XWarpPointer(
|
||||||
@ -398,7 +398,7 @@ static int fghCheckDisplayModes( GLboolean exactMatch, int displayModesCount, XF
|
|||||||
/*
|
/*
|
||||||
* Changes the current display mode to match user's settings
|
* Changes the current display mode to match user's settings
|
||||||
*/
|
*/
|
||||||
static GLboolean fgPlatformChangeDisplayMode( GLboolean haveToTest )
|
GLboolean fgPlatformChangeDisplayMode( GLboolean haveToTest )
|
||||||
{
|
{
|
||||||
GLboolean success = GL_FALSE;
|
GLboolean success = GL_FALSE;
|
||||||
/* first try to use XRandR, then fallback to XF86VidMode */
|
/* first try to use XRandR, then fallback to XF86VidMode */
|
||||||
|
@ -246,7 +246,7 @@ int fgHintPresent(Window window, Atom property, Atom hint)
|
|||||||
/*
|
/*
|
||||||
* A call to this function should initialize all the display stuff...
|
* A call to this function should initialize all the display stuff...
|
||||||
*/
|
*/
|
||||||
static void fgPlatformInitialize( const char* displayName )
|
void fgPlatformInitialize( const char* displayName )
|
||||||
{
|
{
|
||||||
fgDisplay.Display = XOpenDisplay( displayName );
|
fgDisplay.Display = XOpenDisplay( displayName );
|
||||||
|
|
||||||
@ -437,7 +437,7 @@ void fghCloseInputDevices ( void )
|
|||||||
|
|
||||||
|
|
||||||
#if TARGET_HOST_POSIX_X11
|
#if TARGET_HOST_POSIX_X11
|
||||||
static void fgPlatformDeinitialiseInputDevices ( void )
|
void fgPlatformDeinitialiseInputDevices ( void )
|
||||||
{
|
{
|
||||||
fghCloseInputDevices ();
|
fghCloseInputDevices ();
|
||||||
|
|
||||||
@ -446,7 +446,7 @@ static void fgPlatformDeinitialiseInputDevices ( void )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void fgPlatformCloseDisplay ( void )
|
void fgPlatformCloseDisplay ( void )
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Make sure all X-client data we have created will be destroyed on
|
* Make sure all X-client data we have created will be destroyed on
|
||||||
|
@ -128,7 +128,7 @@ int fgInputDeviceDetect( void )
|
|||||||
* Try initializing the input device(s)
|
* Try initializing the input device(s)
|
||||||
*/
|
*/
|
||||||
#if TARGET_HOST_POSIX_X11
|
#if TARGET_HOST_POSIX_X11
|
||||||
static void fgPlatformRegisterDialDevice ( const char *dial_device )
|
void fgPlatformRegisterDialDevice ( const char *dial_device )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -96,7 +96,7 @@ extern void fgPlatformMainLoopPreliminaryWork ( void );
|
|||||||
* match the new window size.
|
* match the new window size.
|
||||||
*/
|
*/
|
||||||
#if TARGET_HOST_POSIX_X11
|
#if TARGET_HOST_POSIX_X11
|
||||||
static void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )
|
void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )
|
||||||
{
|
{
|
||||||
XResizeWindow( fgDisplay.Display, window->Window.Handle,
|
XResizeWindow( fgDisplay.Display, window->Window.Handle,
|
||||||
width, height );
|
width, height );
|
||||||
@ -170,7 +170,7 @@ void fghRedrawWindow ( SFG_Window *window )
|
|||||||
* A static helper function to execute display callback for a window
|
* A static helper function to execute display callback for a window
|
||||||
*/
|
*/
|
||||||
#if TARGET_HOST_POSIX_X11
|
#if TARGET_HOST_POSIX_X11
|
||||||
static void fgPlatformDisplayWindow ( SFG_Window *window )
|
void fgPlatformDisplayWindow ( SFG_Window *window )
|
||||||
{
|
{
|
||||||
fghRedrawWindow ( window ) ;
|
fghRedrawWindow ( window ) ;
|
||||||
}
|
}
|
||||||
@ -416,7 +416,7 @@ static long fghNextTimer( void )
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#if TARGET_HOST_POSIX_X11
|
#if TARGET_HOST_POSIX_X11
|
||||||
static void fgPlatformSleepForEvents( long msec )
|
void fgPlatformSleepForEvents( long msec )
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Possibly due to aggressive use of XFlush() and friends,
|
* Possibly due to aggressive use of XFlush() and friends,
|
||||||
@ -1405,7 +1405,7 @@ void fgPlatformProcessSingleEvent ( void )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void fgPlatformMainLoopPreliminaryWork ( void )
|
void fgPlatformMainLoopPreliminaryWork ( void )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -143,7 +143,7 @@ static void fghDeactivateSubMenu( SFG_MenuEntry *menuEntry )
|
|||||||
* Private function to get the virtual maximum screen extent
|
* Private function to get the virtual maximum screen extent
|
||||||
*/
|
*/
|
||||||
#if TARGET_HOST_POSIX_X11
|
#if TARGET_HOST_POSIX_X11
|
||||||
static GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
|
GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
|
||||||
{
|
{
|
||||||
int wx, wy;
|
int wx, wy;
|
||||||
Window w;
|
Window w;
|
||||||
|
@ -73,7 +73,7 @@ static int fghGetConfig( int attribute )
|
|||||||
return returnValue;
|
return returnValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int fgPlatformGlutGet ( GLenum eWhat )
|
int fgPlatformGlutGet ( GLenum eWhat )
|
||||||
{
|
{
|
||||||
int nsamples = 0;
|
int nsamples = 0;
|
||||||
|
|
||||||
@ -233,7 +233,7 @@ static int fgPlatformGlutGet ( GLenum eWhat )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int fgPlatformGlutDeviceGet ( GLenum eWhat )
|
int fgPlatformGlutDeviceGet ( GLenum eWhat )
|
||||||
{
|
{
|
||||||
switch( eWhat )
|
switch( eWhat )
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user