X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_joystick.c;h=547c83963ac2aed677ad47e3554ef8bdecc187b6;hb=30971e75717f3d7b826714fbbb1171dfaf9164cf;hp=781d0ddb47ed713ee6ffeb343221b5e578d52de2;hpb=1652c4a486eb064ee27d475b317d8bd22ea9e040;p=freeglut diff --git a/src/freeglut_joystick.c b/src/freeglut_joystick.c index 781d0dd..547c839 100644 --- a/src/freeglut_joystick.c +++ b/src/freeglut_joystick.c @@ -41,8 +41,11 @@ * Initial defines from "js.h" starting around line 33 with the existing "freeglut_joystick.c" * interspersed */ -#define _JS_MAX_BUTTONS 32 +/* XXX It might be better to poll the operating system for the numbers of buttons and + * XXX axes and then dynamically allocate the arrays. + */ +#define _JS_MAX_BUTTONS 32 #if TARGET_HOST_MACINTOSH # define _JS_MAX_AXES 9 @@ -56,16 +59,15 @@ # include #endif -#if TARGET_HOST_WIN32 +#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE) # define _JS_MAX_AXES 8 # include # include -# include # include #endif -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 # define _JS_MAX_AXES 16 # if HAVE_SYS_IOCTL_H # include @@ -73,11 +75,12 @@ # if HAVE_FCNTL_H # include # endif +# include # if defined(__FreeBSD__) || defined(__NetBSD__) /* XXX The below hack is done until freeglut's autoconf is updated. */ # define HAVE_USB_JS 1 -# if defined(__FreeBSD__) && __FreeBSD_version >= 500000 +# if defined(__FreeBSD__) # include # else /* @@ -93,8 +96,6 @@ # define JS_RETURN (sizeof(struct JS_DATA_TYPE)) # endif -# include - # if defined(__linux__) # include @@ -384,14 +385,14 @@ struct tagSFG_Joystick maxReport[_JS_MAX_AXES]; #endif -#if TARGET_HOST_WIN32 +#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE) JOYCAPS jsCaps; JOYINFOEX js; UINT js_id; #endif -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 # if defined(__FreeBSD__) || defined(__NetBSD__) struct os_specific_s *os; # endif @@ -435,7 +436,6 @@ static CFDictionaryRef fghJoystickGetCFProperties ( SFG_Joystick* joy, io_object static void fghJoystickEnumerateElements ( SFG_Joystick* joy, CFTypeRef element ); /* callback for CFArrayApply */ static void fghJoystickElementEnumerator ( SFG_Joystick* joy, void *element, void* vjs ); -static void fghJoystickParseElement ( SFG_Joystick* joy, CFDictionaryRef element ); static void fghJoystickAddAxisElement ( SFG_Joystick* joy, CFDictionaryRef axis ); static void fghJoystickAddButtonElement ( SFG_Joystick* joy, CFDictionaryRef button ); @@ -455,7 +455,7 @@ static SFG_Joystick *fgJoystick [ MAX_NUM_JOYSTICKS ]; */ static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes ) { -#if TARGET_HOST_WIN32 +#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE) MMRESULT status; #else int status; @@ -531,7 +531,7 @@ static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes ) } #endif -#if TARGET_HOST_WIN32 +#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE) status = joyGetPosEx( joy->js_id, &joy->js ); if ( status != JOYERR_NOERROR ) @@ -597,7 +597,7 @@ static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes ) } #endif -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 # if defined(__FreeBSD__) || defined(__NetBSD__) if ( joy->os->is_analog ) { @@ -656,9 +656,9 @@ static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes ) if (usage > 0 && usage < _JS_MAX_BUTTONS + 1) { if (d) - joy->os->cache_buttons |= (1 << usage - 1); + joy->os->cache_buttons |= (1 << ( usage - 1 )); else - joy->os->cache_buttons &= ~(1 << usage - 1); + joy->os->cache_buttons &= ~(1 << ( usage - 1 )); } } } @@ -931,66 +931,6 @@ static void fghJoystickEnumerateElements ( SFG_Joystick *joy, CFTypeRef element &fghJoystickElementEnumerator, joy ); } -static void fghJoystickParseElement ( SFG_Joystick *joy, CFDictionaryRef element ) -{ - CFTypeRef refPage = CFDictionaryGetValue ((CFDictionaryRef) element, CFSTR(kIOHIDElementUsagePageKey)); - CFTypeRef refUsage = CFDictionaryGetValue ((CFDictionaryRef) element, CFSTR(kIOHIDElementUsageKey)); - - long type, page, usage; - - CFNumberGetValue((CFNumberRef) - CFDictionaryGetValue ((CFDictionaryRef) element, CFSTR(kIOHIDElementTypeKey)), - kCFNumberLongType, &type); - - switch ( type ) { - case kIOHIDElementTypeInput_Misc: - case kIOHIDElementTypeInput_Axis: - case kIOHIDElementTypeInput_Button: - printf("got input element..."); - CFNumberGetValue( (CFNumberRef) refUsage, kCFNumberLongType, &usage ); - CFNumberGetValue( (CFNumberRef) refPage, kCFNumberLongType, &page ); - - if (page == kHIDPage_GenericDesktop) { - switch ( usage ) /* look at usage to determine function */ - { - case kHIDUsage_GD_X: - case kHIDUsage_GD_Y: - case kHIDUsage_GD_Z: - case kHIDUsage_GD_Rx: - case kHIDUsage_GD_Ry: - case kHIDUsage_GD_Rz: - case kHIDUsage_GD_Slider: /* for throttle / trim controls */ - printf(" axis\n"); - fghJoystickAddAxisElement((CFDictionaryRef) element); - break; - - case kHIDUsage_GD_Hatswitch: - printf(" hat\n"); - fghJoystickAddHatElement((CFDictionaryRef) element); - break; - - default: - fgWarning ( "input type element has weird usage (%x)", usage); - break; - } - } else if (page == kHIDPage_Button) { - printf(" button\n"); - fghJoystickAddButtonElement((CFDictionaryRef) element); - } else - fgWarning ( "input type element has weird page (%x)", page); - break; - - case kIOHIDElementTypeCollection: - fghJoystickEnumerateElements ( - CFDictionaryGetValue ( element, CFSTR(kIOHIDElementKey) ) - ); - break; - - default: - break; - } -} - static void fghJoystickAddAxisElement ( SFG_Joystick *joy, CFDictionaryRef axis ) { long cookie, lmin, lmax; @@ -1035,11 +975,11 @@ static void fghJoystickAddHatElement ( SFG_Joystick *joy, CFDictionaryRef button } #endif -#if TARGET_HOST_WIN32 +#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE) /* Inspired by http://msdn.microsoft.com/archive/en-us/dnargame/html/msdn_sidewind3d.asp */ -# if defined(_MSC_VER) +# if FREEGLUT_LIB_PRAGMAS # pragma comment (lib, "advapi32.lib") # endif @@ -1099,7 +1039,7 @@ static int fghJoystickGetOEMProductName ( SFG_Joystick* joy, char *buf, int buf_ static void fghJoystickOpen( SFG_Joystick* joy ) { - int i; + int i = 0; #if TARGET_HOST_MACINTOSH OSStatus err; #endif @@ -1113,17 +1053,22 @@ static void fghJoystickOpen( SFG_Joystick* joy ) CFDictionaryRef props; CFTypeRef topLevelElement; #endif -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 # if defined( __FreeBSD__ ) || defined( __NetBSD__ ) char *cp; # endif # ifdef JS_NEW unsigned char u; # else - int counter; +# if defined( __linux__ ) + int counter = 0; +# endif # endif #endif + /* Silence gcc, the correct #ifdefs would be too fragile... */ + (void)i; + /* * Default values (for no joystick -- each conditional will reset the * error flag) @@ -1282,7 +1227,7 @@ static void fghJoystickOpen( SFG_Joystick* joy ) CFRelease( props ); #endif -#if TARGET_HOST_WIN32 +#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE) joy->js.dwFlags = JOY_RETURNALL; joy->js.dwSize = sizeof( joy->js ); @@ -1344,7 +1289,7 @@ static void fghJoystickOpen( SFG_Joystick* joy ) } #endif -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 #if defined( __FreeBSD__ ) || defined( __NetBSD__ ) for( i = 0; i < _JS_MAX_AXES; i++ ) joy->os->cache_axes[ i ] = 0.0f; @@ -1590,7 +1535,7 @@ static void fghJoystickInit( int ident ) } #endif -#if TARGET_HOST_WIN32 +#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE) switch( ident ) { case 0: @@ -1608,7 +1553,7 @@ static void fghJoystickInit( int ident ) } #endif -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 # if defined( __FreeBSD__ ) || defined( __NetBSD__ ) fgJoystick[ ident ]->id = ident; fgJoystick[ ident ]->error = GL_FALSE; @@ -1641,15 +1586,14 @@ static void fghJoystickInit( int ident ) */ void fgInitialiseJoysticks ( void ) { - /* Initialization courtesy of OpenGLUT -- do we want it? */ - if( !fgState.JoysticksInitialised ) - { - int ident ; - for ( ident = 0; ident < MAX_NUM_JOYSTICKS; ident++ ) - fghJoystickInit( ident ); + if( !fgState.JoysticksInitialised ) + { + int ident ; + for ( ident = 0; ident < MAX_NUM_JOYSTICKS; ident++ ) + fghJoystickInit( ident ); - fgState.JoysticksInitialised = GL_TRUE; - } + fgState.JoysticksInitialised = GL_TRUE; + } } /* @@ -1674,11 +1618,11 @@ void fgJoystickClose( void ) close( fgJoystick[ ident ]->hidDev ); #endif -#if TARGET_HOST_WIN32 +#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE) /* Do nothing special */ #endif -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 #if defined( __FreeBSD__ ) || defined( __NetBSD__ ) if( fgJoystick[ident]->os ) { @@ -1740,21 +1684,18 @@ void fgJoystickPollWindow( SFG_Window* window ) */ int fgJoystickDetect( void ) { - int ident; - - fgInitialiseJoysticks (); + int ident; - if ( !fgJoystick ) - return 0; + fgInitialiseJoysticks (); - if ( !fgState.JoysticksInitialised ) - return 0; + if ( !fgState.JoysticksInitialised ) + return 0; - for( ident=0; identerror ) - return 1; + for( ident=0; identerror ) + return 1; - return 0; + return 0; } /*