some whitespace cleanup
(cherry picked from commit 2dd5aa4aa1)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1830 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho
parent
b39b3a5edf
commit
07297565c8
@ -689,14 +689,14 @@ static void fghInitErrorFuncCallback( const char *fmt, va_list ap, FGCBUserData
|
||||
|
||||
void FGAPIENTRY glutInitErrorFunc( FGError callback )
|
||||
{
|
||||
if (callback)
|
||||
{
|
||||
glutInitErrorFuncUcall( fghInitErrorFuncCallback, (FGCBUserData)callback );
|
||||
}
|
||||
else
|
||||
{
|
||||
glutInitErrorFuncUcall( NULL, NULL );
|
||||
}
|
||||
if (callback)
|
||||
{
|
||||
glutInitErrorFuncUcall( fghInitErrorFuncCallback, (FGCBUserData)callback );
|
||||
}
|
||||
else
|
||||
{
|
||||
glutInitErrorFuncUcall( NULL, NULL );
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
@ -717,14 +717,14 @@ static void fghInitWarningFuncCallback( const char *fmt, va_list ap, FGCBUserDat
|
||||
|
||||
void FGAPIENTRY glutInitWarningFunc( FGWarning callback )
|
||||
{
|
||||
if (callback)
|
||||
{
|
||||
glutInitWarningFuncUcall( fghInitWarningFuncCallback, (FGCBUserData)callback );
|
||||
}
|
||||
else
|
||||
{
|
||||
glutInitWarningFuncUcall( NULL, NULL );
|
||||
}
|
||||
if (callback)
|
||||
{
|
||||
glutInitWarningFuncUcall( fghInitWarningFuncCallback, (FGCBUserData)callback );
|
||||
}
|
||||
else
|
||||
{
|
||||
glutInitWarningFuncUcall( NULL, NULL );
|
||||
}
|
||||
}
|
||||
|
||||
/*** END OF FILE ***/
|
||||
|
||||
@ -581,7 +581,7 @@ void fgPlatformJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
|
||||
|
||||
void fgPlatformJoystickOpen( SFG_Joystick* joy )
|
||||
{
|
||||
int i = 0;
|
||||
int i = 0;
|
||||
OSStatus err;
|
||||
|
||||
/* 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->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 ]->error = GL_TRUE;
|
||||
|
||||
fgPlatformJoystickInit( fgJoystick, ident );
|
||||
fgPlatformJoystickInit( fgJoystick, ident );
|
||||
|
||||
fghJoystickOpen( fgJoystick[ ident ] );
|
||||
}
|
||||
@ -906,7 +906,7 @@ void fgJoystickClose( void )
|
||||
{
|
||||
if( fgJoystick[ ident ] )
|
||||
{
|
||||
fgPlatformJoystickClose ( ident );
|
||||
fgPlatformJoystickClose ( ident );
|
||||
|
||||
free( fgJoystick[ ident ] );
|
||||
fgJoystick[ ident ] = NULL;
|
||||
|
||||
@ -246,7 +246,7 @@ static void fghCheckTimers( void )
|
||||
*/
|
||||
fg_time_t fgSystemTime(void)
|
||||
{
|
||||
return fgPlatformSystemTime();
|
||||
return fgPlatformSystemTime();
|
||||
}
|
||||
|
||||
/*
|
||||
@ -446,7 +446,7 @@ void fgProcessWork(SFG_Window *window)
|
||||
void FGAPIENTRY glutMainLoopEvent( void )
|
||||
{
|
||||
/* Process input */
|
||||
fgPlatformProcessSingleEvent ();
|
||||
fgPlatformProcessSingleEvent ();
|
||||
|
||||
if( fgState.Timers.First )
|
||||
fghCheckTimers( );
|
||||
|
||||
@ -1,163 +1,163 @@
|
||||
VERSION @VERSION_MAJOR@.@VERSION_MINOR@
|
||||
EXPORTS
|
||||
glutInit
|
||||
glutInitWindowPosition
|
||||
glutInitWindowSize
|
||||
glutInitDisplayMode
|
||||
glutInitDisplayString
|
||||
glutMainLoop
|
||||
glutMainLoopEvent
|
||||
glutLeaveMainLoop
|
||||
glutCreateWindow
|
||||
glutCreateSubWindow
|
||||
glutDestroyWindow
|
||||
glutSetWindow
|
||||
glutGetWindow
|
||||
glutSetWindowData
|
||||
glutGetWindowData
|
||||
glutSetWindowTitle
|
||||
glutSetIconTitle
|
||||
glutReshapeWindow
|
||||
glutPositionWindow
|
||||
glutShowWindow
|
||||
glutHideWindow
|
||||
glutIconifyWindow
|
||||
glutPushWindow
|
||||
glutPopWindow
|
||||
glutFullScreen
|
||||
glutPostWindowRedisplay
|
||||
glutPostRedisplay
|
||||
glutSwapBuffers
|
||||
glutWarpPointer
|
||||
glutSetCursor
|
||||
glutEstablishOverlay
|
||||
glutRemoveOverlay
|
||||
glutUseLayer
|
||||
glutPostOverlayRedisplay
|
||||
glutPostWindowOverlayRedisplay
|
||||
glutShowOverlay
|
||||
glutHideOverlay
|
||||
glutCreateMenu
|
||||
glutDestroyMenu
|
||||
glutGetMenu
|
||||
glutSetMenu
|
||||
glutGetMenuData
|
||||
glutSetMenuData
|
||||
glutAddMenuEntry
|
||||
glutAddSubMenu
|
||||
glutChangeToMenuEntry
|
||||
glutChangeToSubMenu
|
||||
glutRemoveMenuItem
|
||||
glutAttachMenu
|
||||
glutDetachMenu
|
||||
glutTimerFunc
|
||||
glutIdleFunc
|
||||
glutKeyboardFunc
|
||||
glutSpecialFunc
|
||||
glutReshapeFunc
|
||||
glutInit
|
||||
glutInitWindowPosition
|
||||
glutInitWindowSize
|
||||
glutInitDisplayMode
|
||||
glutInitDisplayString
|
||||
glutMainLoop
|
||||
glutMainLoopEvent
|
||||
glutLeaveMainLoop
|
||||
glutCreateWindow
|
||||
glutCreateSubWindow
|
||||
glutDestroyWindow
|
||||
glutSetWindow
|
||||
glutGetWindow
|
||||
glutSetWindowData
|
||||
glutGetWindowData
|
||||
glutSetWindowTitle
|
||||
glutSetIconTitle
|
||||
glutReshapeWindow
|
||||
glutPositionWindow
|
||||
glutShowWindow
|
||||
glutHideWindow
|
||||
glutIconifyWindow
|
||||
glutPushWindow
|
||||
glutPopWindow
|
||||
glutFullScreen
|
||||
glutPostWindowRedisplay
|
||||
glutPostRedisplay
|
||||
glutSwapBuffers
|
||||
glutWarpPointer
|
||||
glutSetCursor
|
||||
glutEstablishOverlay
|
||||
glutRemoveOverlay
|
||||
glutUseLayer
|
||||
glutPostOverlayRedisplay
|
||||
glutPostWindowOverlayRedisplay
|
||||
glutShowOverlay
|
||||
glutHideOverlay
|
||||
glutCreateMenu
|
||||
glutDestroyMenu
|
||||
glutGetMenu
|
||||
glutSetMenu
|
||||
glutGetMenuData
|
||||
glutSetMenuData
|
||||
glutAddMenuEntry
|
||||
glutAddSubMenu
|
||||
glutChangeToMenuEntry
|
||||
glutChangeToSubMenu
|
||||
glutRemoveMenuItem
|
||||
glutAttachMenu
|
||||
glutDetachMenu
|
||||
glutTimerFunc
|
||||
glutIdleFunc
|
||||
glutKeyboardFunc
|
||||
glutSpecialFunc
|
||||
glutReshapeFunc
|
||||
glutPositionFunc
|
||||
glutVisibilityFunc
|
||||
glutDisplayFunc
|
||||
glutMouseFunc
|
||||
glutMouseWheelFunc
|
||||
glutMotionFunc
|
||||
glutPassiveMotionFunc
|
||||
glutEntryFunc
|
||||
glutCloseFunc
|
||||
glutWMCloseFunc
|
||||
glutKeyboardUpFunc
|
||||
glutSpecialUpFunc
|
||||
glutJoystickFunc
|
||||
glutMenuStateFunc
|
||||
glutMenuStatusFunc
|
||||
glutMenuDestroyFunc
|
||||
glutOverlayDisplayFunc
|
||||
glutWindowStatusFunc
|
||||
glutSpaceballMotionFunc
|
||||
glutSpaceballRotateFunc
|
||||
glutSpaceballButtonFunc
|
||||
glutButtonBoxFunc
|
||||
glutDialsFunc
|
||||
glutTabletMotionFunc
|
||||
glutTabletButtonFunc
|
||||
glutSetOption
|
||||
glutGet
|
||||
glutDeviceGet
|
||||
glutGetModifiers
|
||||
glutLayerGet
|
||||
glutBitmapCharacter
|
||||
glutBitmapWidth
|
||||
glutStrokeCharacter
|
||||
glutStrokeWidth
|
||||
glutBitmapLength
|
||||
glutStrokeLength
|
||||
glutBitmapHeight
|
||||
glutStrokeHeight
|
||||
glutBitmapString
|
||||
glutStrokeString
|
||||
glutWireCube
|
||||
glutSolidCube
|
||||
glutWireSphere
|
||||
glutSolidSphere
|
||||
glutWireCone
|
||||
glutSolidCone
|
||||
glutWireTorus
|
||||
glutSolidTorus
|
||||
glutWireDodecahedron
|
||||
glutSolidDodecahedron
|
||||
glutWireOctahedron
|
||||
glutSolidOctahedron
|
||||
glutWireTetrahedron
|
||||
glutSolidTetrahedron
|
||||
glutWireIcosahedron
|
||||
glutSolidIcosahedron
|
||||
glutWireRhombicDodecahedron
|
||||
glutSolidRhombicDodecahedron
|
||||
glutWireSierpinskiSponge
|
||||
glutSolidSierpinskiSponge
|
||||
glutWireTeapot
|
||||
glutSolidTeapot
|
||||
glutWireTeacup
|
||||
glutSolidTeacup
|
||||
glutWireTeaspoon
|
||||
glutSolidTeaspoon
|
||||
glutWireCylinder
|
||||
glutSolidCylinder
|
||||
glutGameModeString
|
||||
glutEnterGameMode
|
||||
glutLeaveGameMode
|
||||
glutGameModeGet
|
||||
glutVideoResizeGet
|
||||
glutSetupVideoResizing
|
||||
glutStopVideoResizing
|
||||
glutVideoResize
|
||||
glutVideoPan
|
||||
glutSetColor
|
||||
glutGetColor
|
||||
glutCopyColormap
|
||||
glutIgnoreKeyRepeat
|
||||
glutSetKeyRepeat
|
||||
glutForceJoystickFunc
|
||||
glutExtensionSupported
|
||||
glutReportErrors
|
||||
glutGetProcAddress
|
||||
glutExit
|
||||
glutFullScreenToggle
|
||||
glutLeaveFullScreen
|
||||
glutVisibilityFunc
|
||||
glutDisplayFunc
|
||||
glutMouseFunc
|
||||
glutMouseWheelFunc
|
||||
glutMotionFunc
|
||||
glutPassiveMotionFunc
|
||||
glutEntryFunc
|
||||
glutCloseFunc
|
||||
glutWMCloseFunc
|
||||
glutKeyboardUpFunc
|
||||
glutSpecialUpFunc
|
||||
glutJoystickFunc
|
||||
glutMenuStateFunc
|
||||
glutMenuStatusFunc
|
||||
glutMenuDestroyFunc
|
||||
glutOverlayDisplayFunc
|
||||
glutWindowStatusFunc
|
||||
glutSpaceballMotionFunc
|
||||
glutSpaceballRotateFunc
|
||||
glutSpaceballButtonFunc
|
||||
glutButtonBoxFunc
|
||||
glutDialsFunc
|
||||
glutTabletMotionFunc
|
||||
glutTabletButtonFunc
|
||||
glutSetOption
|
||||
glutGet
|
||||
glutDeviceGet
|
||||
glutGetModifiers
|
||||
glutLayerGet
|
||||
glutBitmapCharacter
|
||||
glutBitmapWidth
|
||||
glutStrokeCharacter
|
||||
glutStrokeWidth
|
||||
glutBitmapLength
|
||||
glutStrokeLength
|
||||
glutBitmapHeight
|
||||
glutStrokeHeight
|
||||
glutBitmapString
|
||||
glutStrokeString
|
||||
glutWireCube
|
||||
glutSolidCube
|
||||
glutWireSphere
|
||||
glutSolidSphere
|
||||
glutWireCone
|
||||
glutSolidCone
|
||||
glutWireTorus
|
||||
glutSolidTorus
|
||||
glutWireDodecahedron
|
||||
glutSolidDodecahedron
|
||||
glutWireOctahedron
|
||||
glutSolidOctahedron
|
||||
glutWireTetrahedron
|
||||
glutSolidTetrahedron
|
||||
glutWireIcosahedron
|
||||
glutSolidIcosahedron
|
||||
glutWireRhombicDodecahedron
|
||||
glutSolidRhombicDodecahedron
|
||||
glutWireSierpinskiSponge
|
||||
glutSolidSierpinskiSponge
|
||||
glutWireTeapot
|
||||
glutSolidTeapot
|
||||
glutWireTeacup
|
||||
glutSolidTeacup
|
||||
glutWireTeaspoon
|
||||
glutSolidTeaspoon
|
||||
glutWireCylinder
|
||||
glutSolidCylinder
|
||||
glutGameModeString
|
||||
glutEnterGameMode
|
||||
glutLeaveGameMode
|
||||
glutGameModeGet
|
||||
glutVideoResizeGet
|
||||
glutSetupVideoResizing
|
||||
glutStopVideoResizing
|
||||
glutVideoResize
|
||||
glutVideoPan
|
||||
glutSetColor
|
||||
glutGetColor
|
||||
glutCopyColormap
|
||||
glutIgnoreKeyRepeat
|
||||
glutSetKeyRepeat
|
||||
glutForceJoystickFunc
|
||||
glutExtensionSupported
|
||||
glutReportErrors
|
||||
glutGetProcAddress
|
||||
glutExit
|
||||
glutFullScreenToggle
|
||||
glutLeaveFullScreen
|
||||
glutSetMenuFont
|
||||
glutGetModeValues
|
||||
glutInitContextFlags
|
||||
glutInitContextVersion
|
||||
glutInitContextProfile
|
||||
glutInitErrorFunc
|
||||
glutInitWarningFunc
|
||||
__glutInitWithExit
|
||||
__glutCreateWindowWithExit
|
||||
__glutCreateMenuWithExit
|
||||
glutMultiButtonFunc
|
||||
glutMultiEntryFunc
|
||||
glutMultiMotionFunc
|
||||
glutMultiPassiveFunc
|
||||
glutGetModeValues
|
||||
glutInitContextFlags
|
||||
glutInitContextVersion
|
||||
glutInitContextProfile
|
||||
glutInitErrorFunc
|
||||
glutInitWarningFunc
|
||||
__glutInitWithExit
|
||||
__glutCreateWindowWithExit
|
||||
__glutCreateMenuWithExit
|
||||
glutMultiButtonFunc
|
||||
glutMultiEntryFunc
|
||||
glutMultiMotionFunc
|
||||
glutMultiPassiveFunc
|
||||
glutInitContextFunc
|
||||
glutAppStatusFunc
|
||||
glutSetVertexAttribCoord3
|
||||
|
||||
@ -170,7 +170,7 @@ static int fghJoystickGetOEMProductName ( SFG_Joystick* joy, char *buf, int buf_
|
||||
|
||||
void fgPlatformJoystickOpen( SFG_Joystick* joy )
|
||||
{
|
||||
int i = 0;
|
||||
int i = 0;
|
||||
|
||||
joy->pJoystick.js.dwFlags = JOY_RETURNALL;
|
||||
joy->pJoystick.js.dwSize = sizeof( joy->pJoystick.js );
|
||||
|
||||
@ -1296,10 +1296,10 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
|
||||
|
||||
window = fghWindowUnderCursor(window);
|
||||
|
||||
fgState.MouseWheelTicks += ticks;
|
||||
fgState.MouseWheelTicks += ticks;
|
||||
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 ) &&
|
||||
! FETCH_WCB( *window, Mouse ) )
|
||||
@ -1309,7 +1309,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
|
||||
fgState.Modifiers = fgPlatformGetModifiers( );
|
||||
|
||||
while( abs ( fgState.MouseWheelTicks ) >= WHEEL_DELTA )
|
||||
{
|
||||
{
|
||||
if( FETCH_WCB( *window, MouseWheel ) )
|
||||
INVOKE_WCB( *window, MouseWheel,
|
||||
( 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 */
|
||||
{
|
||||
{
|
||||
/*
|
||||
* Map wheel zero to button 3 and 4; +1 to 3, -1 to 4
|
||||
* " " one +1 to 5, -1 to 6, ...
|
||||
@ -1338,13 +1338,13 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
|
||||
( button, GLUT_UP,
|
||||
window->State.MouseX, window->State.MouseY )
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
fgState.MouseWheelTicks -= WHEEL_DELTA * direction;
|
||||
}
|
||||
fgState.MouseWheelTicks -= WHEEL_DELTA * direction;
|
||||
}
|
||||
|
||||
fgState.Modifiers = INVALID_MODIFIERS;
|
||||
}
|
||||
}
|
||||
/* Per docs, should return zero */
|
||||
lRet = 0;
|
||||
}
|
||||
@ -1498,60 +1498,60 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
|
||||
break;
|
||||
|
||||
#ifdef WM_TOUCH
|
||||
/* handle multi-touch messages */
|
||||
case WM_TOUCH:
|
||||
{
|
||||
unsigned int numInputs = (unsigned int)wParam;
|
||||
unsigned int i = 0;
|
||||
TOUCHINPUT* ti = (TOUCHINPUT*)malloc( sizeof(TOUCHINPUT)*numInputs);
|
||||
/* handle multi-touch messages */
|
||||
case WM_TOUCH:
|
||||
{
|
||||
unsigned int numInputs = (unsigned int)wParam;
|
||||
unsigned int i = 0;
|
||||
TOUCHINPUT* ti = (TOUCHINPUT*)malloc( sizeof(TOUCHINPUT)*numInputs);
|
||||
|
||||
if (fghGetTouchInputInfo == (pGetTouchInputInfo)0xDEADBEEF) {
|
||||
fghGetTouchInputInfo = (pGetTouchInputInfo)GetProcAddress(GetModuleHandle("user32"),"GetTouchInputInfo");
|
||||
fghCloseTouchInputHandle = (pCloseTouchInputHandle)GetProcAddress(GetModuleHandle("user32"),"CloseTouchInputHandle");
|
||||
}
|
||||
if (fghGetTouchInputInfo == (pGetTouchInputInfo)0xDEADBEEF) {
|
||||
fghGetTouchInputInfo = (pGetTouchInputInfo)GetProcAddress(GetModuleHandle("user32"),"GetTouchInputInfo");
|
||||
fghCloseTouchInputHandle = (pCloseTouchInputHandle)GetProcAddress(GetModuleHandle("user32"),"CloseTouchInputHandle");
|
||||
}
|
||||
|
||||
if (!fghGetTouchInputInfo) {
|
||||
free( (void*)ti );
|
||||
break;
|
||||
}
|
||||
if (!fghGetTouchInputInfo) {
|
||||
free( (void*)ti );
|
||||
break;
|
||||
}
|
||||
|
||||
if (fghGetTouchInputInfo( (HTOUCHINPUT)lParam, numInputs, ti, sizeof(TOUCHINPUT) )) {
|
||||
/* Handle each contact point */
|
||||
for (i = 0; i < numInputs; ++i ) {
|
||||
if (fghGetTouchInputInfo( (HTOUCHINPUT)lParam, numInputs, ti, sizeof(TOUCHINPUT) )) {
|
||||
/* Handle each contact point */
|
||||
for (i = 0; i < numInputs; ++i ) {
|
||||
|
||||
POINT tp;
|
||||
tp.x = TOUCH_COORD_TO_PIXEL(ti[i].x);
|
||||
tp.y = TOUCH_COORD_TO_PIXEL(ti[i].y);
|
||||
ScreenToClient( hWnd, &tp );
|
||||
POINT tp;
|
||||
tp.x = TOUCH_COORD_TO_PIXEL(ti[i].x);
|
||||
tp.y = TOUCH_COORD_TO_PIXEL(ti[i].y);
|
||||
ScreenToClient( hWnd, &tp );
|
||||
|
||||
ti[i].dwID = ti[i].dwID * 2;
|
||||
ti[i].dwID = ti[i].dwID * 2;
|
||||
|
||||
if (ti[i].dwFlags & TOUCHEVENTF_DOWN) {
|
||||
INVOKE_WCB( *window, MultiEntry, ( ti[i].dwID, GLUT_ENTERED ) );
|
||||
INVOKE_WCB( *window, MultiButton, ( ti[i].dwID, tp.x, tp.y, 0, GLUT_DOWN ) );
|
||||
} else if (ti[i].dwFlags & TOUCHEVENTF_MOVE) {
|
||||
INVOKE_WCB( *window, MultiMotion, ( ti[i].dwID, tp.x, tp.y ) );
|
||||
} else if (ti[i].dwFlags & TOUCHEVENTF_UP) {
|
||||
INVOKE_WCB( *window, MultiButton, ( ti[i].dwID, tp.x, tp.y, 0, GLUT_UP ) );
|
||||
INVOKE_WCB( *window, MultiEntry, ( ti[i].dwID, GLUT_LEFT ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
fghCloseTouchInputHandle((HTOUCHINPUT)lParam);
|
||||
free( (void*)ti );
|
||||
lRet = 0; /*DefWindowProc( hWnd, uMsg, wParam, lParam );*/
|
||||
break;
|
||||
}
|
||||
if (ti[i].dwFlags & TOUCHEVENTF_DOWN) {
|
||||
INVOKE_WCB( *window, MultiEntry, ( ti[i].dwID, GLUT_ENTERED ) );
|
||||
INVOKE_WCB( *window, MultiButton, ( ti[i].dwID, tp.x, tp.y, 0, GLUT_DOWN ) );
|
||||
} else if (ti[i].dwFlags & TOUCHEVENTF_MOVE) {
|
||||
INVOKE_WCB( *window, MultiMotion, ( ti[i].dwID, tp.x, tp.y ) );
|
||||
} else if (ti[i].dwFlags & TOUCHEVENTF_UP) {
|
||||
INVOKE_WCB( *window, MultiButton, ( ti[i].dwID, tp.x, tp.y, 0, GLUT_UP ) );
|
||||
INVOKE_WCB( *window, MultiEntry, ( ti[i].dwID, GLUT_LEFT ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
fghCloseTouchInputHandle((HTOUCHINPUT)lParam);
|
||||
free( (void*)ti );
|
||||
lRet = 0; /*DefWindowProc( hWnd, uMsg, wParam, lParam );*/
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef WM_INPUT
|
||||
case WM_INPUT:
|
||||
case WM_INPUT:
|
||||
/* Added by Jinrong Xie <stonexjr at gmail.com> for SpaceNavigator support on Windows. Dec 2014 */
|
||||
if (fgHasSpaceball())
|
||||
{
|
||||
fgSpaceballHandleWinEvent(hWnd, wParam, lParam);
|
||||
}
|
||||
break;
|
||||
if (fgHasSpaceball())
|
||||
{
|
||||
fgSpaceballHandleWinEvent(hWnd, wParam, lParam);
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
/* 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
|
||||
* by the window and get its rect as the resize target.
|
||||
*/
|
||||
*/
|
||||
hMonitor= MonitorFromWindow(window->Window.Handle, MONITOR_DEFAULTTONEAREST);
|
||||
mi.cbSize = sizeof(mi);
|
||||
GetMonitorInfo(hMonitor, &mi);
|
||||
|
||||
Reference in New Issue
Block a user