X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_joystick.c;h=ff8738a9a2fd1076c3243de483d724946f103de1;hb=8d9293fc97d651748eacc2a95a92ff75a2246201;hp=7c7d112051aa4b8555edf8c242a6f70f758f35a5;hpb=2a0c45b1a10b1bf07fc6760b55172a16e69c9739;p=freeglut diff --git a/src/freeglut_joystick.c b/src/freeglut_joystick.c index 7c7d112..ff8738a 100644 --- a/src/freeglut_joystick.c +++ b/src/freeglut_joystick.c @@ -34,7 +34,7 @@ * FreeBSD port by Stephen Montgomery-Smith */ -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined( __FreeBSD__ ) || defined( __NetBSD__ ) #include #endif @@ -42,15 +42,13 @@ #include "config.h" #endif -#define G_LOG_DOMAIN "freeglut-joystick" - #include "../include/GL/freeglut.h" #include "freeglut_internal.h" /* * PWO: I don't like it at all. It's a mess. Could it be cleared? */ -#ifdef WIN32 +#if TARGET_HOST_WIN32 # include # if defined( __CYGWIN32__ ) || defined( __CYGWIN__ ) # define NEAR /* */ @@ -105,7 +103,7 @@ # endif #endif -#ifdef WIN32 +#if TARGET_HOST_WIN32 # define _JS_MAX_AXES 6 #else # ifdef __FreeBSD__ @@ -118,11 +116,14 @@ typedef struct tagSFG_Joystick SFG_Joystick; struct tagSFG_Joystick { +/* + * XXX All BSDs might share this? + */ #ifdef __FreeBSD__ int id; #endif -#ifdef WIN32 +#if TARGET_HOST_WIN32 JOYINFOEX js; UINT js_id; #else @@ -157,9 +158,9 @@ static SFG_Joystick* fgJoystick = NULL; /* * Read the raw joystick data */ -static void fghJoystickRawRead ( SFG_Joystick* joy, int* buttons, float* axes ) +static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes ) { -#ifdef WIN32 +#if TARGET_HOST_WIN32 MMRESULT status; #else int status; @@ -170,7 +171,7 @@ static void fghJoystickRawRead ( SFG_Joystick* joy, int* buttons, float* axes ) if( joy->error ) { if( buttons ) - *buttons = 0 ; + *buttons = 0; if( axes ) for( i=0; inum_axes; i++ ) @@ -179,12 +180,12 @@ static void fghJoystickRawRead ( SFG_Joystick* joy, int* buttons, float* axes ) return; } -#ifdef WIN32 +#if TARGET_HOST_WIN32 status = joyGetPosEx( joy->js_id, &joy->js ); if( status != JOYERR_NOERROR ) { - joy->error = TRUE; + joy->error = GL_TRUE; return; } @@ -213,7 +214,7 @@ static void fghJoystickRawRead ( SFG_Joystick* joy, int* buttons, float* axes ) { status = read( joy->fd, &joy->js, sizeof(struct js_event) ); - if( status != sizeof(struct js_event) ) + if( status != sizeof( struct js_event ) ) { if( errno == EAGAIN ) { @@ -224,26 +225,26 @@ static void fghJoystickRawRead ( SFG_Joystick* joy, int* buttons, float* axes ) *buttons = joy->tmp_buttons; if( axes ) memcpy( axes, joy->tmp_axes, - sizeof(float) * joy->num_axes ); + sizeof( float ) * joy->num_axes ); return; } fgWarning( "%s", joy->fname ); - joy->error = TRUE; + joy->error = GL_TRUE; return; } switch( joy->js.type & ~JS_EVENT_INIT ) { case JS_EVENT_BUTTON: - if ( joy->js.value == 0 ) /* clear the flag */ - joy->tmp_buttons &= ~(1 << joy->js.number); - else - joy->tmp_buttons |= (1 << joy->js.number); + if( joy->js.value == 0 ) /* clear the flag */ + joy->tmp_buttons &= ~( 1 << joy->js.number ); + else + joy->tmp_buttons |= ( 1 << joy->js.number ); break; case JS_EVENT_AXIS: - joy->tmp_axes[ joy->js.number ] = (float) joy->js.value; + joy->tmp_axes[ joy->js.number ] = ( float )joy->js.value; if( axes ) memcpy( axes, joy->tmp_axes, sizeof(float) * joy->num_axes ); @@ -260,13 +261,13 @@ static void fghJoystickRawRead ( SFG_Joystick* joy, int* buttons, float* axes ) if( status != JS_RETURN ) { fgWarning( "%s", joy->fname ); - joy->error = TRUE; + joy->error = GL_TRUE; return; } if( buttons ) -# if defined(__FreeBSD__) || defined(__NetBSD__) - *buttons = (joy->js.b1 ? 1 : 0) | (joy->js.b2 ? 2 : 0); +# if defined( __FreeBSD__ ) || defined( __NetBSD__ ) + *buttons = ( joy->js.b1 ? 1 : 0 ) | ( joy->js.b2 ? 2 : 0 ); # else *buttons = joy->js.buttons; # endif @@ -287,35 +288,35 @@ static float fghJoystickFudgeAxis( SFG_Joystick* joy, float value, int axis ) { if( value < joy->center[ axis ] ) { - float xx = (value - joy->center[ axis ]) / (joy->center[ axis ] - - joy->min[ axis ]); + float xx = ( value - joy->center[ axis ] ) / ( joy->center[ axis ] - + joy->min[ axis ] ); if( xx < -joy->saturate[ axis ] ) - return( -1.0f ); + return -1.0f; if( xx > -joy->dead_band [ axis ] ) - return( 0.0f ); + return 0.0f; - xx = (xx + joy->dead_band[ axis ]) / (joy->saturate[ axis ] - - joy->dead_band[ axis ]); + xx = ( xx + joy->dead_band[ axis ] ) / ( joy->saturate[ axis ] - + joy->dead_band[ axis ] ); - return( ( xx < -1.0f ) ? -1.0f : xx ); + return ( xx < -1.0f ) ? -1.0f : xx; } else { - float xx = (value - joy->center [ axis ]) / (joy->max[ axis ] - - joy->center[ axis ]); + float xx = ( value - joy->center [ axis ] ) / ( joy->max[ axis ] - + joy->center[ axis ] ); if( xx > joy->saturate[ axis ] ) - return 1.0f ; + return 1.0f; if( xx < joy->dead_band[ axis ] ) - return 0.0f ; + return 0.0f; - xx = (xx - joy->dead_band[ axis ]) / (joy->saturate[ axis ] - - joy->dead_band[ axis ]); + xx = ( xx - joy->dead_band[ axis ] ) / ( joy->saturate[ axis ] - + joy->dead_band[ axis ] ); - return( ( xx > 1.0f ) ? 1.0f : xx ); + return ( xx > 1.0f ) ? 1.0f : xx; } } @@ -349,20 +350,20 @@ static void fghJoystickRead( SFG_Joystick* joy, int* buttons, float* axes ) */ static void fghJoystickOpen( SFG_Joystick* joy ) { -#ifdef WIN32 +#if TARGET_HOST_WIN32 JOYCAPS jsCaps; int i; joy->js.dwFlags = JOY_RETURNALL; joy->js.dwSize = sizeof( joy->js ); - memset( &jsCaps, 0, sizeof(jsCaps) ); + memset( &jsCaps, 0, sizeof( jsCaps ) ); joy->error = - (joyGetDevCaps( joy->js_id, &jsCaps, sizeof(jsCaps) ) != - JOYERR_NOERROR); + ( joyGetDevCaps( joy->js_id, &jsCaps, sizeof( jsCaps ) ) != + JOYERR_NOERROR ); joy->num_axes = - (jsCaps.wNumAxes < _JS_MAX_AXES ) ? jsCaps.wNumAxes : _JS_MAX_AXES; + ( jsCaps.wNumAxes < _JS_MAX_AXES ) ? jsCaps.wNumAxes : _JS_MAX_AXES; /* * WARNING - Fall through case clauses!! @@ -393,7 +394,7 @@ static void fghJoystickOpen( SFG_Joystick* joy ) * I guess we have no axes at all */ default: - joy->error = TRUE; + joy->error = GL_TRUE; break; } @@ -440,17 +441,19 @@ static void fghJoystickOpen( SFG_Joystick* joy ) if( joy->error ) return; - +/* + * XXX All BSDs should share this? + */ # ifdef __FreeBSD__ fghJoystickRawRead(joy, buttons, axes ); joy->error = axes[ 0 ] < -1000000000.0f; if( joy->error ) - return ; + return; sprintf( joyfname, "%s/.joy%drc", getenv( "HOME" ), joy->id ); joyfile = fopen( joyfname, "r" ); - joy->error = (joyfile == NULL); + joy->error =( joyfile == NULL ); if( joy->error ) return; @@ -461,12 +464,12 @@ static void fghJoystickOpen( SFG_Joystick* joy ) &joy->min[ 1 ], &joy->center[ 1 ], &joy->max[ 1 ] ); - joy->error = (noargs != 7) || (in_no_axes != _JS_MAX_AXES); + joy->error =( noargs != 7 ) || ( in_no_axes != _JS_MAX_AXES ); fclose( joyfile ); if( joy->error ) return; - for( i=0 ; i<_JS_MAX_AXES ; i++ ) + for( i = 0; i < _JS_MAX_AXES; i++ ) { joy->dead_band[ i ] = 0.0f; joy->saturate [ i ] = 1.0f; @@ -477,6 +480,7 @@ static void fghJoystickOpen( SFG_Joystick* joy ) * Set the correct number of axes for the linux driver */ # ifdef JS_NEW + ioctl( joy->fd, JSIOCGAXES , &joy->num_axes ); ioctl( joy->fd, JSIOCGBUTTONS, &joy->num_buttons ); fcntl( joy->fd, F_SETFL, O_NONBLOCK ); @@ -492,19 +496,22 @@ static void fghJoystickOpen( SFG_Joystick* joy ) * PWO: shouldn't be that done somehow wiser on the kernel level? */ # ifndef JS_NEW - counter = 0 ; + counter = 0; do { fghJoystickRawRead( joy, NULL, joy->center ); counter++; - } while( !joy->error && counter < 100 && joy->center[ 0 ] == 512.0f && joy->center[ 1 ] == 512.0f ); + } while( !joy->error && + counter < 100 && + joy->center[ 0 ] == 512.0f && + joy->center[ 1 ] == 512.0f ); if( counter >= 100 ) - joy->error = TRUE; + joy->error = GL_TRUE; # endif - for( i=0 ; i<_JS_MAX_AXES ; i++ ) + for( i = 0; i < _JS_MAX_AXES; i++ ) { # ifdef JS_NEW joy->max [ i ] = 32767.0f; @@ -526,20 +533,32 @@ static void fghJoystickOpen( SFG_Joystick* joy ) */ void fgJoystickInit( int ident ) { - if( fgJoystick != NULL ) + if( fgJoystick ) fgError( "illegal attemp to initialize joystick device" ); - fgJoystick = (SFG_Joystick *)calloc( sizeof(SFG_Joystick), 1 ); + fgJoystick = ( SFG_Joystick * )calloc( sizeof( SFG_Joystick ), 1 ); -#ifdef WIN32 +#if TARGET_HOST_WIN32 switch( ident ) { - case 0: fgJoystick->js_id = JOYSTICKID1; fghJoystickOpen( fgJoystick ); break; - case 1: fgJoystick->js_id = JOYSTICKID2; fghJoystickOpen( fgJoystick ); break; - default: fgJoystick->num_axes = 0; fgJoystick->error = TRUE; break; + case 0: + fgJoystick->js_id = JOYSTICKID1; + fghJoystickOpen( fgJoystick ); + break; + case 1: + fgJoystick->js_id = JOYSTICKID2; + fghJoystickOpen( fgJoystick ); + break; + default: + fgJoystick->num_axes = 0; + fgJoystick->error = GL_TRUE; + break; } #else +/* + * XXX All BSDs should share this code? + */ # ifdef __FreeBSD__ fgJoystick->id = ident; sprintf( fgJoystick->fname, "/dev/joy%d", ident ); @@ -556,16 +575,16 @@ void fgJoystickInit( int ident ) */ void fgJoystickClose( void ) { - if( fgJoystick == NULL ) + if( !fgJoystick ) fgError( "illegal attempt to deinitialize joystick device" ); -#ifndef WIN32 - if( fgJoystick->error != TRUE ) +#if !TARGET_HOST_WIN32 + if( ! fgJoystick->error ) close( fgJoystick->fd ); #endif - free ( fgJoystick ) ; - fgJoystick = NULL ; /* show joystick has been deinitialized */ + free( fgJoystick ); + fgJoystick = NULL; /* show joystick has been deinitialized */ } /* @@ -577,18 +596,28 @@ void fgJoystickPollWindow( SFG_Window* window ) float axes[ _JS_MAX_AXES ]; int buttons; - freeglut_return_if_fail( fgJoystick != NULL && window != NULL ); - freeglut_return_if_fail( window->Callbacks.Joystick != NULL ); + freeglut_return_if_fail( fgJoystick ); + freeglut_return_if_fail( window ); + freeglut_return_if_fail( FETCH_WCB( *window, Joystick ) ); fghJoystickRead( fgJoystick, &buttons, axes ); - fgSetWindow (window); - window->Callbacks.Joystick( - buttons, - (int) (axes[ 0 ] * 1000.0f), - (int) (axes[ 1 ] * 1000.0f), - (int) (axes[ 2 ] * 1000.0f) + INVOKE_WCB( *window, Joystick, + ( buttons, + (int) (axes[ 0 ] * 1000.0f ), + (int) (axes[ 1 ] * 1000.0f ), + (int) (axes[ 2 ] * 1000.0f ) ) ); + + /* + * fgSetWindow (window); + * window->Callbacks.Joystick( + * buttons, + * (int) (axes[ 0 ] * 1000.0f), + * (int) (axes[ 1 ] * 1000.0f), + * (int) (axes[ 2 ] * 1000.0f) + * ); + */ } /* @@ -596,22 +625,34 @@ void fgJoystickPollWindow( SFG_Window* window ) * We might consider adding such functions to freeglut-2.0. */ #if 0 - int getNumAxes () { return num_axes ; } - int notWorking () { return error ; } - - float getDeadBand ( int axis ) { return dead_band [ axis ] ; } - void setDeadBand ( int axis, float db ) { dead_band [ axis ] = db ; } - - float getSaturation ( int axis ) { return saturate [ axis ] ; } - void setSaturation ( int axis, float st ) { saturate [ axis ] = st ; } - - void setMinRange ( float *axes ) { memcpy ( min , axes, num_axes * sizeof(float) ) ; } - void setMaxRange ( float *axes ) { memcpy ( max , axes, num_axes * sizeof(float) ) ; } - void setCenter ( float *axes ) { memcpy ( center, axes, num_axes * sizeof(float) ) ; } - - void getMinRange ( float *axes ) { memcpy ( axes, min , num_axes * sizeof(float) ) ; } - void getMaxRange ( float *axes ) { memcpy ( axes, max , num_axes * sizeof(float) ) ; } - void getCenter ( float *axes ) { memcpy ( axes, center, num_axes * sizeof(float) ) ; } +int getNumAxes () + { return num_axes; } +int notWorking () + { return error; } + +float getDeadBand ( int axis ) + { return dead_band [ axis ]; } +void setDeadBand ( int axis, float db ) + { dead_band [ axis ] = db; } + +float getSaturation ( int axis ) + { return saturate [ axis ]; } +void setSaturation ( int axis, float st ) + { saturate [ axis ] = st; } + +void setMinRange ( float *axes ) + { memcpy ( min , axes, num_axes * sizeof(float) ); } +void setMaxRange ( float *axes ) + { memcpy ( max , axes, num_axes * sizeof(float) ); } +void setCenter ( float *axes ) + { memcpy ( center, axes, num_axes * sizeof(float) ); } + +void getMinRange ( float *axes ) + { memcpy ( axes, min , num_axes * sizeof(float) ); } +void getMaxRange ( float *axes ) + { memcpy ( axes, max , num_axes * sizeof(float) ); } +void getCenter ( float *axes ) + { memcpy ( axes, center, num_axes * sizeof(float) ); } #endif /*** END OF FILE ***/