aboutsummaryrefslogtreecommitdiff
path: root/macosx/plugins/DFInput/SDL
diff options
context:
space:
mode:
authornotaz2010-11-16 18:39:07 +0200
committernotaz2010-11-17 00:58:09 +0200
commitaa1fc44b4532dc68be2482730a275f8a3ba8a039 (patch)
tree95f1ec936aa776158f8b76e805eb0c1eafe473b0 /macosx/plugins/DFInput/SDL
parentef79bbde537d6b9c745a7d86cb9df1d04c35590d (diff)
downloadpcsx_rearmed-aa1fc44b4532dc68be2482730a275f8a3ba8a039.tar.gz
pcsx_rearmed-aa1fc44b4532dc68be2482730a275f8a3ba8a039.tar.bz2
pcsx_rearmed-aa1fc44b4532dc68be2482730a275f8a3ba8a039.zip
remove stuff we won't need
this makes the source tree more pleasant to work with.
Diffstat (limited to 'macosx/plugins/DFInput/SDL')
-rw-r--r--macosx/plugins/DFInput/SDL/include/SDL.h151
-rw-r--r--macosx/plugins/DFInput/SDL/include/SDL_config.h313
-rw-r--r--macosx/plugins/DFInput/SDL/include/SDL_endian.h258
-rw-r--r--macosx/plugins/DFInput/SDL/include/SDL_error.h78
-rw-r--r--macosx/plugins/DFInput/SDL/include/SDL_haptic.h1123
-rw-r--r--macosx/plugins/DFInput/SDL/include/SDL_joystick.h209
-rw-r--r--macosx/plugins/DFInput/SDL/include/SDL_main.h96
-rw-r--r--macosx/plugins/DFInput/SDL/include/SDL_platform.h154
-rw-r--r--macosx/plugins/DFInput/SDL/include/SDL_stdinc.h792
-rw-r--r--macosx/plugins/DFInput/SDL/include/begin_code.h136
-rw-r--r--macosx/plugins/DFInput/SDL/include/close_code.h38
-rw-r--r--macosx/plugins/DFInput/SDL/src/SDL.c101
-rw-r--r--macosx/plugins/DFInput/SDL/src/SDL_error.c259
-rw-r--r--macosx/plugins/DFInput/SDL/src/SDL_error_c.h62
-rw-r--r--macosx/plugins/DFInput/SDL/src/haptic/SDL_haptic.c708
-rw-r--r--macosx/plugins/DFInput/SDL/src/haptic/SDL_haptic_c.h26
-rw-r--r--macosx/plugins/DFInput/SDL/src/haptic/SDL_syshaptic.h201
-rw-r--r--macosx/plugins/DFInput/SDL/src/haptic/darwin/SDL_syshaptic.c1321
-rw-r--r--macosx/plugins/DFInput/SDL/src/joystick/SDL_joystick.c503
-rw-r--r--macosx/plugins/DFInput/SDL/src/joystick/SDL_joystick_c.h47
-rw-r--r--macosx/plugins/DFInput/SDL/src/joystick/SDL_sysjoystick.h85
-rw-r--r--macosx/plugins/DFInput/SDL/src/joystick/darwin/SDL_sysjoystick.c847
-rw-r--r--macosx/plugins/DFInput/SDL/src/joystick/darwin/SDL_sysjoystick_c.h88
23 files changed, 0 insertions, 7596 deletions
diff --git a/macosx/plugins/DFInput/SDL/include/SDL.h b/macosx/plugins/DFInput/SDL/include/SDL.h
deleted file mode 100644
index 6032d95..0000000
--- a/macosx/plugins/DFInput/SDL/include/SDL.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-// 7/31/2010 Wei Mingzhi
-// Removed everything unrated to Mac OS X Joystick support
-
-/**
- * \file SDL.h
- *
- * Main include header for the SDL library
- */
-
-/**
- * \mainpage Simple DirectMedia Layer (SDL)
- *
- * http://www.libsdl.org/
- *
- * \section intro_sec Introduction
- *
- * This is the Simple DirectMedia Layer, a general API that provides low
- * level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL,
- * and 2D framebuffer across multiple platforms.
- *
- * The current version supports Windows, Windows CE, Mac OS X, Linux,
- * FreeBSD, NetBSD, OpenBSD, BSD/OS, Solaris, and QNX. The code contains
- * support for other operating systems but those are not officially supported.
- *
- * SDL is written in C, but works with C++ natively, and has bindings to
- * several other languages, including Ada, C#, Eiffel, Erlang, Euphoria,
- * Guile, Haskell, Java, Lisp, Lua, ML, Objective C, Pascal, Perl, PHP,
- * Pike, Pliant, Python, Ruby, and Smalltalk.
- *
- * This library is distributed under GNU LGPL version 2, which can be
- * found in the file "COPYING". This license allows you to use SDL
- * freely in commercial programs as long as you link with the dynamic
- * library.
- *
- * The best way to learn how to use SDL is to check out the header files in
- * the "include" subdirectory and the programs in the "test" subdirectory.
- * The header files and test programs are well commented and always up to date.
- * More documentation is available in HTML format in "docs/index.html", and
- * a documentation wiki is available online at:
- * http://www.libsdl.org/cgi/docwiki.cgi
- *
- * The test programs in the "test" subdirectory are in the public domain.
- *
- * Frequently asked questions are answered online:
- * http://www.libsdl.org/faq.php
- *
- * If you need help with the library, or just want to discuss SDL related
- * issues, you can join the developers mailing list:
- * http://www.libsdl.org/mailing-list.php
- *
- * Enjoy!
- * Sam Lantinga (slouken@libsdl.org)
- */
-
-#ifndef _SDL_H
-#define _SDL_H
-
-#include "SDL_main.h"
-#include "SDL_stdinc.h"
-#include "SDL_endian.h"
-#include "SDL_error.h"
-
-#ifndef SDL_IGNORE
-#define SDL_IGNORE 0
-#endif
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* As of version 0.5, SDL is loaded dynamically into the application */
-
-/**
- * \name SDL_INIT_*
- *
- * These are the flags which may be passed to SDL_Init(). You should
- * specify the subsystems which you will be using in your application.
- */
-/*@{*/
-#define SDL_INIT_JOYSTICK 0x00000200
-#define SDL_INIT_HAPTIC 0x00001000
-#define SDL_INIT_NOPARACHUTE 0x00100000 /**< Don't catch fatal signals */
-#define SDL_INIT_EVERYTHING 0x0000FFFF
-/*@}*/
-
-/**
- * This function loads the SDL dynamically linked library and initializes
- * the subsystems specified by \c flags (and those satisfying dependencies).
- * Unless the ::SDL_INIT_NOPARACHUTE flag is set, it will install cleanup
- * signal handlers for some commonly ignored fatal signals (like SIGSEGV).
- */
-extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags);
-
-/**
- * This function initializes specific SDL subsystems
- */
-extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags);
-
-/**
- * This function cleans up specific SDL subsystems
- */
-extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);
-
-/**
- * This function returns mask of the specified subsystems which have
- * been initialized.
- *
- * If \c flags is 0, it returns a mask of all initialized subsystems.
- */
-extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags);
-
-/**
- * This function cleans up all initialized subsystems and unloads the
- * dynamically linked library. You should call it upon all exit conditions.
- */
-extern DECLSPEC void SDLCALL SDL_Quit(void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_H */
diff --git a/macosx/plugins/DFInput/SDL/include/SDL_config.h b/macosx/plugins/DFInput/SDL/include/SDL_config.h
deleted file mode 100644
index 81eda63..0000000
--- a/macosx/plugins/DFInput/SDL/include/SDL_config.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/* include/SDL_config.h. Generated from SDL_config.h.in by configure. */
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-#ifndef _SDL_config_h
-#define _SDL_config_h
-
-/**
- * \file SDL_config.h.in
- *
- * This is a set of defines to configure the SDL features
- */
-
-/* General platform specific identifiers */
-#include "SDL_platform.h"
-
-/* Make sure that this isn't included by Visual C++ */
-#ifdef _MSC_VER
-#error You should copy include/SDL_config.h.default to include/SDL_config.h
-#endif
-
-/* C language features */
-/* #undef const */
-/* #undef inline */
-/* #undef volatile */
-
-/* C datatypes */
-#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
-/* #undef size_t */
-/* #undef int8_t */
-/* #undef uint8_t */
-/* #undef int16_t */
-/* #undef uint16_t */
-/* #undef int32_t */
-/* #undef uint32_t */
-/* #undef int64_t */
-/* #undef uint64_t */
-/* #undef uintptr_t */
-#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
-
-#define SIZEOF_VOIDP 4
-#define SDL_HAS_64BIT_TYPE 1
-
-/* Comment this if you want to build without any C library requirements */
-#define HAVE_LIBC 1
-#if HAVE_LIBC
-
-/* Useful headers */
-#define HAVE_ALLOCA_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STDARG_H 1
-/* #undef HAVE_MALLOC_H */
-#define HAVE_MEMORY_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-#define HAVE_ICONV_H 1
-#define HAVE_SIGNAL_H 1
-/* #undef HAVE_ALTIVEC_H */
-
-/* C library functions */
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#define HAVE_ALLOCA 1
-#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */
-#define HAVE_GETENV 1
-#define HAVE_SETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_UNSETENV 1
-#endif
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_BCOPY 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_STRLEN 1
-#define HAVE_STRLCPY 1
-#define HAVE_STRLCAT 1
-#define HAVE_STRDUP 1
-/* #undef HAVE__STRREV */
-/* #undef HAVE__STRUPR */
-/* #undef HAVE__STRLWR */
-/* #undef HAVE_INDEX */
-/* #undef HAVE_RINDEX */
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-/* #undef HAVE_ITOA */
-/* #undef HAVE__LTOA */
-/* #undef HAVE__UITOA */
-/* #undef HAVE__ULTOA */
-#define HAVE_STRTOL 1
-#define HAVE_STRTOUL 1
-/* #undef HAVE__I64TOA */
-/* #undef HAVE__UI64TOA */
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOULL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-/* #undef HAVE__STRICMP */
-#define HAVE_STRCASECMP 1
-/* #undef HAVE__STRNICMP */
-#define HAVE_STRNCASECMP 1
-#define HAVE_SSCANF 1
-#define HAVE_SNPRINTF 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_M_PI
-#define HAVE_CEIL 1
-#define HAVE_COPYSIGN 1
-#define HAVE_COS 1
-#define HAVE_COSF 1
-#define HAVE_FABS 1
-#define HAVE_FLOOR 1
-#define HAVE_LOG 1
-#define HAVE_POW 1
-#define HAVE_SCALBN 1
-#define HAVE_SIN 1
-#define HAVE_SINF 1
-#define HAVE_SQRT 1
-#define HAVE_SIGACTION 1
-#define HAVE_SETJMP 1
-#define HAVE_NANOSLEEP 1
-#define HAVE_SYSCONF 1
-#define HAVE_SYSCTLBYNAME 1
-/* #undef HAVE_CLOCK_GETTIME */
-/* #undef HAVE_GETPAGESIZE */
-#define HAVE_MPROTECT 1
-
-#else
-/* We may need some replacement for stdarg.h here */
-#include <stdarg.h>
-#endif /* HAVE_LIBC */
-
-/* SDL internal assertion support */
-/* #undef SDL_DEFAULT_ASSERT_LEVEL */
-
-/* Allow disabling of core subsystems */
-#define SDL_AUDIO_DISABLED 1
-#define SDL_CPUINFO_DISABLED 1
-#define SDL_EVENTS_DISABLED 1
-#define SDL_FILE_DISABLED 1
-/* #undef SDL_JOYSTICK_DISABLED */
-/* #undef SDL_HAPTIC_DISABLED */
-#define SDL_LOADSO_DISABLED 1
-#define SDL_THREADS_DISABLED 1
-#define SDL_TIMERS_DISABLED 1
-#define SDL_VIDEO_DISABLED 1
-#define SDL_POWER_DISABLED 1
-
-/* Enable various audio drivers */
-/* #undef SDL_AUDIO_DRIVER_ALSA */
-/* #undef SDL_AUDIO_DRIVER_ALSA_DYNAMIC */
-/* #undef SDL_AUDIO_DRIVER_ARTS */
-/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
-/* #undef SDL_AUDIO_DRIVER_PULSEAUDIO */
-/* #undef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC */
-/* #undef SDL_AUDIO_DRIVER_BEOSAUDIO */
-/* #undef SDL_AUDIO_DRIVER_BSD */
-/* #undef SDL_AUDIO_DRIVER_COREAUDIO */
-/* #undef SDL_AUDIO_DRIVER_DISK */
-/* #undef SDL_AUDIO_DRIVER_DUMMY */
-/* #undef SDL_AUDIO_DRIVER_DMEDIA */
-/* #undef SDL_AUDIO_DRIVER_DSOUND */
-/* #undef SDL_AUDIO_DRIVER_ESD */
-/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */
-/* #undef SDL_AUDIO_DRIVER_MMEAUDIO */
-/* #undef SDL_AUDIO_DRIVER_NAS */
-/* #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC */
-/* #undef SDL_AUDIO_DRIVER_NDS */
-/* #undef SDL_AUDIO_DRIVER_OSS */
-/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
-/* #undef SDL_AUDIO_DRIVER_PAUDIO */
-/* #undef SDL_AUDIO_DRIVER_QSA */
-/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */
-/* #undef SDL_AUDIO_DRIVER_WINWAVEOUT */
-/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND */
-/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC */
-
-/* Enable various input drivers */
-/* #undef SDL_INPUT_LINUXEV */
-/* #undef SDL_INPUT_TSLIB */
-/* #undef SDL_JOYSTICK_BEOS */
-/* #undef SDL_JOYSTICK_DINPUT */
-/* #undef SDL_JOYSTICK_DUMMY */
-#define SDL_JOYSTICK_IOKIT 1
-/* #undef SDL_JOYSTICK_LINUX */
-/* #undef SDL_JOYSTICK_NDS */
-/* #undef SDL_JOYSTICK_RISCOS */
-/* #undef SDL_JOYSTICK_WINMM */
-/* #undef SDL_JOYSTICK_USBHID */
-/* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
-/* #undef SDL_HAPTIC_DUMMY */
-/* #undef SDL_HAPTIC_LINUX */
-#define SDL_HAPTIC_IOKIT 1
-/* #undef SDL_HAPTIC_DINPUT */
-
-/* Enable various shared object loading systems */
-/* #undef SDL_LOADSO_BEOS */
-/* #undef SDL_LOADSO_DLCOMPAT */
-/* #undef SDL_LOADSO_DLOPEN */
-/* #undef SDL_LOADSO_DUMMY */
-/* #undef SDL_LOADSO_LDG */
-/* #undef SDL_LOADSO_WIN32 */
-
-/* Enable various threading systems */
-/* #undef SDL_THREAD_BEOS */
-/* #undef SDL_THREAD_NDS */
-/* #undef SDL_THREAD_PTHREAD */
-/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX */
-/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */
-/* #undef SDL_THREAD_SPROC */
-/* #undef SDL_THREAD_WIN32 */
-
-/* Enable various timer systems */
-/* #undef SDL_TIMER_BEOS */
-/* #undef SDL_TIMER_DUMMY */
-/* #undef SDL_TIMER_NDS */
-/* #undef SDL_TIMER_RISCOS */
-/* #undef SDL_TIMER_UNIX */
-/* #undef SDL_TIMER_WIN32 */
-/* #undef SDL_TIMER_WINCE */
-
-/* Enable various video drivers */
-/* #undef SDL_VIDEO_DRIVER_BWINDOW */
-/* #undef SDL_VIDEO_DRIVER_COCOA */
-/* #undef SDL_VIDEO_DRIVER_DIRECTFB */
-/* #undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC */
-#define SDL_VIDEO_DRIVER_DUMMY 1
-/* #undef SDL_VIDEO_DRIVER_FBCON */
-/* #undef SDL_VIDEO_DRIVER_NDS */
-/* #undef SDL_VIDEO_DRIVER_PHOTON */
-/* #undef SDL_VIDEO_DRIVER_QNXGF */
-/* #undef SDL_VIDEO_DRIVER_PS3 */
-/* #undef SDL_VIDEO_DRIVER_RISCOS */
-/* #undef SDL_VIDEO_DRIVER_SVGALIB */
-/* #undef SDL_VIDEO_DRIVER_WIN32 */
-/* #undef SDL_VIDEO_DRIVER_X11 */
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC */
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT */
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR */
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER */
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT */
-/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS */
-/* #undef SDL_VIDEO_DRIVER_X11_VIDMODE */
-/* #undef SDL_VIDEO_DRIVER_X11_XINERAMA */
-/* #undef SDL_VIDEO_DRIVER_X11_XRANDR */
-/* #undef SDL_VIDEO_DRIVER_X11_XINPUT */
-/* #undef SDL_VIDEO_DRIVER_X11_SCRNSAVER */
-/* #undef SDL_VIDEO_DRIVER_X11_XV */
-
-/* #undef SDL_VIDEO_RENDER_D3D */
-/* #undef SDL_VIDEO_RENDER_GDI */
-/* #undef SDL_VIDEO_RENDER_OGL */
-/* #undef SDL_VIDEO_RENDER_OGL_ES */
-/* #undef SDL_VIDEO_RENDER_X11 */
-/* #undef SDL_VIDEO_RENDER_GAPI */
-/* #undef SDL_VIDEO_RENDER_DDRAW */
-
-/* Enable OpenGL support */
-/* #undef SDL_VIDEO_OPENGL */
-/* #undef SDL_VIDEO_OPENGL_ES */
-/* #undef SDL_VIDEO_OPENGL_BGL */
-/* #undef SDL_VIDEO_OPENGL_CGL */
-/* #undef SDL_VIDEO_OPENGL_GLX */
-/* #undef SDL_VIDEO_OPENGL_WGL */
-/* #undef SDL_VIDEO_OPENGL_OSMESA */
-/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
-
-/* Enable system power support */
-/* #undef SDL_POWER_LINUX */
-/* #undef SDL_POWER_WINDOWS */
-/* #undef SDL_POWER_MACOSX */
-/* #undef SDL_POWER_BEOS */
-/* #undef SDL_POWER_NINTENDODS */
-/* #undef SDL_POWER_HARDWIRED */
-
-/* Enable assembly routines */
-/* #undef SDL_ASSEMBLY_ROUTINES */
-/* #undef SDL_ALTIVEC_BLITTERS */
-
-#endif /* _SDL_config_h */
diff --git a/macosx/plugins/DFInput/SDL/include/SDL_endian.h b/macosx/plugins/DFInput/SDL/include/SDL_endian.h
deleted file mode 100644
index de69e32..0000000
--- a/macosx/plugins/DFInput/SDL/include/SDL_endian.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-/**
- * \file SDL_endian.h
- *
- * Functions for reading and writing endian-specific values
- */
-
-#ifndef _SDL_endian_h
-#define _SDL_endian_h
-
-#include "SDL_stdinc.h"
-
-/**
- * \name The two types of endianness
- */
-/*@{*/
-#define SDL_LIL_ENDIAN 1234
-#define SDL_BIG_ENDIAN 4321
-/*@}*/
-
-#ifndef SDL_BYTEORDER /* Not defined in SDL_config.h? */
-#ifdef __linux__
-#include <endian.h>
-#define SDL_BYTEORDER __BYTE_ORDER
-#else /* __linux __ */
-#if defined(__hppa__) || \
- defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
- (defined(__MIPS__) && defined(__MISPEB__)) || \
- defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \
- defined(__sparc__)
-#define SDL_BYTEORDER SDL_BIG_ENDIAN
-#else
-#define SDL_BYTEORDER SDL_LIL_ENDIAN
-#endif
-#endif /* __linux __ */
-#endif /* !SDL_BYTEORDER */
-
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/**
- * \file SDL_endian.h
- *
- * Uses inline functions for compilers that support them, and static
- * functions for those that do not. Because these functions become
- * static for compilers that do not support inline functions, this
- * header should only be included in files that actually use them.
- */
-#if defined(__GNUC__) && defined(__i386__) && \
- !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */)
-static __inline__ Uint16
-SDL_Swap16(Uint16 x)
-{
- __asm__("xchgb %b0,%h0": "=q"(x):"0"(x));
- return x;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint16
-SDL_Swap16(Uint16 x)
-{
- __asm__("xchgb %b0,%h0": "=Q"(x):"0"(x));
- return x;
-}
-#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-static __inline__ Uint16
-SDL_Swap16(Uint16 x)
-{
- Uint16 result;
-
- __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x));
- return result;
-}
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
-static __inline__ Uint16
-SDL_Swap16(Uint16 x)
-{
- __asm__("rorw #8,%0": "=d"(x): "0"(x):"cc");
- return x;
-}
-#else
-static __inline__ Uint16
-SDL_Swap16(Uint16 x)
-{
- return SDL_static_cast(Uint16, ((x << 8) | (x >> 8)));
-}
-#endif
-
-#if defined(__GNUC__) && defined(__i386__)
-static __inline__ Uint32
-SDL_Swap32(Uint32 x)
-{
- __asm__("bswap %0": "=r"(x):"0"(x));
- return x;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint32
-SDL_Swap32(Uint32 x)
-{
- __asm__("bswapl %0": "=r"(x):"0"(x));
- return x;
-}
-#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
-static __inline__ Uint32
-SDL_Swap32(Uint32 x)
-{
- Uint32 result;
-
- __asm__("rlwimi %0,%2,24,16,23": "=&r"(result):"0"(x >> 24), "r"(x));
- __asm__("rlwimi %0,%2,8,8,15": "=&r"(result):"0"(result), "r"(x));
- __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x));
- return result;
-}
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
-static __inline__ Uint32
-SDL_Swap32(Uint32 x)
-{
- __asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0": "=d"(x): "0"(x):"cc");
- return x;
-}
-#else
-static __inline__ Uint32
-SDL_Swap32(Uint32 x)
-{
- return SDL_static_cast(Uint32, ((x << 24) | ((x << 8) & 0x00FF0000) |
- ((x >> 8) & 0x0000FF00) | (x >> 24)));
-}
-#endif
-
-#ifdef SDL_HAS_64BIT_TYPE
-#if defined(__GNUC__) && defined(__i386__)
-static __inline__ Uint64
-SDL_Swap64(Uint64 x)
-{
- union
- {
- struct
- {
- Uint32 a, b;
- } s;
- Uint64 u;
- } v;
- v.u = x;
- __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r"(v.s.a), "=r"(v.s.b):"0"(v.s.a),
- "1"(v.s.
- b));
- return v.u;
-}
-#elif defined(__GNUC__) && defined(__x86_64__)
-static __inline__ Uint64
-SDL_Swap64(Uint64 x)
-{
- __asm__("bswapq %0": "=r"(x):"0"(x));
- return x;
-}
-#else
-static __inline__ Uint64
-SDL_Swap64(Uint64 x)
-{
- Uint32 hi, lo;
-
- /* Separate into high and low 32-bit values and swap them */
- lo = SDL_static_cast(Uint32, x & 0xFFFFFFFF);
- x >>= 32;
- hi = SDL_static_cast(Uint32, x & 0xFFFFFFFF);
- x = SDL_Swap32(lo);
- x <<= 32;
- x |= SDL_Swap32(hi);
- return (x);
-}
-#endif
-#else
-/**
- * This is mainly to keep compilers from complaining in SDL code.
- * If there is no real 64-bit datatype, then compilers will complain about
- * the fake 64-bit datatype that SDL provides when it compiles user code.
- */
-#define SDL_Swap64(X) (X)
-#endif /* SDL_HAS_64BIT_TYPE */
-
-
-static __inline__ float
-SDL_SwapFloat(float x)
-{
- union
- {
- float f;
- Uint32 ui32;
- } swapper;
- swapper.f = x;
- swapper.ui32 = SDL_Swap32(swapper.ui32);
- return swapper.f;
-}
-
-
-/**
- * \name Swap to native
- * Byteswap item from the specified endianness to the native endianness.
- */
-/*@{*/
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-#define SDL_SwapLE16(X) (X)
-#define SDL_SwapLE32(X) (X)
-#define SDL_SwapLE64(X) (X)
-#define SDL_SwapFloatLE(X) (X)
-#define SDL_SwapBE16(X) SDL_Swap16(X)
-#define SDL_SwapBE32(X) SDL_Swap32(X)
-#define SDL_SwapBE64(X) SDL_Swap64(X)
-#define SDL_SwapFloatBE(X) SDL_SwapFloat(X)
-#else
-#define SDL_SwapLE16(X) SDL_Swap16(X)
-#define SDL_SwapLE32(X) SDL_Swap32(X)
-#define SDL_SwapLE64(X) SDL_Swap64(X)
-#define SDL_SwapFloatLE(X) SDL_SwapFloat(X)
-#define SDL_SwapBE16(X) (X)
-#define SDL_SwapBE32(X) (X)
-#define SDL_SwapBE64(X) (X)
-#define SDL_SwapFloatBE(X) (X)
-#endif
-/*@}*//*Swap to native*/
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_endian_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/macosx/plugins/DFInput/SDL/include/SDL_error.h b/macosx/plugins/DFInput/SDL/include/SDL_error.h
deleted file mode 100644
index a4a90d0..0000000
--- a/macosx/plugins/DFInput/SDL/include/SDL_error.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-/**
- * \file SDL_error.h
- *
- * Simple error message routines for SDL.
- */
-
-#ifndef _SDL_error_h
-#define _SDL_error_h
-
-#include "SDL_stdinc.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/* Public functions */
-extern DECLSPEC void SDLCALL SDL_SetError(const char *fmt, ...);
-extern DECLSPEC char *SDLCALL SDL_GetError(void);
-extern DECLSPEC void SDLCALL SDL_ClearError(void);
-
-/**
- * \name Internal error functions
- *
- * \internal
- * Private error message function - used internally.
- */
-/*@{*/
-#define SDL_OutOfMemory() SDL_Error(SDL_ENOMEM)
-#define SDL_Unsupported() SDL_Error(SDL_UNSUPPORTED)
-typedef enum
-{
- SDL_ENOMEM,
- SDL_EFREAD,
- SDL_EFWRITE,
- SDL_EFSEEK,
- SDL_UNSUPPORTED,
- SDL_LASTERROR
-} SDL_errorcode;
-extern DECLSPEC void SDLCALL SDL_Error(SDL_errorcode code);
-/*@}*//*Internal error functions*/
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_error_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/macosx/plugins/DFInput/SDL/include/SDL_haptic.h b/macosx/plugins/DFInput/SDL/include/SDL_haptic.h
deleted file mode 100644
index 52f33f1..0000000
--- a/macosx/plugins/DFInput/SDL/include/SDL_haptic.h
+++ /dev/null
@@ -1,1123 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 2008 Edgar Simo
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-/**
- * \file SDL_haptic.h
- *
- * \brief The SDL Haptic subsystem allows you to control haptic (force feedback)
- * devices.
- *
- * The basic usage is as follows:
- * - Initialize the Subsystem (::SDL_INIT_HAPTIC).
- * - Open a Haptic Device.
- * - SDL_HapticOpen() to open from index.
- * - SDL_HapticOpenFromJoystick() to open from an existing joystick.
- * - Create an effect (::SDL_HapticEffect).
- * - Upload the effect with SDL_HapticNewEffect().
- * - Run the effect with SDL_HapticRunEffect().
- * - (optional) Free the effect with SDL_HapticDestroyEffect().
- * - Close the haptic device with SDL_HapticClose().
- *
- * \par Example:
- * \code
- * int test_haptic( SDL_Joystick * joystick ) {
- * SDL_Haptic *haptic;
- * SDL_HapticEffect effect;
- * int effect_id;
- *
- * // Open the device
- * haptic = SDL_HapticOpenFromJoystick( joystick );
- * if (haptic == NULL) return -1; // Most likely joystick isn't haptic
- *
- * // See if it can do sine waves
- * if ((SDL_HapticQuery(haptic) & SDL_HAPTIC_SINE)==0) {
- * SDL_HapticClose(haptic); // No sine effect
- * return -1;
- * }
- *
- * // Create the effect
- * memset( &effect, 0, sizeof(SDL_HapticEffect) ); // 0 is safe default
- * effect.type = SDL_HAPTIC_SINE;
- * effect.periodic.direction.type = SDL_HAPTIC_POLAR; // Polar coordinates
- * effect.periodic.direction.dir[0] = 18000; // Force comes from south
- * effect.periodic.period = 1000; // 1000 ms
- * effect.periodic.magnitude = 20000; // 20000/32767 strength
- * effect.periodic.length = 5000; // 5 seconds long
- * effect.periodic.attack_length = 1000; // Takes 1 second to get max strength
- * effect.periodic.fade_length = 1000; // Takes 1 second to fade away
- *
- * // Upload the effect
- * effect_id = SDL_HapticNewEffect( haptic, &effect );
- *
- * // Test the effect
- * SDL_HapticRunEffect( haptic, effect_id, 1 );
- * SDL_Delay( 5000); // Wait for the effect to finish
- *
- * // We destroy the effect, although closing the device also does this
- * SDL_HapticDestroyEffect( haptic, effect_id );
- *
- * // Close the device
- * SDL_HapticClose(haptic);
- *
- * return 0; // Success
- * }
- * \endcode
- * \author Edgar Simo Serra
- */
-
-#ifndef _SDL_haptic_h
-#define _SDL_haptic_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_joystick.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
- /* *INDENT-ON* */
-#endif /* __cplusplus */
-
-/**
- * \typedef SDL_Haptic
- *
- * \brief The haptic structure used to identify an SDL haptic.
- *
- * \sa SDL_HapticOpen
- * \sa SDL_HapticOpenFromJoystick
- * \sa SDL_HapticClose
- */
-struct _SDL_Haptic;
-typedef struct _SDL_Haptic SDL_Haptic;
-
-
-/**
- * \name Haptic features
- *
- * Different haptic features a device can have.
- */
-/*@{*/
-
-/**
- * \name Haptic effects
- */
-/*@{*/
-
-/**
- * \brief Constant effect supported.
- *
- * Constant haptic effect.
- *
- * \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_CONSTANT (1<<0)
-
-/**
- * \brief Sine wave effect supported.
- *
- * Periodic haptic effect that simulates sine waves.
- *
- * \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_SINE (1<<1)
-
-/**
- * \brief Square wave effect supported.
- *
- * Periodic haptic effect that simulates square waves.
- *
- * \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_SQUARE (1<<2)
-
-/**
- * \brief Triangle wave effect supported.
- *
- * Periodic haptic effect that simulates triangular waves.
- *
- * \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_TRIANGLE (1<<3)
-
-/**
- * \brief Sawtoothup wave effect supported.
- *
- * Periodic haptic effect that simulates saw tooth up waves.
- *
- * \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_SAWTOOTHUP (1<<4)
-
-/**
- * \brief Sawtoothdown wave effect supported.
- *
- * Periodic haptic effect that simulates saw tooth down waves.
- *
- * \sa SDL_HapticPeriodic
- */
-#define SDL_HAPTIC_SAWTOOTHDOWN (1<<5)
-
-/**
- * \brief Ramp effect supported.
- *
- * Ramp haptic effect.
- *
- * \sa SDL_HapticRamp
- */
-#define SDL_HAPTIC_RAMP (1<<6)
-
-/**
- * \brief Spring effect supported - uses axes position.
- *
- * Condition haptic effect that simulates a spring. Effect is based on the
- * axes position.
- *
- * \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_SPRING (1<<7)
-
-/**
- * \brief Damper effect supported - uses axes velocity.
- *
- * Condition haptic effect that simulates dampening. Effect is based on the
- * axes velocity.
- *
- * \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_DAMPER (1<<8)
-
-/**
- * \brief Inertia effect supported - uses axes acceleration.
- *
- * Condition haptic effect that simulates inertia. Effect is based on the axes
- * acceleration.
- *
- * \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_INERTIA (1<<9)
-
-/**
- * \brief Friction effect supported - uses axes movement.
- *
- * Condition haptic effect that simulates friction. Effect is based on the
- * axes movement.
- *
- * \sa SDL_HapticCondition
- */
-#define SDL_HAPTIC_FRICTION (1<<10)
-
-/**
- * \brief Custom effect is supported.
- *
- * User defined custom haptic effect.
- */
-#define SDL_HAPTIC_CUSTOM (1<<11)
-
-/*@}*//*Haptic effects*/
-
-/* These last few are features the device has, not effects */
-
-/**
- * \brief Device can set global gain.
- *
- * Device supports setting the global gain.
- *
- * \sa SDL_HapticSetGain
- */
-#define SDL_HAPTIC_GAIN (1<<12)
-
-/**
- * \brief Device can set autocenter.
- *
- * Device supports setting autocenter.
- *
- * \sa SDL_HapticSetAutocenter
- */
-#define SDL_HAPTIC_AUTOCENTER (1<<13)
-
-/**
- * \brief Device can be queried for effect status.
- *
- * Device can be queried for effect status.
- *
- * \sa SDL_HapticGetEffectStatus
- */
-#define SDL_HAPTIC_STATUS (1<<14)
-
-/**
- * \brief Device can be paused.
- *
- * \sa SDL_HapticPause
- * \sa SDL_HapticUnpause
- */
-#define SDL_HAPTIC_PAUSE (1<<15)
-
-
-/**
- * \name Direction encodings
- */
-/*@{*/
-
-/**
- * \brief Uses polar coordinates for the direction.
- *
- * \sa SDL_HapticDirection
- */
-#define SDL_HAPTIC_POLAR 0
-
-/**
- * \brief Uses cartesian coordinates for the direction.
- *
- * \sa SDL_HapticDirection
- */
-#define SDL_HAPTIC_CARTESIAN 1
-
-/**
- * \brief Uses spherical coordinates for the direction.
- *
- * \sa SDL_HapticDirection
- */
-#define SDL_HAPTIC_SPHERICAL 2
-
-/*@}*//*Direction encodings*/
-
-/*@}*//*Haptic features*/
-
-/*
- * Misc defines.
- */
-
-/**
- * \brief Used to play a device an infinite number of times.
- *
- * \sa SDL_HapticRunEffect
- */
-#define SDL_HAPTIC_INFINITY 4294967295U
-
-
-/**
- * \brief Structure that represents a haptic direction.
- *
- * Directions can be specified by:
- * - ::SDL_HAPTIC_POLAR : Specified by polar coordinates.
- * - ::SDL_HAPTIC_CARTESIAN : Specified by cartesian coordinates.
- * - ::SDL_HAPTIC_SPHERICAL : Specified by spherical coordinates.
- *
- * Cardinal directions of the haptic device are relative to the positioning
- * of the device. North is considered to be away from the user.
- *
- * The following diagram represents the cardinal directions:
- * \verbatim
- .--.
- |__| .-------.
- |=.| |.-----.|
- |--| || ||
- | | |'-----'|
- |__|~')_____('
- [ COMPUTER ]
-
-
- North (0,-1)
- ^
- |
- |
- (1,0) West <----[ HAPTIC ]----> East (-1,0)
- |
- |
- v
- South (0,1)
-
-
- [ USER ]
- \|||/
- (o o)
- ---ooO-(_)-Ooo---
- \endverbatim
- *
- * If type is ::SDL_HAPTIC_POLAR, direction is encoded by hundredths of a
- * degree starting north and turning clockwise. ::SDL_HAPTIC_POLAR only uses
- * the first \c dir parameter. The cardinal directions would be:
- * - North: 0 (0 degrees)
- * - East: 9000 (90 degrees)
- * - South: 18000 (180 degrees)
- * - West: 27000 (270 degrees)
- *
- * If type is ::SDL_HAPTIC_CARTESIAN, direction is encoded by three positions
- * (X axis, Y axis and Z axis (with 3 axes)). ::SDL_HAPTIC_CARTESIAN uses
- * the first three \c dir parameters. The cardinal directions would be:
- * - North: 0,-1, 0
- * - East: -1, 0, 0
- * - South: 0, 1, 0
- * - West: 1, 0, 0
- *
- * The Z axis represents the height of the effect if supported, otherwise
- * it's unused. In cartesian encoding (1, 2) would be the same as (2, 4), you
- * can use any multiple you want, only the direction matters.
- *
- * If type is ::SDL_HAPTIC_SPHERICAL, direction is encoded by two rotations.
- * The first two \c dir parameters are used. The \c dir parameters are as
- * follows (all values are in hundredths of degrees):
- * - Degrees from (1, 0) rotated towards (0, 1).
- * - Degrees towards (0, 0, 1) (device needs at least 3 axes).
- *
- *
- * Example of force coming from the south with all encodings (force coming
- * from the south means the user will have to pull the stick to counteract):
- * \code
- * SDL_HapticDirection direction;
- *
- * // Cartesian directions
- * direction.type = SDL_HAPTIC_CARTESIAN; // Using cartesian direction encoding.
- * direction.dir[0] = 0; // X position
- * direction.dir[1] = 1; // Y position
- * // Assuming the device has 2 axes, we don't need to specify third parameter.
- *
- * // Polar directions
- * direction.type = SDL_HAPTIC_POLAR; // We'll be using polar direction encoding.
- * direction.dir[0] = 18000; // Polar only uses first parameter
- *
- * // Spherical coordinates
- * direction.type = SDL_HAPTIC_SPHERICAL; // Spherical encoding
- * direction.dir[0] = 9000; // Since we only have two axes we don't need more parameters.
- * \endcode
- *
- * \sa SDL_HAPTIC_POLAR
- * \sa SDL_HAPTIC_CARTESIAN
- * \sa SDL_HAPTIC_SPHERICAL
- * \sa SDL_HapticEffect
- * \sa SDL_HapticNumAxes
- */
-typedef struct SDL_HapticDirection
-{
- Uint8 type; /**< The type of encoding. */
- Sint32 dir[3]; /**< The encoded direction. */
-} SDL_HapticDirection;
-
-
-/**
- * \brief A structure containing a template for a Constant effect.
- *
- * The struct is exclusive to the ::SDL_HAPTIC_CONSTANT effect.
- *
- * A constant effect applies a constant force in the specified direction
- * to the joystick.
- *
- * \sa SDL_HAPTIC_CONSTANT
- * \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticConstant
-{
- /* Header */
- Uint16 type; /**< ::SDL_HAPTIC_CONSTANT */
- SDL_HapticDirection direction; /**< Direction of the effect. */
-
- /* Replay */
- Uint32 length; /**< Duration of the effect. */
- Uint16 delay; /**< Delay before starting the effect. */
-
- /* Trigger */
- Uint16 button; /**< Button that triggers the effect. */
- Uint16 interval; /**< How soon it can be triggered again after button. */
-
- /* Constant */
- Sint16 level; /**< Strength of the constant effect. */
-
- /* Envelope */
- Uint16 attack_length; /**< Duration of the attack. */
- Uint16 attack_level; /**< Level at the start of the attack. */
- Uint16 fade_length; /**< Duration of the fade. */
- Uint16 fade_level; /**< Level at the end of the fade. */
-} SDL_HapticConstant;
-
-/**
- * \brief A structure containing a template for a Periodic effect.
- *
- * The struct handles the following effects:
- * - ::SDL_HAPTIC_SINE
- * - ::SDL_HAPTIC_SQUARE
- * - ::SDL_HAPTIC_TRIANGLE
- * - ::SDL_HAPTIC_SAWTOOTHUP
- * - ::SDL_HAPTIC_SAWTOOTHDOWN
- *
- * A periodic effect consists in a wave-shaped effect that repeats itself
- * over time. The type determines the shape of the wave and the parameters
- * determine the dimensions of the wave.
- *
- * Phase is given by hundredth of a cyle meaning that giving the phase a value
- * of 9000 will displace it 25% of it's period. Here are sample values:
- * - 0: No phase displacement.
- * - 9000: Displaced 25% of it's period.
- * - 18000: Displaced 50% of it's period.
- * - 27000: Displaced 75% of it's period.
- * - 36000: Displaced 100% of it's period, same as 0, but 0 is preffered.
- *
- * Examples:
- * \verbatim
- SDL_HAPTIC_SINE
- __ __ __ __
- / \ / \ / \ /
- / \__/ \__/ \__/
-
- SDL_HAPTIC_SQUARE
- __ __ __ __ __
- | | | | | | | | | |
- | |__| |__| |__| |__| |
-
- SDL_HAPTIC_TRIANGLE
- /\ /\ /\ /\ /\
- / \ / \ / \ / \ /
- / \/ \/ \/ \/
-
- SDL_HAPTIC_SAWTOOTHUP
- /| /| /| /| /| /| /|
- / | / | / | / | / | / | / |
- / |/ |/ |/ |/ |/ |/ |
-
- SDL_HAPTIC_SAWTOOTHDOWN
- \ |\ |\ |\ |\ |\ |\ |
- \ | \ | \ | \ | \ | \ | \ |
- \| \| \| \| \| \| \|
- \endverbatim
- *
- * \sa SDL_HAPTIC_SINE
- * \sa SDL_HAPTIC_SQUARE
- * \sa SDL_HAPTIC_TRIANGLE
- * \sa SDL_HAPTIC_SAWTOOTHUP
- * \sa SDL_HAPTIC_SAWTOOTHDOWN
- * \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticPeriodic
-{
- /* Header */
- Uint16 type; /**< ::SDL_HAPTIC_SINE, ::SDL_HAPTIC_SQUARE,
- ::SDL_HAPTIC_TRIANGLE, ::SDL_HAPTIC_SAWTOOTHUP or
- ::SDL_HAPTIC_SAWTOOTHDOWN */
- SDL_HapticDirection direction; /**< Direction of the effect. */
-
- /* Replay */
- Uint32 length; /**< Duration of the effect. */
- Uint16 delay; /**< Delay before starting the effect. */
-
- /* Trigger */
- Uint16 button; /**< Button that triggers the effect. */
- Uint16 interval; /**< How soon it can be triggered again after button. */
-
- /* Periodic */
- Uint16 period; /**< Period of the wave. */
- Sint16 magnitude; /**< Peak value. */
- Sint16 offset; /**< Mean value of the wave. */
- Uint16 phase; /**< Horizontal shift given by hundredth of a cycle. */
-
- /* Envelope */
- Uint16 attack_length; /**< Duration of the attack. */
- Uint16 attack_level; /**< Level at the start of the attack. */
- Uint16 fade_length; /**< Duration of the fade. */
- Uint16 fade_level; /**< Level at the end of the fade. */
-} SDL_HapticPeriodic;
-
-/**
- * \brief A structure containing a template for a Condition effect.
- *
- * The struct handles the following effects:
- * - ::SDL_HAPTIC_SPRING: Effect based on axes position.
- * - ::SDL_HAPTIC_DAMPER: Effect based on axes velocity.
- * - ::SDL_HAPTIC_INERTIA: Effect based on axes acceleration.
- * - ::SDL_HAPTIC_FRICTION: Effect based on axes movement.
- *
- * Direction is handled by condition internals instead of a direction member.
- * The condition effect specific members have three parameters. The first
- * refers to the X axis, the second refers to the Y axis and the third
- * refers to the Z axis. The right terms refer to the positive side of the
- * axis and the left terms refer to the negative side of the axis. Please
- * refer to the ::SDL_HapticDirection diagram for which side is positive and
- * which is negative.
- *
- * \sa SDL_HapticDirection
- * \sa SDL_HAPTIC_SPRING
- * \sa SDL_HAPTIC_DAMPER
- * \sa SDL_HAPTIC_INERTIA
- * \sa SDL_HAPTIC_FRICTION
- * \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticCondition
-{
- /* Header */
- Uint16 type; /**< ::SDL_HAPTIC_SPRING, ::SDL_HAPTIC_DAMPER,
- ::SDL_HAPTIC_INERTIA or ::SDL_HAPTIC_FRICTION */
- SDL_HapticDirection direction; /**< Direction of the effect - Not used ATM. */
-
- /* Replay */
- Uint32 length; /**< Duration of the effect. */
- Uint16 delay; /**< Delay before starting the effect. */
-
- /* Trigger */
- Uint16 button; /**< Button that triggers the effect. */
- Uint16 interval; /**< How soon it can be triggered again after button. */
-
- /* Condition */
- Uint16 right_sat[3]; /**< Level when joystick is to the positive side. */
- Uint16 left_sat[3]; /**< Level when joystick is to the negative side. */
- Sint16 right_coeff[3]; /**< How fast to increase the force towards the positive side. */
- Sint16 left_coeff[3]; /**< How fast to increase the force towards the negative side. */
- Uint16 deadband[3]; /**< Size of the dead zone. */
- Sint16 center[3]; /**< Position of the dead zone. */
-} SDL_HapticCondition;
-
-/**
- * \brief A structure containing a template for a Ramp effect.
- *
- * This struct is exclusively for the ::SDL_HAPTIC_RAMP effect.
- *
- * The ramp effect starts at start strength and ends at end strength.
- * It augments in linear fashion. If you use attack and fade with a ramp
- * they effects get added to the ramp effect making the effect become
- * quadratic instead of linear.
- *
- * \sa SDL_HAPTIC_RAMP
- * \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticRamp
-{
- /* Header */
- Uint16 type; /**< ::SDL_HAPTIC_RAMP */
- SDL_HapticDirection direction; /**< Direction of the effect. */
-
- /* Replay */
- Uint32 length; /**< Duration of the effect. */
- Uint16 delay; /**< Delay before starting the effect. */
-
- /* Trigger */
- Uint16 button; /**< Button that triggers the effect. */
- Uint16 interval; /**< How soon it can be triggered again after button. */
-
- /* Ramp */
- Sint16 start; /**< Beginning strength level. */
- Sint16 end; /**< Ending strength level. */
-
- /* Envelope */
- Uint16 attack_length; /**< Duration of the attack. */
- Uint16 attack_level; /**< Level at the start of the attack. */
- Uint16 fade_length; /**< Duration of the fade. */
- Uint16 fade_level; /**< Level at the end of the fade. */
-} SDL_HapticRamp;
-
-/**
- * \brief A structure containing a template for the ::SDL_HAPTIC_CUSTOM effect.
- *
- * A custom force feedback effect is much like a periodic effect, where the
- * application can define it's exact shape. You will have to allocate the
- * data yourself. Data should consist of channels * samples Uint16 samples.
- *
- * If channels is one, the effect is rotated using the defined direction.
- * Otherwise it uses the samples in data for the different axes.
- *
- * \sa SDL_HAPTIC_CUSTOM
- * \sa SDL_HapticEffect
- */
-typedef struct SDL_HapticCustom
-{
- /* Header */
- Uint16 type; /**< ::SDL_HAPTIC_CUSTOM */
- SDL_HapticDirection direction; /**< Direction of the effect. */
-
- /* Replay */
- Uint32 length; /**< Duration of the effect. */
- Uint16 delay; /**< Delay before starting the effect. */
-
- /* Trigger */
- Uint16 button; /**< Button that triggers the effect. */
- Uint16 interval; /**< How soon it can be triggered again after button. */
-
- /* Custom */
- Uint8 channels; /**< Axes to use, minimum of one. */
- Uint16 period; /**< Sample periods. */
- Uint16 samples; /**< Amount of samples. */
- Uint16 *data; /**< Should contain channels*samples items. */
-
- /* Envelope */
- Uint16 attack_length; /**< Duration of the attack. */
- Uint16 attack_level; /**< Level at the start of the attack. */
- Uint16 fade_length; /**< Duration of the fade. */
- Uint16 fade_level; /**< Level at the end of the fade. */
-} SDL_HapticCustom;
-
-/**
- * \brief The generic template for any haptic effect.
- *
- * All values max at 32767 (0x7FFF). Signed values also can be negative.
- * Time values unless specified otherwise are in milliseconds.
- *
- * You can also pass ::SDL_HAPTIC_INFINITY to length instead of a 0-32767
- * value. Neither delay, interval, attack_length nor fade_length support
- * ::SDL_HAPTIC_INFINITY. Fade will also not be used since effect never ends.
- *
- * Additionally, the ::SDL_HAPTIC_RAMP effect does not support a duration of
- * ::SDL_HAPTIC_INFINITY.
- *
- * Button triggers may not be supported on all devices, it is advised to not
- * use them if possible. Buttons start at index 1 instead of index 0 like
- * they joystick.
- *
- * If both attack_length and fade_level are 0, the envelope is not used,
- * otherwise both values are used.
- *
- * Common parts:
- * \code
- * // Replay - All effects have this
- * Uint32 length; // Duration of effect (ms).
- * Uint16 delay; // Delay before starting effect.
- *
- * // Trigger - All effects have this
- * Uint16 button; // Button that triggers effect.
- * Uint16 interval; // How soon before effect can be triggered again.
- *
- * // Envelope - All effects except condition effects have this
- * Uint16 attack_length; // Duration of the attack (ms).
- * Uint16 attack_level; // Level at the start of the attack.
- * Uint16 fade_length; // Duration of the fade out (ms).
- * Uint16 fade_level; // Level at the end of the fade.
- * \endcode
- *
- *
- * Here we have an example of a constant effect evolution in time:
- * \verbatim
- Strength
- ^
- |
- | effect level --> _________________
- | / \
- | / \
- | / \
- | / \
- | attack_level --> | \
- | | | <--- fade_level
- |
- +--------------------------------------------------> Time
- [--] [---]
- attack_length fade_length
-
- [------------------][-----------------------]
- delay length
- \endverbatim
- *
- * Note either the attack_level or the fade_level may be above the actual
- * effect level.
- *
- * \sa SDL_HapticConstant
- * \sa SDL_HapticPeriodic
- * \sa SDL_HapticCondition
- * \sa SDL_HapticRamp
- * \sa SDL_HapticCustom
- */
-typedef union SDL_HapticEffect
-{
- /* Common for all force feedback effects */
- Uint16 type; /**< Effect type. */
- SDL_HapticConstant constant; /**< Constant effect. */
- SDL_HapticPeriodic periodic; /**< Periodic effect. */
- SDL_HapticCondition condition; /**< Condition effect. */
- SDL_HapticRamp ramp; /**< Ramp effect. */
- SDL_HapticCustom custom; /**< Custom effect. */
-} SDL_HapticEffect;
-
-
-/* Function prototypes */
-/**
- * \brief Count the number of joysticks attached to the system.
- *
- * \return Number of haptic devices detected on the system.
- */
-extern DECLSPEC int SDLCALL SDL_NumHaptics(void);
-
-/**
- * \brief Get the implementation dependent name of a Haptic device.
- *
- * This can be called before any joysticks are opened.
- * If no name can be found, this function returns NULL.
- *
- * \param device_index Index of the device to get it's name.
- * \return Name of the device or NULL on error.
- *
- * \sa SDL_NumHaptics
- */
-extern DECLSPEC const char *SDLCALL SDL_HapticName(int device_index);
-
-/**
- * \brief Opens a Haptic device for usage.
- *
- * The index passed as an argument refers to the N'th Haptic device on this
- * system.
- *
- * When opening a haptic device, it's gain will be set to maximum and
- * autocenter will be disabled. To modify these values use
- * SDL_HapticSetGain() and SDL_HapticSetAutocenter().
- *
- * \param device_index Index of the device to open.
- * \return Device identifier or NULL on error.
- *
- * \sa SDL_HapticIndex
- * \sa SDL_HapticOpenFromMouse
- * \sa SDL_HapticOpenFromJoystick
- * \sa SDL_HapticClose
- * \sa SDL_HapticSetGain
- * \sa SDL_HapticSetAutocenter
- * \sa SDL_HapticPause
- * \sa SDL_HapticStopAll
- */
-extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpen(int device_index);
-
-/**
- * \brief Checks if the haptic device at index has been opened.
- *
- * \param device_index Index to check to see if it has been opened.
- * \return 1 if it has been opened or 0 if it hasn't.
- *
- * \sa SDL_HapticOpen
- * \sa SDL_HapticIndex
- */
-extern DECLSPEC int SDLCALL SDL_HapticOpened(int device_index);
-
-/**
- * \brief Gets the index of a haptic device.
- *
- * \param haptic Haptic device to get the index of.
- * \return The index of the haptic device or -1 on error.
- *
- * \sa SDL_HapticOpen
- * \sa SDL_HapticOpened
- */
-extern DECLSPEC int SDLCALL SDL_HapticIndex(SDL_Haptic * haptic);
-
-/**
- * \brief Gets whether or not the current mouse has haptic capabilities.
- *
- * \return SDL_TRUE if the mouse is haptic, SDL_FALSE if it isn't.
- *
- * \sa SDL_HapticOpenFromMouse
- */
-extern DECLSPEC int SDLCALL SDL_MouseIsHaptic(void);
-
-/**
- * \brief Tries to open a haptic device from the current mouse.
- *
- * \return The haptic device identifier or NULL on error.
- *
- * \sa SDL_MouseIsHaptic
- * \sa SDL_HapticOpen
- */
-extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromMouse(void);
-
-/**
- * \brief Checks to see if a joystick has haptic features.
- *
- * \param joystick Joystick to test for haptic capabilities.
- * \return 1 if the joystick is haptic, 0 if it isn't
- * or -1 if an error ocurred.
- *
- * \sa SDL_HapticOpenFromJoystick
- */
-extern DECLSPEC int SDLCALL SDL_JoystickIsHaptic(SDL_Joystick * joystick);
-
-/**
- * \brief Opens a Haptic device for usage from a Joystick device.
- *
- * You must still close the haptic device seperately. It will not be closed
- * with the joystick.
- *
- * When opening from a joystick you should first close the haptic device before
- * closing the joystick device. If not, on some implementations the haptic
- * device will also get unallocated and you'll be unable to use force feedback
- * on that device.
- *
- * \param joystick Joystick to create a haptic device from.
- * \return A valid haptic device identifier on success or NULL on error.
- *
- * \sa SDL_HapticOpen
- * \sa SDL_HapticClose
- */
-extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromJoystick(SDL_Joystick *
- joystick);
-
-/**
- * \brief Closes a Haptic device previously opened with SDL_HapticOpen().
- *
- * \param haptic Haptic device to close.
- */
-extern DECLSPEC void SDLCALL SDL_HapticClose(SDL_Haptic * haptic);
-
-/**
- * \brief Returns the number of effects a haptic device can store.
- *
- * On some platforms this isn't fully supported, and therefore is an
- * aproximation. Always check to see if your created effect was actually
- * created and do not rely solely on SDL_HapticNumEffects().
- *
- * \param haptic The haptic device to query effect max.
- * \return The number of effects the haptic device can store or
- * -1 on error.
- *
- * \sa SDL_HapticNumEffectsPlaying
- * \sa SDL_HapticQuery
- */
-extern DECLSPEC int SDLCALL SDL_HapticNumEffects(SDL_Haptic * haptic);
-
-/**
- * \brief Returns the number of effects a haptic device can play at the same
- * time.
- *
- * This is not supported on all platforms, but will always return a value.
- * Added here for the sake of completness.
- *
- * \param haptic The haptic device to query maximum playing effects.
- * \return The number of effects the haptic device can play at the same time
- * or -1 on error.
- *
- * \sa SDL_HapticNumEffects
- * \sa SDL_HapticQuery
- */
-extern DECLSPEC int SDLCALL SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic);
-
-/**
- * \brief Gets the haptic devices supported features in bitwise matter.
- *
- * Example:
- * \code
- * if (SDL_HapticQueryEffects(haptic) & SDL_HAPTIC_CONSTANT) {
- * printf("We have constant haptic effect!");
- * }
- * \endcode
- *
- * \param haptic The haptic device to query.
- * \return Haptic features in bitwise manner (OR'd).
- *
- * \sa SDL_HapticNumEffects
- * \sa SDL_HapticEffectSupported
- */
-extern DECLSPEC unsigned int SDLCALL SDL_HapticQuery(SDL_Haptic * haptic);
-
-
-/**
- * \brief Gets the number of haptic axes the device has.
- *
- * \sa SDL_HapticDirection
- */
-extern DECLSPEC int SDLCALL SDL_HapticNumAxes(SDL_Haptic * haptic);
-
-/**
- * \brief Checks to see if effect is supported by haptic.
- *
- * \param haptic Haptic device to check on.
- * \param effect Effect to check to see if it is supported.
- * \return 1 if effect is supported, 0 if it isn't or -1 on error.
- *
- * \sa SDL_HapticQuery
- * \sa SDL_HapticNewEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticEffectSupported(SDL_Haptic * haptic,
- SDL_HapticEffect *
- effect);
-
-/**
- * \brief Creates a new haptic effect on the device.
- *
- * \param haptic Haptic device to create the effect on.
- * \param effect Properties of the effect to create.
- * \return The id of the effect on success or -1 on error.
- *
- * \sa SDL_HapticUpdateEffect
- * \sa SDL_HapticRunEffect
- * \sa SDL_HapticDestroyEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticNewEffect(SDL_Haptic * haptic,
- SDL_HapticEffect * effect);
-
-/**
- * \brief Updates the properties of an effect.
- *
- * Can be used dynamically, although behaviour when dynamically changing
- * direction may be strange. Specifically the effect may reupload itself
- * and start playing from the start. You cannot change the type either when
- * running SDL_HapticUpdateEffect().
- *
- * \param haptic Haptic device that has the effect.
- * \param effect Effect to update.
- * \param data New effect properties to use.
- * \return The id of the effect on success or -1 on error.
- *
- * \sa SDL_HapticNewEffect
- * \sa SDL_HapticRunEffect
- * \sa SDL_HapticDestroyEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticUpdateEffect(SDL_Haptic * haptic,
- int effect,
- SDL_HapticEffect * data);
-
-/**
- * \brief Runs the haptic effect on it's assosciated haptic device.
- *
- * If iterations are ::SDL_HAPTIC_INFINITY, it'll run the effect over and over
- * repeating the envelope (attack and fade) every time. If you only want the
- * effect to last forever, set ::SDL_HAPTIC_INFINITY in the effect's length
- * parameter.
- *
- * \param haptic Haptic device to run the effect on.
- * \param effect Identifier of the haptic effect to run.
- * \param iterations Number of iterations to run the effect. Use
- * ::SDL_HAPTIC_INFINITY for infinity.
- * \return 0 on success or -1 on error.
- *
- * \sa SDL_HapticStopEffect
- * \sa SDL_HapticDestroyEffect
- * \sa SDL_HapticGetEffectStatus
- */
-extern DECLSPEC int SDLCALL SDL_HapticRunEffect(SDL_Haptic * haptic,
- int effect,
- Uint32 iterations);
-
-/**
- * \brief Stops the haptic effect on it's assosciated haptic device.
- *
- * \param haptic Haptic device to stop the effect on.
- * \param effect Identifier of the effect to stop.
- * \return 0 on success or -1 on error.
- *
- * \sa SDL_HapticRunEffect
- * \sa SDL_HapticDestroyEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticStopEffect(SDL_Haptic * haptic,
- int effect);
-
-/**
- * \brief Destroys a haptic effect on the device.
- *
- * This will stop the effect if it's running. Effects are automatically
- * destroyed when the device is closed.
- *
- * \param haptic Device to destroy the effect on.
- * \param effect Identifier of the effect to destroy.
- *
- * \sa SDL_HapticNewEffect
- */
-extern DECLSPEC void SDLCALL SDL_HapticDestroyEffect(SDL_Haptic * haptic,
- int effect);
-
-/**
- * \brief Gets the status of the current effect on the haptic device.
- *
- * Device must support the ::SDL_HAPTIC_STATUS feature.
- *
- * \param haptic Haptic device to query the effect status on.
- * \param effect Identifier of the effect to query it's status.
- * \return 0 if it isn't playing, ::SDL_HAPTIC_PLAYING if it is playing
- * or -1 on error.
- *
- * \sa SDL_HapticRunEffect
- * \sa SDL_HapticStopEffect
- */
-extern DECLSPEC int SDLCALL SDL_HapticGetEffectStatus(SDL_Haptic * haptic,
- int effect);
-
-/**
- * \brief Sets the global gain of the device.
- *
- * Device must support the ::SDL_HAPTIC_GAIN feature.
- *
- * The user may specify the maxmimum gain by setting the environment variable
- * ::SDL_HAPTIC_GAIN_MAX which should be between 0 and 100. All calls to
- * SDL_HapticSetGain() will scale linearly using ::SDL_HAPTIC_GAIN_MAX as the
- * maximum.
- *
- * \param haptic Haptic device to set the gain on.
- * \param gain Value to set the gain to, should be between 0 and 100.
- * \return 0 on success or -1 on error.
- *
- * \sa SDL_HapticQuery
- */
-extern DECLSPEC int SDLCALL SDL_HapticSetGain(SDL_Haptic * haptic, int gain);
-
-/**
- * \brief Sets the global autocenter of the device.
- *
- * Autocenter should be between 0 and 100. Setting it to 0 will disable
- * autocentering.
- *
- * Device must support the ::SDL_HAPTIC_AUTOCENTER feature.
- *
- * \param haptic Haptic device to set autocentering on.
- * \param autocenter Value to set autocenter to, 0 disables autocentering.
- * \return 0 on success or -1 on error.
- *
- * \sa SDL_HapticQuery
- */
-extern DECLSPEC int SDLCALL SDL_HapticSetAutocenter(SDL_Haptic * haptic,
- int autocenter);
-
-/**
- * \brief Pauses a haptic device.
- *
- * Device must support the ::SDL_HAPTIC_PAUSE feature. Call
- * SDL_HapticUnpause() to resume playback.
- *
- * Do not modify the effects nor add new ones while the device is paused.
- * That can cause all sorts of weird errors.
- *
- * \param haptic Haptic device to pause.
- * \return 0 on success or -1 on error.
- *
- * \sa SDL_HapticUnpause
- */
-extern DECLSPEC int SDLCALL SDL_HapticPause(SDL_Haptic * haptic);
-
-/**
- * \brief Unpauses a haptic device.
- *
- * Call to unpause after SDL_HapticPause().
- *
- * \param haptic Haptic device to pause.
- * \return 0 on success or -1 on error.
- *
- * \sa SDL_HapticPause
- */
-extern DECLSPEC int SDLCALL SDL_HapticUnpause(SDL_Haptic * haptic);
-
-/**
- * \brief Stops all the currently playing effects on a haptic device.
- *
- * \param haptic Haptic device to stop.
- * \return 0 on success or -1 on error.
- */
-extern DECLSPEC int SDLCALL SDL_HapticStopAll(SDL_Haptic * haptic);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_haptic_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/macosx/plugins/DFInput/SDL/include/SDL_joystick.h b/macosx/plugins/DFInput/SDL/include/SDL_joystick.h
deleted file mode 100644
index 2e70862..0000000
--- a/macosx/plugins/DFInput/SDL/include/SDL_joystick.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-/**
- * \file SDL_joystick.h
- *
- * Include file for SDL joystick event handling
- */
-
-#ifndef _SDL_joystick_h
-#define _SDL_joystick_h
-
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/**
- * \file SDL_joystick.h
- *
- * In order to use these functions, SDL_Init() must have been called
- * with the ::SDL_INIT_JOYSTICK flag. This causes SDL to scan the system
- * for joysticks, and load appropriate drivers.
- */
-
-/* The joystick structure used to identify an SDL joystick */
-struct _SDL_Joystick;
-typedef struct _SDL_Joystick SDL_Joystick;
-
-
-/* Function prototypes */
-/**
- * Count the number of joysticks attached to the system
- */
-extern DECLSPEC int SDLCALL SDL_NumJoysticks(void);
-
-/**
- * Get the implementation dependent name of a joystick.
- * This can be called before any joysticks are opened.
- * If no name can be found, this function returns NULL.
- */
-extern DECLSPEC const char *SDLCALL SDL_JoystickName(int device_index);
-
-/**
- * Open a joystick for use.
- * The index passed as an argument refers tothe N'th joystick on the system.
- * This index is the value which will identify this joystick in future joystick
- * events.
- *
- * \return A joystick identifier, or NULL if an error occurred.
- */
-extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickOpen(int device_index);
-
-/**
- * Returns 1 if the joystick has been opened, or 0 if it has not.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickOpened(int device_index);
-
-/**
- * Get the device index of an opened joystick.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickIndex(SDL_Joystick * joystick);
-
-/**
- * Get the number of general axis controls on a joystick.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick * joystick);
-
-/**
- * Get the number of trackballs on a joystick.
- *
- * Joystick trackballs have only relative motion events associated
- * with them and their state cannot be polled.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick * joystick);
-
-/**
- * Get the number of POV hats on a joystick.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick * joystick);
-
-/**
- * Get the number of buttons on a joystick.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick * joystick);
-
-/**
- * Update the current state of the open joysticks.
- *
- * This is called automatically by the event loop if any joystick
- * events are enabled.
- */
-extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void);
-
-/**
- * Enable/disable joystick event polling.
- *
- * If joystick events are disabled, you must call SDL_JoystickUpdate()
- * yourself and check the state of the joystick when you want joystick
- * information.
- *
- * The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state);
-
-/**
- * Get the current state of an axis control on a joystick.
- *
- * The state is a value ranging from -32768 to 32767.
- *
- * The axis indices start at index 0.
- */
-extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick,
- int axis);
-
-/**
- * \name Hat positions
- */
-/*@{*/
-#define SDL_HAT_CENTERED 0x00
-#define SDL_HAT_UP 0x01
-#define SDL_HAT_RIGHT 0x02
-#define SDL_HAT_DOWN 0x04
-#define SDL_HAT_LEFT 0x08
-#define SDL_HAT_RIGHTUP (SDL_HAT_RIGHT|SDL_HAT_UP)
-#define SDL_HAT_RIGHTDOWN (SDL_HAT_RIGHT|SDL_HAT_DOWN)
-#define SDL_HAT_LEFTUP (SDL_HAT_LEFT|SDL_HAT_UP)
-#define SDL_HAT_LEFTDOWN (SDL_HAT_LEFT|SDL_HAT_DOWN)
-/*@}*/
-
-/**
- * Get the current state of a POV hat on a joystick.
- *
- * The hat indices start at index 0.
- *
- * \return The return value is one of the following positions:
- * - ::SDL_HAT_CENTERED
- * - ::SDL_HAT_UP
- * - ::SDL_HAT_RIGHT
- * - ::SDL_HAT_DOWN
- * - ::SDL_HAT_LEFT
- * - ::SDL_HAT_RIGHTUP
- * - ::SDL_HAT_RIGHTDOWN
- * - ::SDL_HAT_LEFTUP
- * - ::SDL_HAT_LEFTDOWN
- */
-extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick * joystick,
- int hat);
-
-/**
- * Get the ball axis change since the last poll.
- *
- * \return 0, or -1 if you passed it invalid parameters.
- *
- * The ball indices start at index 0.
- */
-extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick * joystick,
- int ball, int *dx, int *dy);
-
-/**
- * Get the current state of a button on a joystick.
- *
- * The button indices start at index 0.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick * joystick,
- int button);
-
-/**
- * Close a joystick previously opened with SDL_JoystickOpen().
- */
-extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick * joystick);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_joystick_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/macosx/plugins/DFInput/SDL/include/SDL_main.h b/macosx/plugins/DFInput/SDL/include/SDL_main.h
deleted file mode 100644
index 803aa0f..0000000
--- a/macosx/plugins/DFInput/SDL/include/SDL_main.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-#ifndef _SDL_main_h
-#define _SDL_main_h
-
-#include "SDL_stdinc.h"
-
-/**
- * \file SDL_main.h
- *
- * Redefine main() on some platforms so that it is called by SDL.
- */
-
-#if defined(__WIN32__) || \
- (defined(__MWERKS__) && !defined(__BEOS__)) || \
- defined(__SYMBIAN32__) || defined(__IPHONEOS__)
-
-#ifdef __cplusplus
-#define C_LINKAGE "C"
-#else
-#define C_LINKAGE
-#endif /* __cplusplus */
-
-/**
- * \file SDL_main.h
- *
- * The application's main() function must be called with C linkage,
- * and should be declared like this:
- * \code
- * #ifdef __cplusplus
- * extern "C"
- * #endif
- * int main(int argc, char *argv[])
- * {
- * }
- * \endcode
- */
-
-#define main SDL_main
-
-/**
- * The prototype for the application's main() function
- */
-extern C_LINKAGE int SDL_main(int argc, char *argv[]);
-
-
-/* From the SDL library code -- needed for registering the app on Win32 */
-#ifdef __WIN32__
-
-#include "begin_code.h"
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/**
- * This can be called to set the application class at startup
- */
-extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style,
- void *hInst);
-extern DECLSPEC void SDLCALL SDL_UnregisterApp(void);
-
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-#endif
-
-#endif /* Need to redefine main()? */
-
-#endif /* _SDL_main_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/macosx/plugins/DFInput/SDL/include/SDL_platform.h b/macosx/plugins/DFInput/SDL/include/SDL_platform.h
deleted file mode 100644
index f9429bd..0000000
--- a/macosx/plugins/DFInput/SDL/include/SDL_platform.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-/**
- * \file SDL_platform.h
- *
- * Try to get a standard set of platform defines.
- */
-
-#ifndef _SDL_platform_h
-#define _SDL_platform_h
-
-#if defined(_AIX)
-#undef __AIX__
-#define __AIX__ 1
-#endif
-#if defined(__BEOS__)
-#undef __BEOS__
-#define __BEOS__ 1
-#endif
-#if defined(__HAIKU__)
-#undef __HAIKU__
-#define __HAIKU__ 1
-#endif
-#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
-#undef __BSDI__
-#define __BSDI__ 1
-#endif
-#if defined(_arch_dreamcast)
-#undef __DREAMCAST__
-#define __DREAMCAST__ 1
-#endif
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-#undef __FREEBSD__
-#define __FREEBSD__ 1
-#endif
-#if defined(hpux) || defined(__hpux) || defined(__hpux__)
-#undef __HPUX__
-#define __HPUX__ 1
-#endif
-#if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE)
-#undef __IRIX__
-#define __IRIX__ 1
-#endif
-#if defined(linux) || defined(__linux) || defined(__linux__)
-#undef __LINUX__
-#define __LINUX__ 1
-#endif
-
-#if defined(__APPLE__)
-/* lets us know what version of Mac OS X we're compiling on */
-#include "AvailabilityMacros.h"
-#ifdef MAC_OS_X_VERSION_10_3
-#include "TargetConditionals.h" /* this header is in 10.3 or later */
-#if TARGET_OS_IPHONE
-/* if compiling for iPhone */
-#undef __IPHONEOS__
-#define __IPHONEOS__ 1
-#undef __MACOSX__
-#else
-/* if not compiling for iPhone */
-#undef __MACOSX__
-#define __MACOSX__ 1
-#endif /* TARGET_OS_IPHONE */
-#else
-/* if earlier verion of Mac OS X than version 10.3 */
-#undef __MACOSX__
-#define __MACOSX__ 1
-#endif
-
-#endif /* defined(__APPLE__) */
-
-#if defined(__NetBSD__)
-#undef __NETBSD__
-#define __NETBSD__ 1
-#endif
-#if defined(__OpenBSD__)
-#undef __OPENBSD__
-#define __OPENBSD__ 1
-#endif
-#if defined(__OS2__)
-#undef __OS2__
-#define __OS2__ 1
-#endif
-#if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE)
-#undef __OSF__
-#define __OSF__ 1
-#endif
-#if defined(__QNXNTO__)
-#undef __QNXNTO__
-#define __QNXNTO__ 1
-#endif
-#if defined(riscos) || defined(__riscos) || defined(__riscos__)
-#undef __RISCOS__
-#define __RISCOS__ 1
-#endif
-#if defined(__SVR4)
-#undef __SOLARIS__
-#define __SOLARIS__ 1
-#endif
-#if defined(WIN32) || defined(_WIN32)
-#undef __WIN32__
-#define __WIN32__ 1
-#endif
-
-#if defined(__NDS__)
-#undef __NINTENDODS__
-#define __NINTENDODS__ 1
-#endif
-
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-/**
- * \brief Gets the name of the platform.
- */
-extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void);
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_platform_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/macosx/plugins/DFInput/SDL/include/SDL_stdinc.h b/macosx/plugins/DFInput/SDL/include/SDL_stdinc.h
deleted file mode 100644
index ba1e5b5..0000000
--- a/macosx/plugins/DFInput/SDL/include/SDL_stdinc.h
+++ /dev/null
@@ -1,792 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-/**
- * \file SDL_stdinc.h
- *
- * This is a general header that includes C language support.
- */
-
-#ifndef _SDL_stdinc_h
-#define _SDL_stdinc_h
-
-#include "SDL_config.h"
-
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if defined(STDC_HEADERS)
-# include <stdlib.h>
-# include <stddef.h>
-# include <stdarg.h>
-#else
-# if defined(HAVE_STDLIB_H)
-# include <stdlib.h>
-# elif defined(HAVE_MALLOC_H)
-# include <malloc.h>
-# endif
-# if defined(HAVE_STDDEF_H)
-# include <stddef.h>
-# endif
-# if defined(HAVE_STDARG_H)
-# include <stdarg.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
-# include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#elif defined(HAVE_STDINT_H)
-# include <stdint.h>
-#endif
-#ifdef HAVE_CTYPE_H
-# include <ctype.h>
-#endif
-#ifdef HAVE_MATH_H
-# include <math.h>
-#endif
-#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
-# include <iconv.h>
-#endif
-
-/**
- * The number of elements in an array.
- */
-#define SDL_arraysize(array) (sizeof(array)/sizeof(array[0]))
-#define SDL_TABLESIZE(table) SDL_arraysize(table)
-
-/**
- * \name Cast operators
- *
- * Use proper C++ casts when compiled as C++ to be compatible with the option
- * -Wold-style-cast of GCC (and -Werror=old-style-cast in GCC 4.2 and above).
- */
-/*@{*/
-#ifdef __cplusplus
-#define SDL_reinterpret_cast(type, expression) reinterpret_cast<type>(expression)
-#define SDL_static_cast(type, expression) static_cast<type>(expression)
-#else
-#define SDL_reinterpret_cast(type, expression) ((type)(expression))
-#define SDL_static_cast(type, expression) ((type)(expression))
-#endif
-/*@}*//*Cast operators*/
-
-/* Define a four character code as a Uint32 */
-#define SDL_FOURCC(A, B, C, D) \
- ((SDL_static_cast(Uint32, SDL_static_cast(Uint8, (A))) << 0) | \
- (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (B))) << 8) | \
- (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (C))) << 16) | \
- (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (D))) << 24))
-
-/**
- * \name Basic data types
- */
-/*@{*/
-
-typedef enum
-{
- SDL_FALSE = 0,
- SDL_TRUE = 1
-} SDL_bool;
-
-/**
- * \brief A signed 8-bit integer type.
- */
-typedef int8_t Sint8;
-/**
- * \brief An unsigned 8-bit integer type.
- */
-typedef uint8_t Uint8;
-/**
- * \brief A signed 16-bit integer type.
- */
-typedef int16_t Sint16;
-/**
- * \brief An unsigned 16-bit integer type.
- */
-typedef uint16_t Uint16;
-/**
- * \brief A signed 32-bit integer type.
- */
-typedef int32_t Sint32;
-/**
- * \brief An unsigned 32-bit integer type.
- */
-typedef uint32_t Uint32;
-
-#ifdef SDL_HAS_64BIT_TYPE
-/**
- * \brief A signed 64-bit integer type.
- * \warning On platforms without any sort of 64-bit datatype, this is equivalent to Sint32!
- */
-typedef int64_t Sint64;
-/**
- * \brief An unsigned 64-bit integer type.
- * \warning On platforms without any sort of 64-bit datatype, this is equivalent to Uint32!
- */
-typedef uint64_t Uint64;
-#else
-/* This is really just a hack to prevent the compiler from complaining */
-typedef Sint32 Sint64;
-typedef Uint32 Uint64;
-#endif
-
-/*@}*//*Basic data types*/
-
-
-#define SDL_COMPILE_TIME_ASSERT(name, x) \
- typedef int SDL_dummy_ ## name[(x) * 2 - 1]
-/** \cond */
-#ifndef DOXYGEN_SHOULD_IGNORE_THIS
-SDL_COMPILE_TIME_ASSERT(uint8, sizeof(Uint8) == 1);
-SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1);
-SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2);
-SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2);
-SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4);
-SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4);
-#ifndef __NINTENDODS__ /* TODO: figure out why the following happens:
- include/SDL_stdinc.h:150: error: size of array 'SDL_dummy_uint64' is negative
- include/SDL_stdinc.h:151: error: size of array 'SDL_dummy_sint64' is negative */
-SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8);
-SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
-#endif
-#endif /* DOXYGEN_SHOULD_IGNORE_THIS */
-/** \endcond */
-
-/* Check to make sure enums are the size of ints, for structure packing.
- For both Watcom C/C++ and Borland C/C++ the compiler option that makes
- enums having the size of an int must be enabled.
- This is "-b" for Borland C/C++ and "-ei" for Watcom C/C++ (v11).
-*/
-/* Enable enums always int in CodeWarrior (for MPW use "-enum int") */
-#ifdef __MWERKS__
-#pragma enumsalwaysint on
-#endif
-
-/** \cond */
-#ifndef DOXYGEN_SHOULD_IGNORE_THIS
-#ifndef __NINTENDODS__ /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */
-typedef enum
-{
- DUMMY_ENUM_VALUE
-} SDL_DUMMY_ENUM;
-
-SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int));
-#endif
-#endif /* DOXYGEN_SHOULD_IGNORE_THIS */
-/** \endcond */
-
-#include "begin_code.h"
-/* Set up for C function definitions, even when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-extern "C" {
-/* *INDENT-ON* */
-#endif
-
-#ifdef HAVE_MALLOC
-#define SDL_malloc malloc
-#else
-extern DECLSPEC void *SDLCALL SDL_malloc(size_t size);
-#endif
-
-#ifdef HAVE_CALLOC
-#define SDL_calloc calloc
-#else
-extern DECLSPEC void *SDLCALL SDL_calloc(size_t nmemb, size_t size);
-#endif
-
-#ifdef HAVE_REALLOC
-#define SDL_realloc realloc
-#else
-extern DECLSPEC void *SDLCALL SDL_realloc(void *mem, size_t size);
-#endif
-
-#ifdef HAVE_FREE
-#define SDL_free free
-#else
-extern DECLSPEC void SDLCALL SDL_free(void *mem);
-#endif
-
-#if defined(HAVE_ALLOCA) && !defined(alloca)
-# if defined(HAVE_ALLOCA_H)
-# include <alloca.h>
-# elif defined(__GNUC__)
-# define alloca __builtin_alloca
-# elif defined(_MSC_VER)
-# include <malloc.h>
-# define alloca _alloca
-# elif defined(__WATCOMC__)
-# include <malloc.h>
-# elif defined(__BORLANDC__)
-# include <malloc.h>
-# elif defined(__DMC__)
-# include <stdlib.h>
-# elif defined(__AIX__)
-#pragma alloca
-# elif defined(__MRC__)
-void *alloca(unsigned);
-# else
-char *alloca();
-# endif
-#endif
-#ifdef HAVE_ALLOCA
-#define SDL_stack_alloc(type, count) (type*)alloca(sizeof(type)*(count))
-#define SDL_stack_free(data)
-#else
-#define SDL_stack_alloc(type, count) (type*)SDL_malloc(sizeof(type)*(count))
-#define SDL_stack_free(data) SDL_free(data)
-#endif
-
-#ifdef HAVE_GETENV
-#define SDL_getenv getenv
-#else
-extern DECLSPEC char *SDLCALL SDL_getenv(const char *name);
-#endif
-
-/* SDL_putenv() has moved to SDL_compat. */
-#ifdef HAVE_SETENV
-#define SDL_setenv setenv
-#else
-extern DECLSPEC int SDLCALL SDL_setenv(const char *name, const char *value,
- int overwrite);
-#endif
-
-#ifdef HAVE_QSORT
-#define SDL_qsort qsort
-#else
-extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size,
- int (*compare) (const void *,
- const void *));
-#endif
-
-#ifdef HAVE_ABS
-#define SDL_abs abs
-#else
-#define SDL_abs(X) ((X) < 0 ? -(X) : (X))
-#endif
-
-#define SDL_min(x, y) (((x) < (y)) ? (x) : (y))
-#define SDL_max(x, y) (((x) > (y)) ? (x) : (y))
-
-#ifdef HAVE_CTYPE_H
-#define SDL_isdigit(X) isdigit(X)
-#define SDL_isspace(X) isspace(X)
-#define SDL_toupper(X) toupper(X)
-#define SDL_tolower(X) tolower(X)
-#else
-#define SDL_isdigit(X) (((X) >= '0') && ((X) <= '9'))
-#define SDL_isspace(X) (((X) == ' ') || ((X) == '\t') || ((X) == '\r') || ((X) == '\n'))
-#define SDL_toupper(X) (((X) >= 'a') && ((X) <= 'z') ? ('A'+((X)-'a')) : (X))
-#define SDL_tolower(X) (((X) >= 'A') && ((X) <= 'Z') ? ('a'+((X)-'A')) : (X))
-#endif
-
-#ifdef HAVE_MEMSET
-#define SDL_memset memset
-#else
-extern DECLSPEC void *SDLCALL SDL_memset(void *dst, int c, size_t len);
-#endif
-#define SDL_zero(x) SDL_memset(&(x), 0, sizeof((x)))
-#define SDL_zerop(x) SDL_memset((x), 0, sizeof(*(x)))
-
-#if defined(__GNUC__) && defined(i386)
-#define SDL_memset4(dst, val, len) \
-do { \
- int u0, u1, u2; \
- __asm__ __volatile__ ( \
- "cld\n\t" \
- "rep ; stosl\n\t" \
- : "=&D" (u0), "=&a" (u1), "=&c" (u2) \
- : "0" (dst), "1" (val), "2" (SDL_static_cast(Uint32, len)) \
- : "memory" ); \
-} while(0)
-#endif
-#ifndef SDL_memset4
-#define SDL_memset4(dst, val, len) \
-do { \
- unsigned _count = (len); \
- unsigned _n = (_count + 3) / 4; \
- Uint32 *_p = SDL_static_cast(Uint32 *, dst); \
- Uint32 _val = (val); \
- if (len == 0) break; \
- switch (_count % 4) { \
- case 0: do { *_p++ = _val; \
- case 3: *_p++ = _val; \
- case 2: *_p++ = _val; \
- case 1: *_p++ = _val; \
- } while ( --_n ); \
- } \
-} while(0)
-#endif
-
-/* We can count on memcpy existing on Mac OS X and being well-tuned. */
-#if defined(__MACH__) && defined(__APPLE__)
-#define SDL_memcpy(dst, src, len) memcpy(dst, src, len)
-#elif defined(__GNUC__) && defined(i386)
-#define SDL_memcpy(dst, src, len) \
-do { \
- int u0, u1, u2; \
- __asm__ __volatile__ ( \
- "cld\n\t" \
- "rep ; movsl\n\t" \
- "testb $2,%b4\n\t" \
- "je 1f\n\t" \
- "movsw\n" \
- "1:\ttestb $1,%b4\n\t" \
- "je 2f\n\t" \
- "movsb\n" \
- "2:" \
- : "=&c" (u0), "=&D" (u1), "=&S" (u2) \
- : "0" (SDL_static_cast(unsigned, len)/4), "q" (len), "1" (dst),"2" (src) \
- : "memory" ); \
-} while(0)
-#endif
-#ifndef SDL_memcpy
-#ifdef HAVE_MEMCPY
-#define SDL_memcpy memcpy
-#elif defined(HAVE_BCOPY)
-#define SDL_memcpy(d, s, n) bcopy((s), (d), (n))
-#else
-extern DECLSPEC void *SDLCALL SDL_memcpy(void *dst, const void *src,
- size_t len);
-#endif
-#endif
-
-/* We can count on memcpy existing on Mac OS X and being well-tuned. */
-#if defined(__MACH__) && defined(__APPLE__)
-#define SDL_memcpy4(dst, src, len) memcpy(dst, src, (len)*4)
-#elif defined(__GNUC__) && defined(i386)
-#define SDL_memcpy4(dst, src, len) \
-do { \
- int ecx, edi, esi; \
- __asm__ __volatile__ ( \
- "cld\n\t" \
- "rep ; movsl" \
- : "=&c" (ecx), "=&D" (edi), "=&S" (esi) \
- : "0" (SDL_static_cast(unsigned, len)), "1" (dst), "2" (src) \
- : "memory" ); \
-} while(0)
-#endif
-#ifndef SDL_memcpy4
-#define SDL_memcpy4(dst, src, len) SDL_memcpy(dst, src, (len) << 2)
-#endif
-
-#if defined(__GNUC__) && defined(i386)
-#define SDL_revcpy(dst, src, len) \
-do { \
- int u0, u1, u2; \
- char *dstp = SDL_static_cast(char *, dst); \
- char *srcp = SDL_static_cast(char *, src); \
- int n = (len); \
- if ( n >= 4 ) { \
- __asm__ __volatile__ ( \
- "std\n\t" \
- "rep ; movsl\n\t" \
- "cld\n\t" \
- : "=&c" (u0), "=&D" (u1), "=&S" (u2) \
- : "0" (n >> 2), \
- "1" (dstp+(n-4)), "2" (srcp+(n-4)) \
- : "memory" ); \
- } \
- switch (n & 3) { \
- case 3: dstp[2] = srcp[2]; \
- case 2: dstp[1] = srcp[1]; \
- case 1: dstp[0] = srcp[0]; \
- break; \
- default: \
- break; \
- } \
-} while(0)
-#endif
-#ifndef SDL_revcpy
-extern DECLSPEC void *SDLCALL SDL_revcpy(void *dst, const void *src,
- size_t len);
-#endif
-
-#ifdef HAVE_MEMMOVE
-#define SDL_memmove memmove
-#elif defined(HAVE_BCOPY)
-#define SDL_memmove(d, s, n) bcopy((s), (d), (n))
-#else
-#define SDL_memmove(dst, src, len) \
-do { \
- if ( dst < src ) { \
- SDL_memcpy(dst, src, len); \
- } else { \
- SDL_revcpy(dst, src, len); \
- } \
-} while(0)
-#endif
-
-#ifdef HAVE_MEMCMP
-#define SDL_memcmp memcmp
-#else
-extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2,
- size_t len);
-#endif
-
-#ifdef HAVE_STRLEN
-#define SDL_strlen strlen
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlen(const char *string);
-#endif
-
-#ifdef HAVE_WCSLEN
-#define SDL_wcslen wcslen
-#else
-#if !defined(wchar_t) && defined(__NINTENDODS__)
-#define wchar_t short /* TODO: figure out why libnds doesn't have this */
-#endif
-extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t * string);
-#endif
-
-#ifdef HAVE_STRLCPY
-#define SDL_strlcpy strlcpy
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlcpy(char *dst, const char *src,
- size_t maxlen);
-#endif
-
-#ifdef HAVE_STRLCAT
-#define SDL_strlcat strlcat
-#else
-extern DECLSPEC size_t SDLCALL SDL_strlcat(char *dst, const char *src,
- size_t maxlen);
-#endif
-
-#ifdef HAVE_STRDUP
-#define SDL_strdup strdup
-#else
-extern DECLSPEC char *SDLCALL SDL_strdup(const char *string);
-#endif
-
-#ifdef HAVE__STRREV
-#define SDL_strrev _strrev
-#else
-extern DECLSPEC char *SDLCALL SDL_strrev(char *string);
-#endif
-
-#ifdef HAVE__STRUPR
-#define SDL_strupr _strupr
-#else
-extern DECLSPEC char *SDLCALL SDL_strupr(char *string);
-#endif
-
-#ifdef HAVE__STRLWR
-#define SDL_strlwr _strlwr
-#else
-extern DECLSPEC char *SDLCALL SDL_strlwr(char *string);
-#endif
-
-#ifdef HAVE_STRCHR
-#define SDL_strchr strchr
-#elif defined(HAVE_INDEX)
-#define SDL_strchr index
-#else
-extern DECLSPEC char *SDLCALL SDL_strchr(const char *string, int c);
-#endif
-
-#ifdef HAVE_STRRCHR
-#define SDL_strrchr strrchr
-#elif defined(HAVE_RINDEX)
-#define SDL_strrchr rindex
-#else
-extern DECLSPEC char *SDLCALL SDL_strrchr(const char *string, int c);
-#endif
-
-#ifdef HAVE_STRSTR
-#define SDL_strstr strstr
-#else
-extern DECLSPEC char *SDLCALL SDL_strstr(const char *haystack,
- const char *needle);
-#endif
-
-#ifdef HAVE_ITOA
-#define SDL_itoa itoa
-#else
-#define SDL_itoa(value, string, radix) SDL_ltoa((long)value, string, radix)
-#endif
-
-#ifdef HAVE__LTOA
-#define SDL_ltoa _ltoa
-#else
-extern DECLSPEC char *SDLCALL SDL_ltoa(long value, char *string, int radix);
-#endif
-
-#ifdef HAVE__UITOA
-#define SDL_uitoa _uitoa
-#else
-#define SDL_uitoa(value, string, radix) SDL_ultoa((long)value, string, radix)
-#endif
-
-#ifdef HAVE__ULTOA
-#define SDL_ultoa _ultoa
-#else
-extern DECLSPEC char *SDLCALL SDL_ultoa(unsigned long value, char *string,
- int radix);
-#endif
-
-#ifdef HAVE_STRTOL
-#define SDL_strtol strtol
-#else
-extern DECLSPEC long SDLCALL SDL_strtol(const char *string, char **endp,
- int base);
-#endif
-
-#ifdef HAVE_STRTOUL
-#define SDL_strtoul strtoul
-#else
-extern DECLSPEC unsigned long SDLCALL SDL_strtoul(const char *string,
- char **endp, int base);
-#endif
-
-#ifdef SDL_HAS_64BIT_TYPE
-
-#ifdef HAVE__I64TOA
-#define SDL_lltoa _i64toa
-#else
-extern DECLSPEC char *SDLCALL SDL_lltoa(Sint64 value, char *string,
- int radix);
-#endif
-
-#ifdef HAVE__UI64TOA
-#define SDL_ulltoa _ui64toa
-#else
-extern DECLSPEC char *SDLCALL SDL_ulltoa(Uint64 value, char *string,
- int radix);
-#endif
-
-#ifdef HAVE_STRTOLL
-#define SDL_strtoll strtoll
-#else
-extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *string, char **endp,
- int base);
-#endif
-
-#ifdef HAVE_STRTOULL
-#define SDL_strtoull strtoull
-#else
-extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *string, char **endp,
- int base);
-#endif
-
-#endif /* SDL_HAS_64BIT_TYPE */
-
-#ifdef HAVE_STRTOD
-#define SDL_strtod strtod
-#else
-extern DECLSPEC double SDLCALL SDL_strtod(const char *string, char **endp);
-#endif
-
-#ifdef HAVE_ATOI
-#define SDL_atoi atoi
-#else
-#define SDL_atoi(X) SDL_strtol(X, NULL, 0)
-#endif
-
-#ifdef HAVE_ATOF
-#define SDL_atof atof
-#else
-#define SDL_atof(X) SDL_strtod(X, NULL)
-#endif
-
-#ifdef HAVE_STRCMP
-#define SDL_strcmp strcmp
-#else
-extern DECLSPEC int SDLCALL SDL_strcmp(const char *str1, const char *str2);
-#endif
-
-#ifdef HAVE_STRNCMP
-#define SDL_strncmp strncmp
-#else
-extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2,
- size_t maxlen);
-#endif
-
-#ifdef HAVE_STRCASECMP
-#define SDL_strcasecmp strcasecmp
-#elif defined(HAVE__STRICMP)
-#define SDL_strcasecmp _stricmp
-#else
-extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1,
- const char *str2);
-#endif
-
-#ifdef HAVE_STRNCASECMP
-#define SDL_strncasecmp strncasecmp
-#elif defined(HAVE__STRNICMP)
-#define SDL_strncasecmp _strnicmp
-#else
-extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1,
- const char *str2, size_t maxlen);
-#endif
-
-#ifdef HAVE_SSCANF
-#define SDL_sscanf sscanf
-#else
-extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, const char *fmt,
- ...);
-#endif
-
-#ifdef HAVE_SNPRINTF
-#define SDL_snprintf snprintf
-#else
-extern DECLSPEC int SDLCALL SDL_snprintf(char *text, size_t maxlen,
- const char *fmt, ...);
-#endif
-
-#ifdef HAVE_VSNPRINTF
-#define SDL_vsnprintf vsnprintf
-#else
-extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen,
- const char *fmt, va_list ap);
-#endif
-
-#ifndef HAVE_M_PI
-#define M_PI 3.14159265358979323846264338327950288 /* pi */
-#endif
-
-#ifdef HAVE_CEIL
-#define SDL_ceil ceil
-#else
-#define SDL_ceil(x) ((double)(int)((x)+0.5))
-#endif
-
-#ifdef HAVE_COPYSIGN
-#define SDL_copysign copysign
-#else
-extern DECLSPEC double SDLCALL SDL_copysign(double x, double y);
-#endif
-
-#ifdef HAVE_COS
-#define SDL_cos cos
-#else
-extern DECLSPEC double SDLCALL SDL_cos(double x);
-#endif
-
-#ifdef HAVE_COSF
-#define SDL_cosf cosf
-#else
-#define SDL_cosf(x) (float)SDL_cos((double)x)
-#endif
-
-#ifdef HAVE_FABS
-#define SDL_fabs fabs
-#else
-extern DECLSPEC double SDLCALL SDL_fabs(double x);
-#endif
-
-#ifdef HAVE_FLOOR
-#define SDL_floor floor
-#else
-extern DECLSPEC double SDLCALL SDL_floor(double x);
-#endif
-
-#ifdef HAVE_LOG
-#define SDL_log log
-#else
-extern DECLSPEC double SDLCALL SDL_log(double x);
-#endif
-
-#ifdef HAVE_POW
-#define SDL_pow pow
-#else
-extern DECLSPEC double SDLCALL SDL_pow(double x, double y);
-#endif
-
-#ifdef HAVE_SCALBN
-#define SDL_scalbn scalbn
-#else
-extern DECLSPEC double SDLCALL SDL_scalbn(double x, int n);
-#endif
-
-#ifdef HAVE_SIN
-#define SDL_sin sin
-#else
-extern DECLSPEC double SDLCALL SDL_sin(double x);
-#endif
-
-#ifdef HAVE_SINF
-#define SDL_sinf sinf
-#else
-#define SDL_sinf(x) (float)SDL_sin((double)x)
-#endif
-
-#ifdef HAVE_SQRT
-#define SDL_sqrt sqrt
-#else
-extern DECLSPEC double SDLCALL SDL_sqrt(double x);
-#endif
-
-/* The SDL implementation of iconv() returns these error codes */
-#define SDL_ICONV_ERROR (size_t)-1
-#define SDL_ICONV_E2BIG (size_t)-2
-#define SDL_ICONV_EILSEQ (size_t)-3
-#define SDL_ICONV_EINVAL (size_t)-4
-
-#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
-#define SDL_iconv_t iconv_t
-#define SDL_iconv_open iconv_open
-#define SDL_iconv_close iconv_close
-#else
-typedef struct _SDL_iconv_t *SDL_iconv_t;
-extern DECLSPEC SDL_iconv_t SDLCALL SDL_iconv_open(const char *tocode,
- const char *fromcode);
-extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd);
-#endif
-extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf,
- size_t * inbytesleft, char **outbuf,
- size_t * outbytesleft);
-/**
- * This function converts a string between encodings in one pass, returning a
- * string that must be freed with SDL_free() or NULL on error.
- */
-extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode,
- const char *fromcode,
- const char *inbuf,
- size_t inbytesleft);
-#define SDL_iconv_utf8_locale(S) SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1)
-#define SDL_iconv_utf8_ucs2(S) (Uint16 *)SDL_iconv_string("UCS-2", "UTF-8", S, SDL_strlen(S)+1)
-#define SDL_iconv_utf8_ucs4(S) (Uint32 *)SDL_iconv_string("UCS-4", "UTF-8", S, SDL_strlen(S)+1)
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-/* *INDENT-OFF* */
-}
-/* *INDENT-ON* */
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_stdinc_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/macosx/plugins/DFInput/SDL/include/begin_code.h b/macosx/plugins/DFInput/SDL/include/begin_code.h
deleted file mode 100644
index 395dc7c..0000000
--- a/macosx/plugins/DFInput/SDL/include/begin_code.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-/**
- * \file begin_code.h
- *
- * This file sets things up for C dynamic library function definitions,
- * static inlined functions, and structures aligned at 4-byte alignment.
- * If you don't like ugly C preprocessor code, don't look at this file. :)
- */
-
-/* This shouldn't be nested -- included it around code only. */
-#ifdef _begin_code_h
-#error Nested inclusion of begin_code.h
-#endif
-#define _begin_code_h
-
-/* Some compilers use a special export keyword */
-#ifndef DECLSPEC
-# if defined(__BEOS__) || defined(__HAIKU__)
-# if defined(__GNUC__)
-# define DECLSPEC __declspec(dllexport)
-# else
-# define DECLSPEC __declspec(export)
-# endif
-# elif defined(__WIN32__)
-# ifdef __BORLANDC__
-# ifdef BUILD_SDL
-# define DECLSPEC
-# else
-# define DECLSPEC __declspec(dllimport)
-# endif
-# else
-# define DECLSPEC __declspec(dllexport)
-# endif
-# else
-# if defined(__GNUC__) && __GNUC__ >= 4
-# define DECLSPEC __attribute__ ((visibility("default")))
-# else
-# define DECLSPEC
-# endif
-# endif
-#endif
-
-/* By default SDL uses the C calling convention */
-#ifndef SDLCALL
-#if defined(__WIN32__) && !defined(__GNUC__)
-#define SDLCALL __cdecl
-#else
-#define SDLCALL
-#endif
-#endif /* SDLCALL */
-
-/* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */
-#ifdef __SYMBIAN32__
-#undef DECLSPEC
-#define DECLSPEC
-#endif /* __SYMBIAN32__ */
-
-/* Force structure packing at 4 byte alignment.
- This is necessary if the header is included in code which has structure
- packing set to an alternate value, say for loading structures from disk.
- The packing is reset to the previous value in close_code.h
- */
-#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__)
-#ifdef _MSC_VER
-#pragma warning(disable: 4103)
-#endif
-#ifdef __BORLANDC__
-#pragma nopackwarning
-#endif
-#pragma pack(push,4)
-#endif /* Compiler needs structure packing set */
-
-/* Set up compiler-specific options for inlining functions */
-#ifndef SDL_INLINE_OKAY
-#ifdef __GNUC__
-#define SDL_INLINE_OKAY
-#else
-/* Add any special compiler-specific cases here */
-#if defined(_MSC_VER) || defined(__BORLANDC__) || \
- defined(__DMC__) || defined(__SC__) || \
- defined(__WATCOMC__) || defined(__LCC__) || \
- defined(__DECC)
-#ifndef __inline__
-#define __inline__ __inline
-#endif
-#define SDL_INLINE_OKAY
-#else
-#if !defined(__MRC__) && !defined(_SGI_SOURCE)
-#ifndef __inline__
-#define __inline__ inline
-#endif
-#define SDL_INLINE_OKAY
-#endif /* Not a funky compiler */
-#endif /* Visual C++ */
-#endif /* GNU C */
-#endif /* SDL_INLINE_OKAY */
-
-/* If inlining isn't supported, remove "__inline__", turning static
- inlined functions into static functions (resulting in code bloat
- in all files which include the offending header files)
-*/
-#ifndef SDL_INLINE_OKAY
-#define __inline__
-#endif
-
-/* Apparently this is needed by several Windows compilers */
-#if !defined(__MACH__)
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void *)0)
-#endif
-#endif /* NULL */
-#endif /* ! Mac OS X - breaks precompiled headers */
diff --git a/macosx/plugins/DFInput/SDL/include/close_code.h b/macosx/plugins/DFInput/SDL/include/close_code.h
deleted file mode 100644
index 4b4e8a4..0000000
--- a/macosx/plugins/DFInput/SDL/include/close_code.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-/**
- * \file close_code.h
- *
- * This file reverses the effects of begin_code.h and should be included
- * after you finish any function and structure declarations in your headers
- */
-
-#undef _begin_code_h
-
-/* Reset structure packing at previous byte alignment */
-#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__WATCOMC__) || defined(__BORLANDC__)
-#ifdef __BORLANDC__
-#pragma nopackwarning
-#endif
-#pragma pack(pop)
-#endif /* Compiler needs structure packing set */
diff --git a/macosx/plugins/DFInput/SDL/src/SDL.c b/macosx/plugins/DFInput/SDL/src/SDL.c
deleted file mode 100644
index 8f8e676..0000000
--- a/macosx/plugins/DFInput/SDL/src/SDL.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-// 7/31/2010 Wei Mingzhi
-// Removed everything unrated to Mac OS X Joystick support
-
-#include "SDL_config.h"
-
-/* Initialization code for SDL */
-
-#include "SDL.h"
-#include "haptic/SDL_haptic_c.h"
-#include "joystick/SDL_joystick_c.h"
-
-/* The initialized subsystems */
-static Uint32 SDL_initialized = 0;
-
-int
-SDL_InitSubSystem(Uint32 flags)
-{
- /* Initialize the joystick subsystem */
- if ((flags & SDL_INIT_JOYSTICK) && !(SDL_initialized & SDL_INIT_JOYSTICK)) {
- if (SDL_JoystickInit() < 0) {
- return (-1);
- }
- SDL_initialized |= SDL_INIT_JOYSTICK;
- }
-
- /* Initialize the haptic subsystem */
- if ((flags & SDL_INIT_HAPTIC) && !(SDL_initialized & SDL_INIT_HAPTIC)) {
- if (SDL_HapticInit() < 0) {
- return (-1);
- }
- SDL_initialized |= SDL_INIT_HAPTIC;
- }
-
- return (0);
-}
-
-int
-SDL_Init(Uint32 flags)
-{
- /* Clear the error message */
- SDL_ClearError();
-
- /* Initialize the desired subsystems */
- if (SDL_InitSubSystem(flags) < 0) {
- return (-1);
- }
-
- return (0);
-}
-
-void
-SDL_QuitSubSystem(Uint32 flags)
-{
- /* Shut down requested initialized subsystems */
- if ((flags & SDL_initialized & SDL_INIT_JOYSTICK)) {
- SDL_JoystickQuit();
- SDL_initialized &= ~SDL_INIT_JOYSTICK;
- }
-
- if ((flags & SDL_initialized & SDL_INIT_HAPTIC)) {
- SDL_HapticQuit();
- SDL_initialized &= ~SDL_INIT_HAPTIC;
- }
-}
-
-Uint32
-SDL_WasInit(Uint32 flags)
-{
- if (!flags) {
- flags = SDL_INIT_EVERYTHING;
- }
- return (SDL_initialized & flags);
-}
-
-void
-SDL_Quit(void)
-{
- /* Quit all subsystems */
- SDL_QuitSubSystem(SDL_INIT_EVERYTHING);
-}
diff --git a/macosx/plugins/DFInput/SDL/src/SDL_error.c b/macosx/plugins/DFInput/SDL/src/SDL_error.c
deleted file mode 100644
index 55d183a..0000000
--- a/macosx/plugins/DFInput/SDL/src/SDL_error.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* Simple error handling in SDL */
-
-#include "SDL_error.h"
-#include "SDL_error_c.h"
-
-/* Routine to get the thread-specific error variable */
-#if SDL_THREADS_DISABLED
-/* !!! FIXME: what does this comment mean? Victim of Search and Replace? */
-/* The SDL_arraysize(The ),default (non-thread-safe) global error variable */
-static SDL_error SDL_global_error;
-#define SDL_GetErrBuf() (&SDL_global_error)
-#else
-extern SDL_error *SDL_GetErrBuf(void);
-#endif /* SDL_THREADS_DISABLED */
-
-#define SDL_ERRBUFIZE 1024
-
-/* Private functions */
-
-static const char *
-SDL_LookupString(const char *key)
-{
- /* FIXME: Add code to lookup key in language string hash-table */
- return key;
-}
-
-/* Public functions */
-
-void
-SDL_SetError(const char *fmt, ...)
-{
- va_list ap;
- SDL_error *error;
-
- /* Copy in the key, mark error as valid */
- error = SDL_GetErrBuf();
- error->error = 1;
- SDL_strlcpy((char *) error->key, fmt, sizeof(error->key));
-
- va_start(ap, fmt);
- error->argc = 0;
- while (*fmt) {
- if (*fmt++ == '%') {
- while (*fmt == '.' || (*fmt >= '0' && *fmt <= '9')) {
- ++fmt;
- }
- switch (*fmt++) {
- case 0: /* Malformed format string.. */
- --fmt;
- break;
- case 'c':
- case 'i':
- case 'd':
- case 'u':
- case 'o':
- case 'x':
- case 'X':
- error->args[error->argc++].value_i = va_arg(ap, int);
- break;
- case 'f':
- error->args[error->argc++].value_f = va_arg(ap, double);
- break;
- case 'p':
- error->args[error->argc++].value_ptr = va_arg(ap, void *);
- break;
- case 's':
- {
- int i = error->argc;
- const char *str = va_arg(ap, const char *);
- if (str == NULL)
- str = "(null)";
- SDL_strlcpy((char *) error->args[i].buf, str,
- ERR_MAX_STRLEN);
- error->argc++;
- }
- break;
- default:
- break;
- }
- if (error->argc >= ERR_MAX_ARGS) {
- break;
- }
- }
- }
- va_end(ap);
-
- /* If we are in debug mode, print out an error message */
-#ifdef DEBUG_ERROR
- fprintf(stderr, "SDL_SetError: %s\n", SDL_GetError());
-#endif
-}
-
-/* This function has a bit more overhead than most error functions
- so that it supports internationalization and thread-safe errors.
-*/
-static char *
-SDL_GetErrorMsg(char *errstr, unsigned int maxlen)
-{
- SDL_error *error;
-
- /* Clear the error string */
- *errstr = '\0';
- --maxlen;
-
- /* Get the thread-safe error, and print it out */
- error = SDL_GetErrBuf();
- if (error->error) {
- const char *fmt;
- char *msg = errstr;
- int len;
- int argi;
-
- fmt = SDL_LookupString(error->key);
- argi = 0;
- while (*fmt && (maxlen > 0)) {
- if (*fmt == '%') {
- char tmp[32], *spot = tmp;
- *spot++ = *fmt++;
- while ((*fmt == '.' || (*fmt >= '0' && *fmt <= '9'))
- && spot < (tmp + SDL_arraysize(tmp) - 2)) {
- *spot++ = *fmt++;
- }
- *spot++ = *fmt++;
- *spot++ = '\0';
- switch (spot[-2]) {
- case '%':
- *msg++ = '%';
- maxlen -= 1;
- break;
- case 'c':
- case 'i':
- case 'd':
- case 'u':
- case 'o':
- case 'x':
- case 'X':
- len =
- SDL_snprintf(msg, maxlen, tmp,
- error->args[argi++].value_i);
- msg += len;
- maxlen -= len;
- break;
- case 'f':
- len =
- SDL_snprintf(msg, maxlen, tmp,
- error->args[argi++].value_f);
- msg += len;
- maxlen -= len;
- break;
- case 'p':
- len =
- SDL_snprintf(msg, maxlen, tmp,
- error->args[argi++].value_ptr);
- msg += len;
- maxlen -= len;
- break;
- case 's':
- len =
- SDL_snprintf(msg, maxlen, tmp,
- SDL_LookupString(error->args[argi++].
- buf));
- msg += len;
- maxlen -= len;
- break;
- }
- } else {
- *msg++ = *fmt++;
- maxlen -= 1;
- }
- }
- *msg = 0; /* NULL terminate the string */
- }
- return (errstr);
-}
-
-/* Available for backwards compatibility */
-char *
-SDL_GetError(void)
-{
- static char errmsg[SDL_ERRBUFIZE];
-
- return ((char *) SDL_GetErrorMsg(errmsg, SDL_ERRBUFIZE));
-}
-
-void
-SDL_ClearError(void)
-{
- SDL_error *error;
-
- error = SDL_GetErrBuf();
- error->error = 0;
-}
-
-/* Very common errors go here */
-void
-SDL_Error(SDL_errorcode code)
-{
- switch (code) {
- case SDL_ENOMEM:
- SDL_SetError("Out of memory");
- break;
- case SDL_EFREAD:
- SDL_SetError("Error reading from datastream");
- break;
- case SDL_EFWRITE:
- SDL_SetError("Error writing to datastream");
- break;
- case SDL_EFSEEK:
- SDL_SetError("Error seeking in datastream");
- break;
- case SDL_UNSUPPORTED:
- SDL_SetError("That operation is not supported");
- break;
- default:
- SDL_SetError("Unknown SDL error");
- break;
- }
-}
-
-#ifdef TEST_ERROR
-int
-main(int argc, char *argv[])
-{
- char buffer[BUFSIZ + 1];
-
- SDL_SetError("Hi there!");
- printf("Error 1: %s\n", SDL_GetError());
- SDL_ClearError();
- SDL_memset(buffer, '1', BUFSIZ);
- buffer[BUFSIZ] = 0;
- SDL_SetError("This is the error: %s (%f)", buffer, 1.0);
- printf("Error 2: %s\n", SDL_GetError());
- exit(0);
-}
-#endif
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/macosx/plugins/DFInput/SDL/src/SDL_error_c.h b/macosx/plugins/DFInput/SDL/src/SDL_error_c.h
deleted file mode 100644
index 54501f5..0000000
--- a/macosx/plugins/DFInput/SDL/src/SDL_error_c.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* This file defines a structure that carries language-independent
- error messages
-*/
-
-#ifndef _SDL_error_c_h
-#define _SDL_error_c_h
-
-#define ERR_MAX_STRLEN 128
-#define ERR_MAX_ARGS 5
-
-typedef struct SDL_error
-{
- /* This is a numeric value corresponding to the current error */
- int error;
-
- /* This is a key used to index into a language hashtable containing
- internationalized versions of the SDL error messages. If the key
- is not in the hashtable, or no hashtable is available, the key is
- used directly as an error message format string.
- */
- char key[ERR_MAX_STRLEN];
-
- /* These are the arguments for the error functions */
- int argc;
- union
- {
- void *value_ptr;
-#if 0 /* What is a character anyway? (UNICODE issues) */
- unsigned char value_c;
-#endif
- int value_i;
- double value_f;
- char buf[ERR_MAX_STRLEN];
- } args[ERR_MAX_ARGS];
-} SDL_error;
-
-#endif /* _SDL_error_c_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/macosx/plugins/DFInput/SDL/src/haptic/SDL_haptic.c b/macosx/plugins/DFInput/SDL/src/haptic/SDL_haptic.c
deleted file mode 100644
index af8c39a..0000000
--- a/macosx/plugins/DFInput/SDL/src/haptic/SDL_haptic.c
+++ /dev/null
@@ -1,708 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 2008 Edgar Simo
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#include "SDL_syshaptic.h"
-#include "SDL_haptic_c.h"
-#include "../joystick/SDL_joystick_c.h" /* For SDL_PrivateJoystickValid */
-
-
-Uint8 SDL_numhaptics = 0;
-SDL_Haptic **SDL_haptics = NULL;
-
-
-/*
- * Initializes the Haptic devices.
- */
-int
-SDL_HapticInit(void)
-{
- int arraylen;
- int status;
-
- SDL_numhaptics = 0;
- status = SDL_SYS_HapticInit();
- if (status >= 0) {
- arraylen = (status + 1) * sizeof(*SDL_haptics);
- SDL_haptics = (SDL_Haptic **) SDL_malloc(arraylen);
- if (SDL_haptics == NULL) { /* Out of memory. */
- SDL_numhaptics = 0;
- } else {
- SDL_memset(SDL_haptics, 0, arraylen);
- SDL_numhaptics = status;
- }
- status = 0;
- }
-
- return status;
-}
-
-
-/*
- * Checks to see if the haptic device is valid
- */
-static int
-ValidHaptic(SDL_Haptic * haptic)
-{
- int i;
- int valid;
-
- valid = 0;
- if (haptic != NULL) {
- for (i = 0; i < SDL_numhaptics; i++) {
- if (SDL_haptics[i] == haptic) {
- valid = 1;
- break;
- }
- }
- }
-
- /* Create the error here. */
- if (valid == 0) {
- SDL_SetError("Haptic: Invalid haptic device identifier");
- }
-
- return valid;
-}
-
-
-/*
- * Returns the number of available devices.
- */
-int
-SDL_NumHaptics(void)
-{
- return SDL_numhaptics;
-}
-
-
-/*
- * Gets the name of a Haptic device by index.
- */
-const char *
-SDL_HapticName(int device_index)
-{
- if ((device_index < 0) || (device_index >= SDL_numhaptics)) {
- SDL_SetError("Haptic: There are %d haptic devices available",
- SDL_numhaptics);
- return NULL;
- }
- return SDL_SYS_HapticName(device_index);
-}
-
-
-/*
- * Opens a Haptic device.
- */
-SDL_Haptic *
-SDL_HapticOpen(int device_index)
-{
- int i;
- SDL_Haptic *haptic;
-
- if ((device_index < 0) || (device_index >= SDL_numhaptics)) {
- SDL_SetError("Haptic: There are %d haptic devices available",
- SDL_numhaptics);
- return NULL;
- }
-
- /* If the haptic is already open, return it */
- for (i = 0; SDL_haptics[i]; i++) {
- if (device_index == SDL_haptics[i]->index) {
- haptic = SDL_haptics[i];
- ++haptic->ref_count;
- return haptic;
- }
- }
-
- /* Create the haptic device */
- haptic = (SDL_Haptic *) SDL_malloc((sizeof *haptic));
- if (haptic == NULL) {
- SDL_OutOfMemory();
- return NULL;
- }
-
- /* Initialize the haptic device */
- SDL_memset(haptic, 0, (sizeof *haptic));
- haptic->index = device_index;
- if (SDL_SYS_HapticOpen(haptic) < 0) {
- SDL_free(haptic);
- return NULL;
- }
-
- /* Disable autocenter and set gain to max. */
- if (haptic->supported & SDL_HAPTIC_GAIN)
- SDL_HapticSetGain(haptic, 100);
- if (haptic->supported & SDL_HAPTIC_AUTOCENTER)
- SDL_HapticSetAutocenter(haptic, 0);
-
- /* Add haptic to list */
- ++haptic->ref_count;
- for (i = 0; SDL_haptics[i]; i++)
- /* Skip to next haptic */ ;
- SDL_haptics[i] = haptic;
-
- return haptic;
-}
-
-
-/*
- * Returns 1 if the device has been opened.
- */
-int
-SDL_HapticOpened(int device_index)
-{
- int i, opened;
-
- opened = 0;
- for (i = 0; SDL_haptics[i]; i++) {
- if (SDL_haptics[i]->index == (Uint8) device_index) {
- opened = 1;
- break;
- }
- }
- return opened;
-}
-
-
-/*
- * Returns the index to a haptic device.
- */
-int
-SDL_HapticIndex(SDL_Haptic * haptic)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- return haptic->index;
-}
-
-
-/*
- * Returns SDL_TRUE if mouse is haptic, SDL_FALSE if it isn't.
- */
-int
-SDL_MouseIsHaptic(void)
-{
- if (SDL_SYS_HapticMouse() < 0)
- return SDL_FALSE;
- return SDL_TRUE;
-}
-
-
-/*
- * Returns the haptic device if mouse is haptic or NULL elsewise.
- */
-SDL_Haptic *
-SDL_HapticOpenFromMouse(void)
-{
- int device_index;
-
- device_index = SDL_SYS_HapticMouse();
-
- if (device_index < 0) {
- SDL_SetError("Haptic: Mouse isn't a haptic device.");
- return NULL;
- }
-
- return SDL_HapticOpen(device_index);
-}
-
-
-/*
- * Returns SDL_TRUE if joystick has haptic features.
- */
-int
-SDL_JoystickIsHaptic(SDL_Joystick * joystick)
-{
- int ret;
-
- /* Must be a valid joystick */
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return -1;
- }
-
- ret = SDL_SYS_JoystickIsHaptic(joystick);
-
- if (ret > 0)
- return SDL_TRUE;
- else if (ret == 0)
- return SDL_FALSE;
- else
- return -1;
-}
-
-
-/*
- * Opens a haptic device from a joystick.
- */
-SDL_Haptic *
-SDL_HapticOpenFromJoystick(SDL_Joystick * joystick)
-{
- int i;
- SDL_Haptic *haptic;
-
- /* Must be a valid joystick */
- if (!SDL_PrivateJoystickValid(&joystick)) {
- SDL_SetError("Haptic: Joystick isn't valid.");
- return NULL;
- }
-
- /* Joystick must be haptic */
- if (SDL_SYS_JoystickIsHaptic(joystick) <= 0) {
- SDL_SetError("Haptic: Joystick isn't a haptic device.");
- return NULL;
- }
-
- /* Check to see if joystick's haptic is already open */
- for (i = 0; SDL_haptics[i]; i++) {
- if (SDL_SYS_JoystickSameHaptic(SDL_haptics[i], joystick)) {
- haptic = SDL_haptics[i];
- ++haptic->ref_count;
- return haptic;
- }
- }
-
- /* Create the haptic device */
- haptic = (SDL_Haptic *) SDL_malloc((sizeof *haptic));
- if (haptic == NULL) {
- SDL_OutOfMemory();
- return NULL;
- }
-
- /* Initialize the haptic device */
- SDL_memset(haptic, 0, sizeof(SDL_Haptic));
- if (SDL_SYS_HapticOpenFromJoystick(haptic, joystick) < 0) {
- SDL_free(haptic);
- return NULL;
- }
-
- /* Add haptic to list */
- ++haptic->ref_count;
- for (i = 0; SDL_haptics[i]; i++)
- /* Skip to next haptic */ ;
- SDL_haptics[i] = haptic;
-
- return haptic;
-}
-
-
-/*
- * Closes a SDL_Haptic device.
- */
-void
-SDL_HapticClose(SDL_Haptic * haptic)
-{
- int i;
-
- /* Must be valid */
- if (!ValidHaptic(haptic)) {
- return;
- }
-
- /* Check if it's still in use */
- if (--haptic->ref_count < 0) {
- return;
- }
-
- /* Close it, properly removing effects if needed */
- for (i = 0; i < haptic->neffects; i++) {
- if (haptic->effects[i].hweffect != NULL) {
- SDL_HapticDestroyEffect(haptic, i);
- }
- }
- SDL_SYS_HapticClose(haptic);
-
- /* Remove from the list */
- for (i = 0; SDL_haptics[i]; ++i) {
- if (haptic == SDL_haptics[i]) {
- SDL_haptics[i] = NULL;
- SDL_memcpy(&SDL_haptics[i], &SDL_haptics[i + 1],
- (SDL_numhaptics - i) * sizeof(haptic));
- break;
- }
- }
-
- /* Free */
- SDL_free(haptic);
-}
-
-/*
- * Cleans up after the subsystem.
- */
-void
-SDL_HapticQuit(void)
-{
- SDL_SYS_HapticQuit();
- if (SDL_haptics != NULL) {
- SDL_free(SDL_haptics);
- SDL_haptics = NULL;
- }
- SDL_numhaptics = 0;
-}
-
-/*
- * Returns the number of effects a haptic device has.
- */
-int
-SDL_HapticNumEffects(SDL_Haptic * haptic)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- return haptic->neffects;
-}
-
-
-/*
- * Returns the number of effects a haptic device can play.
- */
-int
-SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- return haptic->nplaying;
-}
-
-
-/*
- * Returns supported effects by the device.
- */
-unsigned int
-SDL_HapticQuery(SDL_Haptic * haptic)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- return haptic->supported;
-}
-
-
-/*
- * Returns the number of axis on the device.
- */
-int
-SDL_HapticNumAxes(SDL_Haptic * haptic)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- return haptic->naxes;
-}
-
-/*
- * Checks to see if the device can support the effect.
- */
-int
-SDL_HapticEffectSupported(SDL_Haptic * haptic, SDL_HapticEffect * effect)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- if ((haptic->supported & effect->type) != 0)
- return SDL_TRUE;
- return SDL_FALSE;
-}
-
-/*
- * Creates a new haptic effect.
- */
-int
-SDL_HapticNewEffect(SDL_Haptic * haptic, SDL_HapticEffect * effect)
-{
- int i;
-
- /* Check for device validity. */
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- /* Check to see if effect is supported */
- if (SDL_HapticEffectSupported(haptic, effect) == SDL_FALSE) {
- SDL_SetError("Haptic: Effect not supported by haptic device.");
- return -1;
- }
-
- /* See if there's a free slot */
- for (i = 0; i < haptic->neffects; i++) {
- if (haptic->effects[i].hweffect == NULL) {
-
- /* Now let the backend create the real effect */
- if (SDL_SYS_HapticNewEffect(haptic, &haptic->effects[i], effect)
- != 0) {
- return -1; /* Backend failed to create effect */
- }
-
- SDL_memcpy(&haptic->effects[i].effect, effect,
- sizeof(SDL_HapticEffect));
- return i;
- }
- }
-
- SDL_SetError("Haptic: Device has no free space left.");
- return -1;
-}
-
-/*
- * Checks to see if an effect is valid.
- */
-static int
-ValidEffect(SDL_Haptic * haptic, int effect)
-{
- if ((effect < 0) || (effect >= haptic->neffects)) {
- SDL_SetError("Haptic: Invalid effect identifier.");
- return 0;
- }
- return 1;
-}
-
-/*
- * Updates an effect.
- */
-int
-SDL_HapticUpdateEffect(SDL_Haptic * haptic, int effect,
- SDL_HapticEffect * data)
-{
- if (!ValidHaptic(haptic) || !ValidEffect(haptic, effect)) {
- return -1;
- }
-
- /* Can't change type dynamically. */
- if (data->type != haptic->effects[effect].effect.type) {
- SDL_SetError("Haptic: Updating effect type is illegal.");
- return -1;
- }
-
- /* Updates the effect */
- if (SDL_SYS_HapticUpdateEffect(haptic, &haptic->effects[effect], data) <
- 0) {
- return -1;
- }
-
- SDL_memcpy(&haptic->effects[effect].effect, data,
- sizeof(SDL_HapticEffect));
- return 0;
-}
-
-
-/*
- * Runs the haptic effect on the device.
- */
-int
-SDL_HapticRunEffect(SDL_Haptic * haptic, int effect, Uint32 iterations)
-{
- if (!ValidHaptic(haptic) || !ValidEffect(haptic, effect)) {
- return -1;
- }
-
- /* Run the effect */
- if (SDL_SYS_HapticRunEffect(haptic, &haptic->effects[effect], iterations)
- < 0) {
- return -1;
- }
-
- return 0;
-}
-
-/*
- * Stops the haptic effect on the device.
- */
-int
-SDL_HapticStopEffect(SDL_Haptic * haptic, int effect)
-{
- if (!ValidHaptic(haptic) || !ValidEffect(haptic, effect)) {
- return -1;
- }
-
- /* Stop the effect */
- if (SDL_SYS_HapticStopEffect(haptic, &haptic->effects[effect]) < 0) {
- return -1;
- }
-
- return 0;
-}
-
-/*
- * Gets rid of a haptic effect.
- */
-void
-SDL_HapticDestroyEffect(SDL_Haptic * haptic, int effect)
-{
- if (!ValidHaptic(haptic) || !ValidEffect(haptic, effect)) {
- return;
- }
-
- /* Not allocated */
- if (haptic->effects[effect].hweffect == NULL) {
- return;
- }
-
- SDL_SYS_HapticDestroyEffect(haptic, &haptic->effects[effect]);
-}
-
-/*
- * Gets the status of a haptic effect.
- */
-int
-SDL_HapticGetEffectStatus(SDL_Haptic * haptic, int effect)
-{
- if (!ValidHaptic(haptic) || !ValidEffect(haptic, effect)) {
- return -1;
- }
-
- if ((haptic->supported & SDL_HAPTIC_STATUS) == 0) {
- SDL_SetError("Haptic: Device does not support status queries.");
- return -1;
- }
-
- return SDL_SYS_HapticGetEffectStatus(haptic, &haptic->effects[effect]);
-}
-
-/*
- * Sets the global gain of the device.
- */
-int
-SDL_HapticSetGain(SDL_Haptic * haptic, int gain)
-{
- const char *env;
- int real_gain, max_gain;
-
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- if ((haptic->supported & SDL_HAPTIC_GAIN) == 0) {
- SDL_SetError("Haptic: Device does not support setting gain.");
- return -1;
- }
-
- if ((gain < 0) || (gain > 100)) {
- SDL_SetError("Haptic: Gain must be between 0 and 100.");
- return -1;
- }
-
- /* We use the envvar to get the maximum gain. */
- env = SDL_getenv("SDL_HAPTIC_GAIN_MAX");
- if (env != NULL) {
- max_gain = SDL_atoi(env);
-
- /* Check for sanity. */
- if (max_gain < 0)
- max_gain = 0;
- else if (max_gain > 100)
- max_gain = 100;
-
- /* We'll scale it linearly with SDL_HAPTIC_GAIN_MAX */
- real_gain = (gain * max_gain) / 100;
- } else {
- real_gain = gain;
- }
-
- if (SDL_SYS_HapticSetGain(haptic, real_gain) < 0) {
- return -1;
- }
-
- return 0;
-}
-
-/*
- * Makes the device autocenter, 0 disables.
- */
-int
-SDL_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- if ((haptic->supported & SDL_HAPTIC_AUTOCENTER) == 0) {
- SDL_SetError("Haptic: Device does not support setting autocenter.");
- return -1;
- }
-
- if ((autocenter < 0) || (autocenter > 100)) {
- SDL_SetError("Haptic: Autocenter must be between 0 and 100.");
- return -1;
- }
-
- if (SDL_SYS_HapticSetAutocenter(haptic, autocenter) < 0) {
- return -1;
- }
-
- return 0;
-}
-
-/*
- * Pauses the haptic device.
- */
-int
-SDL_HapticPause(SDL_Haptic * haptic)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- if ((haptic->supported & SDL_HAPTIC_PAUSE) == 0) {
- SDL_SetError("Haptic: Device does not support setting pausing.");
- return -1;
- }
-
- return SDL_SYS_HapticPause(haptic);
-}
-
-/*
- * Unpauses the haptic device.
- */
-int
-SDL_HapticUnpause(SDL_Haptic * haptic)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- if ((haptic->supported & SDL_HAPTIC_PAUSE) == 0) {
- return 0; /* Not going to be paused, so we pretend it's unpaused. */
- }
-
- return SDL_SYS_HapticUnpause(haptic);
-}
-
-/*
- * Stops all the currently playing effects.
- */
-int
-SDL_HapticStopAll(SDL_Haptic * haptic)
-{
- if (!ValidHaptic(haptic)) {
- return -1;
- }
-
- return SDL_SYS_HapticStopAll(haptic);
-}
diff --git a/macosx/plugins/DFInput/SDL/src/haptic/SDL_haptic_c.h b/macosx/plugins/DFInput/SDL/src/haptic/SDL_haptic_c.h
deleted file mode 100644
index 4144a0f..0000000
--- a/macosx/plugins/DFInput/SDL/src/haptic/SDL_haptic_c.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-extern int SDL_HapticInit(void);
-extern void SDL_HapticQuit(void);
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/macosx/plugins/DFInput/SDL/src/haptic/SDL_syshaptic.h b/macosx/plugins/DFInput/SDL/src/haptic/SDL_syshaptic.h
deleted file mode 100644
index 9542a0d..0000000
--- a/macosx/plugins/DFInput/SDL/src/haptic/SDL_syshaptic.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 2008 Edgar Simo
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-
-#include "SDL_config.h"
-
-#include "SDL_haptic.h"
-
-
-/*
- * Number of haptic devices on the system.
- */
-extern Uint8 SDL_numhaptics;
-
-
-struct haptic_effect
-{
- SDL_HapticEffect effect; /* The current event */
- struct haptic_hweffect *hweffect; /* The hardware behind the event */
-};
-
-/*
- * The real SDL_Haptic struct.
- */
-struct _SDL_Haptic
-{
- Uint8 index; /* Stores index it is attached to */
-
- struct haptic_effect *effects; /* Allocated effects */
- int neffects; /* Maximum amount of effects */
- int nplaying; /* Maximum amount of effects to play at the same time */
- unsigned int supported; /* Supported effects */
- int naxes; /* Number of axes on the device. */
-
- struct haptic_hwdata *hwdata; /* Driver dependent */
- int ref_count; /* Count for multiple opens */
-};
-
-/*
- * Scans the system for haptic devices.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticInit(void);
-
-/*
- * Gets the device dependent name of the haptic device
- */
-extern const char *SDL_SYS_HapticName(int index);
-
-/*
- * Opens the haptic device for usage. The haptic device should have
- * the index value set previously.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticOpen(SDL_Haptic * haptic);
-
-/*
- * Returns the index of the haptic core pointer or -1 if none is found.
- */
-int SDL_SYS_HapticMouse(void);
-
-/*
- * Checks to see if the joystick has haptic capabilities.
- *
- * Returns >0 if haptic capabilities are detected, 0 if haptic
- * capabilities aren't detected and -1 on error.
- */
-extern int SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick);
-
-/*
- * Opens the haptic device for usage using the same device as
- * the joystick.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic,
- SDL_Joystick * joystick);
-/*
- * Checks to see if haptic device and joystick device are the same.
- *
- * Returns 1 if they are the same, 0 if they aren't.
- */
-extern int SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic,
- SDL_Joystick * joystick);
-
-/*
- * Closes a haptic device after usage.
- */
-extern void SDL_SYS_HapticClose(SDL_Haptic * haptic);
-
-/*
- * Performs a cleanup on the haptic subsystem.
- */
-extern void SDL_SYS_HapticQuit(void);
-
-/*
- * Creates a new haptic effect on the haptic device using base
- * as a template for the effect.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticNewEffect(SDL_Haptic * haptic,
- struct haptic_effect *effect,
- SDL_HapticEffect * base);
-
-/*
- * Updates the haptic effect on the haptic device using data
- * as a template.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticUpdateEffect(SDL_Haptic * haptic,
- struct haptic_effect *effect,
- SDL_HapticEffect * data);
-
-/*
- * Runs the effect on the haptic device.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticRunEffect(SDL_Haptic * haptic,
- struct haptic_effect *effect,
- Uint32 iterations);
-
-/*
- * Stops the effect on the haptic device.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticStopEffect(SDL_Haptic * haptic,
- struct haptic_effect *effect);
-
-/*
- * Cleanups up the effect on the haptic device.
- */
-extern void SDL_SYS_HapticDestroyEffect(SDL_Haptic * haptic,
- struct haptic_effect *effect);
-
-/*
- * Queries the device for the status of effect.
- *
- * Returns 0 if device is stopped, >0 if device is playing and
- * -1 on error.
- */
-extern int SDL_SYS_HapticGetEffectStatus(SDL_Haptic * haptic,
- struct haptic_effect *effect);
-
-/*
- * Sets the global gain of the haptic device.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticSetGain(SDL_Haptic * haptic, int gain);
-
-/*
- * Sets the autocenter feature of the haptic device.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter);
-
-/*
- * Pauses the haptic device.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticPause(SDL_Haptic * haptic);
-
-/*
- * Unpauses the haptic device.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticUnpause(SDL_Haptic * haptic);
-
-/*
- * Stops all the currently playing haptic effects on the device.
- *
- * Returns 0 on success, -1 on error.
- */
-extern int SDL_SYS_HapticStopAll(SDL_Haptic * haptic);
diff --git a/macosx/plugins/DFInput/SDL/src/haptic/darwin/SDL_syshaptic.c b/macosx/plugins/DFInput/SDL/src/haptic/darwin/SDL_syshaptic.c
deleted file mode 100644
index c5b1e54..0000000
--- a/macosx/plugins/DFInput/SDL/src/haptic/darwin/SDL_syshaptic.c
+++ /dev/null
@@ -1,1321 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 2008 Edgar Simo
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#ifdef SDL_HAPTIC_IOKIT
-
-#include "SDL_haptic.h"
-#include "../SDL_syshaptic.h"
-#include "SDL_joystick.h"
-#include "../../joystick/SDL_sysjoystick.h" /* For the real SDL_Joystick */
-#include "../../joystick/darwin/SDL_sysjoystick_c.h" /* For joystick hwdata */
-
-#include <IOKit/IOKitLib.h>
-#include <IOKit/hid/IOHIDKeys.h>
-#include <IOKit/hid/IOHIDUsageTables.h>
-#include <ForceFeedback/ForceFeedback.h>
-#include <ForceFeedback/ForceFeedbackConstants.h>
-
-#ifndef IO_OBJECT_NULL
-#define IO_OBJECT_NULL ((io_service_t)0)
-#endif
-
-#define MAX_HAPTICS 32
-
-
-/*
- * List of available haptic devices.
- */
-static struct
-{
- char name[256]; /* Name of the device. */
-
- io_service_t dev; /* Node we use to create the device. */
- SDL_Haptic *haptic; /* Haptic currently assosciated with it. */
-
- /* Usage pages for determining if it's a mouse or not. */
- long usage;
- long usagePage;
-} SDL_hapticlist[MAX_HAPTICS];
-
-
-/*
- * Haptic system hardware data.
- */
-struct haptic_hwdata
-{
- FFDeviceObjectReference device; /* Hardware device. */
- UInt8 axes[3];
-};
-
-
-/*
- * Haptic system effect data.
- */
-struct haptic_hweffect
-{
- FFEffectObjectReference ref; /* Reference. */
- struct FFEFFECT effect; /* Hardware effect. */
-};
-
-/*
- * Prototypes.
- */
-static void SDL_SYS_HapticFreeFFEFFECT(FFEFFECT * effect, int type);
-static int HIDGetDeviceProduct(io_service_t dev, char *name);
-
-
-/*
- * Like strerror but for force feedback errors.
- */
-static const char *
-FFStrError(HRESULT err)
-{
- switch (err) {
- case FFERR_DEVICEFULL:
- return "device full";
- /* This should be valid, but for some reason isn't defined... */
- /*case FFERR_DEVICENOTREG:
- return "device not registered"; */
- case FFERR_DEVICEPAUSED:
- return "device paused";
- case FFERR_DEVICERELEASED:
- return "device released";
- case FFERR_EFFECTPLAYING:
- return "effect playing";
- case FFERR_EFFECTTYPEMISMATCH:
- return "effect type mismatch";
- case FFERR_EFFECTTYPENOTSUPPORTED:
- return "effect type not supported";
- case FFERR_GENERIC:
- return "undetermined error";
- case FFERR_HASEFFECTS:
- return "device has effects";
- case FFERR_INCOMPLETEEFFECT:
- return "incomplete effect";
- case FFERR_INTERNAL:
- return "internal fault";
- case FFERR_INVALIDDOWNLOADID:
- return "invalid download id";
- case FFERR_INVALIDPARAM:
- return "invalid parameter";
- case FFERR_MOREDATA:
- return "more data";
- case FFERR_NOINTERFACE:
- return "interface not supported";
- case FFERR_NOTDOWNLOADED:
- return "effect is not downloaded";
- case FFERR_NOTINITIALIZED:
- return "object has not been initialized";
- case FFERR_OUTOFMEMORY:
- return "out of memory";
- case FFERR_UNPLUGGED:
- return "device is unplugged";
- case FFERR_UNSUPPORTED:
- return "function call unsupported";
- case FFERR_UNSUPPORTEDAXIS:
- return "axis unsupported";
-
- default:
- return "unknown error";
- }
-}
-
-
-/*
- * Initializes the haptic subsystem.
- */
-int
-SDL_SYS_HapticInit(void)
-{
- int numhaptics;
- IOReturn result;
- io_iterator_t iter;
- CFDictionaryRef match;
- io_service_t device;
- CFMutableDictionaryRef hidProperties;
- CFTypeRef refCF;
-
- /* Clear all the memory. */
- SDL_memset(SDL_hapticlist, 0, sizeof(SDL_hapticlist));
-
- /* Get HID devices. */
- match = IOServiceMatching(kIOHIDDeviceKey);
- if (match == NULL) {
- SDL_SetError("Haptic: Failed to get IOServiceMatching.");
- return -1;
- }
-
- /* Now search I/O Registry for matching devices. */
- result = IOServiceGetMatchingServices(kIOMasterPortDefault, match, &iter);
- if (result != kIOReturnSuccess) {
- SDL_SetError("Haptic: Couldn't create a HID object iterator.");
- return -1;
- }
- /* IOServiceGetMatchingServices consumes dictionary. */
-
- if (!IOIteratorIsValid(iter)) { /* No iterator. */
- numhaptics = 0;
- return 0;
- }
-
- numhaptics = 0;
- while ((device = IOIteratorNext(iter)) != IO_OBJECT_NULL) {
-
- /* Check for force feedback. */
- if (FFIsForceFeedback(device) == FF_OK) {
-
- /* Set basic device data. */
- HIDGetDeviceProduct(device, SDL_hapticlist[numhaptics].name);
- SDL_hapticlist[numhaptics].dev = device;
- SDL_hapticlist[numhaptics].haptic = NULL;
-
- /* Set usage pages. */
- hidProperties = 0;
- refCF = 0;
- result = IORegistryEntryCreateCFProperties(device,
- &hidProperties,
- kCFAllocatorDefault,
- kNilOptions);
- if ((result == KERN_SUCCESS) && hidProperties) {
- refCF =
- CFDictionaryGetValue(hidProperties,
- CFSTR(kIOHIDPrimaryUsagePageKey));
- if (refCF) {
- if (!CFNumberGetValue(refCF, kCFNumberLongType,
- &SDL_hapticlist[numhaptics].
- usagePage))
- SDL_SetError
- ("Haptic: Recieving device's usage page.");
- refCF =
- CFDictionaryGetValue(hidProperties,
- CFSTR(kIOHIDPrimaryUsageKey));
- if (refCF) {
- if (!CFNumberGetValue(refCF, kCFNumberLongType,
- &SDL_hapticlist[numhaptics].
- usage))
- SDL_SetError("Haptic: Recieving device's usage.");
- }
- }
- CFRelease(hidProperties);
- }
-
- /* Device has been added. */
- numhaptics++;
- } else { /* Free the unused device. */
- IOObjectRelease(device);
- }
-
- /* Reached haptic limit. */
- if (numhaptics >= MAX_HAPTICS)
- break;
- }
- IOObjectRelease(iter);
-
- return numhaptics;
-}
-
-
-/*
- * Return the name of a haptic device, does not need to be opened.
- */
-const char *
-SDL_SYS_HapticName(int index)
-{
- return SDL_hapticlist[index].name;
-}
-
-/*
- * Gets the device's product name.
- */
-static int
-HIDGetDeviceProduct(io_service_t dev, char *name)
-{
- CFMutableDictionaryRef hidProperties, usbProperties;
- io_registry_entry_t parent1, parent2;
- kern_return_t ret;
-
- hidProperties = usbProperties = 0;
-
- ret = IORegistryEntryCreateCFProperties(dev, &hidProperties,
- kCFAllocatorDefault, kNilOptions);
- if ((ret != KERN_SUCCESS) || !hidProperties) {
- SDL_SetError("Haptic: Unable to create CFProperties.");
- return -1;
- }
-
- /* 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
- */
- if ((KERN_SUCCESS ==
- IORegistryEntryGetParentEntry(dev, kIOServicePlane, &parent1))
- && (KERN_SUCCESS ==
- IORegistryEntryGetParentEntry(parent1, kIOServicePlane, &parent2))
- && (KERN_SUCCESS ==
- IORegistryEntryCreateCFProperties(parent2, &usbProperties,
- kCFAllocatorDefault,
- kNilOptions))) {
- if (usbProperties) {
- CFTypeRef refCF = 0;
- /* get device info
- * try hid dictionary first, if fail then go to usb dictionary
- */
-
-
- /* Get product name */
- refCF =
- CFDictionaryGetValue(hidProperties, CFSTR(kIOHIDProductKey));
- if (!refCF)
- refCF =
- CFDictionaryGetValue(usbProperties,
- CFSTR("USB Product Name"));
- if (refCF) {
- if (!CFStringGetCString(refCF, name, 256,
- CFStringGetSystemEncoding())) {
- SDL_SetError
- ("Haptic: CFStringGetCString error retrieving pDevice->product.");
- return -1;
- }
- }
-
- CFRelease(usbProperties);
- } else {
- SDL_SetError
- ("Haptic: IORegistryEntryCreateCFProperties failed to create usbProperties.");
- return -1;
- }
-
- /* Release stuff. */
- if (kIOReturnSuccess != IOObjectRelease(parent2)) {
- SDL_SetError("Haptic: IOObjectRelease error with parent2.");
- }
- if (kIOReturnSuccess != IOObjectRelease(parent1)) {
- SDL_SetError("Haptic: IOObjectRelease error with parent1.");
- }
- } else {
- SDL_SetError("Haptic: Error getting registry entries.");
- return -1;
- }
-
- return 0;
-}
-
-
-#define FF_TEST(ff, s) \
-if (features.supportedEffects & (ff)) supported |= (s)
-/*
- * Gets supported features.
- */
-static unsigned int
-GetSupportedFeatures(SDL_Haptic * haptic)
-{
- HRESULT ret;
- FFDeviceObjectReference device;
- FFCAPABILITIES features;
- unsigned int supported;
- Uint32 val;
-
- device = haptic->hwdata->device;
-
- ret = FFDeviceGetForceFeedbackCapabilities(device, &features);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to get device's supported features.");
- return -1;
- }
-
- supported = 0;
-
- /* Get maximum effects. */
- haptic->neffects = features.storageCapacity;
- haptic->nplaying = features.playbackCapacity;
-
- /* Test for effects. */
- FF_TEST(FFCAP_ET_CONSTANTFORCE, SDL_HAPTIC_CONSTANT);
- FF_TEST(FFCAP_ET_RAMPFORCE, SDL_HAPTIC_RAMP);
- FF_TEST(FFCAP_ET_SQUARE, SDL_HAPTIC_SQUARE);
- FF_TEST(FFCAP_ET_SINE, SDL_HAPTIC_SINE);
- FF_TEST(FFCAP_ET_TRIANGLE, SDL_HAPTIC_TRIANGLE);
- FF_TEST(FFCAP_ET_SAWTOOTHUP, SDL_HAPTIC_SAWTOOTHUP);
- FF_TEST(FFCAP_ET_SAWTOOTHDOWN, SDL_HAPTIC_SAWTOOTHDOWN);
- FF_TEST(FFCAP_ET_SPRING, SDL_HAPTIC_SPRING);
- FF_TEST(FFCAP_ET_DAMPER, SDL_HAPTIC_DAMPER);
- FF_TEST(FFCAP_ET_INERTIA, SDL_HAPTIC_INERTIA);
- FF_TEST(FFCAP_ET_FRICTION, SDL_HAPTIC_FRICTION);
- FF_TEST(FFCAP_ET_CUSTOMFORCE, SDL_HAPTIC_CUSTOM);
-
- /* Check if supports gain. */
- ret = FFDeviceGetForceFeedbackProperty(device, FFPROP_FFGAIN,
- &val, sizeof(val));
- if (ret == FF_OK)
- supported |= SDL_HAPTIC_GAIN;
- else if (ret != FFERR_UNSUPPORTED) {
- SDL_SetError("Haptic: Unable to get if device supports gain: %s.",
- FFStrError(ret));
- return -1;
- }
-
- /* Checks if supports autocenter. */
- ret = FFDeviceGetForceFeedbackProperty(device, FFPROP_AUTOCENTER,
- &val, sizeof(val));
- if (ret == FF_OK)
- supported |= SDL_HAPTIC_AUTOCENTER;
- else if (ret != FFERR_UNSUPPORTED) {
- SDL_SetError
- ("Haptic: Unable to get if device supports autocenter: %s.",
- FFStrError(ret));
- return -1;
- }
-
- /* Check for axes, we have an artificial limit on axes */
- haptic->naxes = ((features.numFfAxes) > 3) ? 3 : features.numFfAxes;
- /* Actually store the axes we want to use */
- SDL_memcpy(haptic->hwdata->axes, features.ffAxes,
- haptic->naxes * sizeof(Uint8));
-
- /* Always supported features. */
- supported |= SDL_HAPTIC_STATUS | SDL_HAPTIC_PAUSE;
-
- haptic->supported = supported;
- return 0;;
-}
-
-
-/*
- * Opens the haptic device from the file descriptor.
- */
-static int
-SDL_SYS_HapticOpenFromService(SDL_Haptic * haptic, io_service_t service)
-{
- HRESULT ret;
- int ret2;
-
- /* Allocate the hwdata */
- haptic->hwdata = (struct haptic_hwdata *)
- SDL_malloc(sizeof(*haptic->hwdata));
- if (haptic->hwdata == NULL) {
- SDL_OutOfMemory();
- goto creat_err;
- }
- SDL_memset(haptic->hwdata, 0, sizeof(*haptic->hwdata));
-
- /* Open the device */
- ret = FFCreateDevice(service, &haptic->hwdata->device);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to create device from service: %s.",
- FFStrError(ret));
- goto creat_err;
- }
-
- /* Get supported features. */
- ret2 = GetSupportedFeatures(haptic);
- if (haptic->supported < 0) {
- goto open_err;
- }
-
-
- /* Reset and then enable actuators. */
- ret = FFDeviceSendForceFeedbackCommand(haptic->hwdata->device,
- FFSFFC_RESET);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to reset device: %s.", FFStrError(ret));
- goto open_err;
- }
- ret = FFDeviceSendForceFeedbackCommand(haptic->hwdata->device,
- FFSFFC_SETACTUATORSON);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to enable actuators: %s.",
- FFStrError(ret));
- goto open_err;
- }
-
-
- /* Allocate effects memory. */
- haptic->effects = (struct haptic_effect *)
- SDL_malloc(sizeof(struct haptic_effect) * haptic->neffects);
- if (haptic->effects == NULL) {
- SDL_OutOfMemory();
- goto open_err;
- }
- /* Clear the memory */
- SDL_memset(haptic->effects, 0,
- sizeof(struct haptic_effect) * haptic->neffects);
-
- return 0;
-
- /* Error handling */
- open_err:
- FFReleaseDevice(haptic->hwdata->device);
- creat_err:
- if (haptic->hwdata != NULL) {
- free(haptic->hwdata);
- haptic->hwdata = NULL;
- }
- return -1;
-
-}
-
-
-/*
- * Opens a haptic device for usage.
- */
-int
-SDL_SYS_HapticOpen(SDL_Haptic * haptic)
-{
- return SDL_SYS_HapticOpenFromService(haptic,
- SDL_hapticlist[haptic->index].dev);
-}
-
-
-/*
- * Opens a haptic device from first mouse it finds for usage.
- */
-int
-SDL_SYS_HapticMouse(void)
-{
- int i;
-
- for (i = 0; i < SDL_numhaptics; i++) {
- if ((SDL_hapticlist[i].usagePage == kHIDPage_GenericDesktop) &&
- (SDL_hapticlist[i].usage == kHIDUsage_GD_Mouse))
- return i;
- }
-
- return -1;
-}
-
-
-/*
- * Checks to see if a joystick has haptic features.
- */
-int
-SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick)
-{
- if (joystick->hwdata->ffservice != 0)
- return SDL_TRUE;
- return SDL_FALSE;
-}
-
-
-/*
- * Checks to see if the haptic device and joystick and in reality the same.
- */
-int
-SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
-{
- if (IOObjectIsEqualTo((io_object_t) haptic->hwdata->device,
- joystick->hwdata->ffservice))
- return 1;
- return 0;
-}
-
-
-/*
- * Opens a SDL_Haptic from a SDL_Joystick.
- */
-int
-SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick)
-{
- return SDL_SYS_HapticOpenFromService(haptic, joystick->hwdata->ffservice);
-}
-
-
-/*
- * Closes the haptic device.
- */
-void
-SDL_SYS_HapticClose(SDL_Haptic * haptic)
-{
- if (haptic->hwdata) {
-
- /* Free Effects. */
- SDL_free(haptic->effects);
- haptic->effects = NULL;
- haptic->neffects = 0;
-
- /* Clean up */
- FFReleaseDevice(haptic->hwdata->device);
-
- /* Free */
- SDL_free(haptic->hwdata);
- haptic->hwdata = NULL;
- }
-}
-
-
-/*
- * Clean up after system specific haptic stuff
- */
-void
-SDL_SYS_HapticQuit(void)
-{
- int i;
-
- for (i = 0; i < SDL_numhaptics; i++) {
- /* Opened and not closed haptics are leaked, this is on purpose.
- * Close your haptic devices after usage. */
-
- /* Free the io_service_t */
- IOObjectRelease(SDL_hapticlist[i].dev);
- }
-}
-
-
-/*
- * Converts an SDL trigger button to an FFEFFECT trigger button.
- */
-static DWORD
-FFGetTriggerButton(Uint16 button)
-{
- DWORD dwTriggerButton;
-
- dwTriggerButton = FFEB_NOTRIGGER;
-
- if (button != 0) {
- dwTriggerButton = FFJOFS_BUTTON(button - 1);
- }
-
- return dwTriggerButton;
-}
-
-
-/*
- * Sets the direction.
- */
-static int
-SDL_SYS_SetDirection(FFEFFECT * effect, SDL_HapticDirection * dir, int naxes)
-{
- LONG *rglDir;
-
- /* Handle no axes a part. */
- if (naxes == 0) {
- effect->dwFlags |= FFEFF_SPHERICAL; /* Set as default. */
- effect->rglDirection = NULL;
- return 0;
- }
-
- /* Has axes. */
- rglDir = SDL_malloc(sizeof(LONG) * naxes);
- if (rglDir == NULL) {
- SDL_OutOfMemory();
- return -1;
- }
- SDL_memset(rglDir, 0, sizeof(LONG) * naxes);
- effect->rglDirection = rglDir;
-
- switch (dir->type) {
- case SDL_HAPTIC_POLAR:
- effect->dwFlags |= FFEFF_POLAR;
- rglDir[0] = dir->dir[0];
- return 0;
- case SDL_HAPTIC_CARTESIAN:
- effect->dwFlags |= FFEFF_CARTESIAN;
- rglDir[0] = dir->dir[0];
- if (naxes > 1)
- rglDir[1] = dir->dir[1];
- if (naxes > 2)
- rglDir[2] = dir->dir[2];
- return 0;
- case SDL_HAPTIC_SPHERICAL:
- effect->dwFlags |= FFEFF_SPHERICAL;
- rglDir[0] = dir->dir[0];
- if (naxes > 1)
- rglDir[1] = dir->dir[1];
- if (naxes > 2)
- rglDir[2] = dir->dir[2];
- return 0;
-
- default:
- SDL_SetError("Haptic: Unknown direction type.");
- return -1;
- }
-}
-
-
-/* Clamps and converts. */
-#define CCONVERT(x) (((x) > 0x7FFF) ? 10000 : ((x)*10000) / 0x7FFF)
-/* Just converts. */
-#define CONVERT(x) (((x)*10000) / 0x7FFF)
-/*
- * Creates the FFEFFECT from a SDL_HapticEffect.
- */
-static int
-SDL_SYS_ToFFEFFECT(SDL_Haptic * haptic, FFEFFECT * dest,
- SDL_HapticEffect * src)
-{
- int i;
- FFCONSTANTFORCE *constant;
- FFPERIODIC *periodic;
- FFCONDITION *condition; /* Actually an array of conditions - one per axis. */
- FFRAMPFORCE *ramp;
- FFCUSTOMFORCE *custom;
- FFENVELOPE *envelope;
- SDL_HapticConstant *hap_constant;
- SDL_HapticPeriodic *hap_periodic;
- SDL_HapticCondition *hap_condition;
- SDL_HapticRamp *hap_ramp;
- SDL_HapticCustom *hap_custom;
- DWORD *axes;
-
- /* Set global stuff. */
- SDL_memset(dest, 0, sizeof(FFEFFECT));
- dest->dwSize = sizeof(FFEFFECT); /* Set the structure size. */
- dest->dwSamplePeriod = 0; /* Not used by us. */
- dest->dwGain = 10000; /* Gain is set globally, not locally. */
- dest->dwFlags = FFEFF_OBJECTOFFSETS; /* Seems obligatory. */
-
- /* Envelope. */
- envelope = SDL_malloc(sizeof(FFENVELOPE));
- if (envelope == NULL) {
- SDL_OutOfMemory();
- return -1;
- }
- SDL_memset(envelope, 0, sizeof(FFENVELOPE));
- dest->lpEnvelope = envelope;
- envelope->dwSize = sizeof(FFENVELOPE); /* Always should be this. */
-
- /* Axes. */
- dest->cAxes = haptic->naxes;
- if (dest->cAxes > 0) {
- axes = SDL_malloc(sizeof(DWORD) * dest->cAxes);
- if (axes == NULL) {
- SDL_OutOfMemory();
- return -1;
- }
- axes[0] = haptic->hwdata->axes[0]; /* Always at least one axis. */
- if (dest->cAxes > 1) {
- axes[1] = haptic->hwdata->axes[1];
- }
- if (dest->cAxes > 2) {
- axes[2] = haptic->hwdata->axes[2];
- }
- dest->rgdwAxes = axes;
- }
-
-
- /* The big type handling switch, even bigger then linux's version. */
- switch (src->type) {
- case SDL_HAPTIC_CONSTANT:
- hap_constant = &src->constant;
- constant = SDL_malloc(sizeof(FFCONSTANTFORCE));
- if (constant == NULL) {
- SDL_OutOfMemory();
- return -1;
- }
- SDL_memset(constant, 0, sizeof(FFCONSTANTFORCE));
-
- /* Specifics */
- constant->lMagnitude = CONVERT(hap_constant->level);
- dest->cbTypeSpecificParams = sizeof(FFCONSTANTFORCE);
- dest->lpvTypeSpecificParams = constant;
-
- /* Generics */
- dest->dwDuration = hap_constant->length * 1000; /* In microseconds. */
- dest->dwTriggerButton = FFGetTriggerButton(hap_constant->button);
- dest->dwTriggerRepeatInterval = hap_constant->interval;
- dest->dwStartDelay = hap_constant->delay * 1000; /* In microseconds. */
-
- /* Direction. */
- if (SDL_SYS_SetDirection(dest, &hap_constant->direction, dest->cAxes)
- < 0) {
- return -1;
- }
-
- /* Envelope */
- if ((hap_constant->attack_length == 0)
- && (hap_constant->fade_length == 0)) {
- SDL_free(envelope);
- dest->lpEnvelope = NULL;
- } else {
- envelope->dwAttackLevel = CCONVERT(hap_constant->attack_level);
- envelope->dwAttackTime = hap_constant->attack_length * 1000;
- envelope->dwFadeLevel = CCONVERT(hap_constant->fade_level);
- envelope->dwFadeTime = hap_constant->fade_length * 1000;
- }
-
- break;
-
- case SDL_HAPTIC_SINE:
- case SDL_HAPTIC_SQUARE:
- case SDL_HAPTIC_TRIANGLE:
- case SDL_HAPTIC_SAWTOOTHUP:
- case SDL_HAPTIC_SAWTOOTHDOWN:
- hap_periodic = &src->periodic;
- periodic = SDL_malloc(sizeof(FFPERIODIC));
- if (periodic == NULL) {
- SDL_OutOfMemory();
- return -1;
- }
- SDL_memset(periodic, 0, sizeof(FFPERIODIC));
-
- /* Specifics */
- periodic->dwMagnitude = CONVERT(hap_periodic->magnitude);
- periodic->lOffset = CONVERT(hap_periodic->offset);
- periodic->dwPhase = hap_periodic->phase;
- periodic->dwPeriod = hap_periodic->period * 1000;
- dest->cbTypeSpecificParams = sizeof(FFPERIODIC);
- dest->lpvTypeSpecificParams = periodic;
-
- /* Generics */
- dest->dwDuration = hap_periodic->length * 1000; /* In microseconds. */
- dest->dwTriggerButton = FFGetTriggerButton(hap_periodic->button);
- dest->dwTriggerRepeatInterval = hap_periodic->interval;
- dest->dwStartDelay = hap_periodic->delay * 1000; /* In microseconds. */
-
- /* Direction. */
- if (SDL_SYS_SetDirection(dest, &hap_periodic->direction, dest->cAxes)
- < 0) {
- return -1;
- }
-
- /* Envelope */
- if ((hap_periodic->attack_length == 0)
- && (hap_periodic->fade_length == 0)) {
- SDL_free(envelope);
- dest->lpEnvelope = NULL;
- } else {
- envelope->dwAttackLevel = CCONVERT(hap_periodic->attack_level);
- envelope->dwAttackTime = hap_periodic->attack_length * 1000;
- envelope->dwFadeLevel = CCONVERT(hap_periodic->fade_level);
- envelope->dwFadeTime = hap_periodic->fade_length * 1000;
- }
-
- break;
-
- case SDL_HAPTIC_SPRING:
- case SDL_HAPTIC_DAMPER:
- case SDL_HAPTIC_INERTIA:
- case SDL_HAPTIC_FRICTION:
- hap_condition = &src->condition;
- condition = SDL_malloc(sizeof(FFCONDITION) * dest->cAxes);
- if (condition == NULL) {
- SDL_OutOfMemory();
- return -1;
- }
- SDL_memset(condition, 0, sizeof(FFCONDITION));
-
- /* Specifics */
- for (i = 0; i < dest->cAxes; i++) {
- condition[i].lOffset = CONVERT(hap_condition->center[i]);
- condition[i].lPositiveCoefficient =
- CONVERT(hap_condition->right_coeff[i]);
- condition[i].lNegativeCoefficient =
- CONVERT(hap_condition->left_coeff[i]);
- condition[i].dwPositiveSaturation =
- CCONVERT(hap_condition->right_sat[i]);
- condition[i].dwNegativeSaturation =
- CCONVERT(hap_condition->left_sat[i]);
- condition[i].lDeadBand = CCONVERT(hap_condition->deadband[i]);
- }
- dest->cbTypeSpecificParams = sizeof(FFCONDITION) * dest->cAxes;
- dest->lpvTypeSpecificParams = condition;
-
- /* Generics */
- dest->dwDuration = hap_condition->length * 1000; /* In microseconds. */
- dest->dwTriggerButton = FFGetTriggerButton(hap_condition->button);
- dest->dwTriggerRepeatInterval = hap_condition->interval;
- dest->dwStartDelay = hap_condition->delay * 1000; /* In microseconds. */
-
- /* Direction. */
- if (SDL_SYS_SetDirection(dest, &hap_condition->direction, dest->cAxes)
- < 0) {
- return -1;
- }
-
- /* Envelope - Not actually supported by most CONDITION implementations. */
- SDL_free(dest->lpEnvelope);
- dest->lpEnvelope = NULL;
-
- break;
-
- case SDL_HAPTIC_RAMP:
- hap_ramp = &src->ramp;
- ramp = SDL_malloc(sizeof(FFRAMPFORCE));
- if (ramp == NULL) {
- SDL_OutOfMemory();
- return -1;
- }
- SDL_memset(ramp, 0, sizeof(FFRAMPFORCE));
-
- /* Specifics */
- ramp->lStart = CONVERT(hap_ramp->start);
- ramp->lEnd = CONVERT(hap_ramp->end);
- dest->cbTypeSpecificParams = sizeof(FFRAMPFORCE);
- dest->lpvTypeSpecificParams = ramp;
-
- /* Generics */
- dest->dwDuration = hap_ramp->length * 1000; /* In microseconds. */
- dest->dwTriggerButton = FFGetTriggerButton(hap_ramp->button);
- dest->dwTriggerRepeatInterval = hap_ramp->interval;
- dest->dwStartDelay = hap_ramp->delay * 1000; /* In microseconds. */
-
- /* Direction. */
- if (SDL_SYS_SetDirection(dest, &hap_ramp->direction, dest->cAxes) < 0) {
- return -1;
- }
-
- /* Envelope */
- if ((hap_ramp->attack_length == 0) && (hap_ramp->fade_length == 0)) {
- SDL_free(envelope);
- dest->lpEnvelope = NULL;
- } else {
- envelope->dwAttackLevel = CCONVERT(hap_ramp->attack_level);
- envelope->dwAttackTime = hap_ramp->attack_length * 1000;
- envelope->dwFadeLevel = CCONVERT(hap_ramp->fade_level);
- envelope->dwFadeTime = hap_ramp->fade_length * 1000;
- }
-
- break;
-
- case SDL_HAPTIC_CUSTOM:
- hap_custom = &src->custom;
- custom = SDL_malloc(sizeof(FFCUSTOMFORCE));
- if (custom == NULL) {
- SDL_OutOfMemory();
- return -1;
- }
- SDL_memset(custom, 0, sizeof(FFCUSTOMFORCE));
-
- /* Specifics */
- custom->cChannels = hap_custom->channels;
- custom->dwSamplePeriod = hap_custom->period * 1000;
- custom->cSamples = hap_custom->samples;
- custom->rglForceData =
- SDL_malloc(sizeof(LONG) * custom->cSamples * custom->cChannels);
- for (i = 0; i < hap_custom->samples * hap_custom->channels; i++) { /* Copy data. */
- custom->rglForceData[i] = CCONVERT(hap_custom->data[i]);
- }
- dest->cbTypeSpecificParams = sizeof(FFCUSTOMFORCE);
- dest->lpvTypeSpecificParams = custom;
-
- /* Generics */
- dest->dwDuration = hap_custom->length * 1000; /* In microseconds. */
- dest->dwTriggerButton = FFGetTriggerButton(hap_custom->button);
- dest->dwTriggerRepeatInterval = hap_custom->interval;
- dest->dwStartDelay = hap_custom->delay * 1000; /* In microseconds. */
-
- /* Direction. */
- if (SDL_SYS_SetDirection(dest, &hap_custom->direction, dest->cAxes) <
- 0) {
- return -1;
- }
-
- /* Envelope */
- if ((hap_custom->attack_length == 0)
- && (hap_custom->fade_length == 0)) {
- SDL_free(envelope);
- dest->lpEnvelope = NULL;
- } else {
- envelope->dwAttackLevel = CCONVERT(hap_custom->attack_level);
- envelope->dwAttackTime = hap_custom->attack_length * 1000;
- envelope->dwFadeLevel = CCONVERT(hap_custom->fade_level);
- envelope->dwFadeTime = hap_custom->fade_length * 1000;
- }
-
- break;
-
-
- default:
- SDL_SetError("Haptic: Unknown effect type.");
- return -1;
- }
-
- return 0;
-}
-
-
-/*
- * Frees an FFEFFECT allocated by SDL_SYS_ToFFEFFECT.
- */
-static void
-SDL_SYS_HapticFreeFFEFFECT(FFEFFECT * effect, int type)
-{
- FFCUSTOMFORCE *custom;
-
- if (effect->lpEnvelope != NULL) {
- SDL_free(effect->lpEnvelope);
- effect->lpEnvelope = NULL;
- }
- if (effect->rgdwAxes != NULL) {
- SDL_free(effect->rgdwAxes);
- effect->rgdwAxes = NULL;
- }
- if (effect->lpvTypeSpecificParams != NULL) {
- if (type == SDL_HAPTIC_CUSTOM) { /* Must free the custom data. */
- custom = (FFCUSTOMFORCE *) effect->lpvTypeSpecificParams;
- SDL_free(custom->rglForceData);
- custom->rglForceData = NULL;
- }
- SDL_free(effect->lpvTypeSpecificParams);
- effect->lpvTypeSpecificParams = NULL;
- }
- if (effect->rglDirection != NULL) {
- SDL_free(effect->rglDirection);
- effect->rglDirection = NULL;
- }
-}
-
-
-/*
- * Gets the effect type from the generic SDL haptic effect wrapper.
- */
-CFUUIDRef
-SDL_SYS_HapticEffectType(Uint16 type)
-{
- switch (type) {
- case SDL_HAPTIC_CONSTANT:
- return kFFEffectType_ConstantForce_ID;
-
- case SDL_HAPTIC_RAMP:
- return kFFEffectType_RampForce_ID;
-
- case SDL_HAPTIC_SQUARE:
- return kFFEffectType_Square_ID;
-
- case SDL_HAPTIC_SINE:
- return kFFEffectType_Sine_ID;
-
- case SDL_HAPTIC_TRIANGLE:
- return kFFEffectType_Triangle_ID;
-
- case SDL_HAPTIC_SAWTOOTHUP:
- return kFFEffectType_SawtoothUp_ID;
-
- case SDL_HAPTIC_SAWTOOTHDOWN:
- return kFFEffectType_SawtoothDown_ID;
-
- case SDL_HAPTIC_SPRING:
- return kFFEffectType_Spring_ID;
-
- case SDL_HAPTIC_DAMPER:
- return kFFEffectType_Damper_ID;
-
- case SDL_HAPTIC_INERTIA:
- return kFFEffectType_Inertia_ID;
-
- case SDL_HAPTIC_FRICTION:
- return kFFEffectType_Friction_ID;
-
- case SDL_HAPTIC_CUSTOM:
- return kFFEffectType_CustomForce_ID;
-
- default:
- SDL_SetError("Haptic: Unknown effect type.");
- return NULL;
- }
-}
-
-
-/*
- * Creates a new haptic effect.
- */
-int
-SDL_SYS_HapticNewEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
- SDL_HapticEffect * base)
-{
- HRESULT ret;
- CFUUIDRef type;
-
- /* Alloc the effect. */
- effect->hweffect = (struct haptic_hweffect *)
- SDL_malloc(sizeof(struct haptic_hweffect));
- if (effect->hweffect == NULL) {
- SDL_OutOfMemory();
- goto err_hweffect;
- }
-
- /* Get the type. */
- type = SDL_SYS_HapticEffectType(base->type);
- if (type == NULL) {
- goto err_hweffect;
- }
-
- /* Get the effect. */
- if (SDL_SYS_ToFFEFFECT(haptic, &effect->hweffect->effect, base) < 0) {
- goto err_effectdone;
- }
-
- /* Create the actual effect. */
- ret = FFDeviceCreateEffect(haptic->hwdata->device, type,
- &effect->hweffect->effect,
- &effect->hweffect->ref);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to create effect: %s.", FFStrError(ret));
- goto err_effectdone;
- }
-
- return 0;
-
- err_effectdone:
- SDL_SYS_HapticFreeFFEFFECT(&effect->hweffect->effect, base->type);
- err_hweffect:
- if (effect->hweffect != NULL) {
- SDL_free(effect->hweffect);
- effect->hweffect = NULL;
- }
- return -1;
-}
-
-
-/*
- * Updates an effect.
- */
-int
-SDL_SYS_HapticUpdateEffect(SDL_Haptic * haptic,
- struct haptic_effect *effect,
- SDL_HapticEffect * data)
-{
- HRESULT ret;
- FFEffectParameterFlag flags;
- FFEFFECT temp;
-
- /* Get the effect. */
- SDL_memset(&temp, 0, sizeof(FFEFFECT));
- if (SDL_SYS_ToFFEFFECT(haptic, &temp, data) < 0) {
- goto err_update;
- }
-
- /* Set the flags. Might be worthwhile to diff temp with loaded effect and
- * only change those parameters. */
- flags = FFEP_DIRECTION |
- FFEP_DURATION |
- FFEP_ENVELOPE |
- FFEP_STARTDELAY |
- FFEP_TRIGGERBUTTON |
- FFEP_TRIGGERREPEATINTERVAL | FFEP_TYPESPECIFICPARAMS;
-
- /* Create the actual effect. */
- ret = FFEffectSetParameters(effect->hweffect->ref, &temp, flags);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to update effect: %s.", FFStrError(ret));
- goto err_update;
- }
-
- /* Copy it over. */
- SDL_SYS_HapticFreeFFEFFECT(&effect->hweffect->effect, data->type);
- SDL_memcpy(&effect->hweffect->effect, &temp, sizeof(FFEFFECT));
-
- return 0;
-
- err_update:
- SDL_SYS_HapticFreeFFEFFECT(&temp, data->type);
- return -1;
-}
-
-
-/*
- * Runs an effect.
- */
-int
-SDL_SYS_HapticRunEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
- Uint32 iterations)
-{
- HRESULT ret;
- Uint32 iter;
-
- /* Check if it's infinite. */
- if (iterations == SDL_HAPTIC_INFINITY) {
- iter = FF_INFINITE;
- } else
- iter = iterations;
-
- /* Run the effect. */
- ret = FFEffectStart(effect->hweffect->ref, iter, 0);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to run the effect: %s.",
- FFStrError(ret));
- return -1;
- }
-
- return 0;
-}
-
-
-/*
- * Stops an effect.
- */
-int
-SDL_SYS_HapticStopEffect(SDL_Haptic * haptic, struct haptic_effect *effect)
-{
- HRESULT ret;
-
- ret = FFEffectStop(effect->hweffect->ref);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to stop the effect: %s.",
- FFStrError(ret));
- return -1;
- }
-
- return 0;
-}
-
-
-/*
- * Frees the effect.
- */
-void
-SDL_SYS_HapticDestroyEffect(SDL_Haptic * haptic, struct haptic_effect *effect)
-{
- HRESULT ret;
-
- ret =
- FFDeviceReleaseEffect(haptic->hwdata->device, effect->hweffect->ref);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Error removing the effect from the device: %s.",
- FFStrError(ret));
- }
- SDL_SYS_HapticFreeFFEFFECT(&effect->hweffect->effect,
- effect->effect.type);
- SDL_free(effect->hweffect);
- effect->hweffect = NULL;
-}
-
-
-/*
- * Gets the status of a haptic effect.
- */
-int
-SDL_SYS_HapticGetEffectStatus(SDL_Haptic * haptic,
- struct haptic_effect *effect)
-{
- HRESULT ret;
- FFEffectStatusFlag status;
-
- ret = FFEffectGetEffectStatus(effect->hweffect->ref, &status);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Unable to get effect status: %s.",
- FFStrError(ret));
- return -1;
- }
-
- if (status == 0)
- return SDL_FALSE;
- return SDL_TRUE; /* Assume it's playing or emulated. */
-}
-
-
-/*
- * Sets the gain.
- */
-int
-SDL_SYS_HapticSetGain(SDL_Haptic * haptic, int gain)
-{
- HRESULT ret;
- Uint32 val;
-
- val = gain * 100; /* Mac OS X uses 0 to 10,000 */
- ret =
- FFDeviceSetForceFeedbackProperty(haptic->hwdata->device,
- FFPROP_FFGAIN, &val);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Error setting gain: %s.", FFStrError(ret));
- return -1;
- }
-
- return 0;
-}
-
-
-/*
- * Sets the autocentering.
- */
-int
-SDL_SYS_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter)
-{
- HRESULT ret;
- Uint32 val;
-
- /* Mac OS X only has 0 (off) and 1 (on) */
- if (autocenter == 0)
- val = 0;
- else
- val = 1;
-
- ret = FFDeviceSetForceFeedbackProperty(haptic->hwdata->device,
- FFPROP_AUTOCENTER, &val);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Error setting autocenter: %s.",
- FFStrError(ret));
- return -1;
- }
-
- return 0;
-}
-
-
-/*
- * Pauses the device.
- */
-int
-SDL_SYS_HapticPause(SDL_Haptic * haptic)
-{
- HRESULT ret;
-
- ret = FFDeviceSendForceFeedbackCommand(haptic->hwdata->device,
- FFSFFC_PAUSE);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Error pausing device: %s.", FFStrError(ret));
- return -1;
- }
-
- return 0;
-}
-
-
-/*
- * Unpauses the device.
- */
-int
-SDL_SYS_HapticUnpause(SDL_Haptic * haptic)
-{
- HRESULT ret;
-
- ret = FFDeviceSendForceFeedbackCommand(haptic->hwdata->device,
- FFSFFC_CONTINUE);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Error pausing device: %s.", FFStrError(ret));
- return -1;
- }
-
- return 0;
-}
-
-
-/*
- * Stops all currently playing effects.
- */
-int
-SDL_SYS_HapticStopAll(SDL_Haptic * haptic)
-{
- HRESULT ret;
-
- ret = FFDeviceSendForceFeedbackCommand(haptic->hwdata->device,
- FFSFFC_STOPALL);
- if (ret != FF_OK) {
- SDL_SetError("Haptic: Error stopping device: %s.", FFStrError(ret));
- return -1;
- }
-
- return 0;
-}
-
-
-#endif /* SDL_HAPTIC_IOKIT */
diff --git a/macosx/plugins/DFInput/SDL/src/joystick/SDL_joystick.c b/macosx/plugins/DFInput/SDL/src/joystick/SDL_joystick.c
deleted file mode 100644
index 189b811..0000000
--- a/macosx/plugins/DFInput/SDL/src/joystick/SDL_joystick.c
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* This is the joystick API for Simple DirectMedia Layer */
-#include "SDL.h"
-#include "SDL_sysjoystick.h"
-#include "SDL_joystick_c.h"
-
-/* This is used for Quake III Arena */
-#define SDL_Lock_EventThread()
-#define SDL_Unlock_EventThread()
-
-Uint8 SDL_numjoysticks = 0;
-SDL_Joystick **SDL_joysticks = NULL;
-static SDL_Joystick *default_joystick = NULL;
-
-int
-SDL_JoystickInit(void)
-{
- int arraylen;
- int status;
-
- SDL_numjoysticks = 0;
- status = SDL_SYS_JoystickInit();
- if (status >= 0) {
- arraylen = (status + 1) * sizeof(*SDL_joysticks);
- SDL_joysticks = (SDL_Joystick **) SDL_malloc(arraylen);
- if (SDL_joysticks == NULL) {
- SDL_numjoysticks = 0;
- } else {
- SDL_memset(SDL_joysticks, 0, arraylen);
- SDL_numjoysticks = status;
- }
- status = 0;
- }
- default_joystick = NULL;
- return (status);
-}
-
-/*
- * Count the number of joysticks attached to the system
- */
-int
-SDL_NumJoysticks(void)
-{
- return SDL_numjoysticks;
-}
-
-/*
- * Get the implementation dependent name of a joystick
- */
-const char *
-SDL_JoystickName(int device_index)
-{
- if ((device_index < 0) || (device_index >= SDL_numjoysticks)) {
- SDL_SetError("There are %d joysticks available", SDL_numjoysticks);
- return (NULL);
- }
- return (SDL_SYS_JoystickName(device_index));
-}
-
-/*
- * Open a joystick for use - the index passed as an argument refers to
- * the N'th joystick on the system. This index is the value which will
- * identify this joystick in future joystick events.
- *
- * This function returns a joystick identifier, or NULL if an error occurred.
- */
-SDL_Joystick *
-SDL_JoystickOpen(int device_index)
-{
- int i;
- SDL_Joystick *joystick;
-
- if ((device_index < 0) || (device_index >= SDL_numjoysticks)) {
- SDL_SetError("There are %d joysticks available", SDL_numjoysticks);
- return (NULL);
- }
-
- /* If the joystick is already open, return it */
- for (i = 0; SDL_joysticks[i]; ++i) {
- if (device_index == SDL_joysticks[i]->index) {
- joystick = SDL_joysticks[i];
- ++joystick->ref_count;
- return (joystick);
- }
- }
-
- /* Create and initialize the joystick */
- joystick = (SDL_Joystick *) SDL_malloc((sizeof *joystick));
- if (joystick == NULL) {
- SDL_OutOfMemory();
- return NULL;
- }
-
- SDL_memset(joystick, 0, (sizeof *joystick));
- joystick->index = device_index;
- if (SDL_SYS_JoystickOpen(joystick) < 0) {
- SDL_free(joystick);
- return NULL;
- }
- if (joystick->naxes > 0) {
- joystick->axes = (Sint16 *) SDL_malloc
- (joystick->naxes * sizeof(Sint16));
- }
- if (joystick->nhats > 0) {
- joystick->hats = (Uint8 *) SDL_malloc
- (joystick->nhats * sizeof(Uint8));
- }
- if (joystick->nballs > 0) {
- joystick->balls = (struct balldelta *) SDL_malloc
- (joystick->nballs * sizeof(*joystick->balls));
- }
- if (joystick->nbuttons > 0) {
- joystick->buttons = (Uint8 *) SDL_malloc
- (joystick->nbuttons * sizeof(Uint8));
- }
- if (((joystick->naxes > 0) && !joystick->axes)
- || ((joystick->nhats > 0) && !joystick->hats)
- || ((joystick->nballs > 0) && !joystick->balls)
- || ((joystick->nbuttons > 0) && !joystick->buttons)) {
- SDL_OutOfMemory();
- SDL_JoystickClose(joystick);
- return NULL;
- }
- if (joystick->axes) {
- SDL_memset(joystick->axes, 0, joystick->naxes * sizeof(Sint16));
- }
- if (joystick->hats) {
- SDL_memset(joystick->hats, 0, joystick->nhats * sizeof(Uint8));
- }
- if (joystick->balls) {
- SDL_memset(joystick->balls, 0,
- joystick->nballs * sizeof(*joystick->balls));
- }
- if (joystick->buttons) {
- SDL_memset(joystick->buttons, 0, joystick->nbuttons * sizeof(Uint8));
- }
-
- /* Add joystick to list */
- ++joystick->ref_count;
- SDL_Lock_EventThread();
- for (i = 0; SDL_joysticks[i]; ++i)
- /* Skip to next joystick */ ;
- SDL_joysticks[i] = joystick;
- SDL_Unlock_EventThread();
-
- return (joystick);
-}
-
-/*
- * Returns 1 if the joystick has been opened, or 0 if it has not.
- */
-int
-SDL_JoystickOpened(int device_index)
-{
- int i, opened;
-
- opened = 0;
- for (i = 0; SDL_joysticks[i]; ++i) {
- if (SDL_joysticks[i]->index == (Uint8) device_index) {
- opened = 1;
- break;
- }
- }
- return (opened);
-}
-
-
-/*
- * Checks to make sure the joystick is valid.
- */
-int
-SDL_PrivateJoystickValid(SDL_Joystick ** joystick)
-{
- int valid;
-
- if (*joystick == NULL) {
- *joystick = default_joystick;
- }
- if (*joystick == NULL) {
- SDL_SetError("Joystick hasn't been opened yet");
- valid = 0;
- } else {
- valid = 1;
- }
- return valid;
-}
-
-/*
- * Get the device index of an opened joystick.
- */
-int
-SDL_JoystickIndex(SDL_Joystick * joystick)
-{
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (-1);
- }
- return (joystick->index);
-}
-
-/*
- * Get the number of multi-dimensional axis controls on a joystick
- */
-int
-SDL_JoystickNumAxes(SDL_Joystick * joystick)
-{
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (-1);
- }
- return (joystick->naxes);
-}
-
-/*
- * Get the number of hats on a joystick
- */
-int
-SDL_JoystickNumHats(SDL_Joystick * joystick)
-{
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (-1);
- }
- return (joystick->nhats);
-}
-
-/*
- * Get the number of trackballs on a joystick
- */
-int
-SDL_JoystickNumBalls(SDL_Joystick * joystick)
-{
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (-1);
- }
- return (joystick->nballs);
-}
-
-/*
- * Get the number of buttons on a joystick
- */
-int
-SDL_JoystickNumButtons(SDL_Joystick * joystick)
-{
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (-1);
- }
- return (joystick->nbuttons);
-}
-
-/*
- * Get the current state of an axis control on a joystick
- */
-Sint16
-SDL_JoystickGetAxis(SDL_Joystick * joystick, int axis)
-{
- Sint16 state;
-
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (0);
- }
- if (axis < joystick->naxes) {
- state = joystick->axes[axis];
- } else {
- SDL_SetError("Joystick only has %d axes", joystick->naxes);
- state = 0;
- }
- return (state);
-}
-
-/*
- * Get the current state of a hat on a joystick
- */
-Uint8
-SDL_JoystickGetHat(SDL_Joystick * joystick, int hat)
-{
- Uint8 state;
-
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (0);
- }
- if (hat < joystick->nhats) {
- state = joystick->hats[hat];
- } else {
- SDL_SetError("Joystick only has %d hats", joystick->nhats);
- state = 0;
- }
- return (state);
-}
-
-/*
- * Get the ball axis change since the last poll
- */
-int
-SDL_JoystickGetBall(SDL_Joystick * joystick, int ball, int *dx, int *dy)
-{
- int retval;
-
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (-1);
- }
-
- retval = 0;
- if (ball < joystick->nballs) {
- if (dx) {
- *dx = joystick->balls[ball].dx;
- }
- if (dy) {
- *dy = joystick->balls[ball].dy;
- }
- joystick->balls[ball].dx = 0;
- joystick->balls[ball].dy = 0;
- } else {
- SDL_SetError("Joystick only has %d balls", joystick->nballs);
- retval = -1;
- }
- return (retval);
-}
-
-/*
- * Get the current state of a button on a joystick
- */
-Uint8
-SDL_JoystickGetButton(SDL_Joystick * joystick, int button)
-{
- Uint8 state;
-
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return (0);
- }
- if (button < joystick->nbuttons) {
- state = joystick->buttons[button];
- } else {
- SDL_SetError("Joystick only has %d buttons", joystick->nbuttons);
- state = 0;
- }
- return (state);
-}
-
-/*
- * Close a joystick previously opened with SDL_JoystickOpen()
- */
-void
-SDL_JoystickClose(SDL_Joystick * joystick)
-{
- int i;
-
- if (!SDL_PrivateJoystickValid(&joystick)) {
- return;
- }
-
- /* First decrement ref count */
- if (--joystick->ref_count > 0) {
- return;
- }
-
- /* Lock the event queue - prevent joystick polling */
- SDL_Lock_EventThread();
-
- if (joystick == default_joystick) {
- default_joystick = NULL;
- }
- SDL_SYS_JoystickClose(joystick);
-
- /* Remove joystick from list */
- for (i = 0; SDL_joysticks[i]; ++i) {
- if (joystick == SDL_joysticks[i]) {
- SDL_memmove(&SDL_joysticks[i], &SDL_joysticks[i + 1],
- (SDL_numjoysticks - i) * sizeof(joystick));
- break;
- }
- }
-
- /* Let the event thread keep running */
- SDL_Unlock_EventThread();
-
- /* Free the data associated with this joystick */
- if (joystick->axes) {
- SDL_free(joystick->axes);
- }
- if (joystick->hats) {
- SDL_free(joystick->hats);
- }
- if (joystick->balls) {
- SDL_free(joystick->balls);
- }
- if (joystick->buttons) {
- SDL_free(joystick->buttons);
- }
- SDL_free(joystick);
-}
-
-void
-SDL_JoystickQuit(void)
-{
- /* Stop the event polling */
- SDL_Lock_EventThread();
- SDL_numjoysticks = 0;
- SDL_Unlock_EventThread();
-
- /* Quit the joystick setup */
- SDL_SYS_JoystickQuit();
- if (SDL_joysticks) {
- SDL_free(SDL_joysticks);
- SDL_joysticks = NULL;
- }
-}
-
-
-/* These are global for SDL_sysjoystick.c and SDL_events.c */
-
-int
-SDL_PrivateJoystickAxis(SDL_Joystick * joystick, Uint8 axis, Sint16 value)
-{
- int posted;
-
- /* Update internal joystick state */
- joystick->axes[axis] = value;
-
- /* Post the event, if desired */
- posted = 0;
-
- return (posted);
-}
-
-int
-SDL_PrivateJoystickHat(SDL_Joystick * joystick, Uint8 hat, Uint8 value)
-{
- int posted;
-
- /* Update internal joystick state */
- joystick->hats[hat] = value;
-
- /* Post the event, if desired */
- posted = 0;
-
- return (posted);
-}
-
-int
-SDL_PrivateJoystickBall(SDL_Joystick * joystick, Uint8 ball,
- Sint16 xrel, Sint16 yrel)
-{
- int posted;
-
- /* Update internal mouse state */
- joystick->balls[ball].dx += xrel;
- joystick->balls[ball].dy += yrel;
-
- /* Post the event, if desired */
- posted = 0;
-
- return (posted);
-}
-
-int
-SDL_PrivateJoystickButton(SDL_Joystick * joystick, Uint8 button, Uint8 state)
-{
- int posted;
-
- /* Update internal joystick state */
- joystick->buttons[button] = state;
-
- /* Post the event, if desired */
- posted = 0;
-
- return (posted);
-}
-
-void
-SDL_JoystickUpdate(void)
-{
- int i;
-
- for (i = 0; SDL_joysticks[i]; ++i) {
- SDL_SYS_JoystickUpdate(SDL_joysticks[i]);
- }
-}
-
-int
-SDL_JoystickEventState(int state)
-{
- return SDL_IGNORE;
-}
diff --git a/macosx/plugins/DFInput/SDL/src/joystick/SDL_joystick_c.h b/macosx/plugins/DFInput/SDL/src/joystick/SDL_joystick_c.h
deleted file mode 100644
index e0f8529..0000000
--- a/macosx/plugins/DFInput/SDL/src/joystick/SDL_joystick_c.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* Useful functions and variables from SDL_joystick.c */
-#include "SDL_joystick.h"
-
-/* The number of available joysticks on the system */
-extern Uint8 SDL_numjoysticks;
-
-/* Initialization and shutdown functions */
-extern int SDL_JoystickInit(void);
-extern void SDL_JoystickQuit(void);
-
-/* Internal event queueing functions */
-extern int SDL_PrivateJoystickAxis(SDL_Joystick * joystick,
- Uint8 axis, Sint16 value);
-extern int SDL_PrivateJoystickBall(SDL_Joystick * joystick,
- Uint8 ball, Sint16 xrel, Sint16 yrel);
-extern int SDL_PrivateJoystickHat(SDL_Joystick * joystick,
- Uint8 hat, Uint8 value);
-extern int SDL_PrivateJoystickButton(SDL_Joystick * joystick,
- Uint8 button, Uint8 state);
-
-/* Internal sanity checking functions */
-extern int SDL_PrivateJoystickValid(SDL_Joystick ** joystick);
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/macosx/plugins/DFInput/SDL/src/joystick/SDL_sysjoystick.h b/macosx/plugins/DFInput/SDL/src/joystick/SDL_sysjoystick.h
deleted file mode 100644
index ddb3b84..0000000
--- a/macosx/plugins/DFInput/SDL/src/joystick/SDL_sysjoystick.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is SDL_free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* This is the system specific header for the SDL joystick API */
-
-#include "SDL_joystick.h"
-
-/* The SDL joystick structure */
-struct _SDL_Joystick
-{
- Uint8 index; /* Device index */
- const char *name; /* Joystick name - system dependent */
-
- int naxes; /* Number of axis controls on the joystick */
- Sint16 *axes; /* Current axis states */
-
- int nhats; /* Number of hats on the joystick */
- Uint8 *hats; /* Current hat states */
-
- int nballs; /* Number of trackballs on the joystick */
- struct balldelta
- {
- int dx;
- int dy;
- } *balls; /* Current ball motion deltas */
-
- int nbuttons; /* Number of buttons on the joystick */
- Uint8 *buttons; /* Current button states */
-
- struct joystick_hwdata *hwdata; /* Driver dependent information */
-
- int ref_count; /* Reference count for multiple opens */
-};
-
-/* Function to scan the system for joysticks.
- * Joystick 0 should be the system default joystick.
- * This function should return the number of available joysticks, or -1
- * on an unrecoverable fatal error.
- */
-extern int SDL_SYS_JoystickInit(void);
-
-/* Function to get the device-dependent name of a joystick */
-extern const char *SDL_SYS_JoystickName(int index);
-
-/* Function to open a joystick for use.
- The joystick to open is specified by the index field of the joystick.
- This should fill the nbuttons and naxes fields of the joystick structure.
- It returns 0, or -1 if there is an error.
- */
-extern int SDL_SYS_JoystickOpen(SDL_Joystick * joystick);
-
-/* Function to update the state of a joystick - called as a device poll.
- * This function shouldn't update the joystick structure directly,
- * but instead should call SDL_PrivateJoystick*() to deliver events
- * and update joystick device state.
- */
-extern void SDL_SYS_JoystickUpdate(SDL_Joystick * joystick);
-
-/* Function to close a joystick after use */
-extern void SDL_SYS_JoystickClose(SDL_Joystick * joystick);
-
-/* Function to perform any system-specific joystick related cleanup */
-extern void SDL_SYS_JoystickQuit(void);
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/macosx/plugins/DFInput/SDL/src/joystick/darwin/SDL_sysjoystick.c b/macosx/plugins/DFInput/SDL/src/joystick/darwin/SDL_sysjoystick.c
deleted file mode 100644
index 824917f..0000000
--- a/macosx/plugins/DFInput/SDL/src/joystick/darwin/SDL_sysjoystick.c
+++ /dev/null
@@ -1,847 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#ifdef SDL_JOYSTICK_IOKIT
-
-/* SDL joystick driver for Darwin / Mac OS X, based on the IOKit HID API */
-/* Written 2001 by Max Horn */
-
-#include <unistd.h>
-#include <ctype.h>
-#include <sysexits.h>
-#include <mach/mach.h>
-#include <mach/mach_error.h>
-#include <IOKit/IOKitLib.h>
-#include <IOKit/IOCFPlugIn.h>
-#ifdef MACOS_10_0_4
-#include <IOKit/hidsystem/IOHIDUsageTables.h>
-#else
-/* The header was moved here in Mac OS X 10.1 */
-#include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
-#endif
-#include <IOKit/hid/IOHIDLib.h>
-#include <IOKit/hid/IOHIDKeys.h>
-#include <CoreFoundation/CoreFoundation.h>
-#include <Carbon/Carbon.h> /* for NewPtrClear, DisposePtr */
-
-/* For force feedback testing. */
-#include <ForceFeedback/ForceFeedback.h>
-#include <ForceFeedback/ForceFeedbackConstants.h>
-
-#include "SDL_joystick.h"
-#include "../SDL_sysjoystick.h"
-#include "../SDL_joystick_c.h"
-#include "SDL_sysjoystick_c.h"
-
-
-/* Linked list of all available devices */
-static recDevice *gpDeviceList = NULL;
-
-
-static void
-HIDReportErrorNum(char *strError, long numError)
-{
- SDL_SetError(strError);
-}
-
-static void HIDGetCollectionElements(CFMutableDictionaryRef deviceProperties,
- recDevice * pDevice);
-
-/* returns current value for element, polling element
- * will return 0 on error conditions which should be accounted for by application
- */
-
-static SInt32
-HIDGetElementValue(recDevice * pDevice, recElement * pElement)
-{
- IOReturn result = kIOReturnSuccess;
- IOHIDEventStruct hidEvent;
- hidEvent.value = 0;
-
- if (NULL != pDevice && NULL != pElement && NULL != pDevice->interface) {
- result =
- (*(pDevice->interface))->getElementValue(pDevice->interface,
- pElement->cookie,
- &hidEvent);
- if (kIOReturnSuccess == result) {
- /* record min and max for auto calibration */
- if (hidEvent.value < pElement->minReport)
- pElement->minReport = hidEvent.value;
- if (hidEvent.value > pElement->maxReport)
- pElement->maxReport = hidEvent.value;
- }
- }
-
- /* auto user scale */
- return hidEvent.value;
-}
-
-static SInt32
-HIDScaledCalibratedValue(recDevice * pDevice, recElement * pElement,
- long min, long max)
-{
- float deviceScale = max - min;
- float readScale = pElement->maxReport - pElement->minReport;
- SInt32 value = HIDGetElementValue(pDevice, pElement);
- if (readScale == 0)
- return value; /* no scaling at all */
- else
- return ((value - pElement->minReport) * deviceScale / readScale) +
- min;
-}
-
-
-static void
-HIDRemovalCallback(void *target, IOReturn result, void *refcon, void *sender)
-{
- recDevice *device = (recDevice *) refcon;
- device->removed = 1;
- device->uncentered = 1;
-}
-
-
-
-/* Create and open an interface to device, required prior to extracting values or building queues.
- * Note: appliction now owns the device and must close and release it prior to exiting
- */
-
-static IOReturn
-HIDCreateOpenDeviceInterface(io_object_t hidDevice, recDevice * pDevice)
-{
- IOReturn result = kIOReturnSuccess;
- HRESULT plugInResult = S_OK;
- SInt32 score = 0;
- IOCFPlugInInterface **ppPlugInInterface = NULL;
-
- if (NULL == pDevice->interface) {
- result =
- IOCreatePlugInInterfaceForService(hidDevice,
- kIOHIDDeviceUserClientTypeID,
- kIOCFPlugInInterfaceID,
- &ppPlugInInterface, &score);
- if (kIOReturnSuccess == result) {
- /* Call a method of the intermediate plug-in to create the device interface */
- plugInResult =
- (*ppPlugInInterface)->QueryInterface(ppPlugInInterface,
- CFUUIDGetUUIDBytes
- (kIOHIDDeviceInterfaceID),
- (void *)
- &(pDevice->interface));
- if (S_OK != plugInResult)
- HIDReportErrorNum
- ("CouldnŐt query HID class device interface from plugInInterface",
- plugInResult);
- (*ppPlugInInterface)->Release(ppPlugInInterface);
- } else
- HIDReportErrorNum
- ("Failed to create **plugInInterface via IOCreatePlugInInterfaceForService.",
- result);
- }
- if (NULL != pDevice->interface) {
- result = (*(pDevice->interface))->open(pDevice->interface, 0);
- if (kIOReturnSuccess != result)
- HIDReportErrorNum
- ("Failed to open pDevice->interface via open.", result);
- else
- (*(pDevice->interface))->setRemovalCallback(pDevice->interface,
- HIDRemovalCallback,
- pDevice, pDevice);
-
- }
- return result;
-}
-
-/* Closes and releases interface to device, should be done prior to exting application
- * Note: will have no affect if device or interface do not exist
- * application will "own" the device if interface is not closed
- * (device may have to be plug and re-plugged in different location to get it working again without a restart)
- */
-
-static IOReturn
-HIDCloseReleaseInterface(recDevice * pDevice)
-{
- IOReturn result = kIOReturnSuccess;
-
- if ((NULL != pDevice) && (NULL != pDevice->interface)) {
- /* close the interface */
- result = (*(pDevice->interface))->close(pDevice->interface);
- if (kIOReturnNotOpen == result) {
- /* do nothing as device was not opened, thus can't be closed */
- } else if (kIOReturnSuccess != result)
- HIDReportErrorNum("Failed to close IOHIDDeviceInterface.",
- result);
- /* release the interface */
- result = (*(pDevice->interface))->Release(pDevice->interface);
- if (kIOReturnSuccess != result)
- HIDReportErrorNum("Failed to release IOHIDDeviceInterface.",
- result);
- pDevice->interface = NULL;
- }
- return result;
-}
-
-/* extracts actual specific element information from each element CF dictionary entry */
-
-static void
-HIDGetElementInfo(CFTypeRef refElement, recElement * pElement)
-{
- long number;
- CFTypeRef refType;
-
- refType = CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementCookieKey));
- if (refType && CFNumberGetValue(refType, kCFNumberLongType, &number))
- pElement->cookie = (IOHIDElementCookie) number;
- refType = CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementMinKey));
- if (refType && CFNumberGetValue(refType, kCFNumberLongType, &number))
- pElement->minReport = pElement->min = number;
- pElement->maxReport = pElement->min;
- refType = CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementMaxKey));
- if (refType && CFNumberGetValue(refType, kCFNumberLongType, &number))
- pElement->maxReport = pElement->max = number;
-/*
- TODO: maybe should handle the following stuff somehow?
-
- refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementScaledMinKey));
- if (refType && CFNumberGetValue (refType, kCFNumberLongType, &number))
- pElement->scaledMin = number;
- refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementScaledMaxKey));
- if (refType && CFNumberGetValue (refType, kCFNumberLongType, &number))
- pElement->scaledMax = number;
- refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementSizeKey));
- if (refType && CFNumberGetValue (refType, kCFNumberLongType, &number))
- pElement->size = number;
- refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementIsRelativeKey));
- if (refType)
- pElement->relative = CFBooleanGetValue (refType);
- refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementIsWrappingKey));
- if (refType)
- pElement->wrapping = CFBooleanGetValue (refType);
- refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementIsNonLinearKey));
- if (refType)
- pElement->nonLinear = CFBooleanGetValue (refType);
- refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementHasPreferedStateKey));
- if (refType)
- pElement->preferredState = CFBooleanGetValue (refType);
- refType = CFDictionaryGetValue (refElement, CFSTR(kIOHIDElementHasNullStateKey));
- if (refType)
- pElement->nullState = CFBooleanGetValue (refType);
-*/
-}
-
-/* examines CF dictionary vlaue in device element hierarchy to determine if it is element of interest or a collection of more elements
- * if element of interest allocate storage, add to list and retrieve element specific info
- * if collection then pass on to deconstruction collection into additional individual elements
- */
-
-static void
-HIDAddElement(CFTypeRef refElement, recDevice * pDevice)
-{
- recElement *element = NULL;
- recElement **headElement = NULL;
- long elementType, usagePage, usage;
- CFTypeRef refElementType =
- CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementTypeKey));
- CFTypeRef refUsagePage =
- CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementUsagePageKey));
- CFTypeRef refUsage =
- CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementUsageKey));
-
-
- if ((refElementType)
- &&
- (CFNumberGetValue(refElementType, kCFNumberLongType, &elementType))) {
- /* look at types of interest */
- if ((elementType == kIOHIDElementTypeInput_Misc)
- || (elementType == kIOHIDElementTypeInput_Button)
- || (elementType == kIOHIDElementTypeInput_Axis)) {
- if (refUsagePage
- && CFNumberGetValue(refUsagePage, kCFNumberLongType,
- &usagePage) && refUsage
- && CFNumberGetValue(refUsage, kCFNumberLongType, &usage)) {
- switch (usagePage) { /* only interested in kHIDPage_GenericDesktop and kHIDPage_Button */
- case 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:
- case kHIDUsage_GD_Dial:
- case kHIDUsage_GD_Wheel:
- element = (recElement *)
- NewPtrClear(sizeof(recElement));
- if (element) {
- pDevice->axes++;
- headElement = &(pDevice->firstAxis);
- }
- break;
- case kHIDUsage_GD_Hatswitch:
- element = (recElement *)
- NewPtrClear(sizeof(recElement));
- if (element) {
- pDevice->hats++;
- headElement = &(pDevice->firstHat);
- }
- break;
- }
- }
- break;
- case kHIDPage_Button:
- element = (recElement *)
- NewPtrClear(sizeof(recElement));
- if (element) {
- pDevice->buttons++;
- headElement = &(pDevice->firstButton);
- }
- break;
- default:
- break;
- }
- }
- } else if (kIOHIDElementTypeCollection == elementType)
- HIDGetCollectionElements((CFMutableDictionaryRef) refElement,
- pDevice);
- }
-
- if (element && headElement) { /* add to list */
- recElement *elementPrevious = NULL;
- recElement *elementCurrent = *headElement;
- while (elementCurrent && usage >= elementCurrent->usage) {
- elementPrevious = elementCurrent;
- elementCurrent = elementCurrent->pNext;
- }
- if (elementPrevious) {
- elementPrevious->pNext = element;
- } else {
- *headElement = element;
- }
- element->usagePage = usagePage;
- element->usage = usage;
- element->pNext = elementCurrent;
- HIDGetElementInfo(refElement, element);
- pDevice->elements++;
- }
-}
-
-/* collects information from each array member in device element list (each array memeber = element) */
-
-static void
-HIDGetElementsCFArrayHandler(const void *value, void *parameter)
-{
- if (CFGetTypeID(value) == CFDictionaryGetTypeID())
- HIDAddElement((CFTypeRef) value, (recDevice *) parameter);
-}
-
-/* handles retrieval of element information from arrays of elements in device IO registry information */
-
-static void
-HIDGetElements(CFTypeRef refElementCurrent, recDevice * pDevice)
-{
- CFTypeID type = CFGetTypeID(refElementCurrent);
- if (type == CFArrayGetTypeID()) { /* if element is an array */
- CFRange range = { 0, CFArrayGetCount(refElementCurrent) };
- /* CountElementsCFArrayHandler called for each array member */
- CFArrayApplyFunction(refElementCurrent, range,
- HIDGetElementsCFArrayHandler, pDevice);
- }
-}
-
-/* handles extracting element information from element collection CF types
- * used from top level element decoding and hierarchy deconstruction to flatten device element list
- */
-
-static void
-HIDGetCollectionElements(CFMutableDictionaryRef deviceProperties,
- recDevice * pDevice)
-{
- CFTypeRef refElementTop =
- CFDictionaryGetValue(deviceProperties, CFSTR(kIOHIDElementKey));
- if (refElementTop)
- HIDGetElements(refElementTop, pDevice);
-}
-
-/* use top level element usage page and usage to discern device usage page and usage setting appropriate vlaues in device record */
-
-static void
-HIDTopLevelElementHandler(const void *value, void *parameter)
-{
- CFTypeRef refCF = 0;
- if (CFGetTypeID(value) != CFDictionaryGetTypeID())
- return;
- refCF = CFDictionaryGetValue(value, CFSTR(kIOHIDElementUsagePageKey));
- if (!CFNumberGetValue
- (refCF, kCFNumberLongType, &((recDevice *) parameter)->usagePage))
- SDL_SetError("CFNumberGetValue error retrieving pDevice->usagePage.");
- refCF = CFDictionaryGetValue(value, CFSTR(kIOHIDElementUsageKey));
- if (!CFNumberGetValue
- (refCF, kCFNumberLongType, &((recDevice *) parameter)->usage))
- SDL_SetError("CFNumberGetValue error retrieving pDevice->usage.");
-}
-
-/* extracts device info from CF dictionary records in IO registry */
-
-static void
-HIDGetDeviceInfo(io_object_t hidDevice, CFMutableDictionaryRef hidProperties,
- recDevice * pDevice)
-{
- CFMutableDictionaryRef usbProperties = 0;
- io_registry_entry_t parent1, parent2;
-
- /* 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
- */
- if ((KERN_SUCCESS ==
- IORegistryEntryGetParentEntry(hidDevice, kIOServicePlane, &parent1))
- && (KERN_SUCCESS ==
- IORegistryEntryGetParentEntry(parent1, kIOServicePlane, &parent2))
- && (KERN_SUCCESS ==
- IORegistryEntryCreateCFProperties(parent2, &usbProperties,
- kCFAllocatorDefault,
- kNilOptions))) {
- if (usbProperties) {
- CFTypeRef refCF = 0;
- /* get device info
- * try hid dictionary first, if fail then go to usb dictionary
- */
-
-
- /* get product name */
- refCF =
- CFDictionaryGetValue(hidProperties, CFSTR(kIOHIDProductKey));
- if (!refCF)
- refCF =
- CFDictionaryGetValue(usbProperties,
- CFSTR("USB Product Name"));
- if (refCF) {
- if (!CFStringGetCString
- (refCF, pDevice->product, 256,
- CFStringGetSystemEncoding()))
- SDL_SetError
- ("CFStringGetCString error retrieving pDevice->product.");
- }
-
- /* get usage page and usage */
- refCF =
- CFDictionaryGetValue(hidProperties,
- CFSTR(kIOHIDPrimaryUsagePageKey));
- if (refCF) {
- if (!CFNumberGetValue
- (refCF, kCFNumberLongType, &pDevice->usagePage))
- SDL_SetError
- ("CFNumberGetValue error retrieving pDevice->usagePage.");
- refCF =
- CFDictionaryGetValue(hidProperties,
- CFSTR(kIOHIDPrimaryUsageKey));
- if (refCF)
- if (!CFNumberGetValue
- (refCF, kCFNumberLongType, &pDevice->usage))
- SDL_SetError
- ("CFNumberGetValue error retrieving pDevice->usage.");
- }
-
- if (NULL == refCF) { /* get top level element HID usage page or usage */
- /* use top level element instead */
- CFTypeRef refCFTopElement = 0;
- refCFTopElement =
- CFDictionaryGetValue(hidProperties,
- CFSTR(kIOHIDElementKey));
- {
- /* refCFTopElement points to an array of element dictionaries */
- CFRange range = { 0, CFArrayGetCount(refCFTopElement) };
- CFArrayApplyFunction(refCFTopElement, range,
- HIDTopLevelElementHandler, pDevice);
- }
- }
-
- CFRelease(usbProperties);
- } else
- SDL_SetError
- ("IORegistryEntryCreateCFProperties failed to create usbProperties.");
-
- if (kIOReturnSuccess != IOObjectRelease(parent2))
- SDL_SetError("IOObjectRelease error with parent2.");
- if (kIOReturnSuccess != IOObjectRelease(parent1))
- SDL_SetError("IOObjectRelease error with parent1.");
- }
-}
-
-
-static recDevice *
-HIDBuildDevice(io_object_t hidDevice)
-{
- recDevice *pDevice = (recDevice *) NewPtrClear(sizeof(recDevice));
- if (pDevice) {
- /* get dictionary for HID properties */
- CFMutableDictionaryRef hidProperties = 0;
- kern_return_t result =
- IORegistryEntryCreateCFProperties(hidDevice, &hidProperties,
- kCFAllocatorDefault,
- kNilOptions);
- if ((result == KERN_SUCCESS) && hidProperties) {
- /* create device interface */
- result = HIDCreateOpenDeviceInterface(hidDevice, pDevice);
- if (kIOReturnSuccess == result) {
- HIDGetDeviceInfo(hidDevice, hidProperties, pDevice); /* hidDevice used to find parents in registry tree */
- HIDGetCollectionElements(hidProperties, pDevice);
- } else {
- DisposePtr((Ptr) pDevice);
- pDevice = NULL;
- }
- CFRelease(hidProperties);
- } else {
- DisposePtr((Ptr) pDevice);
- pDevice = NULL;
- }
- }
- return pDevice;
-}
-
-/* disposes of the element list associated with a device and the memory associated with the list
- */
-
-static void
-HIDDisposeElementList(recElement ** elementList)
-{
- recElement *pElement = *elementList;
- while (pElement) {
- recElement *pElementNext = pElement->pNext;
- DisposePtr((Ptr) pElement);
- pElement = pElementNext;
- }
- *elementList = NULL;
-}
-
-/* disposes of a single device, closing and releaseing interface, freeing memory fro device and elements, setting device pointer to NULL
- * all your device no longer belong to us... (i.e., you do not 'own' the device anymore)
- */
-
-static recDevice *
-HIDDisposeDevice(recDevice ** ppDevice)
-{
- kern_return_t result = KERN_SUCCESS;
- recDevice *pDeviceNext = NULL;
- if (*ppDevice) {
- /* save next device prior to disposing of this device */
- pDeviceNext = (*ppDevice)->pNext;
-
- /* free posible io_service_t */
- if ((*ppDevice)->ffservice) {
- IOObjectRelease((*ppDevice)->ffservice);
- (*ppDevice)->ffservice = 0;
- }
-
- /* free element lists */
- HIDDisposeElementList(&(*ppDevice)->firstAxis);
- HIDDisposeElementList(&(*ppDevice)->firstButton);
- HIDDisposeElementList(&(*ppDevice)->firstHat);
-
- result = HIDCloseReleaseInterface(*ppDevice); /* function sanity checks interface value (now application does not own device) */
- if (kIOReturnSuccess != result)
- HIDReportErrorNum
- ("HIDCloseReleaseInterface failed when trying to dipose device.",
- result);
- DisposePtr((Ptr) * ppDevice);
- *ppDevice = NULL;
- }
- return pDeviceNext;
-}
-
-
-/* Function to scan the system for joysticks.
- * Joystick 0 should be the system default joystick.
- * This function should return the number of available joysticks, or -1
- * on an unrecoverable fatal error.
- */
-int
-SDL_SYS_JoystickInit(void)
-{
- IOReturn result = kIOReturnSuccess;
- mach_port_t masterPort = 0;
- io_iterator_t hidObjectIterator = 0;
- CFMutableDictionaryRef hidMatchDictionary = NULL;
- recDevice *device, *lastDevice;
- io_object_t ioHIDDeviceObject = 0;
-
- SDL_numjoysticks = 0;
-
- if (gpDeviceList) {
- SDL_SetError("Joystick: Device list already inited.");
- return -1;
- }
-
- result = IOMasterPort(bootstrap_port, &masterPort);
- if (kIOReturnSuccess != result) {
- SDL_SetError("Joystick: IOMasterPort error with bootstrap_port.");
- return -1;
- }
-
- /* Set up a matching dictionary to search I/O Registry by class name for all HID class devices. */
- hidMatchDictionary = IOServiceMatching(kIOHIDDeviceKey);
- if (hidMatchDictionary) {
- /* Add key for device type (joystick, in this case) to refine the matching dictionary. */
-
- /* NOTE: we now perform this filtering later
- UInt32 usagePage = kHIDPage_GenericDesktop;
- UInt32 usage = kHIDUsage_GD_Joystick;
- CFNumberRef refUsage = NULL, refUsagePage = NULL;
-
- refUsage = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &usage);
- CFDictionarySetValue (hidMatchDictionary, CFSTR (kIOHIDPrimaryUsageKey), refUsage);
- refUsagePage = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &usagePage);
- CFDictionarySetValue (hidMatchDictionary, CFSTR (kIOHIDPrimaryUsagePageKey), refUsagePage);
- */
- } else {
- SDL_SetError
- ("Joystick: Failed to get HID CFMutableDictionaryRef via IOServiceMatching.");
- return -1;
- }
-
- /*/ Now search I/O Registry for matching devices. */
- result =
- IOServiceGetMatchingServices(masterPort, hidMatchDictionary,
- &hidObjectIterator);
- /* Check for errors */
- if (kIOReturnSuccess != result) {
- SDL_SetError("Joystick: Couldn't create a HID object iterator.");
- return -1;
- }
- if (!hidObjectIterator) { /* there are no joysticks */
- gpDeviceList = NULL;
- SDL_numjoysticks = 0;
- return 0;
- }
- /* IOServiceGetMatchingServices consumes a reference to the dictionary, so we don't need to release the dictionary ref. */
-
- /* build flat linked list of devices from device iterator */
-
- gpDeviceList = lastDevice = NULL;
-
- while ((ioHIDDeviceObject = IOIteratorNext(hidObjectIterator))) {
- /* build a device record */
- device = HIDBuildDevice(ioHIDDeviceObject);
- if (!device)
- continue;
-
- /* Filter device list to non-keyboard/mouse stuff */
- if ((device->usagePage != kHIDPage_GenericDesktop) ||
- ((device->usage != kHIDUsage_GD_Joystick &&
- device->usage != kHIDUsage_GD_GamePad &&
- device->usage != kHIDUsage_GD_MultiAxisController))) {
-
- /* release memory for the device */
- HIDDisposeDevice(&device);
- DisposePtr((Ptr) device);
- continue;
- }
-
- /* We have to do some storage of the io_service_t for
- * SDL_HapticOpenFromJoystick */
- if (FFIsForceFeedback(ioHIDDeviceObject) == FF_OK) {
- device->ffservice = ioHIDDeviceObject;
- } else {
- device->ffservice = 0;
- }
-
- /* Add device to the end of the list */
- if (lastDevice)
- lastDevice->pNext = device;
- else
- gpDeviceList = device;
- lastDevice = device;
- }
- result = IOObjectRelease(hidObjectIterator); /* release the iterator */
-
- /* Count the total number of devices we found */
- device = gpDeviceList;
- while (device) {
- SDL_numjoysticks++;
- device = device->pNext;
- }
-
- return SDL_numjoysticks;
-}
-
-/* Function to get the device-dependent name of a joystick */
-const char *
-SDL_SYS_JoystickName(int index)
-{
- recDevice *device = gpDeviceList;
-
- for (; index > 0; index--)
- device = device->pNext;
-
- return device->product;
-}
-
-/* Function to open a joystick for use.
- * The joystick to open is specified by the index field of the joystick.
- * This should fill the nbuttons and naxes fields of the joystick structure.
- * It returns 0, or -1 if there is an error.
- */
-int
-SDL_SYS_JoystickOpen(SDL_Joystick * joystick)
-{
- recDevice *device = gpDeviceList;
- int index;
-
- for (index = joystick->index; index > 0; index--)
- device = device->pNext;
-
- joystick->hwdata = device;
- joystick->name = device->product;
-
- joystick->naxes = device->axes;
- joystick->nhats = device->hats;
- joystick->nballs = 0;
- joystick->nbuttons = device->buttons;
-
- return 0;
-}
-
-/* Function to update the state of a joystick - called as a device poll.
- * This function shouldn't update the joystick structure directly,
- * but instead should call SDL_PrivateJoystick*() to deliver events
- * and update joystick device state.
- */
-void
-SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
-{
- recDevice *device = joystick->hwdata;
- recElement *element;
- SInt32 value, range;
- int i;
-
- if (device->removed) { /* device was unplugged; ignore it. */
- if (device->uncentered) {
- device->uncentered = 0;
-
- /* Tell the app that everything is centered/unpressed... */
- for (i = 0; i < device->axes; i++)
- SDL_PrivateJoystickAxis(joystick, i, 0);
-
- for (i = 0; i < device->buttons; i++)
- SDL_PrivateJoystickButton(joystick, i, 0);
-
- for (i = 0; i < device->hats; i++)
- SDL_PrivateJoystickHat(joystick, i, SDL_HAT_CENTERED);
- }
-
- return;
- }
-
- element = device->firstAxis;
- i = 0;
- while (element) {
- value = HIDScaledCalibratedValue(device, element, -32768, 32767);
- if (value != joystick->axes[i])
- SDL_PrivateJoystickAxis(joystick, i, value);
- element = element->pNext;
- ++i;
- }
-
- element = device->firstButton;
- i = 0;
- while (element) {
- value = HIDGetElementValue(device, element);
- if (value > 1) /* handle pressure-sensitive buttons */
- value = 1;
- if (value != joystick->buttons[i])
- SDL_PrivateJoystickButton(joystick, i, value);
- element = element->pNext;
- ++i;
- }
-
- element = device->firstHat;
- i = 0;
- while (element) {
- Uint8 pos = 0;
-
- range = (element->max - element->min + 1);
- value = HIDGetElementValue(device, element) - element->min;
- if (range == 4) /* 4 position hatswitch - scale up value */
- value *= 2;
- else if (range != 8) /* Neither a 4 nor 8 positions - fall back to default position (centered) */
- value = -1;
- switch (value) {
- case 0:
- pos = SDL_HAT_UP;
- break;
- case 1:
- pos = SDL_HAT_RIGHTUP;
- break;
- case 2:
- pos = SDL_HAT_RIGHT;
- break;
- case 3:
- pos = SDL_HAT_RIGHTDOWN;
- break;
- case 4:
- pos = SDL_HAT_DOWN;
- break;
- case 5:
- pos = SDL_HAT_LEFTDOWN;
- break;
- case 6:
- pos = SDL_HAT_LEFT;
- break;
- case 7:
- pos = SDL_HAT_LEFTUP;
- break;
- default:
- /* Every other value is mapped to center. We do that because some
- * joysticks use 8 and some 15 for this value, and apparently
- * there are even more variants out there - so we try to be generous.
- */
- pos = SDL_HAT_CENTERED;
- break;
- }
- if (pos != joystick->hats[i])
- SDL_PrivateJoystickHat(joystick, i, pos);
- element = element->pNext;
- ++i;
- }
-
- return;
-}
-
-/* Function to close a joystick after use */
-void
-SDL_SYS_JoystickClose(SDL_Joystick * joystick)
-{
- /* Should we do anything here? */
- return;
-}
-
-/* Function to perform any system-specific joystick related cleanup */
-void
-SDL_SYS_JoystickQuit(void)
-{
- while (NULL != gpDeviceList)
- gpDeviceList = HIDDisposeDevice(&gpDeviceList);
-}
-
-#endif /* SDL_JOYSTICK_IOKIT */
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/macosx/plugins/DFInput/SDL/src/joystick/darwin/SDL_sysjoystick_c.h b/macosx/plugins/DFInput/SDL/src/joystick/darwin/SDL_sysjoystick_c.h
deleted file mode 100644
index d413f33..0000000
--- a/macosx/plugins/DFInput/SDL/src/joystick/darwin/SDL_sysjoystick_c.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2010 Sam Lantinga
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Sam Lantinga
- slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-#ifndef SDL_JOYSTICK_IOKIT_H
-
-
-#if MAC_OS_X_VERSION_MIN_REQUIRED == 1030
-#include "10.3.9-FIX/IOHIDLib.h"
-#else
-#include <IOKit/hid/IOHIDLib.h>
-#endif
-#include <IOKit/hid/IOHIDKeys.h>
-
-
-struct recElement
-{
- IOHIDElementCookie cookie; /* unique value which identifies element, will NOT change */
- long usagePage, usage; /* HID usage */
- long min; /* reported min value possible */
- long max; /* reported max value possible */
-#if 0
- /* TODO: maybe should handle the following stuff somehow? */
-
- long scaledMin; /* reported scaled min value possible */
- long scaledMax; /* reported scaled max value possible */
- long size; /* size in bits of data return from element */
- Boolean relative; /* are reports relative to last report (deltas) */
- Boolean wrapping; /* does element wrap around (one value higher than max is min) */
- Boolean nonLinear; /* are the values reported non-linear relative to element movement */
- Boolean preferredState; /* does element have a preferred state (such as a button) */
- Boolean nullState; /* does element have null state */
-#endif /* 0 */
-
- /* runtime variables used for auto-calibration */
- long minReport; /* min returned value */
- long maxReport; /* max returned value */
-
- struct recElement *pNext; /* next element in list */
-};
-typedef struct recElement recElement;
-
-struct joystick_hwdata
-{
- io_service_t ffservice; /* Interface for force feedback, 0 = no ff */
- IOHIDDeviceInterface **interface; /* interface to device, NULL = no interface */
-
- char product[256]; /* name of product */
- long usage; /* usage page from IOUSBHID Parser.h which defines general usage */
- long usagePage; /* usage within above page from IOUSBHID Parser.h which defines specific usage */
-
- long axes; /* number of axis (calculated, not reported by device) */
- long buttons; /* number of buttons (calculated, not reported by device) */
- long hats; /* number of hat switches (calculated, not reported by device) */
- long elements; /* number of total elements (shouldbe total of above) (calculated, not reported by device) */
-
- recElement *firstAxis;
- recElement *firstButton;
- recElement *firstHat;
-
- int removed;
- int uncentered;
-
- struct joystick_hwdata *pNext; /* next device */
-};
-typedef struct joystick_hwdata recDevice;
-
-
-#endif /* SDL_JOYSTICK_IOKIT_H */