encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS defaults to true, to match Steam's default behavior

This commit is contained in:
Sam Lantinga 2019-11-13 14:24:48 -08:00
parent 8bd3398020
commit 9a76bebfbc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/SDL_hints.h
View File

@ -507,7 +507,7 @@ extern "C" {
* "0" - Report the face buttons by position, as though they were on an Xbox controller. * "0" - Report the face buttons by position, as though they were on an Xbox controller.
* "1" - Report the face buttons by label instead of position * "1" - Report the face buttons by label instead of position
* *
* The default value is "0". This hint may be set at any time. * The default value is "1". This hint may be set at any time.
*/ */
#define SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS "SDL_GAMECONTROLLER_USE_BUTTON_LABELS" #define SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS "SDL_GAMECONTROLLER_USE_BUTTON_LABELS"

2
src/joystick/hidapi/SDL_hidapi_switch.c
View File

@ -591,7 +591,7 @@ static Sint16 ApplyStickCalibration(SDL_DriverSwitch_Context *ctx, int nStick, i
static void SDLCALL SDL_GameControllerButtonReportingHintChanged(void *userdata, const char *name, const char *oldValue, const char *hint) static void SDLCALL SDL_GameControllerButtonReportingHintChanged(void *userdata, const char *name, const char *oldValue, const char *hint)
{ {
SDL_DriverSwitch_Context *ctx = (SDL_DriverSwitch_Context *)userdata; SDL_DriverSwitch_Context *ctx = (SDL_DriverSwitch_Context *)userdata;
ctx->m_bUseButtonLabels = (hint && *hint != '0' && SDL_strcasecmp(hint, "false") != 0); ctx->m_bUseButtonLabels = (!hint || !*hint || ((*hint != '0') && (SDL_strcasecmp(hint, "false") != 0)));
} }
static Uint8 RemapButton(SDL_DriverSwitch_Context *ctx, Uint8 button) static Uint8 RemapButton(SDL_DriverSwitch_Context *ctx, Uint8 button)