FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some whitespace cleanup

Browse Source
This commit is contained in:
Diederick C. Niehorster 2017-07-12 22:36:48 +02:00
parent c4294ad590
commit 2dd5aa4aa1
6 changed files with 258 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
freeglut/freeglut/src/fg_init.c
View File

@ -689,14 +689,14 @@ static void fghInitErrorFuncCallback( const char *fmt, va_list ap, FGCBUserData
void FGAPIENTRY glutInitErrorFunc( FGError callback ) void FGAPIENTRY glutInitErrorFunc( FGError callback )
{ {
if (callback) if (callback)
{ {
glutInitErrorFuncUcall( fghInitErrorFuncCallback, (FGCBUserData)callback ); glutInitErrorFuncUcall( fghInitErrorFuncCallback, (FGCBUserData)callback );
} }
else else
{ {
glutInitErrorFuncUcall( NULL, NULL ); glutInitErrorFuncUcall( NULL, NULL );
} }
} }
/* /*
@ -717,14 +717,14 @@ static void fghInitWarningFuncCallback( const char *fmt, va_list ap, FGCBUserDat
void FGAPIENTRY glutInitWarningFunc( FGWarning callback ) void FGAPIENTRY glutInitWarningFunc( FGWarning callback )
{ {
if (callback) if (callback)
{ {
glutInitWarningFuncUcall( fghInitWarningFuncCallback, (FGCBUserData)callback ); glutInitWarningFuncUcall( fghInitWarningFuncCallback, (FGCBUserData)callback );
} }
else else
{ {
glutInitWarningFuncUcall( NULL, NULL ); glutInitWarningFuncUcall( NULL, NULL );
} }
} }
/*** END OF FILE ***/ /*** END OF FILE ***/

8
freeglut/freeglut/src/fg_joystick.c
View File

@ -581,7 +581,7 @@ void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
void fgPlatformJoystickOpen( SFG_Joystick* joy ) void fgPlatformJoystickOpen( SFG_Joystick* joy )
{ {
int i = 0; int i = 0;
OSStatus err; OSStatus err;
/* XXX FIXME: get joystick name in Mac */ /* XXX FIXME: get joystick name in Mac */
@ -856,7 +856,7 @@ static void fghJoystickOpen( SFG_Joystick* joy )
joy->num_axes = joy->num_buttons = 0; joy->num_axes = joy->num_buttons = 0;
joy->name[ 0 ] = '\0'; joy->name[ 0 ] = '\0';
fgPlatformJoystickOpen ( joy ); fgPlatformJoystickOpen ( joy );
} }
@ -878,7 +878,7 @@ static void fghJoystickInit( int ident )
fgJoystick[ ident ]->num_axes = fgJoystick[ ident ]->num_buttons = 0; fgJoystick[ ident ]->num_axes = fgJoystick[ ident ]->num_buttons = 0;
fgJoystick[ ident ]->error = GL_TRUE; fgJoystick[ ident ]->error = GL_TRUE;
fgPlatformJoystickInit( fgJoystick, ident ); fgPlatformJoystickInit( fgJoystick, ident );
fghJoystickOpen( fgJoystick[ ident ] ); fghJoystickOpen( fgJoystick[ ident ] );
} }
@ -906,7 +906,7 @@ void fgJoystickClose( void )
{ {
if( fgJoystick[ ident ] ) if( fgJoystick[ ident ] )
{ {
fgPlatformJoystickClose ( ident ); fgPlatformJoystickClose ( ident );
free( fgJoystick[ ident ] ); free( fgJoystick[ ident ] );
fgJoystick[ ident ] = NULL; fgJoystick[ ident ] = NULL;

4
freeglut/freeglut/src/fg_main.c
View File

@ -246,7 +246,7 @@ static void fghCheckTimers( void )
*/ */
fg_time_t fgSystemTime(void) fg_time_t fgSystemTime(void)
{ {
return fgPlatformSystemTime(); return fgPlatformSystemTime();
} }
/* /*
@ -446,7 +446,7 @@ void fgProcessWork(SFG_Window *window)
void FGAPIENTRY glutMainLoopEvent( void ) void FGAPIENTRY glutMainLoopEvent( void )
{ {
/* Process input */ /* Process input */
fgPlatformProcessSingleEvent (); fgPlatformProcessSingleEvent ();
if( fgState.Timers.First ) if( fgState.Timers.First )
fghCheckTimers( ); fghCheckTimers( );

312
freeglut/freeglut/src/freeglutdll.def.in
View File

@ -1,163 +1,163 @@
VERSION @VERSION_MAJOR@.@VERSION_MINOR@ VERSION @VERSION_MAJOR@.@VERSION_MINOR@
EXPORTS EXPORTS
glutInit glutInit
glutInitWindowPosition glutInitWindowPosition
glutInitWindowSize glutInitWindowSize
glutInitDisplayMode glutInitDisplayMode
glutInitDisplayString glutInitDisplayString
glutMainLoop glutMainLoop
glutMainLoopEvent glutMainLoopEvent
glutLeaveMainLoop glutLeaveMainLoop
glutCreateWindow glutCreateWindow
glutCreateSubWindow glutCreateSubWindow
glutDestroyWindow glutDestroyWindow
glutSetWindow glutSetWindow
glutGetWindow glutGetWindow
glutSetWindowData glutSetWindowData
glutGetWindowData glutGetWindowData
glutSetWindowTitle glutSetWindowTitle
glutSetIconTitle glutSetIconTitle
glutReshapeWindow glutReshapeWindow
glutPositionWindow glutPositionWindow
glutShowWindow glutShowWindow
glutHideWindow glutHideWindow
glutIconifyWindow glutIconifyWindow
glutPushWindow glutPushWindow
glutPopWindow glutPopWindow
glutFullScreen glutFullScreen
glutPostWindowRedisplay glutPostWindowRedisplay
glutPostRedisplay glutPostRedisplay
glutSwapBuffers glutSwapBuffers
glutWarpPointer glutWarpPointer
glutSetCursor glutSetCursor
glutEstablishOverlay glutEstablishOverlay
glutRemoveOverlay glutRemoveOverlay
glutUseLayer glutUseLayer
glutPostOverlayRedisplay glutPostOverlayRedisplay
glutPostWindowOverlayRedisplay glutPostWindowOverlayRedisplay
glutShowOverlay glutShowOverlay
glutHideOverlay glutHideOverlay
glutCreateMenu glutCreateMenu
glutDestroyMenu glutDestroyMenu
glutGetMenu glutGetMenu
glutSetMenu glutSetMenu
glutGetMenuData glutGetMenuData
glutSetMenuData glutSetMenuData
glutAddMenuEntry glutAddMenuEntry
glutAddSubMenu glutAddSubMenu
glutChangeToMenuEntry glutChangeToMenuEntry
glutChangeToSubMenu glutChangeToSubMenu
glutRemoveMenuItem glutRemoveMenuItem
glutAttachMenu glutAttachMenu
glutDetachMenu glutDetachMenu
glutTimerFunc glutTimerFunc
glutIdleFunc glutIdleFunc
glutKeyboardFunc glutKeyboardFunc
glutSpecialFunc glutSpecialFunc
glutReshapeFunc glutReshapeFunc
glutPositionFunc glutPositionFunc
glutVisibilityFunc glutVisibilityFunc
glutDisplayFunc glutDisplayFunc
glutMouseFunc glutMouseFunc
glutMouseWheelFunc glutMouseWheelFunc
glutMotionFunc glutMotionFunc
glutPassiveMotionFunc glutPassiveMotionFunc
glutEntryFunc glutEntryFunc
glutCloseFunc glutCloseFunc
glutWMCloseFunc glutWMCloseFunc
glutKeyboardUpFunc glutKeyboardUpFunc
glutSpecialUpFunc glutSpecialUpFunc
glutJoystickFunc glutJoystickFunc
glutMenuStateFunc glutMenuStateFunc
glutMenuStatusFunc glutMenuStatusFunc
glutMenuDestroyFunc glutMenuDestroyFunc
glutOverlayDisplayFunc glutOverlayDisplayFunc
glutWindowStatusFunc glutWindowStatusFunc
glutSpaceballMotionFunc glutSpaceballMotionFunc
glutSpaceballRotateFunc glutSpaceballRotateFunc
glutSpaceballButtonFunc glutSpaceballButtonFunc
glutButtonBoxFunc glutButtonBoxFunc
glutDialsFunc glutDialsFunc
glutTabletMotionFunc glutTabletMotionFunc
glutTabletButtonFunc glutTabletButtonFunc
glutSetOption glutSetOption
glutGet glutGet
glutDeviceGet glutDeviceGet
glutGetModifiers glutGetModifiers
glutLayerGet glutLayerGet
glutBitmapCharacter glutBitmapCharacter
glutBitmapWidth glutBitmapWidth
glutStrokeCharacter glutStrokeCharacter
glutStrokeWidth glutStrokeWidth
glutBitmapLength glutBitmapLength
glutStrokeLength glutStrokeLength
glutBitmapHeight glutBitmapHeight
glutStrokeHeight glutStrokeHeight
glutBitmapString glutBitmapString
glutStrokeString glutStrokeString
glutWireCube glutWireCube
glutSolidCube glutSolidCube
glutWireSphere glutWireSphere
glutSolidSphere glutSolidSphere
glutWireCone glutWireCone
glutSolidCone glutSolidCone
glutWireTorus glutWireTorus
glutSolidTorus glutSolidTorus
glutWireDodecahedron glutWireDodecahedron
glutSolidDodecahedron glutSolidDodecahedron
glutWireOctahedron glutWireOctahedron
glutSolidOctahedron glutSolidOctahedron
glutWireTetrahedron glutWireTetrahedron
glutSolidTetrahedron glutSolidTetrahedron
glutWireIcosahedron glutWireIcosahedron
glutSolidIcosahedron glutSolidIcosahedron
glutWireRhombicDodecahedron glutWireRhombicDodecahedron
glutSolidRhombicDodecahedron glutSolidRhombicDodecahedron
glutWireSierpinskiSponge glutWireSierpinskiSponge
glutSolidSierpinskiSponge glutSolidSierpinskiSponge
glutWireTeapot glutWireTeapot
glutSolidTeapot glutSolidTeapot
glutWireTeacup glutWireTeacup
glutSolidTeacup glutSolidTeacup
glutWireTeaspoon glutWireTeaspoon
glutSolidTeaspoon glutSolidTeaspoon
glutWireCylinder glutWireCylinder
glutSolidCylinder glutSolidCylinder
glutGameModeString glutGameModeString
glutEnterGameMode glutEnterGameMode
glutLeaveGameMode glutLeaveGameMode
glutGameModeGet glutGameModeGet
glutVideoResizeGet glutVideoResizeGet
glutSetupVideoResizing glutSetupVideoResizing
glutStopVideoResizing glutStopVideoResizing
glutVideoResize glutVideoResize
glutVideoPan glutVideoPan
glutSetColor glutSetColor
glutGetColor glutGetColor
glutCopyColormap glutCopyColormap
glutIgnoreKeyRepeat glutIgnoreKeyRepeat
glutSetKeyRepeat glutSetKeyRepeat
glutForceJoystickFunc glutForceJoystickFunc
glutExtensionSupported glutExtensionSupported
glutReportErrors glutReportErrors
glutGetProcAddress glutGetProcAddress
glutExit glutExit
glutFullScreenToggle glutFullScreenToggle
glutLeaveFullScreen glutLeaveFullScreen
glutSetMenuFont glutSetMenuFont
glutGetModeValues glutGetModeValues
glutInitContextFlags glutInitContextFlags
glutInitContextVersion glutInitContextVersion
glutInitContextProfile glutInitContextProfile
glutInitErrorFunc glutInitErrorFunc
glutInitWarningFunc glutInitWarningFunc
__glutInitWithExit __glutInitWithExit
__glutCreateWindowWithExit __glutCreateWindowWithExit
__glutCreateMenuWithExit __glutCreateMenuWithExit
glutMultiButtonFunc glutMultiButtonFunc
glutMultiEntryFunc glutMultiEntryFunc
glutMultiMotionFunc glutMultiMotionFunc
glutMultiPassiveFunc glutMultiPassiveFunc
glutInitContextFunc glutInitContextFunc
glutAppStatusFunc glutAppStatusFunc
glutSetVertexAttribCoord3 glutSetVertexAttribCoord3

2
freeglut/freeglut/src/mswin/fg_joystick_mswin.c
View File

@ -170,7 +170,7 @@ static int fghJoystickGetOEMProductName ( SFG_Joystick* joy, char *buf, int buf_
void fgPlatformJoystickOpen( SFG_Joystick* joy ) void fgPlatformJoystickOpen( SFG_Joystick* joy )
{ {
int i = 0; int i = 0;
joy->pJoystick.js.dwFlags = JOY_RETURNALL; joy->pJoystick.js.dwFlags = JOY_RETURNALL;
joy->pJoystick.js.dwSize = sizeof( joy->pJoystick.js ); joy->pJoystick.js.dwSize = sizeof( joy->pJoystick.js );

108
freeglut/freeglut/src/mswin/fg_main_mswin.c
View File

@ -1296,10 +1296,10 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
window = fghWindowUnderCursor(window); window = fghWindowUnderCursor(window);
fgState.MouseWheelTicks += ticks; fgState.MouseWheelTicks += ticks;
if ( abs ( fgState.MouseWheelTicks ) >= WHEEL_DELTA ) if ( abs ( fgState.MouseWheelTicks ) >= WHEEL_DELTA )
{ {
int direction = ( fgState.MouseWheelTicks > 0 ) ? 1 : -1; int direction = ( fgState.MouseWheelTicks > 0 ) ? 1 : -1;
if( ! FETCH_WCB( *window, MouseWheel ) && if( ! FETCH_WCB( *window, MouseWheel ) &&
! FETCH_WCB( *window, Mouse ) ) ! FETCH_WCB( *window, Mouse ) )
@ -1309,7 +1309,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
fgState.Modifiers = fgPlatformGetModifiers( ); fgState.Modifiers = fgPlatformGetModifiers( );
while( abs ( fgState.MouseWheelTicks ) >= WHEEL_DELTA ) while( abs ( fgState.MouseWheelTicks ) >= WHEEL_DELTA )
{ {
if( FETCH_WCB( *window, MouseWheel ) ) if( FETCH_WCB( *window, MouseWheel ) )
INVOKE_WCB( *window, MouseWheel, INVOKE_WCB( *window, MouseWheel,
( wheel_number, ( wheel_number,
@ -1319,7 +1319,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
) )
); );
else /* No mouse wheel, call the mouse button callback twice */ else /* No mouse wheel, call the mouse button callback twice */
{ {
/* /*
* Map wheel zero to button 3 and 4; +1 to 3, -1 to 4 * Map wheel zero to button 3 and 4; +1 to 3, -1 to 4
* " " one +1 to 5, -1 to 6, ... * " " one +1 to 5, -1 to 6, ...
@ -1338,13 +1338,13 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
( button, GLUT_UP, ( button, GLUT_UP,
window->State.MouseX, window->State.MouseY ) window->State.MouseX, window->State.MouseY )
); );
} }
fgState.MouseWheelTicks -= WHEEL_DELTA * direction; fgState.MouseWheelTicks -= WHEEL_DELTA * direction;
} }
fgState.Modifiers = INVALID_MODIFIERS; fgState.Modifiers = INVALID_MODIFIERS;
} }
/* Per docs, should return zero */ /* Per docs, should return zero */
lRet = 0; lRet = 0;
} }
@ -1498,60 +1498,60 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
break; break;
#ifdef WM_TOUCH #ifdef WM_TOUCH
/* handle multi-touch messages */ /* handle multi-touch messages */
case WM_TOUCH: case WM_TOUCH:
{ {
unsigned int numInputs = (unsigned int)wParam; unsigned int numInputs = (unsigned int)wParam;
unsigned int i = 0; unsigned int i = 0;
TOUCHINPUT* ti = (TOUCHINPUT*)malloc( sizeof(TOUCHINPUT)*numInputs); TOUCHINPUT* ti = (TOUCHINPUT*)malloc( sizeof(TOUCHINPUT)*numInputs);
if (fghGetTouchInputInfo == (pGetTouchInputInfo)0xDEADBEEF) { if (fghGetTouchInputInfo == (pGetTouchInputInfo)0xDEADBEEF) {
fghGetTouchInputInfo = (pGetTouchInputInfo)GetProcAddress(GetModuleHandle("user32"),"GetTouchInputInfo"); fghGetTouchInputInfo = (pGetTouchInputInfo)GetProcAddress(GetModuleHandle("user32"),"GetTouchInputInfo");
fghCloseTouchInputHandle = (pCloseTouchInputHandle)GetProcAddress(GetModuleHandle("user32"),"CloseTouchInputHandle"); fghCloseTouchInputHandle = (pCloseTouchInputHandle)GetProcAddress(GetModuleHandle("user32"),"CloseTouchInputHandle");
} }
if (!fghGetTouchInputInfo) { if (!fghGetTouchInputInfo) {
free( (void*)ti ); free( (void*)ti );
break; break;
} }
if (fghGetTouchInputInfo( (HTOUCHINPUT)lParam, numInputs, ti, sizeof(TOUCHINPUT) )) { if (fghGetTouchInputInfo( (HTOUCHINPUT)lParam, numInputs, ti, sizeof(TOUCHINPUT) )) {
/* Handle each contact point */ /* Handle each contact point */
for (i = 0; i < numInputs; ++i ) { for (i = 0; i < numInputs; ++i ) {
POINT tp; POINT tp;
tp.x = TOUCH_COORD_TO_PIXEL(ti[i].x); tp.x = TOUCH_COORD_TO_PIXEL(ti[i].x);
tp.y = TOUCH_COORD_TO_PIXEL(ti[i].y); tp.y = TOUCH_COORD_TO_PIXEL(ti[i].y);
ScreenToClient( hWnd, &tp ); ScreenToClient( hWnd, &tp );
ti[i].dwID = ti[i].dwID * 2; ti[i].dwID = ti[i].dwID * 2;
if (ti[i].dwFlags & TOUCHEVENTF_DOWN) { if (ti[i].dwFlags & TOUCHEVENTF_DOWN) {
INVOKE_WCB( *window, MultiEntry, ( ti[i].dwID, GLUT_ENTERED ) ); INVOKE_WCB( *window, MultiEntry, ( ti[i].dwID, GLUT_ENTERED ) );
INVOKE_WCB( *window, MultiButton, ( ti[i].dwID, tp.x, tp.y, 0, GLUT_DOWN ) ); INVOKE_WCB( *window, MultiButton, ( ti[i].dwID, tp.x, tp.y, 0, GLUT_DOWN ) );
} else if (ti[i].dwFlags & TOUCHEVENTF_MOVE) { } else if (ti[i].dwFlags & TOUCHEVENTF_MOVE) {
INVOKE_WCB( *window, MultiMotion, ( ti[i].dwID, tp.x, tp.y ) ); INVOKE_WCB( *window, MultiMotion, ( ti[i].dwID, tp.x, tp.y ) );
} else if (ti[i].dwFlags & TOUCHEVENTF_UP) { } else if (ti[i].dwFlags & TOUCHEVENTF_UP) {
INVOKE_WCB( *window, MultiButton, ( ti[i].dwID, tp.x, tp.y, 0, GLUT_UP ) ); INVOKE_WCB( *window, MultiButton, ( ti[i].dwID, tp.x, tp.y, 0, GLUT_UP ) );
INVOKE_WCB( *window, MultiEntry, ( ti[i].dwID, GLUT_LEFT ) ); INVOKE_WCB( *window, MultiEntry, ( ti[i].dwID, GLUT_LEFT ) );
} }
} }
} }
fghCloseTouchInputHandle((HTOUCHINPUT)lParam); fghCloseTouchInputHandle((HTOUCHINPUT)lParam);
free( (void*)ti ); free( (void*)ti );
lRet = 0; /*DefWindowProc( hWnd, uMsg, wParam, lParam );*/ lRet = 0; /*DefWindowProc( hWnd, uMsg, wParam, lParam );*/
break; break;
} }
#endif #endif
#ifdef WM_INPUT #ifdef WM_INPUT
case WM_INPUT: case WM_INPUT:
/* Added by Jinrong Xie <stonexjr at gmail.com> for SpaceNavigator support on Windows. Dec 2014 */ /* Added by Jinrong Xie <stonexjr at gmail.com> for SpaceNavigator support on Windows. Dec 2014 */
if (fgHasSpaceball()) if (fgHasSpaceball())
{ {
fgSpaceballHandleWinEvent(hWnd, wParam, lParam); fgSpaceballHandleWinEvent(hWnd, wParam, lParam);
} }
break; break;
#endif #endif
default: default:
/* Handle unhandled messages */ /* Handle unhandled messages */
@ -1649,7 +1649,7 @@ void fgPlatformPosResZordWork(SFG_Window* window, unsigned int workMask)
/* For fullscreen mode, find the monitor that is covered the most /* For fullscreen mode, find the monitor that is covered the most
* by the window and get its rect as the resize target. * by the window and get its rect as the resize target.
*/ */
hMonitor= MonitorFromWindow(window->Window.Handle, MONITOR_DEFAULTTONEAREST); hMonitor= MonitorFromWindow(window->Window.Handle, MONITOR_DEFAULTTONEAREST);
mi.cbSize = sizeof(mi); mi.cbSize = sizeof(mi);
GetMonitorInfo(hMonitor, &mi); GetMonitorInfo(hMonitor, &mi);