X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_joystick.c;h=185ef1bf35f21e4fc5b8c7444c50116d89715223;hb=89c225066899f8956939f8175a0d548cd6f63a62;hp=478e28742d205991a698a8aa1b885d78a0bc02ff;hpb=65e03872c287ab34ae76bd1831a3786d5e986b72;p=freeglut diff --git a/src/freeglut_joystick.c b/src/freeglut_joystick.c index 478e287..185ef1b 100644 --- a/src/freeglut_joystick.c +++ b/src/freeglut_joystick.c @@ -73,9 +73,7 @@ #if TARGET_HOST_UNIX_X11 # define _JS_MAX_AXES 16 # if defined(__FreeBSD__) || defined(__NetBSD__) -/* - * XXX The below hack is done until freeglut's autoconf is updated. - */ +/* XXX The below hack is done until freeglut's autoconf is updated. */ # define HAVE_USB_JS 1 # include @@ -133,17 +131,13 @@ #define JS_TRUE 1 #define JS_FALSE 0 -/* - * BSD defines from "jsBSD.cxx" around lines 42-270 - */ +/* BSD defines from "jsBSD.cxx" around lines 42-270 */ #if defined(__NetBSD__) || defined(__FreeBSD__) # ifdef HAVE_USB_JS # if defined(__NetBSD__) -/* - * XXX The below hack is done until freeglut's autoconf is updated. - */ +/* XXX The below hack is done until freeglut's autoconf is updated. */ # define HAVE_USBHID_H 1 # ifdef HAVE_USBHID_H # include @@ -154,9 +148,7 @@ # if __FreeBSD_version < 500000 # include # else -/* - * XXX The below hack is done until freeglut's autoconf is updated. - */ +/* XXX The below hack is done until freeglut's autoconf is updated. */ # define HAVE_USBHID_H 1 # include # endif @@ -249,8 +241,7 @@ static int fghJoystickFindUSBdev(char *name, char *out, int outlen) return 1; } else if (errno == EACCES) { if (!protection_warned) { - fprintf(stderr, "Can't open %s for read!\n", - buf); + fgWarning ( "Can't open %s for read!", buf ); protection_warned = 1; } } @@ -271,7 +262,7 @@ static int fghJoystickInitializeHID(struct os_specific_s *os, if ( ( rd = hid_get_report_desc( os->fd ) ) == 0 ) { - fprintf( stderr, "error: %s: %s", os->fname, strerror( errno ) ); + fgWarning ( "error: %s: %s", os->fname, strerror( errno ) ); return FALSE; } @@ -281,8 +272,7 @@ static int fghJoystickInitializeHID(struct os_specific_s *os, if( ioctl( os->fd, USB_GET_REPORT_ID, &report_id ) < 0) { /*** XXX {report_id} may not be the right variable? ***/ - fprintf( stderr, "error: %s%d: %s", - UHIDDEV, report_id, strerror( errno ) ); + fgWarning ( "error: %s%d: %s", UHIDDEV, report_id, strerror( errno ) ); return FALSE; } @@ -445,14 +435,14 @@ io_object_t ioDevices[K_NUM_DEVICES]; static void fghJoystickFindDevices ( SFG_Joystick* joy, mach_port_t ); static CFDictionaryRef fghJoystickGetCFProperties ( SFG_Joystick* joy, io_object_t ); -void fghJoystickEnumerateElements ( SFG_Joystick* joy, CFTypeRef element ); +static void fghJoystickEnumerateElements ( SFG_Joystick* joy, CFTypeRef element ); /* callback for CFArrayApply */ static void fghJoystickElementEnumerator ( SFG_Joystick* joy, void *element, void* vjs ); -void fghJoystickParseElement ( SFG_Joystick* joy, CFDictionaryRef element ); +static void fghJoystickParseElement ( SFG_Joystick* joy, CFDictionaryRef element ); -void fghJoystickAddAxisElement ( SFG_Joystick* joy, CFDictionaryRef axis ); -void fghJoystickAddButtonElement ( SFG_Joystick* joy, CFDictionaryRef button ); -void fghJoystickAddHatElement ( SFG_Joystick* joy, CFDictionaryRef hat ); +static void fghJoystickAddAxisElement ( SFG_Joystick* joy, CFDictionaryRef axis ); +static void fghJoystickAddButtonElement ( SFG_Joystick* joy, CFDictionaryRef button ); +static void fghJoystickAddHatElement ( SFG_Joystick* joy, CFDictionaryRef hat ); #endif @@ -460,7 +450,6 @@ void fghJoystickAddHatElement ( SFG_Joystick* joy, CFDictionaryRef hat ); * The static joystick structure pointer */ #define MAX_NUM_JOYSTICKS 2 -static int fgNumberOfJoysticks = 0; static SFG_Joystick *fgJoystick [ MAX_NUM_JOYSTICKS ]; @@ -530,7 +519,7 @@ static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes ) IOHIDEventStruct hidEvent; (*(joy->hidDev))->getElementValue ( joy->hidDev, buttonCookies[i], &hidEvent ); if ( hidEvent.value ) - *buttons |= 1 << i; + *buttons |= 1 << i; } } @@ -732,7 +721,7 @@ static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes ) break; default: - fgWarning ( "%s", "PLIB_JS: Unrecognised /dev/js return!?!" ); + fgWarning ( "PLIB_JS: Unrecognised /dev/js return!?!" ); /* use the old values */ @@ -859,7 +848,7 @@ static int fghJoystickFindDevices ( SFG_Joystick *joy, mach_port_t masterPort ) rv = IOServiceGetMatchingServices(masterPort, hidMatch, &hidIterator); if (rv != kIOReturnSuccess || !hidIterator) { - fgWarning( "%s", "no joystick (HID) devices found" ); + fgWarning( "no joystick (HID) devices found" ); return; } @@ -892,7 +881,7 @@ static CFDictionaryRef fghJoystickGetCFProperties ( SFG_Joystick *joy, io_object IOReturn rv; CFMutableDictionaryRef cfProperties; -#if 0 +#if 0 /* comment copied from darwin/SDL_sysjoystick.c */ /* Mac OS X currently is not mirroring all USB properties to HID page so need to look at USB device page also * get dictionary for usb properties: step up two levels and get CF dictionary for USB properties @@ -902,21 +891,21 @@ static CFDictionaryRef fghJoystickGetCFProperties ( SFG_Joystick *joy, io_object rv = IORegistryEntryGetParentEntry (ioDev, kIOServicePlane, &parent1); if (rv != kIOReturnSuccess) { - fgWarning ( "%s", "error getting device entry parent"); + fgWarning ( "error getting device entry parent"); return NULL; } rv = IORegistryEntryGetParentEntry (parent1, kIOServicePlane, &parent2); if (rv != kIOReturnSuccess) { - fgWarning ( "%s", "error getting device entry parent 2"); + fgWarning ( "error getting device entry parent 2"); return NULL; } #endif - rv = IORegistryEntryCreateCFProperties( ioDev /*parent2*/, + rv = IORegistryEntryCreateCFProperties( ioDev /*parent2*/, &cfProperties, kCFAllocatorDefault, kNilOptions); if (rv != kIOReturnSuccess || !cfProperties) { - fgWarning ( "%s", "error getting device properties"); + fgWarning ( "error getting device properties"); return NULL; } @@ -930,7 +919,7 @@ static void fghJoystickElementEnumerator ( SFG_Joystick *joy, void *element, voi return; } - static_cast(vjs)->parseElement ( (CFDictionaryRef) element ); + static_cast(vjs)->parseElement ( (CFDictionaryRef) element ); } /** element enumerator function : pass NULL for top-level*/ @@ -939,7 +928,7 @@ static void fghJoystickEnumerateElements ( SFG_Joystick *joy, CFTypeRef element assert(CFGetTypeID(element) == CFArrayGetTypeID()); CFRange range = {0, CFArrayGetCount ((CFArrayRef)element)}; - CFArrayApplyFunction((CFArrayRef) element, range, + CFArrayApplyFunction((CFArrayRef) element, range, &fghJoystickElementEnumerator, joy ); } @@ -951,7 +940,7 @@ static void fghJoystickParseElement ( SFG_Joystick *joy, CFDictionaryRef element long type, page, usage; CFNumberGetValue((CFNumberRef) - CFDictionaryGetValue ((CFDictionaryRef) element, CFSTR(kIOHIDElementTypeKey)), + CFDictionaryGetValue ((CFDictionaryRef) element, CFSTR(kIOHIDElementTypeKey)), kCFNumberLongType, &type); switch ( typ e) { @@ -962,7 +951,7 @@ static void fghJoystickParseElement ( SFG_Joystick *joy, CFDictionaryRef element CFNumberGetValue( (CFNumberRef) refUsage, kCFNumberLongType, &usage ); CFNumberGetValue( (CFNumberRef) refPage, kCFNumberLongType, &page ); - if (page == kHIDPage_GenericDesktop) { + if (page == kHIDPage_GenericDesktop) { switch ( usage ) /* look at usage to determine function */ { case kHIDUsage_GD_X: @@ -982,14 +971,14 @@ static void fghJoystickParseElement ( SFG_Joystick *joy, CFDictionaryRef element break; default: - printf("input type element has weird usage (%x)\n", usage); + fgWarning ( "input type element has weird usage (%x)", usage); break; } } else if (page == kHIDPage_Button) { printf(" button\n"); fghJoystickAddButtonElement((CFDictionaryRef) element); } else - printf("input type element has weird page (%x)\n", page); + fgWarning ( "input type element has weird page (%x)", page); break; case kIOHIDElementTypeCollection: @@ -1000,7 +989,7 @@ static void fghJoystickParseElement ( SFG_Joystick *joy, CFDictionaryRef element default: break; - } + } } static void fghJoystickAddAxisElement ( SFG_Joystick *joy, CFDictionaryRef axis ) @@ -1009,17 +998,17 @@ static void fghJoystickAddAxisElement ( SFG_Joystick *joy, CFDictionaryRef axis int index = joy->num_axes++; CFNumberGetValue ((CFNumberRef) - CFDictionaryGetValue ( axis, CFSTR(kIOHIDElementCookieKey) ), + CFDictionaryGetValue ( axis, CFSTR(kIOHIDElementCookieKey) ), kCFNumberLongType, &cookie); axisCookies[index] = (IOHIDElementCookie) cookie; CFNumberGetValue ((CFNumberRef) - CFDictionaryGetValue ( axis, CFSTR(kIOHIDElementMinKey) ), + CFDictionaryGetValue ( axis, CFSTR(kIOHIDElementMinKey) ), kCFNumberLongType, &lmin); CFNumberGetValue ((CFNumberRef) - CFDictionaryGetValue ( axis, CFSTR(kIOHIDElementMaxKey) ), + CFDictionaryGetValue ( axis, CFSTR(kIOHIDElementMaxKey) ), kCFNumberLongType, &lmax); joy->min[index] = lmin; @@ -1033,7 +1022,7 @@ static void fghJoystickAddButtonElement ( SFG_Joystick *joy, CFDictionaryRef but { long cookie; CFNumberGetValue ((CFNumberRef) - CFDictionaryGetValue ( button, CFSTR(kIOHIDElementCookieKey) ), + CFDictionaryGetValue ( button, CFSTR(kIOHIDElementCookieKey) ), kCFNumberLongType, &cookie); joy->buttonCookies[num_buttons++] = (IOHIDElementCookie) cookie; @@ -1145,9 +1134,7 @@ static void fghJoystickOpen( SFG_Joystick* joy ) joy->name[ 0 ] = '\0'; #if TARGET_HOST_MACINTOSH - /* - * XXX FIXME: get joystick name in Mac - */ + /* XXX FIXME: get joystick name in Mac */ err = ISpStartup( ); @@ -1249,30 +1236,30 @@ static void fghJoystickOpen( SFG_Joystick* joy ) #if TARGET_HOST_MAC_OSX if( joy->id >= numDevices ) { - fgWarning( "%s", "device index out of range in fgJoystickOpen()" ); + fgWarning( "device index out of range in fgJoystickOpen()" ); return; } /* create device interface */ - rv = IOCreatePlugInInterfaceForService( ioDevices[ joy->id ], + rv = IOCreatePlugInInterfaceForService( ioDevices[ joy->id ], kIOHIDDeviceUserClientTypeID, kIOCFPlugInInterfaceID, &plugin, &score ); if( rv != kIOReturnSuccess ) { - fgWarning( "%s", "error creating plugin for io device" ); + fgWarning( "error creating plugin for io device" ); return; } pluginResult = ( *plugin )->QueryInterface( - plugin, + plugin, CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID), &( LPVOID )joy->hidDev ); if( pluginResult != S_OK ) - fgWarning ( "%s", "QI-ing IO plugin to HID Device interface failed" ); + fgWarning ( "QI-ing IO plugin to HID Device interface failed" ); ( *plugin )->Release( plugin ); /* don't leak a ref */ if( joy->hidDev == NULL ) @@ -1289,7 +1276,7 @@ static void fghJoystickOpen( SFG_Joystick* joy ) props = getCFProperties( ioDevices[ joy->id ] ); /* recursively enumerate all the bits */ - CFTypeRef topLevelElement = + CFTypeRef topLevelElement = CFDictionaryGetValue( props, CFSTR( kIOHIDElementKey ) ); enumerateElements( topLevelElement ); @@ -1349,9 +1336,7 @@ static void fghJoystickOpen( SFG_Joystick* joy ) joy->max[ 0 ] = ( float )joy->jsCaps.wXmax; } - /* - * Guess all the rest judging on the axes extremals - */ + /* Guess all the rest judging on the axes extremals */ for( i = 0; i < joy->num_axes; i++ ) { joy->center [ i ] = ( joy->max[ i ] + joy->min[ i ] ) * 0.5f; @@ -1370,7 +1355,7 @@ static void fghJoystickOpen( SFG_Joystick* joy ) joy->os->fd = open( joy->os->fname, O_RDONLY | O_NONBLOCK); if( joy->os->fd < 0 && errno == EACCES ) - fgWarning ( "%s exists but is not readable by you\n", joy->os->fname ); + fgWarning ( "%s exists but is not readable by you", joy->os->fname ); joy->error =( joy->os->fd < 0 ); @@ -1466,9 +1451,7 @@ static void fghJoystickOpen( SFG_Joystick* joy ) #endif #if defined( __linux__ ) - /* - * Default for older Linux systems. - */ + /* Default for older Linux systems. */ joy->num_axes = 2; joy->num_buttons = 32; @@ -1486,15 +1469,13 @@ static void fghJoystickOpen( SFG_Joystick* joy ) if( joy->error ) return; - /* - * Set the correct number of axes for the linux driver - */ + /* Set the correct number of axes for the linux driver */ # ifdef JS_NEW - /* Melchior Franz's fixes for big-endian Linuxes since writing - * to the upper byte of an uninitialized word doesn't work. - * 9 April 2003 + /* Melchior Franz's fixes for big-endian Linuxes since writing + * to the upper byte of an uninitialized word doesn't work. + * 9 April 2003 */ - ioctl( joy->fd, JSIOCGAXES, &u ); + ioctl( joy->fd, JSIOCGAXES, &u ); joy->num_axes = u; ioctl( joy->fd, JSIOCGBUTTONS, &u ); joy->num_buttons = u; @@ -1514,7 +1495,7 @@ static void fghJoystickOpen( SFG_Joystick* joy ) counter = 0; do - { + { fghJoystickRawRead( joy, NULL, joy->center ); counter++; } while( !joy->error && @@ -1546,13 +1527,13 @@ static void fghJoystickOpen( SFG_Joystick* joy ) /* * This function replaces the constructor method in the JS library. */ -void fgJoystickInit( int ident ) +static void fghJoystickInit( int ident ) { if( ident >= MAX_NUM_JOYSTICKS ) - fgError( "Too large a joystick number" ); + fgError( "Too large a joystick number: %d", ident ); if( fgJoystick[ ident ] ) - fgError( "illegal attempt to initialize joystick device" ); + fgError( "illegal attempt to initialize joystick device again" ); fgJoystick[ ident ] = ( SFG_Joystick * )calloc( sizeof( SFG_Joystick ), 1 ); @@ -1582,7 +1563,7 @@ void fgJoystickInit( int ident ) IOReturn rv = IOMasterPort( bootstrap_port, &masterPort ); if( rv != kIOReturnSuccess ) { - fgWarning( "%s", "error getting master Mach port" ); + fgWarning( "error getting master Mach port" ); return; } fghJoystickFindDevices( masterPort ); @@ -1605,7 +1586,7 @@ void fgJoystickInit( int ident ) !CFStringGetCString( ( CFStringRef )ref, name, 128, CFStringGetSystemEncoding( ) ) ) { - fgWarning( "%s", "error getting device name" ); + fgWarning( "error getting device name" ); name[ 0 ] = '\0'; } #endif @@ -1657,6 +1638,22 @@ void fgJoystickInit( int ident ) } /* + * Try initializing all the joysticks (well, both of them) + */ +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 ); + + fgState.JoysticksInitialised = GL_TRUE; + } +} + +/* * */ void fgJoystickClose( void ) @@ -1740,13 +1737,38 @@ void fgJoystickPollWindow( SFG_Window* window ) } /* - * PWO: These jsJoystick class methods have not been implemented. - * We might consider adding such functions to freeglut-2.0. + * Implementation for glutDeviceGet(GLUT_HAS_JOYSTICK) + */ +int fgJoystickDetect( void ) +{ + int ident; + + fgInitialiseJoysticks (); + + if ( !fgJoystick ) + return 0; + + if ( !fgState.JoysticksInitialised ) + return 0; + + for( ident=0; identerror ) + return 1; + + return 0; +} + +/* + * Joystick information functions */ int glutJoystickGetNumAxes( int ident ) { return fgJoystick[ ident ]->num_axes; } +int glutJoystickGetNumButtons( int ident ) +{ + return fgJoystick[ ident ]->num_buttons; +} int glutJoystickNotWorking( int ident ) { return fgJoystick[ ident ]->error;