X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_joystick.c;h=8260340ab2a2553d79e3e833f14d5bf231d0f1a6;hb=4f4c33c357f3dae74ac98fbdb450b3f624026049;hp=042563f9f4aeeb44414317703ee32c89e4f958ab;hpb=8aec061d3b95db47e642b8ac74607465bcb8dec3;p=freeglut diff --git a/src/freeglut_joystick.c b/src/freeglut_joystick.c index 042563f..8260340 100644 --- a/src/freeglut_joystick.c +++ b/src/freeglut_joystick.c @@ -31,23 +31,21 @@ * Many thanks for Steve Baker for permission to pull from that library. */ -#if defined( __FreeBSD__ ) || defined( __NetBSD__ ) +#include +#include "freeglut_internal.h" +#if HAVE_SYS_PARAM_H # include #endif -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include "../include/GL/freeglut.h" -#include "freeglut_internal.h" - /* * 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 @@ -61,25 +59,28 @@ # 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 +# endif +# if HAVE_FCNTL_H +# include +# endif +# include # 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 -# if defined(__FreeBSD__) && __FreeBSD_version >= 500000 +# if defined(__FreeBSD__) # include # else /* @@ -95,12 +96,7 @@ # define JS_RETURN (sizeof(struct JS_DATA_TYPE)) # endif -# include -# include -# include - # if defined(__linux__) -# include # include /* check the joystick driver version */ @@ -133,17 +129,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 +146,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 @@ -240,7 +230,7 @@ static int fghJoystickFindUSBdev(char *name, char *out, int outlen) static int protection_warned = 0; for (i = 0; i < 16; i++) { - sprintf(buf, "%s%d", USBDEV, i); + snprintf(buf, sizeof(buf), "%s%d", USBDEV, i); f = open(buf, O_RDONLY); if (f >= 0) { cp = fghJoystickWalkUSBdev(f, name, out, outlen); @@ -249,8 +239,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 +260,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 +270,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; } @@ -397,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 @@ -445,14 +433,13 @@ 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 ); -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 +447,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 ]; @@ -469,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; @@ -530,7 +516,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; } } @@ -545,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 ) @@ -611,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 ) { @@ -670,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 )); } } } @@ -732,7 +718,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 +845,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 +878,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 +888,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,96 +916,38 @@ 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*/ static void fghJoystickEnumerateElements ( SFG_Joystick *joy, CFTypeRef element ) { - assert(CFGetTypeID(element) == CFArrayGetTypeID()); + FREEGLUT_INTERNAL_ERROR_EXIT( (CFGetTypeID(element) == CFArrayGetTypeID(), + "Joystick element type mismatch", + "fghJoystickEnumerateElements" ); CFRange range = {0, CFArrayGetCount ((CFArrayRef)element)}; - CFArrayApplyFunction((CFArrayRef) element, range, + CFArrayApplyFunction((CFArrayRef) element, range, &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 ( typ e) { - 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: - printf("input type element has weird usage (%x)\n", usage); - break; - } - } else if (page == kHIDPage_Button) { - printf(" button\n"); - fghJoystickAddButtonElement((CFDictionaryRef) element); - } else - printf("input type element has weird page (%x)\n", page); - break; - - case kIOHIDElementTypeCollection: - fghJoystickEnumerateElements ( - CFDictionaryGetValue ( element, CFSTR(kIOHIDElementKey) ) - ); - break; - - default: - break; - } -} - static void fghJoystickAddAxisElement ( SFG_Joystick *joy, CFDictionaryRef axis ) { long cookie, lmin, lmax; 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 +961,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; @@ -1047,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 @@ -1069,9 +997,9 @@ static int fghJoystickGetOEMProductName ( SFG_Joystick* joy, char *buf, int buf_ return 0; /* Open .. MediaResources\CurrentJoystickSettings */ - sprintf ( buffer, "%s\\%s\\%s", - REGSTR_PATH_JOYCONFIG, joy->jsCaps.szRegKey, - REGSTR_KEY_JOYCURR ); + _snprintf ( buffer, sizeof(buffer), "%s\\%s\\%s", + REGSTR_PATH_JOYCONFIG, joy->jsCaps.szRegKey, + REGSTR_KEY_JOYCURR ); lr = RegOpenKeyEx ( HKEY_LOCAL_MACHINE, buffer, 0, KEY_QUERY_VALUE, &hKey); @@ -1081,7 +1009,7 @@ static int fghJoystickGetOEMProductName ( SFG_Joystick* joy, char *buf, int buf_ dwcb = sizeof(OEMKey); /* JOYSTICKID1-16 is zero-based; registry entries for VJOYD are 1-based. */ - sprintf ( buffer, "Joystick%d%s", joy->js_id + 1, REGSTR_VAL_JOYOEMNAME ); + _snprintf ( buffer, sizeof(buffer), "Joystick%d%s", joy->js_id + 1, REGSTR_VAL_JOYOEMNAME ); lr = RegQueryValueEx ( hKey, buffer, 0, 0, (LPBYTE) OEMKey, &dwcb); RegCloseKey ( hKey ); @@ -1089,7 +1017,7 @@ static int fghJoystickGetOEMProductName ( SFG_Joystick* joy, char *buf, int buf_ if ( lr != ERROR_SUCCESS ) return 0; /* Open OEM Key from ...MediaProperties */ - sprintf ( buffer, "%s\\%s", REGSTR_PATH_JOYOEM, OEMKey ); + _snprintf ( buffer, sizeof(buffer), "%s\\%s", REGSTR_PATH_JOYOEM, OEMKey ); lr = RegOpenKeyEx ( HKEY_LOCAL_MACHINE, buffer, 0, KEY_QUERY_VALUE, &hKey ); @@ -1111,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 @@ -1125,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__ ) || TARGET_HOST_SOLARIS + 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) @@ -1145,9 +1078,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 +1180,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,14 +1220,14 @@ 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 ); 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 ); @@ -1349,9 +1280,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; @@ -1360,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; @@ -1370,7 +1299,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 ); @@ -1396,7 +1325,7 @@ static void fghJoystickOpen( SFG_Joystick* joy ) if( joy->error ) return; - sprintf( joyfname, "%s/.joy%drc", getenv( "HOME" ), joy->id ); + snprintf( joyfname, sizeof(buffer), "%s/.joy%drc", getenv( "HOME" ), joy->id ); joyfile = fopen( joyfname, "r" ); joy->error =( joyfile == NULL ); @@ -1465,10 +1394,8 @@ static void fghJoystickOpen( SFG_Joystick* joy ) # endif #endif -#if defined( __linux__ ) - /* - * Default for older Linux systems. - */ +#if defined( __linux__ ) || TARGET_HOST_SOLARIS + /* Default for older Linux systems. */ joy->num_axes = 2; joy->num_buttons = 32; @@ -1486,15 +1413,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 +1439,7 @@ static void fghJoystickOpen( SFG_Joystick* joy ) counter = 0; do - { + { fghJoystickRawRead( joy, NULL, joy->center ); counter++; } while( !joy->error && @@ -1546,13 +1471,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 ); @@ -1563,7 +1488,7 @@ void fgJoystickInit( int ident ) #if TARGET_HOST_MACINTOSH fgJoystick[ ident ]->id = ident; - sprintf( fgJoystick[ ident ]->fname, "/dev/js%d", ident ); /* FIXME */ + snprintf( fgJoystick[ ident ]->fname, sizeof(fgJoystick[ ident ]->fname), "/dev/js%d", ident ); /* FIXME */ fgJoystick[ ident ]->error = GL_FALSE; #endif @@ -1582,7 +1507,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,12 +1530,12 @@ 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 -#if TARGET_HOST_WIN32 +#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE) switch( ident ) { case 0: @@ -1628,7 +1553,7 @@ void fgJoystickInit( 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; @@ -1638,18 +1563,18 @@ void fgJoystickInit( int ident ) if( ident < USB_IDENT_OFFSET ) fgJoystick[ ident ]->os->is_analog = 1; if( fgJoystick[ ident ]->os->is_analog ) - sprintf( fgJoystick[ ident ]->os->fname, "%s%d", AJSDEV, ident ); + snprintf( fgJoystick[ ident ]->os->fname, sizeof(fgJoystick[ ident ]->os->fname), "%s%d", AJSDEV, ident ); else - sprintf( fgJoystick[ ident ]->os->fname, "%s%d", UHIDDEV, + snprintf( fgJoystick[ ident ]->os->fname, sizeof(fgJoystick[ ident ]->os->fname), "%s%d", UHIDDEV, ident - USB_IDENT_OFFSET ); # elif defined( __linux__ ) fgJoystick[ ident ]->id = ident; fgJoystick[ ident ]->error = GL_FALSE; - sprintf( fgJoystick[ident]->fname, "/dev/input/js%d", ident ); + snprintf( fgJoystick[ident]->fname, sizeof(fgJoystick[ident]->fname), "/dev/input/js%d", ident ); if( access( fgJoystick[ ident ]->fname, F_OK ) != 0 ) - sprintf( fgJoystick[ ident ]->fname, "/dev/js%d", ident ); + snprintf( fgJoystick[ ident ]->fname, sizeof(fgJoystick[ ident ]->fname), "/dev/js%d", ident ); # endif #endif @@ -1657,6 +1582,21 @@ void fgJoystickInit( int ident ) } /* + * Try initializing all the joysticks (well, both of them) + */ +void fgInitialiseJoysticks ( void ) +{ + if( !fgState.JoysticksInitialised ) + { + int ident ; + for ( ident = 0; ident < MAX_NUM_JOYSTICKS; ident++ ) + fghJoystickInit( ident ); + + fgState.JoysticksInitialised = GL_TRUE; + } +} + +/* * */ void fgJoystickClose( void ) @@ -1678,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,64 +1680,99 @@ 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 ( !fgState.JoysticksInitialised ) + return 0; + + for( ident=0; identerror ) + return 1; + + return 0; +} + +/* + * Joystick information functions */ int glutJoystickGetNumAxes( int ident ) { + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutJoystickGetNumAxes" ); return fgJoystick[ ident ]->num_axes; } +int glutJoystickGetNumButtons( int ident ) +{ + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutJoystickGetNumButtons" ); + return fgJoystick[ ident ]->num_buttons; +} int glutJoystickNotWorking( int ident ) { + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutJoystickNotWorking" ); return fgJoystick[ ident ]->error; } float glutJoystickGetDeadBand( int ident, int axis ) { + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutJoystickGetDeadBand" ); return fgJoystick[ ident ]->dead_band [ axis ]; } void glutJoystickSetDeadBand( int ident, int axis, float db ) { + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutJoystickSetDeadBand" ); fgJoystick[ ident ]->dead_band[ axis ] = db; } float glutJoystickGetSaturation( int ident, int axis ) { + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutJoystickGetSaturation" ); return fgJoystick[ ident ]->saturate[ axis ]; } void glutJoystickSetSaturation( int ident, int axis, float st ) { + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutJoystickSetSaturation" ); fgJoystick[ ident ]->saturate [ axis ] = st; } void glutJoystickSetMinRange( int ident, float *axes ) { + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutJoystickSetMinRange" ); memcpy( fgJoystick[ ident ]->min, axes, fgJoystick[ ident ]->num_axes * sizeof( float ) ); } void glutJoystickSetMaxRange( int ident, float *axes ) { + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutJoystickSetMaxRange" ); memcpy( fgJoystick[ ident ]->max, axes, fgJoystick[ ident ]->num_axes * sizeof( float ) ); } void glutJoystickSetCenter( int ident, float *axes ) { + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutJoystickSetCenter" ); memcpy( fgJoystick[ ident ]->center, axes, fgJoystick[ ident ]->num_axes * sizeof( float ) ); } void glutJoystickGetMinRange( int ident, float *axes ) { + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutJoystickGetMinRange" ); memcpy( axes, fgJoystick[ ident ]->min, fgJoystick[ ident ]->num_axes * sizeof( float ) ); } void glutJoystickGetMaxRange( int ident, float *axes ) { + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutJoystickGetMaxRange" ); memcpy( axes, fgJoystick[ ident ]->max, fgJoystick[ ident ]->num_axes * sizeof( float ) ); } void glutJoystickGetCenter( int ident, float *axes ) { + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutJoystickGetCenter" ); memcpy( axes, fgJoystick[ ident ]->center, fgJoystick[ ident ]->num_axes * sizeof( float ) ); }