organicmaps/glfw
13
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-04-04 21:15:07 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge 9ae058b208 into e7ea71be03

Browse source
This commit is contained in:
Mason Remaley 2025-01-19 07:31:04 +00:00 • committed by GitHub
commit 24cf0811b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/linux_joystick.c
View file

@ -50,7 +50,7 @@
static void handleKeyEvent(_GLFWjoystick* js, int code, int value)
{
_glfwInputJoystickButton(js,
js->linjs.keyMap[code - BTN_MISC],
js->linjs.keyMap[code],
value ? GLFW_PRESS : GLFW_RELEASE);
}
@ -190,12 +190,28 @@ 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;
linjs.keyMap[code - BTN_MISC] = buttonCount;
linjs.keyMap[code] = buttonCount;
buttonCount++;
}
// 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;
linjs.keyMap[code] = buttonCount;
buttonCount++;
}

2
src/linux_joystick.h
View file

@ -37,7 +37,7 @@ typedef struct _GLFWjoystickLinux
{
int fd;
char path[PATH_MAX];
int keyMap[KEY_CNT - BTN_MISC];
int keyMap[KEY_CNT];
int absMap[ABS_CNT];
struct input_absinfo absInfo[ABS_CNT];
int hats[4][2];