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

Slightly adjusts button mappings for compatibility with SDL game controller database

This commit is contained in:
Mason Remaley 2024-07-05 22:11:59 -07:00
parent 6836e650bc
commit 9ae058b208
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/linux_joystick.c
View File

@ -190,7 +190,10 @@ static GLFWbool openJoystickDevice(const char* path)
int axisCount = 0, buttonCount = 0, hatCount = 0;
for (int code = BTN_MISC; code < KEY_CNT; code++)
// This loop should stop at KEY_CNT instead of KEY_MAX. However, we are
// terminating the loop one iteration early to maintain compatibility with
// the SDL gamepad mappings.
for (int code = BTN_JOYSTICK; code < KEY_MAX; code++)
{
if (!isBitSet(code, keyBits))
continue;
@ -199,7 +202,11 @@ static GLFWbool openJoystickDevice(const char* path)
buttonCount++;
}
for (int code = 0; code < BTN_MISC; code++)
// Originally, this range was not mapped, but some controllers now output
// these values. Appending them to the end of the list maintains both
// backwards compatibility with older versions of GLFW, and with the SDL
// gamepad mappings.
for (int code = 0; code < BTN_JOYSTICK; code++)
{
if (!isBitSet(code, keyBits))
continue;