From 5e1ec2444f26873d8c189d8d43aa1fd539afd190 Mon Sep 17 00:00:00 2001
From: Mason Remaley <mason@anthropicstudios.com>
Date: Fri, 5 Jul 2024 20:17:02 -0700
Subject: [PATCH 1/3] Fixes an out of bounds joystick array access

Testing with an Xbox Series X controller. The extra button they
added directly under the Xbox button emits 0xA7 for me, which is
lower than BTN_MISC. As a result, when pressed, handleKeyEvent
was indexing an array with a negative index.

This commit adds a bounds check preventing the negative index, and
adds a second bounds check to a similar function preemptively.

It's possible that the better fix for this is to extend the range of
the buttons array so that this button can be mapped, but that may
need some disucssion first.
---
 src/linux_joystick.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/linux_joystick.c b/src/linux_joystick.c
index d8a916b0..acf4e7aa 100644
--- a/src/linux_joystick.c
+++ b/src/linux_joystick.c
@@ -49,6 +49,7 @@
 //
 static void handleKeyEvent(_GLFWjoystick* js, int code, int value)
 {
+    if (code < BTN_MISC || code >= KEY_CNT - BTN_MISC) return;
     _glfwInputJoystickButton(js,
                              js->linjs.keyMap[code - BTN_MISC],
                              value ? GLFW_PRESS : GLFW_RELEASE);
@@ -58,6 +59,7 @@ static void handleKeyEvent(_GLFWjoystick* js, int code, int value)
 //
 static void handleAbsEvent(_GLFWjoystick* js, int code, int value)
 {
+    if (code >= ABS_CNT) return;
     const int index = js->linjs.absMap[code];
 
     if (code >= ABS_HAT0X && code <= ABS_HAT3Y)

From 6836e650bc086f2d0a8533f9b00750695cb6a026 Mon Sep 17 00:00:00 2001
From: Mason Remaley <mason@anthropicstudios.com>
Date: Fri, 5 Jul 2024 21:56:00 -0700
Subject: [PATCH 2/3] Remaps indices of buttons below the previous minimum

This prevents us from missing their inputs, while also maintaining
backwards compatibility with previous indices
---
 src/linux_joystick.c | 15 +++++++++++----
 src/linux_joystick.h |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/linux_joystick.c b/src/linux_joystick.c
index acf4e7aa..e704f909 100644
--- a/src/linux_joystick.c
+++ b/src/linux_joystick.c
@@ -49,9 +49,8 @@
 //
 static void handleKeyEvent(_GLFWjoystick* js, int code, int value)
 {
-    if (code < BTN_MISC || code >= KEY_CNT - BTN_MISC) return;
     _glfwInputJoystickButton(js,
-                             js->linjs.keyMap[code - BTN_MISC],
+                             js->linjs.keyMap[code],
                              value ? GLFW_PRESS : GLFW_RELEASE);
 }
 
@@ -59,7 +58,6 @@ static void handleKeyEvent(_GLFWjoystick* js, int code, int value)
 //
 static void handleAbsEvent(_GLFWjoystick* js, int code, int value)
 {
-    if (code >= ABS_CNT) return;
     const int index = js->linjs.absMap[code];
 
     if (code >= ABS_HAT0X && code <= ABS_HAT3Y)
@@ -197,7 +195,16 @@ static GLFWbool openJoystickDevice(const char* path)
         if (!isBitSet(code, keyBits))
             continue;
 
-        linjs.keyMap[code - BTN_MISC] = buttonCount;
+        linjs.keyMap[code] = buttonCount;
+        buttonCount++;
+    }
+
+    for (int code = 0;  code < BTN_MISC;  code++)
+    {
+        if (!isBitSet(code, keyBits))
+            continue;
+
+        linjs.keyMap[code] = buttonCount;
         buttonCount++;
     }
 
diff --git a/src/linux_joystick.h b/src/linux_joystick.h
index 1ea3deb3..36ef21b2 100644
--- a/src/linux_joystick.h
+++ b/src/linux_joystick.h
@@ -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];

From 9ae058b20895e25f4380e8a8fa82eb933b57d2e6 Mon Sep 17 00:00:00 2001
From: Mason Remaley <mason@anthropicstudios.com>
Date: Fri, 5 Jul 2024 22:11:59 -0700
Subject: [PATCH 3/3] Slightly adjusts button mappings for compatibility with
 SDL game controller database

---
 src/linux_joystick.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/linux_joystick.c b/src/linux_joystick.c
index e704f909..bc1a2dc3 100644
--- a/src/linux_joystick.c
+++ b/src/linux_joystick.c
@@ -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;