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

Changing hard-coded constant (number of mouse buttons = 3) to a \"glutDeviceGet\" call in two places under X11

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@597 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2005-05-04 13:19:38 +00:00
parent f2813782f5
commit 29339a69ee
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
freeglut/freeglut/src/freeglut_main.c
View File

@ -777,12 +777,8 @@ void FGAPIENTRY glutMainLoopEvent( void )
fgState.Modifiers = fghGetXModifiers( &event ); fgState.Modifiers = fghGetXModifiers( &event );
/* /* Finally execute the mouse or mouse wheel callback */
* Finally execute the mouse or mouse wheel callback if( ( button < glutDeviceGet ( GLUT_NUM_MOUSE_BUTTONS ) ) || ( ! FETCH_WCB( *window, MouseWheel ) ) )
*
* XXX Use a symbolic constant, *not* "4"! ("3, sire!")
*/
if( ( button < 3 ) || ( ! FETCH_WCB( *window, MouseWheel ) ) )
INVOKE_WCB( *window, Mouse, ( button, INVOKE_WCB( *window, Mouse, ( button,
pressed ? GLUT_DOWN : GLUT_UP, pressed ? GLUT_DOWN : GLUT_UP,
event.xbutton.x, event.xbutton.x,
@ -802,7 +798,7 @@ void FGAPIENTRY glutMainLoopEvent( void )
* XXX Note that {button} has already been decremeted * XXX Note that {button} has already been decremeted
* XXX in mapping from X button numbering to GLUT. * XXX in mapping from X button numbering to GLUT.
*/ */
int wheel_number = (button - 3) / 2; int wheel_number = (button - glutDeviceGet ( GLUT_NUM_MOUSE_BUTTONS )) / 2;
int direction = -1; int direction = -1;
if( button % 2 ) if( button % 2 )
direction = 1; direction = 1;