projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing the DOS/Linux line ending problems in the progs/demos/smooth_opengl3 project...
[freeglut]
/
src
/
freeglut_joystick.c
diff --git
a/src/freeglut_joystick.c
b/src/freeglut_joystick.c
index
b6fcdbc
..
62c91ef
100644
(file)
--- a/
src/freeglut_joystick.c
+++ b/
src/freeglut_joystick.c
@@
-59,7
+59,7
@@
# include <IOKit/hid/IOHIDLib.h>
#endif
# include <IOKit/hid/IOHIDLib.h>
#endif
-#if TARGET_HOST_WIN32
+#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
# define _JS_MAX_AXES 8
# include <windows.h>
# include <mmsystem.h>
# define _JS_MAX_AXES 8
# include <windows.h>
# include <mmsystem.h>
@@
-67,7
+67,7
@@
#endif
#endif
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
# define _JS_MAX_AXES 16
# if HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
# define _JS_MAX_AXES 16
# if HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
@@
-80,7
+80,7
@@
/* XXX The below hack is done until freeglut's autoconf is updated. */
# define HAVE_USB_JS 1
/* 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 <sys/joystick.h>
# else
/*
# include <sys/joystick.h>
# else
/*
@@
-385,14
+385,14
@@
struct tagSFG_Joystick
maxReport[_JS_MAX_AXES];
#endif
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
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
# if defined(__FreeBSD__) || defined(__NetBSD__)
struct os_specific_s *os;
# endif
@@
-455,7
+455,7
@@
static SFG_Joystick *fgJoystick [ MAX_NUM_JOYSTICKS ];
*/
static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
{
*/
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;
MMRESULT status;
#else
int status;
@@
-531,7
+531,7
@@
static void fghJoystickRawRead( SFG_Joystick* joy, int* buttons, float* axes )
}
#endif
}
#endif
-#if TARGET_HOST_WIN32
+#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
status = joyGetPosEx( joy->js_id, &joy->js );
if ( status != JOYERR_NOERROR )
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
}
#endif
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
# if defined(__FreeBSD__) || defined(__NetBSD__)
if ( joy->os->is_analog )
{
# 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)
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
else
- joy->os->cache_buttons &= ~(1 << usage - 1);
+ joy->os->cache_buttons &= ~(1 << ( usage - 1 ));
}
}
}
}
}
}
@@
-975,11
+975,11
@@
static void fghJoystickAddHatElement ( SFG_Joystick *joy, CFDictionaryRef button
}
#endif
}
#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
*/
/* 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
# pragma comment (lib, "advapi32.lib")
# endif
@@
-1039,7
+1039,7
@@
static int fghJoystickGetOEMProductName ( SFG_Joystick* joy, char *buf, int buf_
static void fghJoystickOpen( SFG_Joystick* joy )
{
static void fghJoystickOpen( SFG_Joystick* joy )
{
- int i;
+ int i = 0;
#if TARGET_HOST_MACINTOSH
OSStatus err;
#endif
#if TARGET_HOST_MACINTOSH
OSStatus err;
#endif
@@
-1053,17
+1053,22
@@
static void fghJoystickOpen( SFG_Joystick* joy )
CFDictionaryRef props;
CFTypeRef topLevelElement;
#endif
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
# 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
# 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)
/*
* Default values (for no joystick -- each conditional will reset the
* error flag)
@@
-1222,7
+1227,7
@@
static void fghJoystickOpen( SFG_Joystick* joy )
CFRelease( props );
#endif
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 );
joy->js.dwFlags = JOY_RETURNALL;
joy->js.dwSize = sizeof( joy->js );
@@
-1284,7
+1289,7
@@
static void fghJoystickOpen( SFG_Joystick* joy )
}
#endif
}
#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;
#if defined( __FreeBSD__ ) || defined( __NetBSD__ )
for( i = 0; i < _JS_MAX_AXES; i++ )
joy->os->cache_axes[ i ] = 0.0f;
@@
-1389,7
+1394,7
@@
static void fghJoystickOpen( SFG_Joystick* joy )
# endif
#endif
# endif
#endif
-#if defined( __linux__ )
+#if defined( __linux__ ) || TARGET_HOST_SOLARIS
/* Default for older Linux systems. */
joy->num_axes = 2;
joy->num_buttons = 32;
/* Default for older Linux systems. */
joy->num_axes = 2;
joy->num_buttons = 32;
@@
-1530,7
+1535,7
@@
static void fghJoystickInit( int ident )
}
#endif
}
#endif
-#if TARGET_HOST_WIN32
+#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
switch( ident )
{
case 0:
switch( ident )
{
case 0:
@@
-1548,7
+1553,7
@@
static void fghJoystickInit( int ident )
}
#endif
}
#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;
# if defined( __FreeBSD__ ) || defined( __NetBSD__ )
fgJoystick[ ident ]->id = ident;
fgJoystick[ ident ]->error = GL_FALSE;
@@
-1613,11
+1618,11
@@
void fgJoystickClose( void )
close( fgJoystick[ ident ]->hidDev );
#endif
close( fgJoystick[ ident ]->hidDev );
#endif
-#if TARGET_HOST_WIN32
+#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
/* Do nothing special */
#endif
/* Do nothing special */
#endif
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
#if defined( __FreeBSD__ ) || defined( __NetBSD__ )
if( fgJoystick[ident]->os )
{
#if defined( __FreeBSD__ ) || defined( __NetBSD__ )
if( fgJoystick[ident]->os )
{
@@
-1683,9
+1688,6
@@
int fgJoystickDetect( void )
fgInitialiseJoysticks ();
fgInitialiseJoysticks ();
- if ( !fgJoystick )
- return 0;
-
if ( !fgState.JoysticksInitialised )
return 0;
if ( !fgState.JoysticksInitialised )
return 0;