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

Load the game controller mapping hint when opening a game controller.

Browse source
This commit is contained in:
Sam Lantinga 2013-03-07 15:37:08 -08:00
parent 1dec4dd800
commit 0707530b35
1 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/joystick/SDL_gamecontroller.c
View file

@ -762,6 +762,33 @@ SDL_GameControllerMapping( SDL_GameController * gamecontroller )
return SDL_GameControllerMappingForGUID( gamecontroller->mapping.guid ); return SDL_GameControllerMappingForGUID( gamecontroller->mapping.guid );
} }
static void
SDL_GameControllerLoadHints()
{
const char *hint = SDL_GetHint(SDL_HINT_GAMECONTROLLERCONFIG);
if ( hint && hint[0] ) {
int nchHints = SDL_strlen( hint );
char *pUserMappings = SDL_malloc( nchHints + 1 );
char *pTempMappings = pUserMappings;
SDL_memcpy( pUserMappings, hint, nchHints );
while ( pUserMappings ) {
char *pchNewLine = NULL;
pchNewLine = SDL_strchr( pUserMappings, '\n' );
if ( pchNewLine )
*pchNewLine = '\0';
SDL_GameControllerAddMapping( pUserMappings );
if ( pchNewLine )
pUserMappings = pchNewLine + 1;
else
pUserMappings = NULL;
}
SDL_free(pTempMappings);
}
}
/* /*
* Initialize the game controller system, mostly load our DB of controller config mappings * Initialize the game controller system, mostly load our DB of controller config mappings
*/ */
@ -781,35 +808,11 @@ SDL_GameControllerInit(void)
} }
// load in any user supplied config // load in any user supplied config
{ SDL_GameControllerLoadHints();
const char *hint = SDL_GetHint(SDL_HINT_GAMECONTROLLERCONFIG);
if ( hint && hint[0] )
{
int nchHints = SDL_strlen( hint );
char *pUserMappings = SDL_malloc( nchHints + 1 );
char *pTempMappings = pUserMappings;
SDL_memcpy( pUserMappings, hint, nchHints );
while ( pUserMappings )
{
char *pchNewLine = NULL;
pchNewLine = SDL_strchr( pUserMappings, '\n' );
if ( pchNewLine )
*pchNewLine = '\0';
SDL_GameControllerAddMapping( pUserMappings );
if ( pchNewLine )
pUserMappings = pchNewLine + 1;
else
pUserMappings = NULL;
}
SDL_free(pTempMappings);
}
}
/* watch for joy events and fire controller ones if needed */ /* watch for joy events and fire controller ones if needed */
SDL_AddEventWatch( SDL_GameControllerEventWatcher, NULL ); SDL_AddEventWatch( SDL_GameControllerEventWatcher, NULL );
return (0); return (0);
} }
@ -875,10 +878,11 @@ SDL_GameControllerOpen(int device_index)
gamecontrollerlist = gamecontrollerlist->next; gamecontrollerlist = gamecontrollerlist->next;
} }
// Find a Controller Mapping // Find a controller mapping
// Check for hints in case someone has changed them recently
SDL_GameControllerLoadHints();
pSupportedController = SDL_PrivateGetControllerMapping(device_index); pSupportedController = SDL_PrivateGetControllerMapping(device_index);
if ( !pSupportedController ) if ( !pSupportedController ) {
{
SDL_SetError("Couldn't find mapping for device (%d)", device_index ); SDL_SetError("Couldn't find mapping for device (%d)", device_index );
return (NULL); return (NULL);
} }