pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed iOS joystick support for new API

Browse source
This commit is contained in:
Sam Lantinga 2012-11-26 21:11:28 -08:00
parent ebdb9d4f98
commit 968ccf93b1
7 changed files with 76 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/joystick/SDL_joystick.c
View file

@ -661,13 +661,13 @@ SDL_PrivateJoystickNeedsPolling()
}
/* return the guid for this index*/
/* return the guid for this index */
JoystickGUID SDL_JoystickGetDeviceGUID( int device_index )
{
return SDL_SYS_PrivateJoystickGetDeviceID( device_index );
return SDL_SYS_PrivateJoystickGetDeviceGUID( device_index );
}
/* return the guid for this openeded device*/
/* return the guid for this opened device */
JoystickGUID SDL_JoystickGetGUID(SDL_Joystick * joystick)
{
return SDL_SYS_PrivateJoystickGetGUID( joystick );

2
src/joystick/SDL_sysjoystick.h
View file

@ -107,7 +107,7 @@ extern int SDL_SYS_JoystickNeedsPolling();
/* Function to return the stable GUID for a plugged in device
*/
extern JoystickGUID SDL_SYS_PrivateJoystickGetDeviceID( int device_index );
extern JoystickGUID SDL_SYS_PrivateJoystickGetDeviceGUID( int device_index );
/* Function to return the stable GUID for a opened joystick
*/

2
src/joystick/darwin/SDL_sysjoystick.c
View file

@ -1089,7 +1089,7 @@ SDL_SYS_JoystickNeedsPolling()
return s_bDeviceAdded;
}
JoystickGUID SDL_SYS_PrivateJoystickGetDeviceID( int device_index )
JoystickGUID SDL_SYS_PrivateJoystickGetDeviceGUID( int device_index )
{
recDevice *device = gpDeviceList;
int index;

57
src/joystick/iphoneos/SDL_sysjoystick.m
View file

@ -37,13 +37,12 @@ const char *accelerometerName = "iPhone accelerometer";
int
SDL_SYS_JoystickInit(void)
{
SDL_numjoysticks = 1;
return (1);
}
/* Function to get the device-dependent name of a joystick */
const char *
SDL_SYS_JoystickName(int index)
SDL_SYS_JoystickNameForIndex(int index)
{
switch(index) {
case 0:
@ -60,14 +59,13 @@ SDL_SYS_JoystickName(int index)
It returns 0, or -1 if there is an error.
*/
int
SDL_SYS_JoystickOpen(SDL_Joystick * joystick)
SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
{
if (joystick->index == 0) {
if (device_index == 0) {
joystick->naxes = 3;
joystick->nhats = 0;
joystick->nballs = 0;
joystick->nbuttons = 0;
joystick->name = accelerometerName;
[[SDLUIAccelerationDelegate sharedDelegate] startup];
return 0;
}
@ -107,7 +105,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
void
SDL_SYS_JoystickClose(SDL_Joystick * joystick)
{
if (joystick->index == 0 && [[SDLUIAccelerationDelegate sharedDelegate] isRunning]) {
if ([[SDLUIAccelerationDelegate sharedDelegate] isRunning]) {
[[SDLUIAccelerationDelegate sharedDelegate] shutdown];
}
SDL_SetError("No joystick open with that index");
@ -121,4 +119,51 @@ SDL_SYS_JoystickQuit(void)
{
return;
}
/* Function to perform the mapping from device index to the instance id for this index */
SDL_JoystickID SDL_SYS_GetInstanceIdOfDeviceIndex(int index)
{
return index;
}
/* Function to determine is this joystick is attached to the system right now */
int SDL_SYS_JoystickAttached(SDL_Joystick *joystick)
{
return 1;
}
int SDL_SYS_NumJoysticks()
{
return 1;
}
int SDL_SYS_JoystickNeedsPolling()
{
return 0;
}
void SDL_SYS_JoystickDetect()
{
}
JoystickGUID SDL_SYS_PrivateJoystickGetDeviceGUID( int device_index )
{
JoystickGUID guid;
// the GUID is just the first 16 chars of the name for now
const char *name = SDL_SYS_JoystickNameForIndex( device_index );
SDL_zero( guid );
SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
return guid;
}
JoystickGUID SDL_SYS_PrivateJoystickGetGUID(SDL_Joystick * joystick)
{
JoystickGUID guid;
// the GUID is just the first 16 chars of the name for now
const char *name = joystick->name;
SDL_zero( guid );
SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
return guid;
}
/* vi: set ts=4 sw=4 expandtab: */

19
src/joystick/linux/SDL_sysjoystick.c
View file

@ -513,7 +513,7 @@ SDL_SYS_JoystickNameForIndex(int index)
{
int fd;
static char namebuf[128];
char *name;
const char *name;
SDL_logical_joydecl(int oindex = index);
#ifndef NO_LOGICAL_JOYSTICKS
@ -1248,7 +1248,7 @@ SDL_JoystickID SDL_SYS_GetInstanceIdOfDeviceIndex(int index)
/* Function to determine is this joystick is attached to the system right now */
int SDL_SYS_JoystickAttached(SDL_Joystick *joystick)
{
return !joystick->closed;
return 1;
}
int SDL_SYS_NumJoysticks()
@ -1265,24 +1265,27 @@ void SDL_SYS_JoystickDetect()
{
}
JoystickGUID SDL_SYS_PrivateJoystickGetDeviceID( int device_index )
JoystickGUID SDL_SYS_PrivateJoystickGetDeviceGUID( int device_index )
{
static JoystickGUID guid;
JoystickGUID guid;
// the GUID is just the first 16 chars of the name for now
const char *name = SDL_SYS_JoystickNameForIndex( device_index );
SDL_memcpy( &guid, name, sizeof(guid) );
SDL_zero( guid );
SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
return guid;
}
JoystickGUID SDL_SYS_PrivateJoystickGetGUID(SDL_Joystick * joystick)
{
static JoystickGUID guid;
JoystickGUID guid;
// the GUID is just the first 16 chars of the name for now
const char *name = SDL_SYS_JoystickNameForIndex( joystick->name );
SDL_memcpy( &guid, name, sizeof(guid) );
const char *name = joystick->name;
SDL_zero( guid );
SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
return guid;
}
#endif /* SDL_JOYSTICK_LINUX */
/* vi: set ts=4 sw=4 expandtab: */

2
src/joystick/windows/SDL_dxjoystick.c
View file

@ -1651,7 +1651,7 @@ int SDL_SYS_JoystickNeedsPolling()
}
/* return the stable device guid for this device index */
JoystickGUID SDL_SYS_PrivateJoystickGetDeviceID( int device_index )
JoystickGUID SDL_SYS_PrivateJoystickGetDeviceGUID( int device_index )
{
JoyStick_DeviceData *device = SYS_Joystick;
int index;