From 8bcaabe9a96d47480068e15f5a7fb31afd874183 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sat, 23 Dec 2023 11:58:18 -0500
Subject: [PATCH 01/35] Commit CLion settings to repository, VSCode settings
 already exist and this way starting the project is easier.

---
 .gitignore       |  1 -
 .idea/.gitignore |  8 ++++++++
 .idea/misc.xml   | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/misc.xml

diff --git a/.gitignore b/.gitignore
index 996bbf24375..32c879eebe3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,7 +57,6 @@ xcuserdata
 profile
 *.moved-aside
 DerivedData
-.idea/
 *.hmap
 apple/tmp
 apple/*.mobileprovision
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000000..13566b81b01
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000000..2f317c469fb
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MakefileSettings">
+    <option name="linkedExternalProjectsSettings">
+      <MakefileProjectSettings>
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+        <option name="preConfigureCommands" value="./configure" />
+        <option name="version" value="2" />
+      </MakefileProjectSettings>
+    </option>
+  </component>
+  <component name="MakefileWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
+</project>
\ No newline at end of file

From 1e720ef9e06bf5a8062b46bf3f2bf22c4d7ddaa4 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sat, 23 Dec 2023 13:05:44 -0500
Subject: [PATCH 02/35] Bump netplay version; Slight refactor of inputs to use
 macros rather than magic numbers.

---
 .../libretro-net-retropad/net_retropad_core.c  |  2 +-
 input/input_driver.c                           | 18 +++++++++---------
 libretro-common/include/libretro.h             | 12 ++++++++++++
 network/netplay/netplay_frontend.c             |  2 +-
 network/netplay/netplay_protocol.h             |  2 +-
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/cores/libretro-net-retropad/net_retropad_core.c b/cores/libretro-net-retropad/net_retropad_core.c
index bedf072ad00..e69a264e704 100644
--- a/cores/libretro-net-retropad/net_retropad_core.c
+++ b/cores/libretro-net-retropad/net_retropad_core.c
@@ -92,7 +92,7 @@ static struct descriptor joypad = {
    .index_min = 0,
    .index_max = 0,
    .id_min = RETRO_DEVICE_ID_JOYPAD_B,
-   .id_max = RETRO_DEVICE_ID_JOYPAD_R3
+   .id_max = RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS
 };
 
 static struct descriptor analog = {
diff --git a/input/input_driver.c b/input/input_driver.c
index 177d5df2b86..a14ba6fa468 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -92,7 +92,7 @@
 )
 
 /* Human readable order of input binds */
-const unsigned input_config_bind_order[24] = {
+const unsigned input_config_bind_order[RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS] = {
    RETRO_DEVICE_ID_JOYPAD_UP,
    RETRO_DEVICE_ID_JOYPAD_DOWN,
    RETRO_DEVICE_ID_JOYPAD_LEFT,
@@ -109,14 +109,14 @@ const unsigned input_config_bind_order[24] = {
    RETRO_DEVICE_ID_JOYPAD_R2,
    RETRO_DEVICE_ID_JOYPAD_L3,
    RETRO_DEVICE_ID_JOYPAD_R3,
-   19, /* Left Analog Up */
-   18, /* Left Analog Down */
-   17, /* Left Analog Left */
-   16, /* Left Analog Right */
-   23, /* Right Analog Up */
-   22, /* Right Analog Down */
-   21, /* Right Analog Left */
-   20, /* Right Analog Right */
+   RETRO_DEVICE_ID_JOYPAD_ANALOG_L_UP, /* Left Analog Up */
+   RETRO_DEVICE_ID_JOYPAD_ANALOG_L_DOWN, /* Left Analog Down */
+   RETRO_DEVICE_ID_JOYPAD_ANALOG_L_LEFT, /* Left Analog Left */
+   RETRO_DEVICE_ID_JOYPAD_ANALOG_L_RIGHT, /* Left Analog Right */
+   RETRO_DEVICE_ID_JOYPAD_ANALOG_R_UP, /* Right Analog Up */
+   RETRO_DEVICE_ID_JOYPAD_ANALOG_R_DOWN, /* Right Analog Down */
+   RETRO_DEVICE_ID_JOYPAD_ANALOG_R_LEFT, /* Right Analog Left */
+   RETRO_DEVICE_ID_JOYPAD_ANALOG_R_RIGHT, /* Right Analog Right */
 };
 
 /**************************************/
diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h
index b16228b272d..895afaf25fb 100644
--- a/libretro-common/include/libretro.h
+++ b/libretro-common/include/libretro.h
@@ -202,6 +202,18 @@ extern "C" {
 #define RETRO_DEVICE_ID_JOYPAD_L3      14
 #define RETRO_DEVICE_ID_JOYPAD_R3      15
 
+#define RETRO_DEVICE_ID_JOYPAD_ANALOG_L_RIGHT   16
+#define RETRO_DEVICE_ID_JOYPAD_ANALOG_L_LEFT    17
+#define RETRO_DEVICE_ID_JOYPAD_ANALOG_L_DOWN    18
+#define RETRO_DEVICE_ID_JOYPAD_ANALOG_L_UP      19
+
+#define RETRO_DEVICE_ID_JOYPAD_ANALOG_R_RIGHT   20
+#define RETRO_DEVICE_ID_JOYPAD_ANALOG_R_LEFT    21
+#define RETRO_DEVICE_ID_JOYPAD_ANALOG_R_DOWN    22
+#define RETRO_DEVICE_ID_JOYPAD_ANALOG_R_UP      23
+
+#define RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS 24
+
 #define RETRO_DEVICE_ID_JOYPAD_MASK    256
 
 /* Index / Id values for ANALOG device. */
diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c
index c53b81f4e7e..f8f30caed8c 100644
--- a/network/netplay/netplay_frontend.c
+++ b/network/netplay/netplay_frontend.c
@@ -7744,7 +7744,7 @@ static bool get_self_input_state(
                /* no break */
 
             case RETRO_DEVICE_JOYPAD:
-               for (i = 0; i <= RETRO_DEVICE_ID_JOYPAD_R3; i++)
+               for (i = 0; i <= RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS; i++)
                {
                   int16_t tmp = cb(local_device,
                         RETRO_DEVICE_JOYPAD, 0, (unsigned)i);
diff --git a/network/netplay/netplay_protocol.h b/network/netplay/netplay_protocol.h
index 7583a2e2561..608fca18b77 100644
--- a/network/netplay/netplay_protocol.h
+++ b/network/netplay/netplay_protocol.h
@@ -19,7 +19,7 @@
 #define __RARCH_NETPLAY_PROTOCOL_H
 
 #define LOW_NETPLAY_PROTOCOL_VERSION  5
-#define HIGH_NETPLAY_PROTOCOL_VERSION 6
+#define HIGH_NETPLAY_PROTOCOL_VERSION 7
 
 #define NETPLAY_PROTOCOL_VERSION HIGH_NETPLAY_PROTOCOL_VERSION
 

From a5bc0843f59f3a9b71a6b862ab2fe1191a51435a Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sat, 23 Dec 2023 14:21:48 -0500
Subject: [PATCH 03/35] Base new hypothetical input query for information about
 an input device.

---
 libretro-common/include/libretro.h | 146 +++++++++++++++++++++++++++++
 runloop.c                          |   8 ++
 2 files changed, 154 insertions(+)

diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h
index 895afaf25fb..eba0145458c 100644
--- a/libretro-common/include/libretro.h
+++ b/libretro-common/include/libretro.h
@@ -1864,6 +1864,16 @@ enum retro_mod
                                             * multiplayer, where a deterministic core supporting multiple
                                             * input devices does not need to take any action on its own.
                                             */
+#define RETRO_ENVIRONMENT_QUERY_INPUT_DEVICE_ID 79
+                                           /* const struct retro_query_input_device_id * --
+                                            * Allows a core to query information about what an id of
+                                            * a given device represents along with generic input information.
+                                            * The structure used is freeform.
+                                            * If this returns zero then the core must assume that the
+                                            * frontend does not provide such functionality.
+                                            * This realistically should be called before
+                                            * RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS.
+                                            */
 
 /* VFS functionality */
 
@@ -3372,6 +3382,142 @@ struct retro_input_descriptor
    const char *description;
 };
 
+/** Used with @c retro_query_input_device_id to classify a specific input. */
+enum retro_query_input_device_id_class
+{
+    /** Unbound action, not bound to any key. */
+    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_UNBOUND,
+
+    /** Standard digital button. */
+    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_DIGITAL_BUTTON,
+
+    /** Analog button. */
+    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_ANALOG_BUTTON,
+
+    /** Analog trigger. */
+    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_ANALOG_TRIGGER,
+
+    /** Analog Joystick. */
+    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_JOYSTICK,
+
+    /** Digital hat (d-pad). */
+    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_HAT,
+
+    /** Throttle. */
+    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_THROTTLE,
+
+    /** Touch pad. */
+    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_TOUCH_PAD,
+
+    /** Mouse. */
+    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_MOUSE,
+
+    /** Light Gun. */
+    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_LIGHT_GUN,
+
+    /** Number Pad, 1 on bottom. */
+    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_NUMBER_PAD,
+
+    /** Dial Pad, 1 on top. */
+    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_DIAL_PAD,
+
+    /** The number of input classes. */
+    RETRO_NUM_QUERY_INPUT_DEVICE_ID_CLASS
+};
+
+/** Used with @c retro_query_input_device_id to specify where on the controller an input is. */
+enum retro_query_input_device_id_location
+{
+    /** Undefined. */
+    RETRO_QUERY_INPUT_DEVICE_ID_LOCATION_UNDEFINED,
+
+    /** Left. */
+    RETRO_QUERY_INPUT_DEVICE_ID_LOCATION_LEFT,
+
+    /** Middle. */
+    RETRO_QUERY_INPUT_DEVICE_ID_LOCATION_MIDDLE,
+
+    /** Right. */
+    RETRO_QUERY_INPUT_DEVICE_ID_LOCATION_RIGHT,
+
+    /** Top. */
+    RETRO_QUERY_INPUT_DEVICE_ID_LOCATION_TOP,
+
+    /** Bottom. */
+    RETRO_QUERY_INPUT_DEVICE_ID_LOCATION_BOTTOM,
+
+    /** Back. */
+    RETRO_QUERY_INPUT_DEVICE_ID_LOCATION_BACK,
+
+    /** The number of locations. */
+    RETRO_NUM_QUERY_INPUT_DEVICE_ID_LOCATION
+};
+
+/** Used with @c retro_query_input_device_id to specify the direction of the input relative to the location. */
+enum retro_query_input_device_id_direction
+{
+    /** Undefined. */
+    RETRO_QUERY_INPUT_DEVICE_ID_DIRECTION_UNDEFINED,
+
+    /** Left. */
+    RETRO_QUERY_INPUT_DEVICE_ID_DIRECTION_LEFT,
+
+    /** Right. */
+    RETRO_QUERY_INPUT_DEVICE_ID_DIRECTION_RIGHT,
+
+    /** Up. */
+    RETRO_QUERY_INPUT_DEVICE_ID_DIRECTION_UP,
+
+    /** Down. */
+    RETRO_QUERY_INPUT_DEVICE_ID_DIRECTION_DOWN,
+
+    /** The number of directions. */
+    RETRO_NUM_QUERY_INPUT_DEVICE_ID_DIRECTION
+};
+
+/** Used with @c RETRO_ENVIRONMENT_QUERY_INPUT_DEVICE_ID to query device info. */
+struct retro_query_input_device_id
+{
+    /** Query for device information. */
+    struct {
+        /** The device type to query such as @c RETRO_DEVICE_JOYPAD . */
+        unsigned device;
+
+        /** The ID of the specific input such as @c RETRO_DEVICE_ID_JOYPAD_Y. */
+        unsigned id;
+    } query;
+
+    /** Response given from the give query. */
+    struct {
+        /** General response given for all commands. */
+        struct {
+            /** The number of unbound actions. */
+            unsigned numUnbound;
+
+            /** The start id of unbound actions. */
+            unsigned unboundStartId;
+        } general;
+
+        /** Response for the specific device and ID. */
+        struct {
+            /** Whether or not this input is known, if it is then other fields are valid. */
+            bool known_id;
+
+            /** The class of input this is, one of @c retro_query_input_device_id_class .*/
+            enum retro_query_input_device_id_class input_class;
+
+            /** The location where this button is on a controller, one of @c retro_query_input_device_id_location . */
+            enum retro_query_input_device_id_location location;
+
+            /** The direction the button is on relative to its location on the controller, one of @c retro_query_input_device_id_direction .*/
+            enum retro_query_input_device_id_direction direction;
+
+            /** The description of this specific id, such as @c "Right Trigger". */
+            const char* description;
+        } specific;
+    } response;
+};
+
 struct retro_system_info
 {
    /* All pointers are owned by libretro implementation, and pointers must
diff --git a/runloop.c b/runloop.c
index 43bed44704c..f51b3b23023 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1402,6 +1402,10 @@ static void core_performance_counter_stop(struct retro_perf_counter *perf)
 }
 
 
+void rarch_query_input_device_id(rarch_system_info_t *system_info, struct retro_query_input_device_id *idQuery) {
+    /* TODO: Implement this. */
+}
+
 bool runloop_environment_cb(unsigned cmd, void *data)
 {
    unsigned p;
@@ -3551,6 +3555,10 @@ bool runloop_environment_cb(unsigned cmd, void *data)
             }
          }
          break;
+      case RETRO_ENVIRONMENT_QUERY_INPUT_DEVICE_ID:
+         rarch_query_input_device_id(sys_info, (struct retro_query_input_device_id*)data);
+         break;
+
       default:
          RARCH_LOG("[Environ]: UNSUPPORTED (#%u).\n", cmd);
          return false;

From 7bb72701e3d0cb9faf186e2049b84d9b0d1c14d5 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sat, 23 Dec 2023 14:27:11 -0500
Subject: [PATCH 04/35] Add glyph as well.

---
 libretro-common/include/libretro.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h
index eba0145458c..346eeb13a14 100644
--- a/libretro-common/include/libretro.h
+++ b/libretro-common/include/libretro.h
@@ -3514,6 +3514,9 @@ struct retro_query_input_device_id
 
             /** The description of this specific id, such as @c "Right Trigger". */
             const char* description;
+
+            /** The glyph that is shown for this input, may be @c NULL . */
+            const char* glyph;
         } specific;
     } response;
 };

From b35169a979fc98184bc02c9c4493d8b7255204b7 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sat, 23 Dec 2023 14:52:14 -0500
Subject: [PATCH 05/35] Simplify greatly.

---
 libretro-common/include/libretro.h | 143 +++--------------------------
 runloop.c                          |  12 ++-
 2 files changed, 22 insertions(+), 133 deletions(-)

diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h
index 346eeb13a14..9ca0272afc7 100644
--- a/libretro-common/include/libretro.h
+++ b/libretro-common/include/libretro.h
@@ -1864,11 +1864,11 @@ enum retro_mod
                                             * multiplayer, where a deterministic core supporting multiple
                                             * input devices does not need to take any action on its own.
                                             */
-#define RETRO_ENVIRONMENT_QUERY_INPUT_DEVICE_ID 79
-                                           /* const struct retro_query_input_device_id * --
-                                            * Allows a core to query information about what an id of
-                                            * a given device represents along with generic input information.
-                                            * The structure used is freeform.
+#define RETRO_ENVIRONMENT_GET_EXTRA_INPUT_ACTIONS 79
+                                           /* const struct retro_get_extra_input_actions * --
+                                            * Allows the core to query information on input actions
+                                            * that are additionally available but not bound to any
+                                            * physical button or key.
                                             * If this returns zero then the core must assume that the
                                             * frontend does not provide such functionality.
                                             * This realistically should be called before
@@ -3382,142 +3382,25 @@ struct retro_input_descriptor
    const char *description;
 };
 
-/** Used with @c retro_query_input_device_id to classify a specific input. */
-enum retro_query_input_device_id_class
-{
-    /** Unbound action, not bound to any key. */
-    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_UNBOUND,
-
-    /** Standard digital button. */
-    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_DIGITAL_BUTTON,
-
-    /** Analog button. */
-    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_ANALOG_BUTTON,
-
-    /** Analog trigger. */
-    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_ANALOG_TRIGGER,
-
-    /** Analog Joystick. */
-    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_JOYSTICK,
-
-    /** Digital hat (d-pad). */
-    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_HAT,
-
-    /** Throttle. */
-    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_THROTTLE,
-
-    /** Touch pad. */
-    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_TOUCH_PAD,
-
-    /** Mouse. */
-    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_MOUSE,
-
-    /** Light Gun. */
-    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_LIGHT_GUN,
-
-    /** Number Pad, 1 on bottom. */
-    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_NUMBER_PAD,
-
-    /** Dial Pad, 1 on top. */
-    RETRO_QUERY_INPUT_DEVICE_ID_CLASS_DIAL_PAD,
-
-    /** The number of input classes. */
-    RETRO_NUM_QUERY_INPUT_DEVICE_ID_CLASS
-};
-
-/** Used with @c retro_query_input_device_id to specify where on the controller an input is. */
-enum retro_query_input_device_id_location
-{
-    /** Undefined. */
-    RETRO_QUERY_INPUT_DEVICE_ID_LOCATION_UNDEFINED,
-
-    /** Left. */
-    RETRO_QUERY_INPUT_DEVICE_ID_LOCATION_LEFT,
-
-    /** Middle. */
-    RETRO_QUERY_INPUT_DEVICE_ID_LOCATION_MIDDLE,
-
-    /** Right. */
-    RETRO_QUERY_INPUT_DEVICE_ID_LOCATION_RIGHT,
-
-    /** Top. */
-    RETRO_QUERY_INPUT_DEVICE_ID_LOCATION_TOP,
-
-    /** Bottom. */
-    RETRO_QUERY_INPUT_DEVICE_ID_LOCATION_BOTTOM,
-
-    /** Back. */
-    RETRO_QUERY_INPUT_DEVICE_ID_LOCATION_BACK,
-
-    /** The number of locations. */
-    RETRO_NUM_QUERY_INPUT_DEVICE_ID_LOCATION
-};
-
-/** Used with @c retro_query_input_device_id to specify the direction of the input relative to the location. */
-enum retro_query_input_device_id_direction
-{
-    /** Undefined. */
-    RETRO_QUERY_INPUT_DEVICE_ID_DIRECTION_UNDEFINED,
-
-    /** Left. */
-    RETRO_QUERY_INPUT_DEVICE_ID_DIRECTION_LEFT,
-
-    /** Right. */
-    RETRO_QUERY_INPUT_DEVICE_ID_DIRECTION_RIGHT,
-
-    /** Up. */
-    RETRO_QUERY_INPUT_DEVICE_ID_DIRECTION_UP,
-
-    /** Down. */
-    RETRO_QUERY_INPUT_DEVICE_ID_DIRECTION_DOWN,
-
-    /** The number of directions. */
-    RETRO_NUM_QUERY_INPUT_DEVICE_ID_DIRECTION
-};
-
-/** Used with @c RETRO_ENVIRONMENT_QUERY_INPUT_DEVICE_ID to query device info. */
-struct retro_query_input_device_id
+/** Used with @c RETRO_ENVIRONMENT_GET_EXTRA_INPUT_ACTIONS to query device info. */
+struct retro_get_extra_input_actions
 {
     /** Query for device information. */
     struct {
         /** The device type to query such as @c RETRO_DEVICE_JOYPAD . */
         unsigned device;
-
-        /** The ID of the specific input such as @c RETRO_DEVICE_ID_JOYPAD_Y. */
-        unsigned id;
     } query;
 
     /** Response given from the give query. */
     struct {
-        /** General response given for all commands. */
-        struct {
-            /** The number of unbound actions. */
-            unsigned numUnbound;
-
-            /** The start id of unbound actions. */
-            unsigned unboundStartId;
-        } general;
-
-        /** Response for the specific device and ID. */
-        struct {
-            /** Whether or not this input is known, if it is then other fields are valid. */
-            bool known_id;
-
-            /** The class of input this is, one of @c retro_query_input_device_id_class .*/
-            enum retro_query_input_device_id_class input_class;
-
-            /** The location where this button is on a controller, one of @c retro_query_input_device_id_location . */
-            enum retro_query_input_device_id_location location;
-
-            /** The direction the button is on relative to its location on the controller, one of @c retro_query_input_device_id_direction .*/
-            enum retro_query_input_device_id_direction direction;
+        /** Is this device type known? */
+        bool known;
 
-            /** The description of this specific id, such as @c "Right Trigger". */
-            const char* description;
+        /** The number of extra IDs. */
+        unsigned numExtra;
 
-            /** The glyph that is shown for this input, may be @c NULL . */
-            const char* glyph;
-        } specific;
+        /** The start ID of the extra IDs. */
+        unsigned numExtraStartId;
     } response;
 };
 
diff --git a/runloop.c b/runloop.c
index f51b3b23023..3faaee93f0e 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1401,8 +1401,14 @@ static void core_performance_counter_stop(struct retro_perf_counter *perf)
       perf->total += cpu_features_get_perf_counter() - perf->start;
 }
 
+void rarch_query_input_device_id(rarch_system_info_t *system_info,
+    struct retro_get_extra_input_actions *idQuery) {
+
+    /* We only know about the joypad. */
+    if (idQuery->query.device != RETRO_DEVICE_JOYPAD) {
+        idQuery->response.known = false;
+    }
 
-void rarch_query_input_device_id(rarch_system_info_t *system_info, struct retro_query_input_device_id *idQuery) {
     /* TODO: Implement this. */
 }
 
@@ -3555,8 +3561,8 @@ bool runloop_environment_cb(unsigned cmd, void *data)
             }
          }
          break;
-      case RETRO_ENVIRONMENT_QUERY_INPUT_DEVICE_ID:
-         rarch_query_input_device_id(sys_info, (struct retro_query_input_device_id*)data);
+      case RETRO_ENVIRONMENT_GET_EXTRA_INPUT_ACTIONS:
+         rarch_query_input_device_id(sys_info, (struct retro_get_extra_input_actions*)data);
          break;
 
       default:

From ef5da42d6a0bf9ceac59e5276a72962313502d7d Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sat, 23 Dec 2023 15:02:49 -0500
Subject: [PATCH 06/35] Corrections to naming, mark experimental.

---
 libretro-common/include/libretro.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h
index 9ca0272afc7..e7e3c634b9b 100644
--- a/libretro-common/include/libretro.h
+++ b/libretro-common/include/libretro.h
@@ -1864,7 +1864,7 @@ enum retro_mod
                                             * multiplayer, where a deterministic core supporting multiple
                                             * input devices does not need to take any action on its own.
                                             */
-#define RETRO_ENVIRONMENT_GET_EXTRA_INPUT_ACTIONS 79
+#define RETRO_ENVIRONMENT_GET_EXTRA_INPUT_ACTIONS (79 | RETRO_ENVIRONMENT_EXPERIMENTAL)
                                            /* const struct retro_get_extra_input_actions * --
                                             * Allows the core to query information on input actions
                                             * that are additionally available but not bound to any
@@ -3397,10 +3397,10 @@ struct retro_get_extra_input_actions
         bool known;
 
         /** The number of extra IDs. */
-        unsigned numExtra;
+        unsigned num_extra;
 
         /** The start ID of the extra IDs. */
-        unsigned numExtraStartId;
+        unsigned extra_start_id;
     } response;
 };
 

From 57df9c027a7e0ac8d97926924dfc64e08ccc74cd Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sat, 23 Dec 2023 15:41:45 -0500
Subject: [PATCH 07/35] Just set something in the return value.

---
 runloop.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/runloop.c b/runloop.c
index 3faaee93f0e..a849adf4880 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1401,15 +1401,20 @@ static void core_performance_counter_stop(struct retro_perf_counter *perf)
       perf->total += cpu_features_get_perf_counter() - perf->start;
 }
 
-void rarch_query_input_device_id(rarch_system_info_t *system_info,
-    struct retro_get_extra_input_actions *idQuery) {
+static void rarch_get_extra_input_actions(rarch_system_info_t *system_info,
+    struct retro_get_extra_input_actions *request) {
 
     /* We only know about the joypad. */
-    if (idQuery->query.device != RETRO_DEVICE_JOYPAD) {
-        idQuery->response.known = false;
+    if (request->query.device != RETRO_DEVICE_JOYPAD) {
+        request->response.known = false;
     }
 
     /* TODO: Implement this. */
+    request->response.known = true;
+    request->response.num_extra = 1;
+    request->response.extra_start_id = 128;
+
+    RARCH_LOG("rarch_get_extra_input_actions(%p, %p)", system_info, request);
 }
 
 bool runloop_environment_cb(unsigned cmd, void *data)
@@ -3562,7 +3567,7 @@ bool runloop_environment_cb(unsigned cmd, void *data)
          }
          break;
       case RETRO_ENVIRONMENT_GET_EXTRA_INPUT_ACTIONS:
-         rarch_query_input_device_id(sys_info, (struct retro_get_extra_input_actions*)data);
+         rarch_get_extra_input_actions(sys_info, (struct retro_get_extra_input_actions*)data);
          break;
 
       default:

From f236b449da3060e5f470626adca2fd8e18884d91 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sat, 23 Dec 2023 17:01:35 -0500
Subject: [PATCH 08/35] Initialize inputs and debug printing; Also as well fix
 some constants.

---
 .idea/misc.xml        |   1 +
 input/input_defines.h |   5 +
 input/input_driver.h  |   2 +-
 retroarch_types.h     |   2 +-
 runloop.c             | 270 +++++++++++++++++++++++-------------------
 5 files changed, 154 insertions(+), 126 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2f317c469fb..11f00163296 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,6 +4,7 @@
   <component name="MakefileSettings">
     <option name="linkedExternalProjectsSettings">
       <MakefileProjectSettings>
+        <option name="buildOptions" value="DEBUG=1" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
           <set>
diff --git a/input/input_defines.h b/input/input_defines.h
index bdd36fc37a1..3407ce3a220 100644
--- a/input/input_defines.h
+++ b/input/input_defines.h
@@ -33,6 +33,11 @@
 #define RARCH_FIRST_MISC_CUSTOM_BIND   RARCH_LIGHTGUN_BIND_LIST_END
 #define RARCH_FIRST_META_KEY           RARCH_CUSTOM_BIND_LIST_END
 
+#define RARCH_MAX_EXTRA_BUTTON         (RETRO_DEVICE_ID_JOYPAD_MASK - RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS)
+#define RARCH_EXTRA_BUTTON_ID(id)      (RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS + (id))
+
+#define RARCH_EXTRA_BUTTON_ID_END      (RARCH_FIRST_META_KEY + RARCH_MAX_EXTRA_BUTTON)
+
 #define RARCH_UNMAPPED                 1024
 
 /* Specialized _MOUSE that targets the full screen regardless of viewport.
diff --git a/input/input_driver.h b/input/input_driver.h
index 6fa75a3b353..0ef51d51bc2 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -1058,7 +1058,7 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
 void input_keyboard_event(bool down, unsigned code,
       uint32_t character, uint16_t mod, unsigned device);
 
-extern const unsigned input_config_bind_order[24];
+extern const unsigned input_config_bind_order[RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS];
 
 extern input_device_driver_t *joypad_drivers[];
 extern input_driver_t *input_drivers[];
diff --git a/retroarch_types.h b/retroarch_types.h
index 37e6492d150..8bbdfbadf53 100644
--- a/retroarch_types.h
+++ b/retroarch_types.h
@@ -169,7 +169,7 @@ typedef struct rarch_system_info
    disk_control_interface_t disk_control;      /* ptr alignment */
    struct retro_system_info info;              /* ptr alignment */
    rarch_memory_map_t mmaps;                   /* ptr alignment */
-   const char *input_desc_btn[MAX_USERS][RARCH_FIRST_META_KEY];
+   const char *input_desc_btn[MAX_USERS][RARCH_EXTRA_BUTTON_ID_END];
    struct
    {
       struct retro_subsystem_info *data;
diff --git a/runloop.c b/runloop.c
index a849adf4880..9f0225aac6a 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1403,18 +1403,157 @@ static void core_performance_counter_stop(struct retro_perf_counter *perf)
 
 static void rarch_get_extra_input_actions(rarch_system_info_t *system_info,
     struct retro_get_extra_input_actions *request) {
-
-    /* We only know about the joypad. */
+    /* We only know/care about the joypad. */
     if (request->query.device != RETRO_DEVICE_JOYPAD) {
         request->response.known = false;
     }
 
-    /* TODO: Implement this. */
+    /* Reserve all the buttons after the current maximum. */
+    /* When cores send the input descriptors they will have to start at the given base. */
     request->response.known = true;
-    request->response.num_extra = 1;
-    request->response.extra_start_id = 128;
+    request->response.extra_start_id = RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS;
+    request->response.num_extra = RARCH_MAX_EXTRA_BUTTON;
+}
+
+static void rarch_set_input_descriptors(const void *data, unsigned int p,
+        runloop_state_t *runloop_st, const settings_t *settings,
+        rarch_system_info_t *sys_info) {
+    unsigned retro_id;
+    const struct retro_input_descriptor *desc = NULL;
+    memset((void*)&sys_info->input_desc_btn, 0,
+          sizeof(sys_info->input_desc_btn));
+
+    desc = (const struct retro_input_descriptor*)data;
+
+    for (; desc->description; desc++)
+    {
+       unsigned retro_port = desc->port;
+
+       retro_id            = desc->id;
+
+       if (desc->port >= MAX_USERS)
+          continue;
+
+       /* Ignore extended custom binds. */
+       if (desc->id >= RARCH_FIRST_CUSTOM_BIND)
+       {
+          /* However if we are using extra keys, remap them accordingly. */
+          if (!(desc->id >= RARCH_EXTRA_BUTTON_ID(0) &&
+             desc->id < RARCH_EXTRA_BUTTON_ID(RARCH_MAX_EXTRA_BUTTON)))
+             continue;
+       }
+
+       switch (desc->device)
+       {
+          case RETRO_DEVICE_JOYPAD:
+             sys_info->input_desc_btn[retro_port]
+                [retro_id] = desc->description;
+             break;
+          case RETRO_DEVICE_ANALOG:
+             switch (retro_id)
+             {
+                case RETRO_DEVICE_ID_ANALOG_X:
+                   switch (desc->index)
+                   {
+                      case RETRO_DEVICE_INDEX_ANALOG_LEFT:
+                         sys_info->input_desc_btn[retro_port]
+                            [RARCH_ANALOG_LEFT_X_PLUS]  = desc->description;
+                         sys_info->input_desc_btn[retro_port]
+                            [RARCH_ANALOG_LEFT_X_MINUS] = desc->description;
+                         break;
+                      case RETRO_DEVICE_INDEX_ANALOG_RIGHT:
+                         sys_info->input_desc_btn[retro_port]
+                            [RARCH_ANALOG_RIGHT_X_PLUS] = desc->description;
+                         sys_info->input_desc_btn[retro_port]
+                            [RARCH_ANALOG_RIGHT_X_MINUS] = desc->description;
+                         break;
+                   }
+                   break;
+                case RETRO_DEVICE_ID_ANALOG_Y:
+                   switch (desc->index)
+                   {
+                      case RETRO_DEVICE_INDEX_ANALOG_LEFT:
+                         sys_info->input_desc_btn[retro_port]
+                            [RARCH_ANALOG_LEFT_Y_PLUS] = desc->description;
+                         sys_info->input_desc_btn[retro_port]
+                            [RARCH_ANALOG_LEFT_Y_MINUS] = desc->description;
+                         break;
+                      case RETRO_DEVICE_INDEX_ANALOG_RIGHT:
+                         sys_info->input_desc_btn[retro_port]
+                            [RARCH_ANALOG_RIGHT_Y_PLUS] = desc->description;
+                         sys_info->input_desc_btn[retro_port]
+                            [RARCH_ANALOG_RIGHT_Y_MINUS] = desc->description;
+                         break;
+                   }
+                   break;
+                case RETRO_DEVICE_ID_JOYPAD_R2:
+                   switch (desc->index)
+                   {
+                      case RETRO_DEVICE_INDEX_ANALOG_BUTTON:
+                         sys_info->input_desc_btn[retro_port]
+                            [retro_id] = desc->description;
+                         break;
+                   }
+                   break;
+                case RETRO_DEVICE_ID_JOYPAD_L2:
+                   switch (desc->index)
+                   {
+                      case RETRO_DEVICE_INDEX_ANALOG_BUTTON:
+                         sys_info->input_desc_btn[retro_port]
+                            [retro_id] = desc->description;
+                         break;
+                   }
+                   break;
+             }
+             break;
+       }
+    }
+
+    RARCH_LOG("[Environ]: SET_INPUT_DESCRIPTORS:\n");
+
+    {
+       unsigned log_level      = settings->uints.libretro_log_level;
+
+       if (log_level == RETRO_LOG_DEBUG)
+       {
+          unsigned input_driver_max_users = settings->uints.input_max_users;
+
+          for (p = 0; p < input_driver_max_users; p++)
+          {
+             unsigned mapped_port = settings->uints.input_remap_ports[p];
+
+             RARCH_DBG("   %s %u:\n", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT), p + 1);
+
+             for (retro_id = 0; retro_id < RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS; retro_id++)
+             {
+                unsigned bind_index     = input_config_bind_order[retro_id];
+                const char *description = sys_info->input_desc_btn[mapped_port][bind_index];
+
+                if (!description)
+                   continue;
+
+                RARCH_DBG("      \"%s\" => \"%s\"\n",
+                      msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B + bind_index),
+                      description);
+             }
 
-    RARCH_LOG("rarch_get_extra_input_actions(%p, %p)", system_info, request);
+             for (retro_id = RARCH_EXTRA_BUTTON_ID(0); retro_id < RARCH_EXTRA_BUTTON_ID_END; retro_id++)
+             {
+                 const char *description = sys_info->input_desc_btn[mapped_port][retro_id];
+
+                 if (!description)
+                     continue;
+
+                 RARCH_DBG("      Extra %d => \"%s\"\n",
+                           retro_id,
+                           description);
+             }
+          }
+       }
+    }
+
+    runloop_st->current_core.flags |=
+       RETRO_CORE_FLAG_HAS_SET_INPUT_DESCRIPTORS;
 }
 
 bool runloop_environment_cb(unsigned cmd, void *data)
@@ -2064,124 +2203,7 @@ bool runloop_environment_cb(unsigned cmd, void *data)
       {
          if (sys_info)
          {
-            unsigned retro_id;
-            const struct retro_input_descriptor *desc = NULL;
-            memset((void*)&sys_info->input_desc_btn, 0,
-                  sizeof(sys_info->input_desc_btn));
-
-            desc = (const struct retro_input_descriptor*)data;
-
-            for (; desc->description; desc++)
-            {
-               unsigned retro_port = desc->port;
-
-               retro_id            = desc->id;
-
-               if (desc->port >= MAX_USERS)
-                  continue;
-
-               if (desc->id >= RARCH_FIRST_CUSTOM_BIND)
-                  continue;
-
-               switch (desc->device)
-               {
-                  case RETRO_DEVICE_JOYPAD:
-                     sys_info->input_desc_btn[retro_port]
-                        [retro_id] = desc->description;
-                     break;
-                  case RETRO_DEVICE_ANALOG:
-                     switch (retro_id)
-                     {
-                        case RETRO_DEVICE_ID_ANALOG_X:
-                           switch (desc->index)
-                           {
-                              case RETRO_DEVICE_INDEX_ANALOG_LEFT:
-                                 sys_info->input_desc_btn[retro_port]
-                                    [RARCH_ANALOG_LEFT_X_PLUS]  = desc->description;
-                                 sys_info->input_desc_btn[retro_port]
-                                    [RARCH_ANALOG_LEFT_X_MINUS] = desc->description;
-                                 break;
-                              case RETRO_DEVICE_INDEX_ANALOG_RIGHT:
-                                 sys_info->input_desc_btn[retro_port]
-                                    [RARCH_ANALOG_RIGHT_X_PLUS] = desc->description;
-                                 sys_info->input_desc_btn[retro_port]
-                                    [RARCH_ANALOG_RIGHT_X_MINUS] = desc->description;
-                                 break;
-                           }
-                           break;
-                        case RETRO_DEVICE_ID_ANALOG_Y:
-                           switch (desc->index)
-                           {
-                              case RETRO_DEVICE_INDEX_ANALOG_LEFT:
-                                 sys_info->input_desc_btn[retro_port]
-                                    [RARCH_ANALOG_LEFT_Y_PLUS] = desc->description;
-                                 sys_info->input_desc_btn[retro_port]
-                                    [RARCH_ANALOG_LEFT_Y_MINUS] = desc->description;
-                                 break;
-                              case RETRO_DEVICE_INDEX_ANALOG_RIGHT:
-                                 sys_info->input_desc_btn[retro_port]
-                                    [RARCH_ANALOG_RIGHT_Y_PLUS] = desc->description;
-                                 sys_info->input_desc_btn[retro_port]
-                                    [RARCH_ANALOG_RIGHT_Y_MINUS] = desc->description;
-                                 break;
-                           }
-                           break;
-                        case RETRO_DEVICE_ID_JOYPAD_R2:
-                           switch (desc->index)
-                           {
-                              case RETRO_DEVICE_INDEX_ANALOG_BUTTON:
-                                 sys_info->input_desc_btn[retro_port]
-                                    [retro_id] = desc->description;
-                                 break;
-                           }
-                           break;
-                        case RETRO_DEVICE_ID_JOYPAD_L2:
-                           switch (desc->index)
-                           {
-                              case RETRO_DEVICE_INDEX_ANALOG_BUTTON:
-                                 sys_info->input_desc_btn[retro_port]
-                                    [retro_id] = desc->description;
-                                 break;
-                           }
-                           break;
-                     }
-                     break;
-               }
-            }
-
-            RARCH_LOG("[Environ]: SET_INPUT_DESCRIPTORS:\n");
-
-            {
-               unsigned log_level      = settings->uints.libretro_log_level;
-
-               if (log_level == RETRO_LOG_DEBUG)
-               {
-                  unsigned input_driver_max_users = settings->uints.input_max_users;
-
-                  for (p = 0; p < input_driver_max_users; p++)
-                  {
-                     unsigned mapped_port = settings->uints.input_remap_ports[p];
-
-                     RARCH_DBG("   %s %u:\n", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT), p + 1);
-
-                     for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND; retro_id++)
-                     {
-                        unsigned bind_index     = input_config_bind_order[retro_id];
-                        const char *description = sys_info->input_desc_btn[mapped_port][bind_index];
-
-                        if (!description)
-                           continue;
-
-                        RARCH_DBG("      \"%s\" => \"%s\"\n",
-                              msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B + bind_index),
-                              description);
-                     }
-                  }
-               }
-            }
-
-            runloop_st->current_core.flags |=
-               RETRO_CORE_FLAG_HAS_SET_INPUT_DESCRIPTORS;
+             rarch_set_input_descriptors(data, p, runloop_st, settings, sys_info);
          }
          break;
       }

From 36e4aded472e5b6e639d988deefbfc581b79b885 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sat, 23 Dec 2023 19:36:33 -0500
Subject: [PATCH 09/35] For CLion add scope for dependencies so they can be
 excluded in searches.

---
 .idea/fileColors.xml          | 6 ++++++
 .idea/scopes/Dependencies.xml | 3 +++
 2 files changed, 9 insertions(+)
 create mode 100644 .idea/fileColors.xml
 create mode 100644 .idea/scopes/Dependencies.xml

diff --git a/.idea/fileColors.xml b/.idea/fileColors.xml
new file mode 100644
index 00000000000..42fef831cf9
--- /dev/null
+++ b/.idea/fileColors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="SharedFileColors">
+    <fileColor scope="Dependencies" color="Yellow" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/Dependencies.xml b/.idea/scopes/Dependencies.xml
new file mode 100644
index 00000000000..b457b64c18e
--- /dev/null
+++ b/.idea/scopes/Dependencies.xml
@@ -0,0 +1,3 @@
+<component name="DependencyValidationManager">
+  <scope name="Dependencies" pattern="file[RetroArch]:deps//*" />
+</component>
\ No newline at end of file

From b88ddfd0c775c5a54c9ae8dff1a7b9b829887beb Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sat, 23 Dec 2023 19:36:47 -0500
Subject: [PATCH 10/35] Ignore .gdbinit.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 32c879eebe3..edf85f05ed0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -248,3 +248,4 @@ param.sfo
 
 # Visual Studio Code
 .vscode/
+/.gdbinit

From e0def8f51863f63933d481de08bb88928611e4cb Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sat, 23 Dec 2023 20:46:58 -0500
Subject: [PATCH 11/35] CLion Settings.

---
 .idea/inspectionProfiles/Project_Default.xml | 5 +++++
 .idea/misc.xml                               | 5 +++++
 .idea/vcs.xml                                | 6 ++++++
 3 files changed, 16 insertions(+)
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 00000000000..8d66637cb9f
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,5 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 11f00163296..2e8a9ca1aa4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="CidrRootsConfiguration">
+    <libraryRoots>
+      <file path="$PROJECT_DIR$/deps" />
+    </libraryRoots>
+  </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MakefileSettings">
     <option name="linkedExternalProjectsSettings">
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000000..35eb1ddfbbc
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

From 909ba149c165c6ad33711a53337521250c83a99e Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sat, 23 Dec 2023 20:48:13 -0500
Subject: [PATCH 12/35] Commit before reversion... messy.

---
 configuration.c           |  62 ++++++++++++++-------
 configuration.h           |   4 +-
 input/input_defines.h     |  22 +++++++-
 menu/cbs/menu_cbs_left.c  | 114 +++++++++++++++++++++-----------------
 menu/cbs/menu_cbs_right.c |  53 +-----------------
 menu/menu_cbs.h           |  14 +++++
 menu/menu_displaylist.c   |   2 +-
 retroarch_types.h         |   2 +-
 runloop.c                 |  19 +++++--
 9 files changed, 159 insertions(+), 133 deletions(-)

diff --git a/configuration.c b/configuration.c
index 4bdaa69509f..6e2219763f9 100644
--- a/configuration.c
+++ b/configuration.c
@@ -394,6 +394,8 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
    DECLARE_META_BIND(2, overlay_next,          RARCH_OVERLAY_NEXT,           MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT),
 
    DECLARE_META_BIND(2, osk_toggle,            RARCH_OSK,                    MENU_ENUM_LABEL_VALUE_INPUT_META_OSK),
+
+   /* Extra defined keys. */
 #if 0
    /* Deprecated */
    DECLARE_META_BIND(2, send_debug_info,       RARCH_SEND_DEBUG_INFO,        MENU_ENUM_LABEL_VALUE_INPUT_META_SEND_DEBUG_INFO),
@@ -5669,6 +5671,34 @@ bool config_replace(bool config_replace_save_on_exit, char *path)
    return task_push_start_dummy_core(&content_info);
 }
 
+#define KEYSTRING_BUTTON_BUF_SIZE 8
+typedef char rarch_key_strings_array[RARCH_MAX_TOTAL_BUTTON][KEYSTRING_BUTTON_BUF_SIZE];
+
+static rarch_key_strings_array* rarch_static_key_strings(void)
+{
+    static bool didInit;
+    static char key_strings[RARCH_MAX_TOTAL_BUTTON][KEYSTRING_BUTTON_BUF_SIZE] = {
+        "b", "y", "select", "start",
+        "up", "down", "left", "right",
+        "a", "x", "l", "r", "l2", "r2",
+        "l3", "r3", "l_x+", "l_x-", "l_y+", "l_y-", "r_x+", "r_x-", "r_y+", "r_y-" };
+    int i;
+
+    /* Need to initialize all of the extra keys? */
+    if (!didInit)
+    {
+        /* Do not initialize again. */
+        didInit = true;
+
+        /* Setup massive number of extra buttons. */
+        for (i = RARCH_FIRST_ID_EXTRA_BUTTON; i < RARCH_LAST_ID_EXTRA_BUTTON; i++)
+            snprintf(key_strings[i], KEYSTRING_BUTTON_BUF_SIZE - 1,
+                "ext%d", i - RARCH_FIRST_ID_EXTRA_BUTTON);
+    }
+
+    return &key_strings;
+}
+
 /**
  * input_remapping_load_file:
  * @data                     : Path to config file.
@@ -5683,11 +5713,10 @@ bool input_remapping_load_file(void *data, const char *path)
    config_file_t *conf                              = (config_file_t*)data;
    settings_t *settings                             = config_st;
    runloop_state_t *runloop_st                      = runloop_state_get_ptr();
-   char key_strings[RARCH_FIRST_CUSTOM_BIND + 8][8] = {
-      "b", "y", "select", "start",
-      "up", "down", "left", "right",
-      "a", "x", "l", "r", "l2", "r2",
-      "l3", "r3", "l_x+", "l_x-", "l_y+", "l_y-", "r_x+", "r_x-", "r_y+", "r_y-" };
+   rarch_key_strings_array* key_strings;
+
+   /* Get all the key strings. */
+   key_strings = rarch_static_key_strings();
 
    if (    !conf
          || string_is_empty(path))
@@ -5716,11 +5745,11 @@ bool input_remapping_load_file(void *data, const char *path)
       _len       = strlcpy(s3, prefix, sizeof(s3));
       strlcpy(s3 + _len, "_stk", sizeof(s3) - _len);
 
-      for (j = 0; j < RARCH_FIRST_CUSTOM_BIND + 8; j++)
+      for (j = 0; j < RARCH_MAX_TOTAL_BUTTON + 8; j++)
       {
-         const char *key_string = key_strings[j];
+         const char *key_string = (*key_strings)[j];
 
-         if (j < RARCH_FIRST_CUSTOM_BIND)
+         if (j < RARCH_FIRST_CUSTOM_BIND || j >= RARCH_FIRST_ID_EXTRA_BUTTON)
          {
             int btn_remap = -1;
             int key_remap = -1;
@@ -5814,19 +5843,14 @@ bool input_remapping_save_file(const char *path)
    bool ret;
    unsigned i, j;
    char remap_file_dir[PATH_MAX_LENGTH];
-   char key_strings[RARCH_FIRST_CUSTOM_BIND + 8][8] =
-   {
-      "b",      "y",      "select", "start",
-      "up",     "down",   "left",   "right",
-      "a",      "x",      "l",      "r",
-      "l2",     "r2",     "l3",     "r3",
-      "l_x+",   "l_x-",   "l_y+",   "l_y-",
-      "r_x+",   "r_x-",   "r_y+",   "r_y-"
-   };
    config_file_t         *conf = NULL;
    runloop_state_t *runloop_st = runloop_state_get_ptr();
    settings_t        *settings = config_st;
    unsigned          max_users = settings->uints.input_max_users;
+   rarch_key_strings_array* key_strings;
+
+   /* Get all the key strings. */
+   key_strings = rarch_static_key_strings();
 
    if (string_is_empty(path))
       return false;
@@ -5887,11 +5911,11 @@ bool input_remapping_save_file(const char *path)
       _len       = strlcpy(s3, prefix, sizeof(s3));
       strlcpy(s3 + _len, "_stk", sizeof(s3) - _len);
 
-      for (j = 0; j < RARCH_FIRST_CUSTOM_BIND; j++)
+      for (j = 0; j < RARCH_MAX_TOTAL_BUTTON; j++)
       {
          char btn_ident[128];
          char key_ident[128];
-         const char *key_string = key_strings[j];
+         const char *key_string = (*key_strings)[j];
          unsigned remap_id      = settings->uints.input_remap_ids[i][j];
          unsigned keymap_id     = settings->uints.input_keymapper_ids[i][j];
 
diff --git a/configuration.h b/configuration.h
index 786f1f439c8..189306ba68a 100644
--- a/configuration.h
+++ b/configuration.h
@@ -150,8 +150,8 @@ typedef struct settings
       unsigned input_analog_dpad_mode[MAX_USERS];
 
       unsigned input_remap_ports[MAX_USERS];
-      unsigned input_remap_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
-      unsigned input_keymapper_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
+      unsigned input_remap_ids[MAX_USERS][RARCH_MAX_TOTAL_BUTTON];
+      unsigned input_keymapper_ids[MAX_USERS][RARCH_MAX_TOTAL_BUTTON];
       unsigned input_remap_port_map[MAX_USERS][MAX_USERS + 1];
 
       unsigned led_map[MAX_LEDS];
diff --git a/input/input_defines.h b/input/input_defines.h
index 3407ce3a220..072c3959a68 100644
--- a/input/input_defines.h
+++ b/input/input_defines.h
@@ -33,10 +33,26 @@
 #define RARCH_FIRST_MISC_CUSTOM_BIND   RARCH_LIGHTGUN_BIND_LIST_END
 #define RARCH_FIRST_META_KEY           RARCH_CUSTOM_BIND_LIST_END
 
-#define RARCH_MAX_EXTRA_BUTTON         (RETRO_DEVICE_ID_JOYPAD_MASK - RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS)
-#define RARCH_EXTRA_BUTTON_ID(id)      (RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS + (id))
+/** The number of extra buttons to define, this is virtualized. */
+#define RARCH_MAX_EXTRA_BUTTON         128
 
-#define RARCH_EXTRA_BUTTON_ID_END      (RARCH_FIRST_META_KEY + RARCH_MAX_EXTRA_BUTTON)
+/** The base for extra buttons. */
+#define RARCH_BASE_EXTRA_BUTTON        24
+
+/** The total number of button binds which are possible. */
+#define RARCH_MAX_TOTAL_BUTTON         (RARCH_BASE_EXTRA_BUTTON + RARCH_MAX_EXTRA_BUTTON)
+
+/** An extra button at the given index. */
+#define RARCH_ID_EXTRA_BUTTON(id)      (RARCH_BASE_EXTRA_BUTTON + (id))
+
+/** The first starting extra button. */
+#define RARCH_FIRST_ID_EXTRA_BUTTON    RARCH_ID_EXTRA_BUTTON(0)
+
+/** The last ending extra button. */
+#define RARCH_LAST_ID_EXTRA_BUTTON     RARCH_ID_EXTRA_BUTTON(RARCH_MAX_EXTRA_BUTTON)
+
+/** Is this an extra button bind? */
+#define RARCH_IS_EXTRA_BUTTON_BIND(id) (((id) >= RARCH_FIRST_EXTRA_BUTTON_BIND) ? 1 : 0)
 
 #define RARCH_UNMAPPED                 1024
 
diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index 0bf48a993e5..0672598c1dc 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -135,61 +135,71 @@ static int action_left_cheat(unsigned type, const char *label,
 }
 #endif
 
-static int action_left_input_desc(unsigned type, const char *label,
-   bool wraparound)
+int action_bidirectional_input_desc(unsigned type, const char *label, bool wraparound, int direction)
 {
-   unsigned btn_idx;
-   unsigned user_idx;
-   unsigned remap_idx;
-   unsigned bind_idx;
-   unsigned mapped_port;
-   settings_t *settings                  = config_get_ptr();
-   rarch_system_info_t *sys_info         = &runloop_state_get_ptr()->system;
-   if (!settings || !sys_info)
-      return 0;
-
-   user_idx    = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) / (RARCH_FIRST_CUSTOM_BIND + 8);
-   btn_idx     = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) - (RARCH_FIRST_CUSTOM_BIND + 8) * user_idx;
-   mapped_port = settings->uints.input_remap_ports[user_idx];
-
-   if (settings->uints.input_remap_ids[user_idx][btn_idx] == RARCH_UNMAPPED)
-      settings->uints.input_remap_ids[user_idx][btn_idx] = RARCH_CUSTOM_BIND_LIST_END - 1;
-
-   remap_idx = settings->uints.input_remap_ids[user_idx][btn_idx];
-   for (bind_idx = 0; bind_idx < RARCH_ANALOG_BIND_LIST_END; bind_idx++)
-   {
-      if (input_config_bind_order[bind_idx] == remap_idx)
-         break;
-   }
-
-   if (bind_idx > 0)
-   {
-      if (bind_idx > RARCH_ANALOG_BIND_LIST_END)
-         settings->uints.input_remap_ids[user_idx][btn_idx]--;
-      else
-      {
-         bind_idx--;
-         bind_idx = input_config_bind_order[bind_idx];
-         settings->uints.input_remap_ids[user_idx][btn_idx] = bind_idx;
-      }
-   }
-   else if (bind_idx == 0)
-      settings->uints.input_remap_ids[user_idx][btn_idx] = RARCH_UNMAPPED;
-   else
-      settings->uints.input_remap_ids[user_idx][btn_idx] = RARCH_CUSTOM_BIND_LIST_END - 1;
-
-   remap_idx = settings->uints.input_remap_ids[user_idx][btn_idx];
-
-   /* skip the not used buttons (unless they are at the end by calling the right desc function recursively
-      also skip all the axes until analog remapping is implemented */
-   if (remap_idx != RARCH_UNMAPPED)
-   {
-      if ((string_is_empty(sys_info->input_desc_btn[mapped_port][remap_idx]) && remap_idx < RARCH_CUSTOM_BIND_LIST_END) /*||
+    unsigned btn_idx;
+    unsigned user_idx;
+    unsigned remap_idx;
+    unsigned bind_idx;
+    unsigned mapped_port;
+    settings_t *settings                  = config_get_ptr();
+    rarch_system_info_t *sys_info         = &runloop_state_get_ptr()->system;
+
+    if (!settings || !sys_info)
+        return 0;
+
+    /* TODO: Implement this in a much nicer way! */
+
+#if 0
+    user_idx    = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) / (RARCH_FIRST_CUSTOM_BIND + 8);
+    btn_idx     = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) - (RARCH_FIRST_CUSTOM_BIND + 8) * user_idx;
+    mapped_port = settings->uints.input_remap_ports[user_idx];
+
+    if (settings->uints.input_remap_ids[user_idx][btn_idx] == RARCH_UNMAPPED)
+        settings->uints.input_remap_ids[user_idx][btn_idx] = RARCH_CUSTOM_BIND_LIST_END - 1;
+
+    remap_idx = settings->uints.input_remap_ids[user_idx][btn_idx];
+    for (bind_idx = 0; bind_idx < RARCH_ANALOG_BIND_LIST_END; bind_idx++)
+    {
+        if (input_config_bind_order[bind_idx] == remap_idx)
+            break;
+    }
+
+    if (bind_idx > 0)
+    {
+        if (bind_idx > RARCH_ANALOG_BIND_LIST_END)
+            settings->uints.input_remap_ids[user_idx][btn_idx]--;
+        else
+        {
+            bind_idx--;
+            bind_idx = input_config_bind_order[bind_idx];
+            settings->uints.input_remap_ids[user_idx][btn_idx] = bind_idx;
+        }
+    }
+    else if (bind_idx == 0)
+        settings->uints.input_remap_ids[user_idx][btn_idx] = RARCH_UNMAPPED;
+    else
+        settings->uints.input_remap_ids[user_idx][btn_idx] = RARCH_CUSTOM_BIND_LIST_END - 1;
+
+    remap_idx = settings->uints.input_remap_ids[user_idx][btn_idx];
+
+    /* skip the not used buttons (unless they are at the end by calling the right desc function recursively
+       also skip all the axes until analog remapping is implemented */
+    if (remap_idx != RARCH_UNMAPPED)
+    {
+        if ((string_is_empty(sys_info->input_desc_btn[mapped_port][remap_idx]) && remap_idx < RARCH_CUSTOM_BIND_LIST_END) /*||
           (remap_idx >= RARCH_FIRST_CUSTOM_BIND && remap_idx < RARCH_CUSTOM_BIND_LIST_END)*/)
-         action_left_input_desc(type, label, wraparound);
-   }
+            action_bidirectional_input_desc(type, label, wraparound, direction);
+    }
+#endif
 
-   return 0;
+    return 0;
+}
+
+static int action_left_input_desc(unsigned type, const char *label,
+   bool wraparound)
+{
+    return action_bidirectional_input_desc(type, label, wraparound, -1);
 }
 
 static int action_left_input_desc_kbd(unsigned type, const char *label,
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index 8a6badbc3f6..f8eaf2e5128 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -171,60 +171,11 @@ static int action_right_input_desc_kbd(unsigned type, const char *label,
    return 0;
 }
 
-/* TODO/FIXME: incomplete, lacks error checking */
 static int action_right_input_desc(unsigned type, const char *label,
    bool wraparound)
 {
-   settings_t *settings                  = config_get_ptr();
-   rarch_system_info_t *sys_info         = &runloop_state_get_ptr()->system;
-   if (settings && sys_info)
-   {
-      unsigned bind_idx;
-      unsigned user_idx    = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) / (RARCH_FIRST_CUSTOM_BIND + 8);
-      unsigned btn_idx     = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) - (RARCH_FIRST_CUSTOM_BIND + 8) * user_idx;
-      unsigned mapped_port = settings->uints.input_remap_ports[user_idx];
-      unsigned remap_idx   = settings->uints.input_remap_ids[user_idx][btn_idx];
-      for (bind_idx = 0; bind_idx < RARCH_ANALOG_BIND_LIST_END; bind_idx++)
-      {
-         if (input_config_bind_order[bind_idx] == remap_idx)
-            break;
-      }
-
-      if (bind_idx < RARCH_CUSTOM_BIND_LIST_END - 1)
-      {
-         if (bind_idx > RARCH_ANALOG_BIND_LIST_END)
-            settings->uints.input_remap_ids[user_idx][btn_idx]++;
-         else
-         {
-            if (bind_idx < RARCH_ANALOG_BIND_LIST_END - 1)
-            {
-               bind_idx++;
-               bind_idx = input_config_bind_order[bind_idx];
-            }
-            else if (bind_idx == RARCH_ANALOG_BIND_LIST_END - 1)
-               bind_idx = RARCH_UNMAPPED;
-            else
-               bind_idx = input_config_bind_order[0];
-            settings->uints.input_remap_ids[user_idx][btn_idx] = bind_idx;
-         }
-      }
-      else if (bind_idx == RARCH_CUSTOM_BIND_LIST_END - 1)
-         settings->uints.input_remap_ids[user_idx][btn_idx] = RARCH_UNMAPPED;
-      else
-         settings->uints.input_remap_ids[user_idx][btn_idx] = input_config_bind_order[0];
-
-      remap_idx = settings->uints.input_remap_ids[user_idx][btn_idx];
-
-      /* skip the not used buttons (unless they are at the end by calling the right desc function recursively
-         also skip all the axes until analog remapping is implemented */
-      if (remap_idx != RARCH_UNMAPPED)
-      {
-         if ((string_is_empty(sys_info->input_desc_btn[mapped_port][remap_idx]) && remap_idx < RARCH_CUSTOM_BIND_LIST_END))
-            action_right_input_desc(type, label, wraparound);
-      }
-   }
-
-   return 0;
+    /* The left and right actions are very similar. */
+    return action_bidirectional_input_desc(type, label, wraparound, 1);
 }
 
 static int action_right_scroll(unsigned type, const char *label,
diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h
index 9191f48d448..c6edbf96b37 100644
--- a/menu/menu_cbs.h
+++ b/menu/menu_cbs.h
@@ -335,6 +335,20 @@ void cb_generic_download(retro_task_t *task,
       void *task_data,
       void *user_data, const char *err);
 
+/**
+ * Bidirectional input descriptor navigation.
+ *
+ * @param type
+ * @param label
+ * @param wraparound
+ * @param direction
+ * @return Always zero?
+ */
+int action_bidirectional_input_desc(unsigned type,
+    const char *label,
+    bool wraparound,
+    int direction);
+
 RETRO_END_DECLS
 
 #endif
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index ee71e2dc8e1..ac107020acf 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -5470,7 +5470,7 @@ static int menu_displaylist_parse_input_description_list(
    btn_idx     = (info->type - MENU_SETTINGS_INPUT_DESC_BEGIN) - (RARCH_FIRST_CUSTOM_BIND + 8) * user_idx;
 
    if (   (user_idx >= MAX_USERS)
-       || (btn_idx >= RARCH_CUSTOM_BIND_LIST_END))
+       || (btn_idx >= RARCH_MAX_TOTAL_BUTTON))
       return 0;
 
    mapped_port = settings->uints.input_remap_ports[user_idx];
diff --git a/retroarch_types.h b/retroarch_types.h
index 8bbdfbadf53..259e199c55f 100644
--- a/retroarch_types.h
+++ b/retroarch_types.h
@@ -169,7 +169,7 @@ typedef struct rarch_system_info
    disk_control_interface_t disk_control;      /* ptr alignment */
    struct retro_system_info info;              /* ptr alignment */
    rarch_memory_map_t mmaps;                   /* ptr alignment */
-   const char *input_desc_btn[MAX_USERS][RARCH_EXTRA_BUTTON_ID_END];
+   const char *input_desc_btn[MAX_USERS][RARCH_MAX_TOTAL_BUTTON];
    struct
    {
       struct retro_subsystem_info *data;
diff --git a/runloop.c b/runloop.c
index 9f0225aac6a..84c0693d289 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1403,6 +1403,17 @@ static void core_performance_counter_stop(struct retro_perf_counter *perf)
 
 static void rarch_get_extra_input_actions(rarch_system_info_t *system_info,
     struct retro_get_extra_input_actions *request) {
+    static bool didInitExtra;
+
+    int i;
+
+    /* Do extra inputs need to be initialized? */
+    if (!didInitExtra) {
+        /* Do not initialize again. */
+        didInitExtra = true;
+
+    }
+
     /* We only know/care about the joypad. */
     if (request->query.device != RETRO_DEVICE_JOYPAD) {
         request->response.known = false;
@@ -1437,9 +1448,9 @@ static void rarch_set_input_descriptors(const void *data, unsigned int p,
        /* Ignore extended custom binds. */
        if (desc->id >= RARCH_FIRST_CUSTOM_BIND)
        {
-          /* However if we are using extra keys, remap them accordingly. */
-          if (!(desc->id >= RARCH_EXTRA_BUTTON_ID(0) &&
-             desc->id < RARCH_EXTRA_BUTTON_ID(RARCH_MAX_EXTRA_BUTTON)))
+          /* However if we are using extra binds, remap them accordingly. */
+          if (!(desc->id >= RARCH_FIRST_ID_EXTRA_BUTTON &&
+             desc->id < RARCH_LAST_ID_EXTRA_BUTTON))
              continue;
        }
 
@@ -1537,7 +1548,7 @@ static void rarch_set_input_descriptors(const void *data, unsigned int p,
                       description);
              }
 
-             for (retro_id = RARCH_EXTRA_BUTTON_ID(0); retro_id < RARCH_EXTRA_BUTTON_ID_END; retro_id++)
+             for (retro_id = RARCH_FIRST_ID_EXTRA_BUTTON; retro_id < RARCH_LAST_ID_EXTRA_BUTTON; retro_id++)
              {
                  const char *description = sys_info->input_desc_btn[mapped_port][retro_id];
 

From 07a304d3a6d3432cfe5a10099315d7b6ac6439b0 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sat, 23 Dec 2023 20:48:37 -0500
Subject: [PATCH 13/35] Revert "Commit before reversion... messy."

This reverts commit 909ba149c165c6ad33711a53337521250c83a99e.
---
 configuration.c           |  62 +++++++--------------
 configuration.h           |   4 +-
 input/input_defines.h     |  22 +-------
 menu/cbs/menu_cbs_left.c  | 114 +++++++++++++++++---------------------
 menu/cbs/menu_cbs_right.c |  53 +++++++++++++++++-
 menu/menu_cbs.h           |  14 -----
 menu/menu_displaylist.c   |   2 +-
 retroarch_types.h         |   2 +-
 runloop.c                 |  19 ++-----
 9 files changed, 133 insertions(+), 159 deletions(-)

diff --git a/configuration.c b/configuration.c
index 6e2219763f9..4bdaa69509f 100644
--- a/configuration.c
+++ b/configuration.c
@@ -394,8 +394,6 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
    DECLARE_META_BIND(2, overlay_next,          RARCH_OVERLAY_NEXT,           MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT),
 
    DECLARE_META_BIND(2, osk_toggle,            RARCH_OSK,                    MENU_ENUM_LABEL_VALUE_INPUT_META_OSK),
-
-   /* Extra defined keys. */
 #if 0
    /* Deprecated */
    DECLARE_META_BIND(2, send_debug_info,       RARCH_SEND_DEBUG_INFO,        MENU_ENUM_LABEL_VALUE_INPUT_META_SEND_DEBUG_INFO),
@@ -5671,34 +5669,6 @@ bool config_replace(bool config_replace_save_on_exit, char *path)
    return task_push_start_dummy_core(&content_info);
 }
 
-#define KEYSTRING_BUTTON_BUF_SIZE 8
-typedef char rarch_key_strings_array[RARCH_MAX_TOTAL_BUTTON][KEYSTRING_BUTTON_BUF_SIZE];
-
-static rarch_key_strings_array* rarch_static_key_strings(void)
-{
-    static bool didInit;
-    static char key_strings[RARCH_MAX_TOTAL_BUTTON][KEYSTRING_BUTTON_BUF_SIZE] = {
-        "b", "y", "select", "start",
-        "up", "down", "left", "right",
-        "a", "x", "l", "r", "l2", "r2",
-        "l3", "r3", "l_x+", "l_x-", "l_y+", "l_y-", "r_x+", "r_x-", "r_y+", "r_y-" };
-    int i;
-
-    /* Need to initialize all of the extra keys? */
-    if (!didInit)
-    {
-        /* Do not initialize again. */
-        didInit = true;
-
-        /* Setup massive number of extra buttons. */
-        for (i = RARCH_FIRST_ID_EXTRA_BUTTON; i < RARCH_LAST_ID_EXTRA_BUTTON; i++)
-            snprintf(key_strings[i], KEYSTRING_BUTTON_BUF_SIZE - 1,
-                "ext%d", i - RARCH_FIRST_ID_EXTRA_BUTTON);
-    }
-
-    return &key_strings;
-}
-
 /**
  * input_remapping_load_file:
  * @data                     : Path to config file.
@@ -5713,10 +5683,11 @@ bool input_remapping_load_file(void *data, const char *path)
    config_file_t *conf                              = (config_file_t*)data;
    settings_t *settings                             = config_st;
    runloop_state_t *runloop_st                      = runloop_state_get_ptr();
-   rarch_key_strings_array* key_strings;
-
-   /* Get all the key strings. */
-   key_strings = rarch_static_key_strings();
+   char key_strings[RARCH_FIRST_CUSTOM_BIND + 8][8] = {
+      "b", "y", "select", "start",
+      "up", "down", "left", "right",
+      "a", "x", "l", "r", "l2", "r2",
+      "l3", "r3", "l_x+", "l_x-", "l_y+", "l_y-", "r_x+", "r_x-", "r_y+", "r_y-" };
 
    if (    !conf
          || string_is_empty(path))
@@ -5745,11 +5716,11 @@ bool input_remapping_load_file(void *data, const char *path)
       _len       = strlcpy(s3, prefix, sizeof(s3));
       strlcpy(s3 + _len, "_stk", sizeof(s3) - _len);
 
-      for (j = 0; j < RARCH_MAX_TOTAL_BUTTON + 8; j++)
+      for (j = 0; j < RARCH_FIRST_CUSTOM_BIND + 8; j++)
       {
-         const char *key_string = (*key_strings)[j];
+         const char *key_string = key_strings[j];
 
-         if (j < RARCH_FIRST_CUSTOM_BIND || j >= RARCH_FIRST_ID_EXTRA_BUTTON)
+         if (j < RARCH_FIRST_CUSTOM_BIND)
          {
             int btn_remap = -1;
             int key_remap = -1;
@@ -5843,14 +5814,19 @@ bool input_remapping_save_file(const char *path)
    bool ret;
    unsigned i, j;
    char remap_file_dir[PATH_MAX_LENGTH];
+   char key_strings[RARCH_FIRST_CUSTOM_BIND + 8][8] =
+   {
+      "b",      "y",      "select", "start",
+      "up",     "down",   "left",   "right",
+      "a",      "x",      "l",      "r",
+      "l2",     "r2",     "l3",     "r3",
+      "l_x+",   "l_x-",   "l_y+",   "l_y-",
+      "r_x+",   "r_x-",   "r_y+",   "r_y-"
+   };
    config_file_t         *conf = NULL;
    runloop_state_t *runloop_st = runloop_state_get_ptr();
    settings_t        *settings = config_st;
    unsigned          max_users = settings->uints.input_max_users;
-   rarch_key_strings_array* key_strings;
-
-   /* Get all the key strings. */
-   key_strings = rarch_static_key_strings();
 
    if (string_is_empty(path))
       return false;
@@ -5911,11 +5887,11 @@ bool input_remapping_save_file(const char *path)
       _len       = strlcpy(s3, prefix, sizeof(s3));
       strlcpy(s3 + _len, "_stk", sizeof(s3) - _len);
 
-      for (j = 0; j < RARCH_MAX_TOTAL_BUTTON; j++)
+      for (j = 0; j < RARCH_FIRST_CUSTOM_BIND; j++)
       {
          char btn_ident[128];
          char key_ident[128];
-         const char *key_string = (*key_strings)[j];
+         const char *key_string = key_strings[j];
          unsigned remap_id      = settings->uints.input_remap_ids[i][j];
          unsigned keymap_id     = settings->uints.input_keymapper_ids[i][j];
 
diff --git a/configuration.h b/configuration.h
index 189306ba68a..786f1f439c8 100644
--- a/configuration.h
+++ b/configuration.h
@@ -150,8 +150,8 @@ typedef struct settings
       unsigned input_analog_dpad_mode[MAX_USERS];
 
       unsigned input_remap_ports[MAX_USERS];
-      unsigned input_remap_ids[MAX_USERS][RARCH_MAX_TOTAL_BUTTON];
-      unsigned input_keymapper_ids[MAX_USERS][RARCH_MAX_TOTAL_BUTTON];
+      unsigned input_remap_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
+      unsigned input_keymapper_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
       unsigned input_remap_port_map[MAX_USERS][MAX_USERS + 1];
 
       unsigned led_map[MAX_LEDS];
diff --git a/input/input_defines.h b/input/input_defines.h
index 072c3959a68..3407ce3a220 100644
--- a/input/input_defines.h
+++ b/input/input_defines.h
@@ -33,26 +33,10 @@
 #define RARCH_FIRST_MISC_CUSTOM_BIND   RARCH_LIGHTGUN_BIND_LIST_END
 #define RARCH_FIRST_META_KEY           RARCH_CUSTOM_BIND_LIST_END
 
-/** The number of extra buttons to define, this is virtualized. */
-#define RARCH_MAX_EXTRA_BUTTON         128
+#define RARCH_MAX_EXTRA_BUTTON         (RETRO_DEVICE_ID_JOYPAD_MASK - RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS)
+#define RARCH_EXTRA_BUTTON_ID(id)      (RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS + (id))
 
-/** The base for extra buttons. */
-#define RARCH_BASE_EXTRA_BUTTON        24
-
-/** The total number of button binds which are possible. */
-#define RARCH_MAX_TOTAL_BUTTON         (RARCH_BASE_EXTRA_BUTTON + RARCH_MAX_EXTRA_BUTTON)
-
-/** An extra button at the given index. */
-#define RARCH_ID_EXTRA_BUTTON(id)      (RARCH_BASE_EXTRA_BUTTON + (id))
-
-/** The first starting extra button. */
-#define RARCH_FIRST_ID_EXTRA_BUTTON    RARCH_ID_EXTRA_BUTTON(0)
-
-/** The last ending extra button. */
-#define RARCH_LAST_ID_EXTRA_BUTTON     RARCH_ID_EXTRA_BUTTON(RARCH_MAX_EXTRA_BUTTON)
-
-/** Is this an extra button bind? */
-#define RARCH_IS_EXTRA_BUTTON_BIND(id) (((id) >= RARCH_FIRST_EXTRA_BUTTON_BIND) ? 1 : 0)
+#define RARCH_EXTRA_BUTTON_ID_END      (RARCH_FIRST_META_KEY + RARCH_MAX_EXTRA_BUTTON)
 
 #define RARCH_UNMAPPED                 1024
 
diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index 0672598c1dc..0bf48a993e5 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -135,71 +135,61 @@ static int action_left_cheat(unsigned type, const char *label,
 }
 #endif
 
-int action_bidirectional_input_desc(unsigned type, const char *label, bool wraparound, int direction)
-{
-    unsigned btn_idx;
-    unsigned user_idx;
-    unsigned remap_idx;
-    unsigned bind_idx;
-    unsigned mapped_port;
-    settings_t *settings                  = config_get_ptr();
-    rarch_system_info_t *sys_info         = &runloop_state_get_ptr()->system;
-
-    if (!settings || !sys_info)
-        return 0;
-
-    /* TODO: Implement this in a much nicer way! */
-
-#if 0
-    user_idx    = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) / (RARCH_FIRST_CUSTOM_BIND + 8);
-    btn_idx     = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) - (RARCH_FIRST_CUSTOM_BIND + 8) * user_idx;
-    mapped_port = settings->uints.input_remap_ports[user_idx];
-
-    if (settings->uints.input_remap_ids[user_idx][btn_idx] == RARCH_UNMAPPED)
-        settings->uints.input_remap_ids[user_idx][btn_idx] = RARCH_CUSTOM_BIND_LIST_END - 1;
-
-    remap_idx = settings->uints.input_remap_ids[user_idx][btn_idx];
-    for (bind_idx = 0; bind_idx < RARCH_ANALOG_BIND_LIST_END; bind_idx++)
-    {
-        if (input_config_bind_order[bind_idx] == remap_idx)
-            break;
-    }
-
-    if (bind_idx > 0)
-    {
-        if (bind_idx > RARCH_ANALOG_BIND_LIST_END)
-            settings->uints.input_remap_ids[user_idx][btn_idx]--;
-        else
-        {
-            bind_idx--;
-            bind_idx = input_config_bind_order[bind_idx];
-            settings->uints.input_remap_ids[user_idx][btn_idx] = bind_idx;
-        }
-    }
-    else if (bind_idx == 0)
-        settings->uints.input_remap_ids[user_idx][btn_idx] = RARCH_UNMAPPED;
-    else
-        settings->uints.input_remap_ids[user_idx][btn_idx] = RARCH_CUSTOM_BIND_LIST_END - 1;
-
-    remap_idx = settings->uints.input_remap_ids[user_idx][btn_idx];
-
-    /* skip the not used buttons (unless they are at the end by calling the right desc function recursively
-       also skip all the axes until analog remapping is implemented */
-    if (remap_idx != RARCH_UNMAPPED)
-    {
-        if ((string_is_empty(sys_info->input_desc_btn[mapped_port][remap_idx]) && remap_idx < RARCH_CUSTOM_BIND_LIST_END) /*||
-          (remap_idx >= RARCH_FIRST_CUSTOM_BIND && remap_idx < RARCH_CUSTOM_BIND_LIST_END)*/)
-            action_bidirectional_input_desc(type, label, wraparound, direction);
-    }
-#endif
-
-    return 0;
-}
-
 static int action_left_input_desc(unsigned type, const char *label,
    bool wraparound)
 {
-    return action_bidirectional_input_desc(type, label, wraparound, -1);
+   unsigned btn_idx;
+   unsigned user_idx;
+   unsigned remap_idx;
+   unsigned bind_idx;
+   unsigned mapped_port;
+   settings_t *settings                  = config_get_ptr();
+   rarch_system_info_t *sys_info         = &runloop_state_get_ptr()->system;
+   if (!settings || !sys_info)
+      return 0;
+
+   user_idx    = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) / (RARCH_FIRST_CUSTOM_BIND + 8);
+   btn_idx     = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) - (RARCH_FIRST_CUSTOM_BIND + 8) * user_idx;
+   mapped_port = settings->uints.input_remap_ports[user_idx];
+
+   if (settings->uints.input_remap_ids[user_idx][btn_idx] == RARCH_UNMAPPED)
+      settings->uints.input_remap_ids[user_idx][btn_idx] = RARCH_CUSTOM_BIND_LIST_END - 1;
+
+   remap_idx = settings->uints.input_remap_ids[user_idx][btn_idx];
+   for (bind_idx = 0; bind_idx < RARCH_ANALOG_BIND_LIST_END; bind_idx++)
+   {
+      if (input_config_bind_order[bind_idx] == remap_idx)
+         break;
+   }
+
+   if (bind_idx > 0)
+   {
+      if (bind_idx > RARCH_ANALOG_BIND_LIST_END)
+         settings->uints.input_remap_ids[user_idx][btn_idx]--;
+      else
+      {
+         bind_idx--;
+         bind_idx = input_config_bind_order[bind_idx];
+         settings->uints.input_remap_ids[user_idx][btn_idx] = bind_idx;
+      }
+   }
+   else if (bind_idx == 0)
+      settings->uints.input_remap_ids[user_idx][btn_idx] = RARCH_UNMAPPED;
+   else
+      settings->uints.input_remap_ids[user_idx][btn_idx] = RARCH_CUSTOM_BIND_LIST_END - 1;
+
+   remap_idx = settings->uints.input_remap_ids[user_idx][btn_idx];
+
+   /* skip the not used buttons (unless they are at the end by calling the right desc function recursively
+      also skip all the axes until analog remapping is implemented */
+   if (remap_idx != RARCH_UNMAPPED)
+   {
+      if ((string_is_empty(sys_info->input_desc_btn[mapped_port][remap_idx]) && remap_idx < RARCH_CUSTOM_BIND_LIST_END) /*||
+          (remap_idx >= RARCH_FIRST_CUSTOM_BIND && remap_idx < RARCH_CUSTOM_BIND_LIST_END)*/)
+         action_left_input_desc(type, label, wraparound);
+   }
+
+   return 0;
 }
 
 static int action_left_input_desc_kbd(unsigned type, const char *label,
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index f8eaf2e5128..8a6badbc3f6 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -171,11 +171,60 @@ static int action_right_input_desc_kbd(unsigned type, const char *label,
    return 0;
 }
 
+/* TODO/FIXME: incomplete, lacks error checking */
 static int action_right_input_desc(unsigned type, const char *label,
    bool wraparound)
 {
-    /* The left and right actions are very similar. */
-    return action_bidirectional_input_desc(type, label, wraparound, 1);
+   settings_t *settings                  = config_get_ptr();
+   rarch_system_info_t *sys_info         = &runloop_state_get_ptr()->system;
+   if (settings && sys_info)
+   {
+      unsigned bind_idx;
+      unsigned user_idx    = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) / (RARCH_FIRST_CUSTOM_BIND + 8);
+      unsigned btn_idx     = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) - (RARCH_FIRST_CUSTOM_BIND + 8) * user_idx;
+      unsigned mapped_port = settings->uints.input_remap_ports[user_idx];
+      unsigned remap_idx   = settings->uints.input_remap_ids[user_idx][btn_idx];
+      for (bind_idx = 0; bind_idx < RARCH_ANALOG_BIND_LIST_END; bind_idx++)
+      {
+         if (input_config_bind_order[bind_idx] == remap_idx)
+            break;
+      }
+
+      if (bind_idx < RARCH_CUSTOM_BIND_LIST_END - 1)
+      {
+         if (bind_idx > RARCH_ANALOG_BIND_LIST_END)
+            settings->uints.input_remap_ids[user_idx][btn_idx]++;
+         else
+         {
+            if (bind_idx < RARCH_ANALOG_BIND_LIST_END - 1)
+            {
+               bind_idx++;
+               bind_idx = input_config_bind_order[bind_idx];
+            }
+            else if (bind_idx == RARCH_ANALOG_BIND_LIST_END - 1)
+               bind_idx = RARCH_UNMAPPED;
+            else
+               bind_idx = input_config_bind_order[0];
+            settings->uints.input_remap_ids[user_idx][btn_idx] = bind_idx;
+         }
+      }
+      else if (bind_idx == RARCH_CUSTOM_BIND_LIST_END - 1)
+         settings->uints.input_remap_ids[user_idx][btn_idx] = RARCH_UNMAPPED;
+      else
+         settings->uints.input_remap_ids[user_idx][btn_idx] = input_config_bind_order[0];
+
+      remap_idx = settings->uints.input_remap_ids[user_idx][btn_idx];
+
+      /* skip the not used buttons (unless they are at the end by calling the right desc function recursively
+         also skip all the axes until analog remapping is implemented */
+      if (remap_idx != RARCH_UNMAPPED)
+      {
+         if ((string_is_empty(sys_info->input_desc_btn[mapped_port][remap_idx]) && remap_idx < RARCH_CUSTOM_BIND_LIST_END))
+            action_right_input_desc(type, label, wraparound);
+      }
+   }
+
+   return 0;
 }
 
 static int action_right_scroll(unsigned type, const char *label,
diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h
index c6edbf96b37..9191f48d448 100644
--- a/menu/menu_cbs.h
+++ b/menu/menu_cbs.h
@@ -335,20 +335,6 @@ void cb_generic_download(retro_task_t *task,
       void *task_data,
       void *user_data, const char *err);
 
-/**
- * Bidirectional input descriptor navigation.
- *
- * @param type
- * @param label
- * @param wraparound
- * @param direction
- * @return Always zero?
- */
-int action_bidirectional_input_desc(unsigned type,
-    const char *label,
-    bool wraparound,
-    int direction);
-
 RETRO_END_DECLS
 
 #endif
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index ac107020acf..ee71e2dc8e1 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -5470,7 +5470,7 @@ static int menu_displaylist_parse_input_description_list(
    btn_idx     = (info->type - MENU_SETTINGS_INPUT_DESC_BEGIN) - (RARCH_FIRST_CUSTOM_BIND + 8) * user_idx;
 
    if (   (user_idx >= MAX_USERS)
-       || (btn_idx >= RARCH_MAX_TOTAL_BUTTON))
+       || (btn_idx >= RARCH_CUSTOM_BIND_LIST_END))
       return 0;
 
    mapped_port = settings->uints.input_remap_ports[user_idx];
diff --git a/retroarch_types.h b/retroarch_types.h
index 259e199c55f..8bbdfbadf53 100644
--- a/retroarch_types.h
+++ b/retroarch_types.h
@@ -169,7 +169,7 @@ typedef struct rarch_system_info
    disk_control_interface_t disk_control;      /* ptr alignment */
    struct retro_system_info info;              /* ptr alignment */
    rarch_memory_map_t mmaps;                   /* ptr alignment */
-   const char *input_desc_btn[MAX_USERS][RARCH_MAX_TOTAL_BUTTON];
+   const char *input_desc_btn[MAX_USERS][RARCH_EXTRA_BUTTON_ID_END];
    struct
    {
       struct retro_subsystem_info *data;
diff --git a/runloop.c b/runloop.c
index 84c0693d289..9f0225aac6a 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1403,17 +1403,6 @@ static void core_performance_counter_stop(struct retro_perf_counter *perf)
 
 static void rarch_get_extra_input_actions(rarch_system_info_t *system_info,
     struct retro_get_extra_input_actions *request) {
-    static bool didInitExtra;
-
-    int i;
-
-    /* Do extra inputs need to be initialized? */
-    if (!didInitExtra) {
-        /* Do not initialize again. */
-        didInitExtra = true;
-
-    }
-
     /* We only know/care about the joypad. */
     if (request->query.device != RETRO_DEVICE_JOYPAD) {
         request->response.known = false;
@@ -1448,9 +1437,9 @@ static void rarch_set_input_descriptors(const void *data, unsigned int p,
        /* Ignore extended custom binds. */
        if (desc->id >= RARCH_FIRST_CUSTOM_BIND)
        {
-          /* However if we are using extra binds, remap them accordingly. */
-          if (!(desc->id >= RARCH_FIRST_ID_EXTRA_BUTTON &&
-             desc->id < RARCH_LAST_ID_EXTRA_BUTTON))
+          /* However if we are using extra keys, remap them accordingly. */
+          if (!(desc->id >= RARCH_EXTRA_BUTTON_ID(0) &&
+             desc->id < RARCH_EXTRA_BUTTON_ID(RARCH_MAX_EXTRA_BUTTON)))
              continue;
        }
 
@@ -1548,7 +1537,7 @@ static void rarch_set_input_descriptors(const void *data, unsigned int p,
                       description);
              }
 
-             for (retro_id = RARCH_FIRST_ID_EXTRA_BUTTON; retro_id < RARCH_LAST_ID_EXTRA_BUTTON; retro_id++)
+             for (retro_id = RARCH_EXTRA_BUTTON_ID(0); retro_id < RARCH_EXTRA_BUTTON_ID_END; retro_id++)
              {
                  const char *description = sys_info->input_desc_btn[mapped_port][retro_id];
 

From 545fb808f930106300147a86320676381ab3987c Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sat, 23 Dec 2023 21:24:29 -0500
Subject: [PATCH 14/35] Extra commands instead.

---
 libretro-common/include/libretro.h | 76 +++++++++++++++++++-----------
 runloop.c                          | 18 ++-----
 2 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h
index e7e3c634b9b..4f536f6843c 100644
--- a/libretro-common/include/libretro.h
+++ b/libretro-common/include/libretro.h
@@ -1864,15 +1864,13 @@ enum retro_mod
                                             * multiplayer, where a deterministic core supporting multiple
                                             * input devices does not need to take any action on its own.
                                             */
-#define RETRO_ENVIRONMENT_GET_EXTRA_INPUT_ACTIONS (79 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* const struct retro_get_extra_input_actions * --
-                                            * Allows the core to query information on input actions
-                                            * that are additionally available but not bound to any
-                                            * physical button or key.
-                                            * If this returns zero then the core must assume that the
-                                            * frontend does not provide such functionality.
-                                            * This realistically should be called before
-                                            * RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS.
+#define RETRO_ENVIRONMENT_SET_EXTRA_CORE_COMMANDS (79 | RETRO_ENVIRONMENT_EXPERIMENTAL)
+                                           /* const struct retro_extra_core_commands* --
+                                            * Defines extra commands that can be specified
+                                            * in the menu that when executed will emit a callback into
+                                            * a core for the command. These can act as extra input keys
+                                            * for a given core. Some commands may be specified to
+                                            * send the command over netplay as well.
                                             */
 
 /* VFS functionality */
@@ -3382,26 +3380,48 @@ struct retro_input_descriptor
    const char *description;
 };
 
-/** Used with @c RETRO_ENVIRONMENT_GET_EXTRA_INPUT_ACTIONS to query device info. */
-struct retro_get_extra_input_actions
+/** Used with @c retro_extra_core_commands . */
+struct retro_extra_core_commands_action
 {
-    /** Query for device information. */
-    struct {
-        /** The device type to query such as @c RETRO_DEVICE_JOYPAD . */
-        unsigned device;
-    } query;
-
-    /** Response given from the give query. */
-    struct {
-        /** Is this device type known? */
-        bool known;
-
-        /** The number of extra IDs. */
-        unsigned num_extra;
-
-        /** The start ID of the extra IDs. */
-        unsigned extra_start_id;
-    } response;
+    /** The ID number of the specific command. */
+    unsigned id;
+
+    /** Should this command be sent over net play?
+     * If this is @c true then input commands will be queued and executed
+     * before the next @c retro_run rather than instantly.
+     * Any command like this will be placed in the player controls accordingly. */
+    bool syncedPlayer;
+
+    /** The glyph to use for this command. */
+    const char* glyph;
+
+    /** The description of the command. */
+    const char* description;
+};
+
+/**
+ * Call back to be called when the command is activated, this will be sent to the core
+ * and it may choose whatever action it desires.
+ *
+ * @param action The core action that is being executed.
+ * @param controllerPort The controller port which ran this command.
+ * @since 2023/12/23
+ */
+typedef void (*retro_extra_core_command_callback)(
+    struct retro_extra_core_commands_action* action,
+    unsigned controllerPort);
+
+/** Used with @c RETRO_ENVIRONMENT_SET_EXTRA_CORE_COMMANDS to set extra core commands. */
+struct retro_extra_core_commands
+{
+    /** The callback to be executed on a command run. */
+    retro_extra_core_command_callback callback;
+
+    /** The number of actions to define. */
+    unsigned num_actions;
+
+    /** The core commands that exist. */
+    const struct retro_extra_core_commands_action* actions;
 };
 
 struct retro_system_info
diff --git a/runloop.c b/runloop.c
index 9f0225aac6a..042e7f4176b 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1401,18 +1401,8 @@ static void core_performance_counter_stop(struct retro_perf_counter *perf)
       perf->total += cpu_features_get_perf_counter() - perf->start;
 }
 
-static void rarch_get_extra_input_actions(rarch_system_info_t *system_info,
-    struct retro_get_extra_input_actions *request) {
-    /* We only know/care about the joypad. */
-    if (request->query.device != RETRO_DEVICE_JOYPAD) {
-        request->response.known = false;
-    }
-
-    /* Reserve all the buttons after the current maximum. */
-    /* When cores send the input descriptors they will have to start at the given base. */
-    request->response.known = true;
-    request->response.extra_start_id = RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS;
-    request->response.num_extra = RARCH_MAX_EXTRA_BUTTON;
+static void rarch_set_extra_core_commands(rarch_system_info_t *system_info,
+    struct retro_extra_core_commands *input) {
 }
 
 static void rarch_set_input_descriptors(const void *data, unsigned int p,
@@ -3588,8 +3578,8 @@ bool runloop_environment_cb(unsigned cmd, void *data)
             }
          }
          break;
-      case RETRO_ENVIRONMENT_GET_EXTRA_INPUT_ACTIONS:
-         rarch_get_extra_input_actions(sys_info, (struct retro_get_extra_input_actions*)data);
+      case RETRO_ENVIRONMENT_SET_EXTRA_CORE_COMMANDS:
+         rarch_set_extra_core_commands(sys_info, (struct retro_extra_core_commands*)data);
          break;
 
       default:

From e7d2f784a94e03de755a9a56c5c01143338223ee Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sat, 23 Dec 2023 21:47:27 -0500
Subject: [PATCH 15/35] Minor work on extras.

---
 input/input_defines.h              |  9 +++++++++
 libretro-common/include/libretro.h |  7 ++-----
 runloop.c                          | 17 ++++++++++++++++-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/input/input_defines.h b/input/input_defines.h
index 3407ce3a220..b6c0bb7e9fe 100644
--- a/input/input_defines.h
+++ b/input/input_defines.h
@@ -88,6 +88,9 @@
 
 #endif
 
+/** The number of extra core commands available, used with @c RETRO_ENVIRONMENT_SET_EXTRA_CORE_COMMANDS . */
+#define RARCH_EXTRA_CORE_COMMAND_COUNT 128
+
 RETRO_BEGIN_DECLS
 
 /* RetroArch specific bind IDs. */
@@ -192,6 +195,12 @@ enum
    RARCH_OVERLAY_NEXT,
    RARCH_OSK,
 
+   /** Custom core command start, used with @c RETRO_ENVIRONMENT_SET_EXTRA_CORE_COMMANDS. */
+   RARCH_EXTRA_CORE_COMMAND_START,
+
+   /** Custom core command end, used with @c RETRO_ENVIRONMENT_SET_EXTRA_CORE_COMMANDS. */
+   RARCH_EXTRA_CORE_COMMAND_END = RARCH_EXTRA_CORE_COMMAND_START + RARCH_EXTRA_CORE_COMMAND_COUNT,
+
    RARCH_BIND_LIST_END,
 
    /* Deprecated */
diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h
index 4f536f6843c..3e816343cf4 100644
--- a/libretro-common/include/libretro.h
+++ b/libretro-common/include/libretro.h
@@ -3408,7 +3408,7 @@ struct retro_extra_core_commands_action
  * @since 2023/12/23
  */
 typedef void (*retro_extra_core_command_callback)(
-    struct retro_extra_core_commands_action* action,
+    const struct retro_extra_core_commands_action* action,
     unsigned controllerPort);
 
 /** Used with @c RETRO_ENVIRONMENT_SET_EXTRA_CORE_COMMANDS to set extra core commands. */
@@ -3417,10 +3417,7 @@ struct retro_extra_core_commands
     /** The callback to be executed on a command run. */
     retro_extra_core_command_callback callback;
 
-    /** The number of actions to define. */
-    unsigned num_actions;
-
-    /** The core commands that exist. */
+    /** The core commands that exist, NULL description ends. */
     const struct retro_extra_core_commands_action* actions;
 };
 
diff --git a/runloop.c b/runloop.c
index 042e7f4176b..cbfcfb1f83a 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1402,7 +1402,22 @@ static void core_performance_counter_stop(struct retro_perf_counter *perf)
 }
 
 static void rarch_set_extra_core_commands(rarch_system_info_t *system_info,
-    struct retro_extra_core_commands *input) {
+    const struct retro_extra_core_commands *input) {
+    const struct retro_extra_core_commands_action* action;
+    unsigned at;
+
+    /* Debug. */
+    RARCH_LOG("[Core]: Initializing extra core commands!\n");
+
+    /* Go through the commands and process them. */
+    for (at = 0; input->actions[at].description != NULL &&
+        at < RARCH_EXTRA_CORE_COMMAND_COUNT; at++)
+    {
+        /* Get base action. */
+        action = &input->actions[at];
+
+
+    }
 }
 
 static void rarch_set_input_descriptors(const void *data, unsigned int p,

From 4d46d824d54650c7c493b5e25f7736d101836221 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 24 Dec 2023 11:44:42 -0500
Subject: [PATCH 16/35] Fix pedantic error.

---
 runloop.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/runloop.c b/runloop.c
index cbfcfb1f83a..bdfc051eb60 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1416,15 +1416,17 @@ static void rarch_set_extra_core_commands(rarch_system_info_t *system_info,
         /* Get base action. */
         action = &input->actions[at];
 
-
+        RARCH_LOG("TODO: ");
     }
 }
 
-static void rarch_set_input_descriptors(const void *data, unsigned int p,
+static void rarch_set_input_descriptors(const void *data,
         runloop_state_t *runloop_st, const settings_t *settings,
         rarch_system_info_t *sys_info) {
     unsigned retro_id;
     const struct retro_input_descriptor *desc = NULL;
+    unsigned int p
+
     memset((void*)&sys_info->input_desc_btn, 0,
           sizeof(sys_info->input_desc_btn));
 
@@ -2208,7 +2210,7 @@ bool runloop_environment_cb(unsigned cmd, void *data)
       {
          if (sys_info)
          {
-             rarch_set_input_descriptors(data, p, runloop_st, settings, sys_info);
+             rarch_set_input_descriptors(data, runloop_st, settings, sys_info);
          }
          break;
       }

From 0bfcf3833ebfce08970df821d4304610f3cde87a Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 24 Dec 2023 11:47:17 -0500
Subject: [PATCH 17/35] Fix pedantic error, again.

---
 runloop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runloop.c b/runloop.c
index bdfc051eb60..46eefcfbb5f 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1425,7 +1425,7 @@ static void rarch_set_input_descriptors(const void *data,
         rarch_system_info_t *sys_info) {
     unsigned retro_id;
     const struct retro_input_descriptor *desc = NULL;
-    unsigned int p
+    unsigned int p;
 
     memset((void*)&sys_info->input_desc_btn, 0,
           sizeof(sys_info->input_desc_btn));

From 1d51d77c0d7232b6386eb3358348cd2ea80b8e93 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 24 Dec 2023 12:27:31 -0500
Subject: [PATCH 18/35] Add inlines and defines for game controller bind ids.

---
 input/input_defines.h | 100 +++++++++++++++++++++++++++++++++++++++---
 retroarch_types.h     |   2 +-
 runloop.c             |  19 +-------
 3 files changed, 97 insertions(+), 24 deletions(-)

diff --git a/input/input_defines.h b/input/input_defines.h
index b6c0bb7e9fe..74a5b6da990 100644
--- a/input/input_defines.h
+++ b/input/input_defines.h
@@ -21,6 +21,7 @@
 #include <string.h>
 
 #include <retro_common_api.h>
+#include <retro_inline.h>
 
 #define MAX_USERS                      16
 
@@ -28,16 +29,19 @@
 
 #define RARCH_MAX_KEYS 137
 
+/**
+ * When using this to check if a bind is part of a game controller use
+ * instead @c rarch_bind_is_game_controller() .
+ *
+ * Instead of using @code RARCH_FIRST_CUSTOM_BIND + 8 @endcode use
+ * instead @c rarch_bind_num_game_controller() .
+ */
 #define RARCH_FIRST_CUSTOM_BIND        16
+
 #define RARCH_FIRST_LIGHTGUN_BIND      RARCH_ANALOG_BIND_LIST_END
 #define RARCH_FIRST_MISC_CUSTOM_BIND   RARCH_LIGHTGUN_BIND_LIST_END
 #define RARCH_FIRST_META_KEY           RARCH_CUSTOM_BIND_LIST_END
 
-#define RARCH_MAX_EXTRA_BUTTON         (RETRO_DEVICE_ID_JOYPAD_MASK - RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS)
-#define RARCH_EXTRA_BUTTON_ID(id)      (RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS + (id))
-
-#define RARCH_EXTRA_BUTTON_ID_END      (RARCH_FIRST_META_KEY + RARCH_MAX_EXTRA_BUTTON)
-
 #define RARCH_UNMAPPED                 1024
 
 /* Specialized _MOUSE that targets the full screen regardless of viewport.
@@ -126,6 +130,12 @@ enum
    /* Turbo */
    RARCH_TURBO_ENABLE = RARCH_FIRST_MISC_CUSTOM_BIND,
 
+   /**
+    * End of the custom bind list.
+    *
+    * Instead of using this to check whether a button is part of
+    * a game controller, use @c rarch_bind_is_game_controller() .
+    */
    RARCH_CUSTOM_BIND_LIST_END,
 
    /* Command binds. Not related to game input,
@@ -260,4 +270,84 @@ enum input_turbo_default_button
 
 RETRO_END_DECLS
 
+/**
+ * Represents an actual bind id.
+ *
+ * @since 2023/12/24
+ */
+typedef unsigned rarch_bind_id;
+
+/**
+ * Represents a logical bind id.
+ *
+ * @since 2023/12/24
+ */
+typedef unsigned rarch_logical_bind_id;
+
+/**
+ * Translates a real bind id to a logical bind id.
+ *
+ * @param bind The input bind.
+ * @return The resultant logical index.
+ * @since 2023/12/24
+ */
+static INLINE rarch_logical_bind_id rarch_bind_to_logical_game_controller(rarch_bind_id bind)
+{
+    if (bind < RARCH_CUSTOM_BIND_LIST_END)
+        return bind;
+
+    if (bind >= RARCH_EXTRA_CORE_COMMAND_START && bind < RARCH_EXTRA_CORE_COMMAND_END)
+        return RARCH_CUSTOM_BIND_LIST_END + bind;
+
+    return RARCH_BIND_LIST_END_NULL;
+}
+
+/**
+ * Translates a logical bind id to an actual one.
+ *
+ * @param bind The logical game controller bind.
+ * @return The resultant bind id.
+ * @since 2023/12/24
+ */
+static INLINE rarch_bind_id rarch_logical_to_bind_game_controller(rarch_logical_bind_id bind)
+{
+    if (bind >= RARCH_CUSTOM_BIND_LIST_END)
+        return (RARCH_EXTRA_CORE_COMMAND_START + bind);
+
+    return bind;
+}
+
+/**
+ * Returns the number of binds that are part of game controllers.
+ *
+ * @return The number of binds that are part of game controllers.
+ * @since 2023/12/24
+ */
+#define rarch_bind_num_game_controller() (RARCH_CUSTOM_BIND_LIST_END + RARCH_EXTRA_CORE_COMMAND_COUNT)
+
+/**
+ * Checks whether the given bind is considered to be part of a controller.
+ *
+ * @param bind The bind id to check.
+ * @return If it is a game controller bind.
+ * @since 2023/12/24
+ */
+static INLINE bool rarch_bind_is_game_controller(rarch_bind_id bind)
+{
+    return (bind < RARCH_CUSTOM_BIND_LIST_END) ||
+           (bind >= RARCH_EXTRA_CORE_COMMAND_START && bind < RARCH_EXTRA_CORE_COMMAND_END);
+}
+
+/**
+ * Checks whether the given bind is valid for a logical bind.
+ *
+ * @param bind The logical bind to check.
+ * @return If it is a valid logical bind.
+ * @since 2023/12/24
+ */
+static INLINE bool rarch_logical_bind_is_game_controller(rarch_logical_bind_id bind)
+{
+    return bind < rarch_bind_num_game_controller();
+}
+
 #endif
diff --git a/retroarch_types.h b/retroarch_types.h
index 8bbdfbadf53..1aaff3a1e24 100644
--- a/retroarch_types.h
+++ b/retroarch_types.h
@@ -169,7 +169,7 @@ typedef struct rarch_system_info
    disk_control_interface_t disk_control;      /* ptr alignment */
    struct retro_system_info info;              /* ptr alignment */
    rarch_memory_map_t mmaps;                   /* ptr alignment */
-   const char *input_desc_btn[MAX_USERS][RARCH_EXTRA_BUTTON_ID_END];
+   const char *input_desc_btn[MAX_USERS][rarch_bind_num_game_controller()];
    struct
    {
       struct retro_subsystem_info *data;
diff --git a/runloop.c b/runloop.c
index 46eefcfbb5f..49dc4acf012 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1443,12 +1443,7 @@ static void rarch_set_input_descriptors(const void *data,
 
        /* Ignore extended custom binds. */
        if (desc->id >= RARCH_FIRST_CUSTOM_BIND)
-       {
-          /* However if we are using extra keys, remap them accordingly. */
-          if (!(desc->id >= RARCH_EXTRA_BUTTON_ID(0) &&
-             desc->id < RARCH_EXTRA_BUTTON_ID(RARCH_MAX_EXTRA_BUTTON)))
-             continue;
-       }
+           continue;
 
        switch (desc->device)
        {
@@ -1543,18 +1538,6 @@ static void rarch_set_input_descriptors(const void *data,
                       msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B + bind_index),
                       description);
              }
-
-             for (retro_id = RARCH_EXTRA_BUTTON_ID(0); retro_id < RARCH_EXTRA_BUTTON_ID_END; retro_id++)
-             {
-                 const char *description = sys_info->input_desc_btn[mapped_port][retro_id];
-
-                 if (!description)
-                     continue;
-
-                 RARCH_DBG("      Extra %d => \"%s\"\n",
-                           retro_id,
-                           description);
-             }
           }
        }
     }

From bd7b718873d0505b09d8f313e36dbd0b60a1396c Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 24 Dec 2023 13:36:23 -0500
Subject: [PATCH 19/35] Declare all 128 extra binds input_config_bind_map using
 the power of C preprocessor; Handling of configuration default/load/save for
 logical buttons.

---
 configuration.c       | 181 ++++++++++++++++++++++++++++++------------
 configuration.h       |   4 +-
 input/input_defines.h |  36 ++++++++-
 input/input_driver.c  |  28 ++++---
 retroarch_types.h     |   2 +-
 5 files changed, 183 insertions(+), 68 deletions(-)

diff --git a/configuration.c b/configuration.c
index 4bdaa69509f..ba95b5f2823 100644
--- a/configuration.c
+++ b/configuration.c
@@ -282,6 +282,38 @@ enum midi_driver_enum
 #define DECLARE_BIND(base, bind, desc) { #base, desc, 0, bind, true }
 #define DECLARE_META_BIND(level, base, bind, desc) { #base, desc, level, bind, true }
 
+#define DECLARE_EXTRA_BIND_PASTE2(a, b) a##b
+#define DECLARE_EXTRA_BIND_PASTE(a, b) DECLARE_EXTRA_BIND_PASTE2(a, b)
+#define DECLARE_EXTRA_BIND_STRINGY2(a) #a
+#define DECLARE_EXTRA_BIND_STRINGY(a) DECLARE_EXTRA_BIND_STRINGY2(a)
+
+/** Declare an extra logical bind, the label used depends on the core. */
+#define DECLARE_EXTRA_BIND(id) {DECLARE_EXTRA_BIND_STRINGY(DECLARE_EXTRA_BIND_PASTE(log, id)), MENU_ENUM_LABEL_VALUE_INPUT_KEY, 0, id, true }
+
+/** Declare ten binds. */
+#define DECLARE_EXTRA_BIND_10(dig) \
+    DECLARE_EXTRA_BIND(DECLARE_EXTRA_BIND_PASTE(dig, 0)), \
+    DECLARE_EXTRA_BIND(DECLARE_EXTRA_BIND_PASTE(dig, 1)), \
+    DECLARE_EXTRA_BIND(DECLARE_EXTRA_BIND_PASTE(dig, 2)), \
+    DECLARE_EXTRA_BIND(DECLARE_EXTRA_BIND_PASTE(dig, 3)), \
+    DECLARE_EXTRA_BIND(DECLARE_EXTRA_BIND_PASTE(dig, 4)), \
+    DECLARE_EXTRA_BIND(DECLARE_EXTRA_BIND_PASTE(dig, 5)), \
+    DECLARE_EXTRA_BIND(DECLARE_EXTRA_BIND_PASTE(dig, 6)), \
+    DECLARE_EXTRA_BIND(DECLARE_EXTRA_BIND_PASTE(dig, 7)), \
+    DECLARE_EXTRA_BIND(DECLARE_EXTRA_BIND_PASTE(dig, 9))
+
+/* Declare one hundred binds. */
+#define DECLARE_EXTRA_BIND_100(hun, ten) \
+    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, ten)), \
+    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, 1)), \
+    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, 2)), \
+    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, 3)), \
+    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, 4)), \
+    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, 5)), \
+    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, 6)), \
+    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, 7)), \
+    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, 9))
+
 const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
    DECLARE_BIND(b,                             RETRO_DEVICE_ID_JOYPAD_B,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B),
    DECLARE_BIND(y,                             RETRO_DEVICE_ID_JOYPAD_Y,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y),
@@ -394,12 +426,33 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
    DECLARE_META_BIND(2, overlay_next,          RARCH_OVERLAY_NEXT,           MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT),
 
    DECLARE_META_BIND(2, osk_toggle,            RARCH_OSK,                    MENU_ENUM_LABEL_VALUE_INPUT_META_OSK),
+
+   /* Extra keys, all of them. */
+   DECLARE_EXTRA_BIND_100(,),
+   DECLARE_EXTRA_BIND_10(10),
+   DECLARE_EXTRA_BIND_10(11),
+   DECLARE_EXTRA_BIND(120),
+   DECLARE_EXTRA_BIND(121),
+   DECLARE_EXTRA_BIND(122),
+   DECLARE_EXTRA_BIND(123),
+   DECLARE_EXTRA_BIND(124),
+   DECLARE_EXTRA_BIND(125),
+   DECLARE_EXTRA_BIND(126),
+   DECLARE_EXTRA_BIND(127),
+
 #if 0
    /* Deprecated */
    DECLARE_META_BIND(2, send_debug_info,       RARCH_SEND_DEBUG_INFO,        MENU_ENUM_LABEL_VALUE_INPUT_META_SEND_DEBUG_INFO),
 #endif
 };
 
+#undef DECLARE_EXTRA_BIND_PASTE2
+#undef DECLARE_EXTRA_BIND_PASTE
+#undef DECLARE_EXTRA_BIND_STRINGY2
+#undef DECLARE_EXTRA_BIND_STRINGY
+#undef DECLARE_EXTRA_BIND_10
+#undef DECLARE_EXTRA_BIND_100
+
 #if defined(HAVE_METAL)
 #if defined(HAVE_VULKAN)
 /* Default to Vulkan/MoltenVK when available */
@@ -5669,6 +5722,43 @@ bool config_replace(bool config_replace_save_on_exit, char *path)
    return task_push_start_dummy_core(&content_info);
 }
 
+/**
+ * Returns the key string for a given logical game controller button.
+ *
+ * @param logical The input logical button.
+ * @return The character string for the given key.
+ * @since 2023/12/24
+ */
+static const char* rarch_input_get_key_string(rarch_logical_bind_id logical)
+{
+#define BUF_SIZE 8
+    static char key_strings[rarch_num_bind_game_controller()][BUF_SIZE] =
+    {
+            "b",      "y",      "select", "start",
+            "up",     "down",   "left",   "right",
+            "a",      "x",      "l",      "r",
+            "l2",     "r2",     "l3",     "r3",
+            "l_x+",   "l_x-",   "l_y+",   "l_y-",
+            "r_x+",   "r_x-",   "r_y+",   "r_y-"
+    };
+
+    /* Not valid at all. */
+    if (logical < 0 || logical >= rarch_num_bind_game_controller())
+        return NULL;
+
+    /* Is the key already filled in? */
+    if (key_strings[logical][0] != 0)
+        return key_strings[logical];
+
+    /* Just use a generic logical name for the key. */
+    snprintf(key_strings[logical], BUF_SIZE - 1, "log%d", logical);
+    key_strings[logical][BUF_SIZE - 1] = 0;
+
+    /* It can now be used. */
+    return key_strings[logical];
+#undef BUF_SIZE
+}
+
 /**
  * input_remapping_load_file:
  * @data                     : Path to config file.
@@ -5679,15 +5769,10 @@ bool config_replace(bool config_replace_save_on_exit, char *path)
  **/
 bool input_remapping_load_file(void *data, const char *path)
 {
-   unsigned i, j;
+   unsigned usernum, logical;
    config_file_t *conf                              = (config_file_t*)data;
    settings_t *settings                             = config_st;
    runloop_state_t *runloop_st                      = runloop_state_get_ptr();
-   char key_strings[RARCH_FIRST_CUSTOM_BIND + 8][8] = {
-      "b", "y", "select", "start",
-      "up", "down", "left", "right",
-      "a", "x", "l", "r", "l2", "r2",
-      "l3", "r3", "l_x+", "l_x-", "l_y+", "l_y-", "r_x+", "r_x-", "r_y+", "r_y-" };
 
    if (    !conf
          || string_is_empty(path))
@@ -5699,14 +5784,14 @@ bool input_remapping_load_file(void *data, const char *path)
    input_remapping_set_defaults(false);
    runloop_st->name.remapfile = strdup(path);
 
-   for (i = 0; i < MAX_USERS; i++)
+   for (usernum = 0; usernum < MAX_USERS; usernum++)
    {
       size_t _len;
       char prefix[16];
       char s1[32], s2[32], s3[32];
       char formatted_number[4];
       formatted_number[0] = '\0';
-      snprintf(formatted_number, sizeof(formatted_number), "%u", i + 1);
+      snprintf(formatted_number, sizeof(formatted_number), "%u", usernum + 1);
       _len       = strlcpy(prefix, "input_player",   sizeof(prefix));
       strlcpy(prefix + _len, formatted_number, sizeof(prefix) - _len);
       _len       = strlcpy(s1, prefix, sizeof(s1));
@@ -5716,11 +5801,11 @@ bool input_remapping_load_file(void *data, const char *path)
       _len       = strlcpy(s3, prefix, sizeof(s3));
       strlcpy(s3 + _len, "_stk", sizeof(s3) - _len);
 
-      for (j = 0; j < RARCH_FIRST_CUSTOM_BIND + 8; j++)
+      for (logical = 0; logical < rarch_num_bind_game_controller(); logical++)
       {
-         const char *key_string = key_strings[j];
+         const char *key_string = rarch_input_get_key_string(logical);
 
-         if (j < RARCH_FIRST_CUSTOM_BIND)
+         if (rarch_logical_bind_is_basic(logical))
          {
             int btn_remap = -1;
             int key_remap = -1;
@@ -5738,14 +5823,14 @@ bool input_remapping_load_file(void *data, const char *path)
                   btn_remap = RARCH_UNMAPPED;
 
                configuration_set_uint(settings,
-                     settings->uints.input_remap_ids[i][j], btn_remap);
+                                      settings->uints.input_remap_ids[usernum][logical], btn_remap);
             }
 
             if (!config_get_int(conf, key_ident, &key_remap))
                key_remap = RETROK_UNKNOWN;
 
             configuration_set_uint(settings,
-                  settings->uints.input_keymapper_ids[i][j], key_remap);
+                                   settings->uints.input_keymapper_ids[usernum][logical], key_remap);
          }
          else
          {
@@ -5763,7 +5848,7 @@ bool input_remapping_load_file(void *data, const char *path)
                   stk_remap = RARCH_UNMAPPED;
 
                configuration_set_uint(settings,
-                     settings->uints.input_remap_ids[i][j], stk_remap);
+                                      settings->uints.input_remap_ids[usernum][logical], stk_remap);
             }
 
             fill_pathname_join_delim(key_ident, s2,
@@ -5773,21 +5858,21 @@ bool input_remapping_load_file(void *data, const char *path)
                key_remap = RETROK_UNKNOWN;
 
             configuration_set_uint(settings,
-                  settings->uints.input_keymapper_ids[i][j], key_remap);
+                                   settings->uints.input_keymapper_ids[usernum][logical], key_remap);
          }
       }
 
       _len = strlcpy(s1, prefix, sizeof(s1));
       strlcpy(s1 + _len, "_analog_dpad_mode", sizeof(s1) - _len);
-      CONFIG_GET_INT_BASE(conf, settings, uints.input_analog_dpad_mode[i], s1);
+      CONFIG_GET_INT_BASE(conf, settings, uints.input_analog_dpad_mode[usernum], s1);
 
       _len = strlcpy(s1, "input_libretro_device_p", sizeof(s1));
       strlcpy(s1 + _len, formatted_number, sizeof(s1) - _len);
-      CONFIG_GET_INT_BASE(conf, settings, uints.input_libretro_device[i], s1);
+      CONFIG_GET_INT_BASE(conf, settings, uints.input_libretro_device[usernum], s1);
 
       _len = strlcpy(s1, "input_remap_port_p", sizeof(s1));
       strlcpy(s1 + _len, formatted_number, sizeof(s1) - _len);
-      CONFIG_GET_INT_BASE(conf, settings, uints.input_remap_ports[i], s1);
+      CONFIG_GET_INT_BASE(conf, settings, uints.input_remap_ports[usernum], s1);
    }
 
    input_remapping_update_port_map();
@@ -5812,17 +5897,8 @@ bool input_remapping_save_file(const char *path)
 {
    size_t _len;
    bool ret;
-   unsigned i, j;
+   unsigned usernum, logical;
    char remap_file_dir[PATH_MAX_LENGTH];
-   char key_strings[RARCH_FIRST_CUSTOM_BIND + 8][8] =
-   {
-      "b",      "y",      "select", "start",
-      "up",     "down",   "left",   "right",
-      "a",      "x",      "l",      "r",
-      "l2",     "r2",     "l3",     "r3",
-      "l_x+",   "l_x-",   "l_y+",   "l_y-",
-      "r_x+",   "r_x-",   "r_y+",   "r_y-"
-   };
    config_file_t         *conf = NULL;
    runloop_state_t *runloop_st = runloop_state_get_ptr();
    settings_t        *settings = config_st;
@@ -5844,7 +5920,7 @@ bool input_remapping_save_file(const char *path)
    if (!(conf = config_file_new_alloc()))
       return false;
 
-   for (i = 0; i < MAX_USERS; i++)
+   for (usernum = 0; usernum < MAX_USERS; usernum++)
    {
       size_t _len;
       bool skip_port = true;
@@ -5858,15 +5934,15 @@ bool input_remapping_save_file(const char *path)
 
       /* We must include all mapped ports + all those
        * with an index less than max_users */
-      if (i < max_users)
+      if (usernum < max_users)
          skip_port = false;
       else
       {
          /* Check whether current port is mapped
           * to an input device */
-         for (j = 0; j < max_users; j++)
+         for (logical = 0; logical < max_users; logical++)
          {
-            if (i == settings->uints.input_remap_ports[j])
+            if (usernum == settings->uints.input_remap_ports[logical])
             {
                skip_port = false;
                break;
@@ -5877,7 +5953,7 @@ bool input_remapping_save_file(const char *path)
       if (skip_port)
          continue;
 
-      snprintf(formatted_number, sizeof(formatted_number), "%u", i + 1);
+      snprintf(formatted_number, sizeof(formatted_number), "%u", usernum + 1);
       _len       = strlcpy(prefix, "input_player",   sizeof(prefix));
       strlcpy(prefix + _len, formatted_number, sizeof(prefix) - _len);
       _len       = strlcpy(s1, prefix, sizeof(s1));
@@ -5887,13 +5963,17 @@ bool input_remapping_save_file(const char *path)
       _len       = strlcpy(s3, prefix, sizeof(s3));
       strlcpy(s3 + _len, "_stk", sizeof(s3) - _len);
 
-      for (j = 0; j < RARCH_FIRST_CUSTOM_BIND; j++)
+      for (logical = 0; logical < rarch_num_bind_game_controller(); logical++)
       {
+         /* Ignore the analog/gun binds. */
+         if (!rarch_logical_bind_is_basic(logical))
+             continue;
+
          char btn_ident[128];
          char key_ident[128];
-         const char *key_string = key_strings[j];
-         unsigned remap_id      = settings->uints.input_remap_ids[i][j];
-         unsigned keymap_id     = settings->uints.input_keymapper_ids[i][j];
+         const char *key_string = rarch_input_get_key_string(logical);
+         unsigned remap_id      = settings->uints.input_remap_ids[usernum][logical];
+         unsigned keymap_id     = settings->uints.input_keymapper_ids[usernum][logical];
 
          fill_pathname_join_delim(btn_ident, s1,
                key_string, '_', sizeof(btn_ident));
@@ -5901,7 +5981,7 @@ bool input_remapping_save_file(const char *path)
                key_string, '_', sizeof(key_ident));
 
          /* Only save modified button values */
-         if (remap_id == j)
+         if (remap_id == logical)
             config_unset(conf, btn_ident);
          else
          {
@@ -5909,7 +5989,7 @@ bool input_remapping_save_file(const char *path)
                config_set_int(conf, btn_ident, -1);
             else
                config_set_int(conf, btn_ident,
-                     settings->uints.input_remap_ids[i][j]);
+                     settings->uints.input_remap_ids[usernum][logical]);
          }
 
          /* Only save non-empty keymapper values */
@@ -5917,16 +5997,17 @@ bool input_remapping_save_file(const char *path)
             config_unset(conf, key_ident);
          else
             config_set_int(conf, key_ident,
-                  settings->uints.input_keymapper_ids[i][j]);
+                  settings->uints.input_keymapper_ids[usernum][logical]);
       }
 
-      for (j = RARCH_FIRST_CUSTOM_BIND; j < (RARCH_FIRST_CUSTOM_BIND + 8); j++)
+      /* This goes through axis and otherwise, so should keep the + 8 here. */
+      for (logical = RARCH_FIRST_CUSTOM_BIND; logical < (RARCH_FIRST_CUSTOM_BIND + 8); logical++)
       {
          char stk_ident[128];
          char key_ident[128];
-         const char *key_string = key_strings[j];
-         unsigned remap_id      = settings->uints.input_remap_ids[i][j];
-         unsigned keymap_id     = settings->uints.input_keymapper_ids[i][j];
+         const char *key_string = rarch_input_get_key_string(logical);
+         unsigned remap_id      = settings->uints.input_remap_ids[usernum][logical];
+         unsigned keymap_id     = settings->uints.input_keymapper_ids[usernum][logical];
 
          fill_pathname_join_delim(stk_ident, s3,
                key_string, '_', sizeof(stk_ident));
@@ -5934,7 +6015,7 @@ bool input_remapping_save_file(const char *path)
                key_string, '_', sizeof(key_ident));
 
          /* Only save modified button values */
-         if (remap_id == j)
+         if (remap_id == logical)
             config_unset(conf, stk_ident);
          else
          {
@@ -5942,7 +6023,7 @@ bool input_remapping_save_file(const char *path)
                config_set_int(conf, stk_ident, -1);
             else
                config_set_int(conf, stk_ident,
-                     settings->uints.input_remap_ids[i][j]);
+                     settings->uints.input_remap_ids[usernum][logical]);
          }
 
          /* Only save non-empty keymapper values */
@@ -5950,20 +6031,20 @@ bool input_remapping_save_file(const char *path)
             config_unset(conf, key_ident);
          else
             config_set_int(conf, key_ident,
-                  settings->uints.input_keymapper_ids[i][j]);
+                  settings->uints.input_keymapper_ids[usernum][logical]);
       }
 
       _len = strlcpy(s1, "input_libretro_device_p", sizeof(s1));
       strlcpy(s1 + _len, formatted_number, sizeof(s1) - _len);
-      config_set_int(conf, s1, input_config_get_device(i));
+      config_set_int(conf, s1, input_config_get_device(usernum));
 
       _len = strlcpy(s1, prefix, sizeof(s1));
       strlcpy(s1 + _len, "_analog_dpad_mode", sizeof(s1) - _len);
-      config_set_int(conf, s1, settings->uints.input_analog_dpad_mode[i]);
+      config_set_int(conf, s1, settings->uints.input_analog_dpad_mode[usernum]);
 
       _len = strlcpy(s1, "input_remap_port_p", sizeof(s1));
       strlcpy(s1 + _len, formatted_number, sizeof(s1) - _len);
-      config_set_int(conf, s1, settings->uints.input_remap_ports[i]);
+      config_set_int(conf, s1, settings->uints.input_remap_ports[usernum]);
    }
 
    ret = config_file_write(conf, path, true);
diff --git a/configuration.h b/configuration.h
index 786f1f439c8..b51b8534ab8 100644
--- a/configuration.h
+++ b/configuration.h
@@ -150,8 +150,8 @@ typedef struct settings
       unsigned input_analog_dpad_mode[MAX_USERS];
 
       unsigned input_remap_ports[MAX_USERS];
-      unsigned input_remap_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
-      unsigned input_keymapper_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
+      unsigned input_remap_ids[MAX_USERS][rarch_num_bind_game_controller()];
+      unsigned input_keymapper_ids[MAX_USERS][rarch_num_bind_game_controller()];
       unsigned input_remap_port_map[MAX_USERS][MAX_USERS + 1];
 
       unsigned led_map[MAX_LEDS];
diff --git a/input/input_defines.h b/input/input_defines.h
index 74a5b6da990..45b5664c281 100644
--- a/input/input_defines.h
+++ b/input/input_defines.h
@@ -34,7 +34,10 @@
  * instead @c rarch_bind_is_game_controller() .
  *
  * Instead of using @code RARCH_FIRST_CUSTOM_BIND + 8 @endcode use
- * instead @c rarch_bind_num_game_controller() .
+ * instead @c rarch_num_bind_game_controller() .
+ *
+ * Instead of using this to check if a bind is just a plain button
+ * with no axis, instead use @c rarch_logical_bind_is_basic() .
  */
 #define RARCH_FIRST_CUSTOM_BIND        16
 
@@ -134,7 +137,8 @@ enum
     * End of the custom bind list.
     *
     * Instead of using this to check whether a button is part of
-    * a game controller, use @c rarch_bind_is_game_controller() .
+    * a game controller, use @c rarch_bind_is_game_controller() or
+    * instead @c rarch_num_bind_game_controller() .
     */
    RARCH_CUSTOM_BIND_LIST_END,
 
@@ -284,6 +288,30 @@ typedef unsigned rarch_bind_id;
  */
 typedef unsigned rarch_logical_bind_id;
 
+/**
+ * Is the given logical bind a basic button, one with no axis or otherwise?
+ *
+ * @param bind The logical bind to check.
+ * @return If the bind is simple.
+ * @since 2023/12/24
+ */
+static INLINE bool rarch_logical_bind_is_basic(rarch_logical_bind_id bind)
+{
+    return (bind < RARCH_FIRST_CUSTOM_BIND) || (bind >= RARCH_CUSTOM_BIND_LIST_END);
+}
+
+/**
+ * Is the given logical bind an extended basic button, one with no axis or otherwise?
+ *
+ * @param bind The logical bind to check.
+ * @return If the bind is simple and an extended button.
+ * @since 2023/12/24
+ */
+static INLINE bool rarch_logical_bind_is_extended_basic(rarch_logical_bind_id bind)
+{
+    return (bind >= RARCH_CUSTOM_BIND_LIST_END);
+}
+
 /**
  * Translates a real bind id to a logical bind id.
  *
@@ -323,7 +351,7 @@ static INLINE rarch_bind_id rarch_logical_to_bind_game_controller(rarch_logical_
  * @return The number of binds that are part of game controllers.
  * @since 2023/12/24
  */
-#define rarch_bind_num_game_controller() (RARCH_CUSTOM_BIND_LIST_END + RARCH_EXTRA_CORE_COMMAND_COUNT)
+#define rarch_num_bind_game_controller() (RARCH_CUSTOM_BIND_LIST_END + RARCH_EXTRA_CORE_COMMAND_COUNT)
 
 /**
  * Checks whether the given bind is considered to be part of a controller.
@@ -347,7 +375,7 @@ static INLINE bool rarch_bind_is_game_controller(rarch_bind_id bind)
  */
 static INLINE bool rarch_logical_bind_is_game_controller(rarch_logical_bind_id bind)
 {
-    return bind < rarch_bind_num_game_controller();
+    return bind < rarch_num_bind_game_controller();
 }
 
 #endif
diff --git a/input/input_driver.c b/input/input_driver.c
index a14ba6fa468..b023be35389 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -6116,32 +6116,38 @@ void input_remapping_deinit(bool save_remap)
 
 void input_remapping_set_defaults(bool clear_cache)
 {
-   unsigned i, j;
+   unsigned usernum, logical;
    settings_t *settings        = config_get_ptr();
 
-   for (i = 0; i < MAX_USERS; i++)
+   for (usernum = 0; usernum < MAX_USERS; usernum++)
    {
       /* Button/keyboard remaps */
-      for (j = 0; j < RARCH_FIRST_CUSTOM_BIND; j++)
+      for (logical = 0; logical < rarch_num_bind_game_controller(); logical++)
       {
-         const struct retro_keybind *keybind = &input_config_binds[i][j];
+         /* Ignore the analog/gun binds. */
+         if (!rarch_logical_bind_is_basic(logical))
+            continue;
+
+         const struct retro_keybind *keybind = &input_config_binds[usernum][logical];
 
+         /* Force defaults for extended keys to be unmapped by default. */
          configuration_set_uint(settings,
-               settings->uints.input_remap_ids[i][j],
-                     keybind ? keybind->id : RARCH_UNMAPPED);
+               settings->uints.input_remap_ids[usernum][logical],
+               (!rarch_logical_bind_is_extended_basic(logical) && keybind) ?
+                    keybind->id : RARCH_UNMAPPED);
 
          configuration_set_uint(settings,
-               settings->uints.input_keymapper_ids[i][j], RETROK_UNKNOWN);
+                                settings->uints.input_keymapper_ids[usernum][logical], RETROK_UNKNOWN);
       }
 
-      /* Analog stick remaps */
-      for (j = RARCH_FIRST_CUSTOM_BIND; j < (RARCH_FIRST_CUSTOM_BIND + 8); j++)
+      /* Analog stick remaps, use +8 still here for compatibility purposes. */
+      for (logical = RARCH_FIRST_CUSTOM_BIND; logical < (RARCH_FIRST_CUSTOM_BIND + 8); logical++)
          configuration_set_uint(settings,
-               settings->uints.input_remap_ids[i][j], j);
+                                settings->uints.input_remap_ids[usernum][logical], logical);
 
       /* Controller port remaps */
       configuration_set_uint(settings,
-            settings->uints.input_remap_ports[i], i);
+                             settings->uints.input_remap_ports[usernum], usernum);
    }
 
    /* Need to call 'input_remapping_update_port_map()'
diff --git a/retroarch_types.h b/retroarch_types.h
index 1aaff3a1e24..e6d068bc985 100644
--- a/retroarch_types.h
+++ b/retroarch_types.h
@@ -169,7 +169,7 @@ typedef struct rarch_system_info
    disk_control_interface_t disk_control;      /* ptr alignment */
    struct retro_system_info info;              /* ptr alignment */
    rarch_memory_map_t mmaps;                   /* ptr alignment */
-   const char *input_desc_btn[MAX_USERS][rarch_bind_num_game_controller()];
+   const char *input_desc_btn[MAX_USERS][rarch_num_bind_game_controller()];
    struct
    {
       struct retro_subsystem_info *data;

From 6a87d3996902de5a99a3f36e6a037c94ef1ddf7f Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 24 Dec 2023 14:03:08 -0500
Subject: [PATCH 20/35] Add all of the logical keys to input_config_bind_order,
 which are just their own mapped ID.

---
 input/input_driver.c | 41 ++++++++++++++++++++++++++++++++++++++++-
 input/input_driver.h |  2 +-
 menu/menu_setting.c  | 26 +++++++++++++-------------
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/input/input_driver.c b/input/input_driver.c
index b023be35389..2c7e8823e40 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -91,8 +91,34 @@
       || ((autoconf_bind)->joyaxis != AXIS_NONE)) \
 )
 
+#define INPUT_CONFIG_MASS_BIND_ORDER_PASTE2(a, b) a##b
+#define INPUT_CONFIG_MASS_BIND_ORDER_PASTE(a, b) INPUT_CONFIG_MASS_BIND_ORDER_PASTE2(a, b)
+#define INPUT_CONFIG_MASS_BIND_ORDER(x) (24 + x)
+#define INPUT_CONFIG_MASS_BIND_ORDER_TEN(ten) \
+    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 0)), \
+    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 1)), \
+    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 2)), \
+    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 3)), \
+    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 4)), \
+    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 5)), \
+    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 6)), \
+    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 7)), \
+    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 8)), \
+    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 9))
+#define INPUT_CONFIG_MASS_BIND_ORDER_HUNDRED(hun, ten) \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, ten)), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 1)), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 2)), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 3)), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 4)), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 5)), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 6)), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 7)), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 8)), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 9))
+
 /* Human readable order of input binds */
-const unsigned input_config_bind_order[RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS] = {
+const unsigned input_config_bind_order[rarch_num_bind_game_controller()] = {
    RETRO_DEVICE_ID_JOYPAD_UP,
    RETRO_DEVICE_ID_JOYPAD_DOWN,
    RETRO_DEVICE_ID_JOYPAD_LEFT,
@@ -117,8 +143,21 @@ const unsigned input_config_bind_order[RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS] = {
    RETRO_DEVICE_ID_JOYPAD_ANALOG_R_DOWN, /* Right Analog Down */
    RETRO_DEVICE_ID_JOYPAD_ANALOG_R_LEFT, /* Right Analog Left */
    RETRO_DEVICE_ID_JOYPAD_ANALOG_R_RIGHT, /* Right Analog Right */
+
+   /* The remaining 36 + 128 = 164 entries, just 1:1 mapped... starts at 24. */
+   INPUT_CONFIG_MASS_BIND_ORDER_HUNDRED(,),
+   INPUT_CONFIG_MASS_BIND_ORDER_TEN(10),
+   INPUT_CONFIG_MASS_BIND_ORDER_TEN(11),
+   INPUT_CONFIG_MASS_BIND_ORDER_TEN(12),
+   INPUT_CONFIG_MASS_BIND_ORDER_TEN(13), /* 24 + 139 = 163! */
 };
 
+#undef INPUT_CONFIG_MASS_BIND_ORDER_PASTE
+#undef INPUT_CONFIG_MASS_BIND_ORDER_PASTE2
+#undef INPUT_CONFIG_MASS_BIND_ORDER
+#undef INPUT_CONFIG_MASS_BIND_ORDER_TEN
+#undef INPUT_CONFIG_MASS_BIND_ORDER_HUNDRED
+
 /**************************************/
 /* TODO/FIXME - turn these into static global variable */
 retro_keybind_set input_config_binds[MAX_USERS];
diff --git a/input/input_driver.h b/input/input_driver.h
index 0ef51d51bc2..7a39b985228 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -1058,7 +1058,7 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
 void input_keyboard_event(bool down, unsigned code,
       uint32_t character, uint16_t mod, unsigned device);
 
-extern const unsigned input_config_bind_order[RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS];
+extern const unsigned input_config_bind_order[rarch_num_bind_game_controller()];
 
 extern input_device_driver_t *joypad_drivers[];
 extern input_driver_t *input_drivers[];
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 80a43f75c76..099e5738ab7 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -9021,7 +9021,7 @@ static bool setting_append_list_input_player_options(
     */
    static char buffer[MAX_USERS][13+2+1];
    static char group_label[MAX_USERS][255];
-   unsigned i, j;
+   unsigned bindish, j;
    rarch_setting_group_info_t group_info;
    rarch_setting_group_info_t subgroup_info;
    settings_t *settings                       = config_get_ptr();
@@ -9259,11 +9259,11 @@ static bool setting_append_list_input_player_options(
          char label[NAME_MAX_LENGTH];
          char name[NAME_MAX_LENGTH];
          size_t _len = 0;
-         i           =  (j < RARCH_ANALOG_BIND_LIST_END)
+          bindish           = (j < RARCH_ANALOG_BIND_LIST_END)
             ? input_config_bind_order[j]
             : j;
 
-         if (input_config_bind_map_get_meta(i))
+         if (input_config_bind_map_get_meta(bindish))
             continue;
 
          name[0]          = '\0';
@@ -9279,19 +9279,19 @@ static bool setting_append_list_input_player_options(
 
          if (
                settings->bools.input_descriptor_label_show
-               && (i < RARCH_FIRST_META_KEY)
+               && (bindish < RARCH_FIRST_META_KEY)
                && core_has_set_input_descriptor()
-               && (i != RARCH_TURBO_ENABLE)
+               && (bindish != RARCH_TURBO_ENABLE)
             )
          {
-            if (sys_info->input_desc_btn[user][i])
+            if (sys_info->input_desc_btn[user][bindish])
                strlcpy(label       + _len,
-                     sys_info->input_desc_btn[user][i],
+                     sys_info->input_desc_btn[user][bindish],
                      sizeof(label) - _len);
             else
             {
                snprintf(label, sizeof(label), "%s (%s)",
-                     input_config_bind_map_get_desc(i),
+                     input_config_bind_map_get_desc(bindish),
                      value_na);
 
                if (settings->bools.input_descriptor_hide_unbound)
@@ -9300,23 +9300,23 @@ static bool setting_append_list_input_player_options(
          }
          else
             strlcpy(label       + _len,
-                  input_config_bind_map_get_desc(i),
+                  input_config_bind_map_get_desc(bindish),
                   sizeof(label) - _len);
 
-         snprintf(name, sizeof(name), "p%u_%s", user + 1, input_config_bind_map_get_base(i));
+         snprintf(name, sizeof(name), "p%u_%s", user + 1, input_config_bind_map_get_base(bindish));
 
          CONFIG_BIND_ALT(
                list, list_info,
-               &input_config_binds[user][i],
+               &input_config_binds[user][bindish],
                user + 1,
                user,
                strdup(name),
                strdup(label),
-               &defaults[i],
+               &defaults[bindish],
                &group_info,
                &subgroup_info,
                parent_group);
-         (*list)[list_info->index - 1].bind_type = i + MENU_SETTINGS_BIND_BEGIN;
+         (*list)[list_info->index - 1].bind_type = bindish + MENU_SETTINGS_BIND_BEGIN;
       }
    }
 

From a15c7e67415190257d5914b06d35199e466d99cb Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 24 Dec 2023 14:24:15 -0500
Subject: [PATCH 21/35] Base for attempt to get logical buttons loaded into the
 menu; Correct bind to logical calculation.

---
 input/input_defines.h |  2 +-
 menu/menu_setting.c   | 45 +++++++++++++++++++++++++++++++++----------
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/input/input_defines.h b/input/input_defines.h
index 45b5664c281..546d765eca4 100644
--- a/input/input_defines.h
+++ b/input/input_defines.h
@@ -325,7 +325,7 @@ static INLINE rarch_logical_bind_id rarch_bind_to_logical_game_controller(rarch_
         return bind;
 
     if (bind >= RARCH_EXTRA_CORE_COMMAND_START && bind < RARCH_EXTRA_CORE_COMMAND_END)
-        return RARCH_CUSTOM_BIND_LIST_END + bind;
+        return RARCH_CUSTOM_BIND_LIST_END + (bind - RARCH_EXTRA_CORE_COMMAND_START);
 
     return RARCH_BIND_LIST_END_NULL;
 }
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 099e5738ab7..37aa639537e 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -9021,7 +9021,7 @@ static bool setting_append_list_input_player_options(
     */
    static char buffer[MAX_USERS][13+2+1];
    static char group_label[MAX_USERS][255];
-   unsigned bindish, j;
+   unsigned bindish, bindid;
    rarch_setting_group_info_t group_info;
    rarch_setting_group_info_t subgroup_info;
    settings_t *settings                       = config_get_ptr();
@@ -9254,16 +9254,38 @@ static bool setting_append_list_input_player_options(
    {
       const char *value_na =
          msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE);
-      for (j = 0; j < RARCH_BIND_LIST_END; j++)
+      for (bindid = 0; bindid < RARCH_BIND_LIST_END; bindid++)
       {
          char label[NAME_MAX_LENGTH];
          char name[NAME_MAX_LENGTH];
+         bool is_game;
+         rarch_logical_bind_id logical_bind;
          size_t _len = 0;
-          bindish           = (j < RARCH_ANALOG_BIND_LIST_END)
-            ? input_config_bind_order[j]
-            : j;
 
-         if (input_config_bind_map_get_meta(bindish))
+         /* Is this a game button or similar? */
+         is_game = rarch_bind_is_game_controller(bindid);
+
+         /* Which button does this belong to? */
+         if (is_game)
+         {
+            logical_bind = rarch_bind_to_logical_game_controller(bindid);
+
+            /* For extended basic buttons we go really deep into the actual bind
+             * map as it is not at the start which @c input_config_bind_order
+             * assumes, so effectively use the real bindid for its position. */
+            if (rarch_logical_bind_is_extended_basic(logical_bind))
+                bindish = bindid;
+            else
+                bindish = input_config_bind_order[logical_bind];
+         }
+         else
+         {
+            logical_bind = (rarch_logical_bind_id)-1;
+            bindish = bindid;
+         }
+
+         /* Checks keybind->meta, where 0 is for game controllers. */
+         if (0 != input_config_bind_map_get_meta(bindish))
             continue;
 
          name[0]          = '\0';
@@ -9279,15 +9301,18 @@ static bool setting_append_list_input_player_options(
 
          if (
                settings->bools.input_descriptor_label_show
-               && (bindish < RARCH_FIRST_META_KEY)
-               && core_has_set_input_descriptor()
+               && is_game
+               && (rarch_logical_bind_is_extended_basic(logical_bind) || core_has_set_input_descriptor())
                && (bindish != RARCH_TURBO_ENABLE)
             )
          {
-            if (sys_info->input_desc_btn[user][bindish])
+            /* For core defined keys, we use the label provided by the core... if any. */
+            if (sys_info->input_desc_btn[user][logical_bind])
                strlcpy(label       + _len,
-                     sys_info->input_desc_btn[user][bindish],
+                     sys_info->input_desc_btn[user][logical_bind],
                      sizeof(label) - _len);
+
+            /* Otherwise we just label it with the description of the key. */
             else
             {
                snprintf(label, sizeof(label), "%s (%s)",

From ea4fb65ebc6d9e02444742d9af5b2069b30d25a9 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 24 Dec 2023 14:53:26 -0500
Subject: [PATCH 22/35] More base work to get working on the menu.

---
 input/input_defines.h | 14 ++++++++++++++
 menu/menu_setting.c   | 30 ++++++++++++++++++++++--------
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/input/input_defines.h b/input/input_defines.h
index 546d765eca4..66cb1c85305 100644
--- a/input/input_defines.h
+++ b/input/input_defines.h
@@ -312,6 +312,20 @@ static INLINE bool rarch_logical_bind_is_extended_basic(rarch_logical_bind_id bi
     return (bind >= RARCH_CUSTOM_BIND_LIST_END);
 }
 
+/**
+ * Returns the extended index of a given key.
+ *
+ * @param bind The bind to get the extended index of.
+ * @return The index of then given key or @c -1 if not valid.
+ * @since 2023/12/24
+ */
+static INLINE int rarch_logical_bind_get_extended_index(rarch_logical_bind_id bind)
+{
+    if (bind < RARCH_CUSTOM_BIND_LIST_END)
+        return -1;
+    return bind - RARCH_CUSTOM_BIND_LIST_END;
+}
+
 /**
  * Translates a real bind id to a logical bind id.
  *
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 37aa639537e..3176d588ffd 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -224,9 +224,9 @@
    if (SETTINGS_LIST_APPEND(a, b)) \
       config_hex(a, b, c, d, e, f, g, h, i, j, k, l)
 
-#define CONFIG_BIND_ALT(a, b, c, d, e, f, g, h, i, j, k) \
-   if (SETTINGS_LIST_APPEND(a, b)) \
-      config_bind_alt(a, b, c, d, e, f, g, h, i, j, k)
+#define CONFIG_BIND_ALT(list, list_info, target, player, player_offset, name, SHORT, default_value, group_info, subgroup_info, parent_group) \
+   if (SETTINGS_LIST_APPEND(list, list_info)) \
+      config_bind_alt(list, list_info, target, player, player_offset, name, SHORT, default_value, group_info, subgroup_info, parent_group)
 
 #define CONFIG_BIND(a, b, c, d, e, f, g, h, i, j, k, l) \
    if (SETTINGS_LIST_APPEND(a, b)) \
@@ -9272,7 +9272,7 @@ static bool setting_append_list_input_player_options(
 
             /* For extended basic buttons we go really deep into the actual bind
              * map as it is not at the start which @c input_config_bind_order
-             * assumes, so effectively use the real bindid for its position. */
+             * assumes, so effectively use the real bind id for its position. */
             if (rarch_logical_bind_is_extended_basic(logical_bind))
                 bindish = bindid;
             else
@@ -9308,16 +9308,28 @@ static bool setting_append_list_input_player_options(
          {
             /* For core defined keys, we use the label provided by the core... if any. */
             if (sys_info->input_desc_btn[user][logical_bind])
+            {
                strlcpy(label       + _len,
                      sys_info->input_desc_btn[user][logical_bind],
                      sizeof(label) - _len);
+            }
 
             /* Otherwise we just label it with the description of the key. */
             else
             {
-               snprintf(label, sizeof(label), "%s (%s)",
-                     input_config_bind_map_get_desc(bindish),
-                     value_na);
+               /* For logical keys they have no true label, so use a generic name for them. */
+               if (rarch_logical_bind_is_extended_basic(logical_bind))
+               {
+                   snprintf(label, sizeof(label), "Logical %d (%s)",
+                            rarch_logical_bind_get_extended_index(logical_bind),
+                            value_na);
+               }
+               else
+               {
+                   snprintf(label, sizeof(label), "%s (%s)",
+                         input_config_bind_map_get_desc(bindish),
+                         value_na);
+               }
 
                if (settings->bools.input_descriptor_hide_unbound)
                   continue;
@@ -9328,7 +9340,9 @@ static bool setting_append_list_input_player_options(
                   input_config_bind_map_get_desc(bindish),
                   sizeof(label) - _len);
 
-         snprintf(name, sizeof(name), "p%u_%s", user + 1, input_config_bind_map_get_base(bindish));
+         /* Essentially p1_y. */
+         snprintf(name, sizeof(name), "p%u_%s",
+            user + 1, input_config_bind_map_get_base(bindish));
 
          CONFIG_BIND_ALT(
                list, list_info,

From 038181092c751671d323cafebd9f07dee423ff68 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 24 Dec 2023 15:04:14 -0500
Subject: [PATCH 23/35] Add room to fit all of the logical keys in the menu.

---
 menu/menu_driver.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index e56be9fdd75..c57593297cc 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -217,9 +217,11 @@ enum menu_settings_type
    MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_SEQUENTIAL_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_PLAY_SEQUENTIAL_BEGIN + MENU_SETTINGS_AUDIO_MIXER_MAX_STREAMS,
    MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_VOLUME_BEGIN,
    MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_VOLUME_END = MENU_SETTINGS_AUDIO_MIXER_STREAM_ACTIONS_VOLUME_BEGIN + MENU_SETTINGS_AUDIO_MIXER_MAX_STREAMS,
+
+   /* Binds in the menu, note that every single bind needs to fit! */
    MENU_SETTINGS_BIND_BEGIN,
-   MENU_SETTINGS_BIND_LAST = MENU_SETTINGS_BIND_BEGIN + RARCH_ANALOG_RIGHT_Y_MINUS,
-   MENU_SETTINGS_BIND_ALL_LAST = MENU_SETTINGS_BIND_BEGIN + RARCH_MENU_TOGGLE,
+   MENU_SETTINGS_BIND_LAST = MENU_SETTINGS_BIND_BEGIN + RARCH_EXTRA_CORE_COMMAND_COUNT + RARCH_ANALOG_RIGHT_Y_MINUS,
+   MENU_SETTINGS_BIND_ALL_LAST = MENU_SETTINGS_BIND_BEGIN + RARCH_EXTRA_CORE_COMMAND_COUNT + RARCH_MENU_TOGGLE,
 
    MENU_SETTINGS_CUSTOM_BIND,
    MENU_SETTINGS_CUSTOM_BIND_KEYBOARD,
@@ -236,9 +238,9 @@ enum menu_settings_type
    MENU_SETTINGS_INPUT_ANALOG_DPAD_MODE,
    MENU_SETTINGS_INPUT_INPUT_REMAP_PORT,
    MENU_SETTINGS_INPUT_BEGIN,
-   MENU_SETTINGS_INPUT_END = MENU_SETTINGS_INPUT_BEGIN + RARCH_CUSTOM_BIND_LIST_END + 6,
+   MENU_SETTINGS_INPUT_END = MENU_SETTINGS_INPUT_BEGIN + rarch_num_bind_game_controller() + 6,
    MENU_SETTINGS_INPUT_DESC_BEGIN,
-   MENU_SETTINGS_INPUT_DESC_END = MENU_SETTINGS_INPUT_DESC_BEGIN + ((RARCH_FIRST_CUSTOM_BIND + 8) * MAX_USERS),
+   MENU_SETTINGS_INPUT_DESC_END = MENU_SETTINGS_INPUT_DESC_BEGIN + (rarch_num_bind_game_controller() * MAX_USERS),
    MENU_SETTINGS_INPUT_DESC_KBD_BEGIN,
    MENU_SETTINGS_INPUT_DESC_KBD_END = MENU_SETTINGS_INPUT_DESC_KBD_BEGIN + (RARCH_MAX_KEYS * MAX_USERS),
    MENU_SETTINGS_REMAPPING_PORT_BEGIN,

From 33aff0add44e9b8b26b45575a2e6b5e8fd26ffed Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 24 Dec 2023 15:11:58 -0500
Subject: [PATCH 24/35] Increase sizes more?

---
 input/input_defines.h   | 2 ++
 menu/menu_displaylist.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/input/input_defines.h b/input/input_defines.h
index 66cb1c85305..0083fcc43a9 100644
--- a/input/input_defines.h
+++ b/input/input_defines.h
@@ -362,6 +362,8 @@ static INLINE rarch_bind_id rarch_logical_to_bind_game_controller(rarch_logical_
 /**
  * Returns the number of binds that are part of game controllers.
  *
+ * Use this instead of @c RARCH_FIRST_CUSTOM_BIND .
+ *
  * @return The number of binds that are part of game controllers.
  * @since 2023/12/24
  */
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index ee71e2dc8e1..7a9ce7b7b38 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -11687,7 +11687,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                         if (menu_entries_append(list, descriptor, info->path,
                                  MSG_UNKNOWN,
                                  MENU_SETTINGS_INPUT_DESC_BEGIN +
-                                 (port * (RARCH_FIRST_CUSTOM_BIND + 8)) + retro_id, 0, 0, NULL))
+                                 (port * rarch_num_bind_game_controller()) + retro_id, 0, 0, NULL))
                            count++;
                      }
                   }

From 05d893519558615c3e21fb90c57cb18afd13ee2f Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 24 Dec 2023 15:36:24 -0500
Subject: [PATCH 25/35] Add NIL which is an empty token to hopefully fix C89
 build.

---
 configuration.c      | 6 +++++-
 input/input_driver.c | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/configuration.c b/configuration.c
index ba95b5f2823..264f0c1abe9 100644
--- a/configuration.c
+++ b/configuration.c
@@ -282,6 +282,8 @@ enum midi_driver_enum
 #define DECLARE_BIND(base, bind, desc) { #base, desc, 0, bind, true }
 #define DECLARE_META_BIND(level, base, bind, desc) { #base, desc, level, bind, true }
 
+#define DECLARE_EXTRA_BIND_NIL2
+#define DECLARE_EXTRA_BIND_NIL DECLARE_EXTRA_BIND_NIL2
 #define DECLARE_EXTRA_BIND_PASTE2(a, b) a##b
 #define DECLARE_EXTRA_BIND_PASTE(a, b) DECLARE_EXTRA_BIND_PASTE2(a, b)
 #define DECLARE_EXTRA_BIND_STRINGY2(a) #a
@@ -428,7 +430,7 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
    DECLARE_META_BIND(2, osk_toggle,            RARCH_OSK,                    MENU_ENUM_LABEL_VALUE_INPUT_META_OSK),
 
    /* Extra keys, all of them. */
-   DECLARE_EXTRA_BIND_100(,),
+   DECLARE_EXTRA_BIND_100(DECLARE_EXTRA_BIND_NIL,DECLARE_EXTRA_BIND_NIL),
    DECLARE_EXTRA_BIND_10(10),
    DECLARE_EXTRA_BIND_10(11),
    DECLARE_EXTRA_BIND(120),
@@ -452,6 +454,8 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
 #undef DECLARE_EXTRA_BIND_STRINGY
 #undef DECLARE_EXTRA_BIND_10
 #undef DECLARE_EXTRA_BIND_100
+#undef DECLARE_EXTRA_BIND_NIL2
+#undef DECLARE_EXTRA_BIND_NIL
 
 #if defined(HAVE_METAL)
 #if defined(HAVE_VULKAN)
diff --git a/input/input_driver.c b/input/input_driver.c
index 2c7e8823e40..58b58f99831 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -91,6 +91,8 @@
       || ((autoconf_bind)->joyaxis != AXIS_NONE)) \
 )
 
+#define INPUT_CONFIG_MASS_BIND_ORDER_NIL2
+#define INPUT_CONFIG_MASS_BIND_ORDER_NIL INPUT_CONFIG_MASS_BIND_ORDER_NIL2
 #define INPUT_CONFIG_MASS_BIND_ORDER_PASTE2(a, b) a##b
 #define INPUT_CONFIG_MASS_BIND_ORDER_PASTE(a, b) INPUT_CONFIG_MASS_BIND_ORDER_PASTE2(a, b)
 #define INPUT_CONFIG_MASS_BIND_ORDER(x) (24 + x)
@@ -145,7 +147,7 @@ const unsigned input_config_bind_order[rarch_num_bind_game_controller()] = {
    RETRO_DEVICE_ID_JOYPAD_ANALOG_R_RIGHT, /* Right Analog Right */
 
    /* The remaining 36 + 128 = 164 entries, just 1:1 mapped... starts at 24. */
-   INPUT_CONFIG_MASS_BIND_ORDER_HUNDRED(,),
+   INPUT_CONFIG_MASS_BIND_ORDER_HUNDRED(INPUT_CONFIG_MASS_BIND_ORDER_NIL,INPUT_CONFIG_MASS_BIND_ORDER_NIL),
    INPUT_CONFIG_MASS_BIND_ORDER_TEN(10),
    INPUT_CONFIG_MASS_BIND_ORDER_TEN(11),
    INPUT_CONFIG_MASS_BIND_ORDER_TEN(12),
@@ -157,6 +159,8 @@ const unsigned input_config_bind_order[rarch_num_bind_game_controller()] = {
 #undef INPUT_CONFIG_MASS_BIND_ORDER
 #undef INPUT_CONFIG_MASS_BIND_ORDER_TEN
 #undef INPUT_CONFIG_MASS_BIND_ORDER_HUNDRED
+#undef INPUT_CONFIG_MASS_BIND_ORDER_NIL2
+#undef INPUT_CONFIG_MASS_BIND_ORDER_NIL
 
 /**************************************/
 /* TODO/FIXME - turn these into static global variable */

From aabdbc3e2d6e94835d5b9ee70b529507e016d52c Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 24 Dec 2023 18:21:50 -0500
Subject: [PATCH 26/35] Try C89 fix again without double wrapping NIL.

---
 configuration.c      | 4 +---
 input/input_driver.c | 7 ++-----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/configuration.c b/configuration.c
index 264f0c1abe9..778e0251971 100644
--- a/configuration.c
+++ b/configuration.c
@@ -282,8 +282,7 @@ enum midi_driver_enum
 #define DECLARE_BIND(base, bind, desc) { #base, desc, 0, bind, true }
 #define DECLARE_META_BIND(level, base, bind, desc) { #base, desc, level, bind, true }
 
-#define DECLARE_EXTRA_BIND_NIL2
-#define DECLARE_EXTRA_BIND_NIL DECLARE_EXTRA_BIND_NIL2
+#define DECLARE_EXTRA_BIND_NIL
 #define DECLARE_EXTRA_BIND_PASTE2(a, b) a##b
 #define DECLARE_EXTRA_BIND_PASTE(a, b) DECLARE_EXTRA_BIND_PASTE2(a, b)
 #define DECLARE_EXTRA_BIND_STRINGY2(a) #a
@@ -454,7 +453,6 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
 #undef DECLARE_EXTRA_BIND_STRINGY
 #undef DECLARE_EXTRA_BIND_10
 #undef DECLARE_EXTRA_BIND_100
-#undef DECLARE_EXTRA_BIND_NIL2
 #undef DECLARE_EXTRA_BIND_NIL
 
 #if defined(HAVE_METAL)
diff --git a/input/input_driver.c b/input/input_driver.c
index 58b58f99831..7a6da476a99 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -91,8 +91,7 @@
       || ((autoconf_bind)->joyaxis != AXIS_NONE)) \
 )
 
-#define INPUT_CONFIG_MASS_BIND_ORDER_NIL2
-#define INPUT_CONFIG_MASS_BIND_ORDER_NIL INPUT_CONFIG_MASS_BIND_ORDER_NIL2
+#define INPUT_CONFIG_MASS_BIND_ORDER_NIL
 #define INPUT_CONFIG_MASS_BIND_ORDER_PASTE2(a, b) a##b
 #define INPUT_CONFIG_MASS_BIND_ORDER_PASTE(a, b) INPUT_CONFIG_MASS_BIND_ORDER_PASTE2(a, b)
 #define INPUT_CONFIG_MASS_BIND_ORDER(x) (24 + x)
@@ -159,7 +158,6 @@ const unsigned input_config_bind_order[rarch_num_bind_game_controller()] = {
 #undef INPUT_CONFIG_MASS_BIND_ORDER
 #undef INPUT_CONFIG_MASS_BIND_ORDER_TEN
 #undef INPUT_CONFIG_MASS_BIND_ORDER_HUNDRED
-#undef INPUT_CONFIG_MASS_BIND_ORDER_NIL2
 #undef INPUT_CONFIG_MASS_BIND_ORDER_NIL
 
 /**************************************/
@@ -6161,6 +6159,7 @@ void input_remapping_set_defaults(bool clear_cache)
 {
    unsigned usernum, logical;
    settings_t *settings        = config_get_ptr();
+   const struct retro_keybind *keybind = &input_config_binds[usernum][logical];
 
    for (usernum = 0; usernum < MAX_USERS; usernum++)
    {
@@ -6171,8 +6170,6 @@ void input_remapping_set_defaults(bool clear_cache)
          if (!rarch_logical_bind_is_basic(logical))
             continue;
 
-         const struct retro_keybind *keybind = &input_config_binds[usernum][logical];
-
          /* Force defaults for extended keys to be unmapped by default. */
          configuration_set_uint(settings,
                settings->uints.input_remap_ids[usernum][logical],

From 175dcc78583cc632789f522c6a7df1f10cf97ca7 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 24 Dec 2023 19:01:50 -0500
Subject: [PATCH 27/35] Longer list of macros but no longer has blank tokens;
 Correct bind ordering.

---
 configuration.c      | 55 +++++++++++++++++++++++-----------
 input/input_driver.c | 70 +++++++++++++++++++++++++++++++-------------
 runloop.c            | 10 +++++--
 3 files changed, 96 insertions(+), 39 deletions(-)

diff --git a/configuration.c b/configuration.c
index 778e0251971..b7c80f2434e 100644
--- a/configuration.c
+++ b/configuration.c
@@ -282,7 +282,6 @@ enum midi_driver_enum
 #define DECLARE_BIND(base, bind, desc) { #base, desc, 0, bind, true }
 #define DECLARE_META_BIND(level, base, bind, desc) { #base, desc, level, bind, true }
 
-#define DECLARE_EXTRA_BIND_NIL
 #define DECLARE_EXTRA_BIND_PASTE2(a, b) a##b
 #define DECLARE_EXTRA_BIND_PASTE(a, b) DECLARE_EXTRA_BIND_PASTE2(a, b)
 #define DECLARE_EXTRA_BIND_STRINGY2(a) #a
@@ -303,18 +302,6 @@ enum midi_driver_enum
     DECLARE_EXTRA_BIND(DECLARE_EXTRA_BIND_PASTE(dig, 7)), \
     DECLARE_EXTRA_BIND(DECLARE_EXTRA_BIND_PASTE(dig, 9))
 
-/* Declare one hundred binds. */
-#define DECLARE_EXTRA_BIND_100(hun, ten) \
-    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, ten)), \
-    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, 1)), \
-    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, 2)), \
-    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, 3)), \
-    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, 4)), \
-    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, 5)), \
-    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, 6)), \
-    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, 7)), \
-    DECLARE_EXTRA_BIND_10(DECLARE_EXTRA_BIND_PASTE(hun, 9))
-
 const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
    DECLARE_BIND(b,                             RETRO_DEVICE_ID_JOYPAD_B,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B),
    DECLARE_BIND(y,                             RETRO_DEVICE_ID_JOYPAD_Y,     MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y),
@@ -429,7 +416,25 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
    DECLARE_META_BIND(2, osk_toggle,            RARCH_OSK,                    MENU_ENUM_LABEL_VALUE_INPUT_META_OSK),
 
    /* Extra keys, all of them. */
-   DECLARE_EXTRA_BIND_100(DECLARE_EXTRA_BIND_NIL,DECLARE_EXTRA_BIND_NIL),
+   DECLARE_EXTRA_BIND(0),
+   DECLARE_EXTRA_BIND(1),
+   DECLARE_EXTRA_BIND(2),
+   DECLARE_EXTRA_BIND(3),
+   DECLARE_EXTRA_BIND(4),
+   DECLARE_EXTRA_BIND(5),
+   DECLARE_EXTRA_BIND(6),
+   DECLARE_EXTRA_BIND(7),
+   DECLARE_EXTRA_BIND(8),
+   DECLARE_EXTRA_BIND(9),
+   DECLARE_EXTRA_BIND_10(1),
+   DECLARE_EXTRA_BIND_10(2),
+   DECLARE_EXTRA_BIND_10(3),
+   DECLARE_EXTRA_BIND_10(4),
+   DECLARE_EXTRA_BIND_10(5),
+   DECLARE_EXTRA_BIND_10(6),
+   DECLARE_EXTRA_BIND_10(7),
+   DECLARE_EXTRA_BIND_10(8),
+   DECLARE_EXTRA_BIND_10(9),
    DECLARE_EXTRA_BIND_10(10),
    DECLARE_EXTRA_BIND_10(11),
    DECLARE_EXTRA_BIND(120),
@@ -452,8 +457,6 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
 #undef DECLARE_EXTRA_BIND_STRINGY2
 #undef DECLARE_EXTRA_BIND_STRINGY
 #undef DECLARE_EXTRA_BIND_10
-#undef DECLARE_EXTRA_BIND_100
-#undef DECLARE_EXTRA_BIND_NIL
 
 #if defined(HAVE_METAL)
 #if defined(HAVE_VULKAN)
@@ -5741,7 +5744,25 @@ static const char* rarch_input_get_key_string(rarch_logical_bind_id logical)
             "a",      "x",      "l",      "r",
             "l2",     "r2",     "l3",     "r3",
             "l_x+",   "l_x-",   "l_y+",   "l_y-",
-            "r_x+",   "r_x-",   "r_y+",   "r_y-"
+            "r_x+",   "r_x-",   "r_y+",   "r_y-",
+
+            /* Light gun is only here because of the mixing between defines,
+             * This creates a difficult situation where we do not want to
+             * include it, but we must. */
+            "loggtr",
+            "loggrl",
+            "loggaa",
+            "loggab",
+            "loggac",
+            "loggst",
+            "loggsl",
+            "loggdu",
+            "loggdd",
+            "loggdl",
+            "loggdr",
+
+            /* Turbo as well. */
+            "logtrb"
     };
 
     /* Not valid at all. */
diff --git a/input/input_driver.c b/input/input_driver.c
index 7a6da476a99..fb915f7121a 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -91,10 +91,9 @@
       || ((autoconf_bind)->joyaxis != AXIS_NONE)) \
 )
 
-#define INPUT_CONFIG_MASS_BIND_ORDER_NIL
 #define INPUT_CONFIG_MASS_BIND_ORDER_PASTE2(a, b) a##b
 #define INPUT_CONFIG_MASS_BIND_ORDER_PASTE(a, b) INPUT_CONFIG_MASS_BIND_ORDER_PASTE2(a, b)
-#define INPUT_CONFIG_MASS_BIND_ORDER(x) (24 + x)
+#define INPUT_CONFIG_MASS_BIND_ORDER(x) (36 + x)
 #define INPUT_CONFIG_MASS_BIND_ORDER_TEN(ten) \
     INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 0)), \
     INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 1)), \
@@ -106,17 +105,6 @@
     INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 7)), \
     INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 8)), \
     INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 9))
-#define INPUT_CONFIG_MASS_BIND_ORDER_HUNDRED(hun, ten) \
-    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, ten)), \
-    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 1)), \
-    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 2)), \
-    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 3)), \
-    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 4)), \
-    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 5)), \
-    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 6)), \
-    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 7)), \
-    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 8)), \
-    INPUT_CONFIG_MASS_BIND_ORDER_TEN(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(hun, 9))
 
 /* Human readable order of input binds */
 const unsigned input_config_bind_order[rarch_num_bind_game_controller()] = {
@@ -145,20 +133,60 @@ const unsigned input_config_bind_order[rarch_num_bind_game_controller()] = {
    RETRO_DEVICE_ID_JOYPAD_ANALOG_R_LEFT, /* Right Analog Left */
    RETRO_DEVICE_ID_JOYPAD_ANALOG_R_RIGHT, /* Right Analog Right */
 
-   /* The remaining 36 + 128 = 164 entries, just 1:1 mapped... starts at 24. */
-   INPUT_CONFIG_MASS_BIND_ORDER_HUNDRED(INPUT_CONFIG_MASS_BIND_ORDER_NIL,INPUT_CONFIG_MASS_BIND_ORDER_NIL),
+   /* The remaining 36 + 128 = 164 entries, just 1:1 mapped... starts at 36. */
+   INPUT_CONFIG_MASS_BIND_ORDER(0),
+   INPUT_CONFIG_MASS_BIND_ORDER(1),
+   INPUT_CONFIG_MASS_BIND_ORDER(2),
+   INPUT_CONFIG_MASS_BIND_ORDER(3),
+   INPUT_CONFIG_MASS_BIND_ORDER(4),
+   INPUT_CONFIG_MASS_BIND_ORDER(5),
+   INPUT_CONFIG_MASS_BIND_ORDER(6),
+   INPUT_CONFIG_MASS_BIND_ORDER(7),
+   INPUT_CONFIG_MASS_BIND_ORDER(8),
+   INPUT_CONFIG_MASS_BIND_ORDER(9),
+   INPUT_CONFIG_MASS_BIND_ORDER_TEN(1),
+   INPUT_CONFIG_MASS_BIND_ORDER_TEN(2),
+   INPUT_CONFIG_MASS_BIND_ORDER_TEN(3),
+   INPUT_CONFIG_MASS_BIND_ORDER_TEN(4),
+   INPUT_CONFIG_MASS_BIND_ORDER_TEN(5),
+   INPUT_CONFIG_MASS_BIND_ORDER_TEN(6),
+   INPUT_CONFIG_MASS_BIND_ORDER_TEN(7),
+   INPUT_CONFIG_MASS_BIND_ORDER_TEN(8),
+   INPUT_CONFIG_MASS_BIND_ORDER_TEN(9),
    INPUT_CONFIG_MASS_BIND_ORDER_TEN(10),
    INPUT_CONFIG_MASS_BIND_ORDER_TEN(11),
-   INPUT_CONFIG_MASS_BIND_ORDER_TEN(12),
-   INPUT_CONFIG_MASS_BIND_ORDER_TEN(13), /* 24 + 139 = 163! */
+   INPUT_CONFIG_MASS_BIND_ORDER(9),
+   INPUT_CONFIG_MASS_BIND_ORDER(120),
+   INPUT_CONFIG_MASS_BIND_ORDER(121),
+   INPUT_CONFIG_MASS_BIND_ORDER(122),
+   INPUT_CONFIG_MASS_BIND_ORDER(123),
+   INPUT_CONFIG_MASS_BIND_ORDER(124),
+   INPUT_CONFIG_MASS_BIND_ORDER(125),
+   INPUT_CONFIG_MASS_BIND_ORDER(126),
+   INPUT_CONFIG_MASS_BIND_ORDER(127),
+
+   /* Light gun order, this is here because there has been mix and match
+    * between buttons, analogs, etc. */
+   RARCH_UNMAPPED,
+   RARCH_UNMAPPED,
+   RARCH_UNMAPPED,
+   RARCH_UNMAPPED,
+   RARCH_UNMAPPED,
+   RARCH_UNMAPPED,
+   RARCH_UNMAPPED,
+   RARCH_UNMAPPED,
+   RARCH_UNMAPPED,
+   RARCH_UNMAPPED,
+   RARCH_UNMAPPED,
+
+   /* Same goes for turbo. */
+   RARCH_UNMAPPED,
 };
 
 #undef INPUT_CONFIG_MASS_BIND_ORDER_PASTE
 #undef INPUT_CONFIG_MASS_BIND_ORDER_PASTE2
 #undef INPUT_CONFIG_MASS_BIND_ORDER
 #undef INPUT_CONFIG_MASS_BIND_ORDER_TEN
-#undef INPUT_CONFIG_MASS_BIND_ORDER_HUNDRED
-#undef INPUT_CONFIG_MASS_BIND_ORDER_NIL
 
 /**************************************/
 /* TODO/FIXME - turn these into static global variable */
@@ -6159,7 +6187,7 @@ void input_remapping_set_defaults(bool clear_cache)
 {
    unsigned usernum, logical;
    settings_t *settings        = config_get_ptr();
-   const struct retro_keybind *keybind = &input_config_binds[usernum][logical];
+   const struct retro_keybind *keybind;
 
    for (usernum = 0; usernum < MAX_USERS; usernum++)
    {
@@ -6170,6 +6198,8 @@ void input_remapping_set_defaults(bool clear_cache)
          if (!rarch_logical_bind_is_basic(logical))
             continue;
 
+          keybind = &input_config_binds[usernum][logical];
+
          /* Force defaults for extended keys to be unmapped by default. */
          configuration_set_uint(settings,
                settings->uints.input_remap_ids[usernum][logical],
diff --git a/runloop.c b/runloop.c
index 49dc4acf012..0d32e456e45 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1519,6 +1519,8 @@ static void rarch_set_input_descriptors(const void *data,
        if (log_level == RETRO_LOG_DEBUG)
        {
           unsigned input_driver_max_users = settings->uints.input_max_users;
+          unsigned bind_index;
+          const char *description;
 
           for (p = 0; p < input_driver_max_users; p++)
           {
@@ -1528,8 +1530,12 @@ static void rarch_set_input_descriptors(const void *data,
 
              for (retro_id = 0; retro_id < RETRO_DEVICE_ID_JOYPAD_MAX_BUTTONS; retro_id++)
              {
-                unsigned bind_index     = input_config_bind_order[retro_id];
-                const char *description = sys_info->input_desc_btn[mapped_port][bind_index];
+                bind_index = input_config_bind_order[retro_id];
+
+                if (bind_index == RARCH_UNMAPPED)
+                    continue;
+
+                description = sys_info->input_desc_btn[mapped_port][bind_index];
 
                 if (!description)
                    continue;

From c163451ccf6ce86451a94e4c16b8677d2c01eeeb Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 24 Dec 2023 19:11:18 -0500
Subject: [PATCH 28/35] Adjustments to action_start_input_desc.

---
 menu/cbs/menu_cbs_start.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c
index 828ea697d0e..d2a67b8721b 100644
--- a/menu/cbs/menu_cbs_start.c
+++ b/menu/cbs/menu_cbs_start.c
@@ -245,13 +245,13 @@ static int action_start_input_desc(
 
    if (settings && sys_info)
    {
-      unsigned user_idx    = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) / (RARCH_FIRST_CUSTOM_BIND + 8);
-      unsigned btn_idx     = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) - (RARCH_FIRST_CUSTOM_BIND + 8) * user_idx;
+      unsigned user_idx    = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) / (rarch_num_bind_game_controller());
+      unsigned btn_idx     = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) - (rarch_num_bind_game_controller()) * user_idx;
       unsigned mapped_port = settings->uints.input_remap_ports[user_idx];
 
       if (     (user_idx    >= MAX_USERS)
             || (mapped_port >= MAX_USERS)
-            || (btn_idx     >= RARCH_CUSTOM_BIND_LIST_END))
+            || !rarch_logical_bind_is_game_controller(btn_idx))
          return 0;
 
       /* Check whether core has defined this input */

From 9fc11df9db43e4fc0644b580a577d30427cea728 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 24 Dec 2023 19:55:06 -0500
Subject: [PATCH 29/35] Adjustments to API to simplify it along with setting
 various binds.

---
 input/input_defines.h              | 16 +++++--
 libretro-common/include/libretro.h | 73 +++++++++++++++---------------
 runloop.c                          | 64 ++++++++++++++++++++++----
 3 files changed, 104 insertions(+), 49 deletions(-)

diff --git a/input/input_defines.h b/input/input_defines.h
index 0083fcc43a9..316a8a0d1e5 100644
--- a/input/input_defines.h
+++ b/input/input_defines.h
@@ -95,7 +95,7 @@
 
 #endif
 
-/** The number of extra core commands available, used with @c RETRO_ENVIRONMENT_SET_EXTRA_CORE_COMMANDS . */
+/** The number of extra core commands available, used with @c RETRO_ENVIRONMENT_SET_EXTENDED_RETROPAD . */
 #define RARCH_EXTRA_CORE_COMMAND_COUNT 128
 
 RETRO_BEGIN_DECLS
@@ -139,6 +139,9 @@ enum
     * Instead of using this to check whether a button is part of
     * a game controller, use @c rarch_bind_is_game_controller() or
     * instead @c rarch_num_bind_game_controller() .
+    *
+    * To get the starting ID for logical buttons use
+    * instead @c rarch_first_logical_bind_game_controller() .
     */
    RARCH_CUSTOM_BIND_LIST_END,
 
@@ -209,10 +212,10 @@ enum
    RARCH_OVERLAY_NEXT,
    RARCH_OSK,
 
-   /** Custom core command start, used with @c RETRO_ENVIRONMENT_SET_EXTRA_CORE_COMMANDS. */
+   /** Custom core command start, used with @c RETRO_ENVIRONMENT_SET_EXTENDED_RETROPAD. */
    RARCH_EXTRA_CORE_COMMAND_START,
 
-   /** Custom core command end, used with @c RETRO_ENVIRONMENT_SET_EXTRA_CORE_COMMANDS. */
+   /** Custom core command end, used with @c RETRO_ENVIRONMENT_SET_EXTENDED_RETROPAD. */
    RARCH_EXTRA_CORE_COMMAND_END = RARCH_EXTRA_CORE_COMMAND_START + RARCH_EXTRA_CORE_COMMAND_COUNT,
 
    RARCH_BIND_LIST_END,
@@ -288,6 +291,13 @@ typedef unsigned rarch_bind_id;
  */
 typedef unsigned rarch_logical_bind_id;
 
+/**
+ * The first logical bind index.
+ *
+ * @since 2023/12/24
+ */
+#define rarch_first_logical_bind_game_controller() RARCH_CUSTOM_BIND_LIST_END
+
 /**
  * Is the given logical bind a basic button, one with no axis or otherwise?
  *
diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h
index 3e816343cf4..262e230dfda 100644
--- a/libretro-common/include/libretro.h
+++ b/libretro-common/include/libretro.h
@@ -1864,13 +1864,11 @@ enum retro_mod
                                             * multiplayer, where a deterministic core supporting multiple
                                             * input devices does not need to take any action on its own.
                                             */
-#define RETRO_ENVIRONMENT_SET_EXTRA_CORE_COMMANDS (79 | RETRO_ENVIRONMENT_EXPERIMENTAL)
-                                           /* const struct retro_extra_core_commands* --
-                                            * Defines extra commands that can be specified
-                                            * in the menu that when executed will emit a callback into
-                                            * a core for the command. These can act as extra input keys
-                                            * for a given core. Some commands may be specified to
-                                            * send the command over netplay as well.
+#define RETRO_ENVIRONMENT_SET_EXTENDED_RETROPAD (79 | RETRO_ENVIRONMENT_EXPERIMENTAL)
+                                           /* const struct retro_core_extended_retropad* --
+                                            * Similar to the setting of controls, this allows for
+                                            * the addition of additional button inputs which are not
+                                            * bound to anything.
                                             */
 
 /* VFS functionality */
@@ -3380,45 +3378,48 @@ struct retro_input_descriptor
    const char *description;
 };
 
-/** Used with @c retro_extra_core_commands . */
-struct retro_extra_core_commands_action
+/** Used with @c retro_core_extended_retropad , similar to @c retro_input_descriptor. */
+struct retro_core_extended_retropad_button
 {
-    /** The ID number of the specific command. */
-    unsigned id;
+    /** The controller port or player this is attached to. */
+    unsigned port;
 
-    /** Should this command be sent over net play?
-     * If this is @c true then input commands will be queued and executed
-     * before the next @c retro_run rather than instantly.
-     * Any command like this will be placed in the player controls accordingly. */
-    bool syncedPlayer;
+    /** The index of the device. */
+    unsigned index;
 
-    /** The glyph to use for this command. */
-    const char* glyph;
+    /** The device that this is associated with, either @c RETRO_DEVICE_JOYPAD or @c RETRO_DEVICE_ANALOG. */
+    unsigned device;
+
+    /**
+     * The logical bind ID number of the specific command.
+     * The value will be between @c 0 and @c out_num_extra .
+     */
+    unsigned logical_id;
 
-    /** The description of the command. */
+    /** The description of the command, @c NULL terminates the list.
+     * Must remain allocated until retro_unload_game() is called. */
     const char* description;
-};
 
-/**
- * Call back to be called when the command is activated, this will be sent to the core
- * and it may choose whatever action it desires.
- *
- * @param action The core action that is being executed.
- * @param controllerPort The controller port which ran this command.
- * @since 2023/12/23
- */
-typedef void (*retro_extra_core_command_callback)(
-    const struct retro_extra_core_commands_action* action,
-    unsigned controllerPort);
+    /** The glyph to use for this command, it is up to the front end to provide a picture.
+     * Must remain allocated until retro_unload_game() is called.*/
+    const char* glyph;
+};
 
-/** Used with @c RETRO_ENVIRONMENT_SET_EXTRA_CORE_COMMANDS to set extra core commands. */
-struct retro_extra_core_commands
+/** Used with @c RETRO_ENVIRONMENT_SET_EXTENDED_RETROPAD to set extra core buttons. */
+struct retro_core_extended_retropad_info
 {
-    /** The callback to be executed on a command run. */
-    retro_extra_core_command_callback callback;
+    /** Output: The number of extra buttons which are available. */
+    unsigned out_num_extra;
+};
 
+/** Used with @c RETRO_ENVIRONMENT_SET_EXTENDED_RETROPAD to set extra core buttons. */
+struct retro_core_extended_retropad
+{
     /** The core commands that exist, NULL description ends. */
-    const struct retro_extra_core_commands_action* actions;
+    const struct retro_core_extended_retropad_button* actions;
+
+    /** Extended RetroPad information output. */
+    struct retro_core_extended_retropad_info* out_info;
 };
 
 struct retro_system_info
diff --git a/runloop.c b/runloop.c
index 0d32e456e45..d5184dd43c3 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1401,23 +1401,65 @@ static void core_performance_counter_stop(struct retro_perf_counter *perf)
       perf->total += cpu_features_get_perf_counter() - perf->start;
 }
 
-static void rarch_set_extra_core_commands(rarch_system_info_t *system_info,
-    const struct retro_extra_core_commands *input) {
-    const struct retro_extra_core_commands_action* action;
-    unsigned at;
+static void rarch_set_core_extended_retropad(rarch_system_info_t *sys_info,
+                                             runloop_state_t *runloop_st,
+                                             const struct retro_core_extended_retropad *input) {
+    const struct retro_core_extended_retropad_button* action;
+    unsigned at, bind, usernum;
+    const char** user_inputs;
 
     /* Debug. */
-    RARCH_LOG("[Core]: Initializing extra core commands!\n");
+    RARCH_LOG("[Core]: Initializing extra core buttons!\n");
+
+    /* Erase all the previous extended binds for all users. */
+    for (usernum = 0; usernum < MAX_USERS; usernum++)
+    {
+        /* For simpler access. */
+        user_inputs = sys_info->input_desc_btn[usernum];
+
+        /* Invalidate all entries. */
+        for (at = rarch_first_logical_bind_game_controller();
+            at < rarch_num_bind_game_controller();
+            at++)
+            user_inputs[at] = NULL;;
+    }
+
+    /* Set output details, if requested. */
+    if (input->out_info != NULL) {
+        input->out_info->out_num_extra = RARCH_EXTRA_CORE_COMMAND_COUNT;
+    }
 
     /* Go through the commands and process them. */
-    for (at = 0; input->actions[at].description != NULL &&
-        at < RARCH_EXTRA_CORE_COMMAND_COUNT; at++)
+    for (at = 0; input->actions[at].description != NULL; at++)
     {
         /* Get base action. */
         action = &input->actions[at];
 
-        RARCH_LOG("TODO: ");
+        /* Map player. */
+        usernum = action->port;
+        if (usernum < 0 || usernum >= MAX_USERS)
+            continue;
+
+        /* We only care about gamepads and their analog equivalents. */
+        if (action->device != RETRO_DEVICE_JOYPAD &&
+            action->device != RETRO_DEVICE_ANALOG)
+            continue;
+
+        /* Ignore logical binds which are out of bounds. */
+        bind = action->logical_id;
+        if (bind < 0 || bind >= RARCH_EXTRA_CORE_COMMAND_COUNT)
+            continue;
+
+        /* Map to logical button internally. */
+        bind = rarch_first_logical_bind_game_controller() + bind;
+
+        /* Set description. */
+        sys_info->input_desc_btn[usernum][bind] = action->description;
     }
+
+    /* Indicate that the input descriptors changed. */
+    runloop_st->current_core.flags |=
+        RETRO_CORE_FLAG_HAS_SET_INPUT_DESCRIPTORS;
 }
 
 static void rarch_set_input_descriptors(const void *data,
@@ -3584,8 +3626,10 @@ bool runloop_environment_cb(unsigned cmd, void *data)
             }
          }
          break;
-      case RETRO_ENVIRONMENT_SET_EXTRA_CORE_COMMANDS:
-         rarch_set_extra_core_commands(sys_info, (struct retro_extra_core_commands*)data);
+
+      case RETRO_ENVIRONMENT_SET_EXTENDED_RETROPAD:
+         rarch_set_core_extended_retropad(sys_info, runloop_st,
+            (struct retro_core_extended_retropad*)data);
          break;
 
       default:

From a5cfcfca2e28f5079f9494736a7e673a5cb487d2 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 24 Dec 2023 20:13:07 -0500
Subject: [PATCH 30/35] Filling in of the input descriptors accordingly.

---
 dynamic.h           |  3 ++-
 menu/menu_setting.c |  2 +-
 retroarch.c         |  2 ++
 runloop.c           | 54 ++++++++++++++++++++++++++++++++-------------
 4 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/dynamic.h b/dynamic.h
index 79ed70ab16d..76ac7a534e7 100644
--- a/dynamic.h
+++ b/dynamic.h
@@ -33,7 +33,8 @@ enum retro_core_flags
    RETRO_CORE_FLAG_GAME_LOADED               = (1 << 2),
    RETRO_CORE_FLAG_INPUT_POLLED              = (1 << 3),
    RETRO_CORE_FLAG_HAS_SET_SUBSYSTEMS        = (1 << 4),
-   RETRO_CORE_FLAG_HAS_SET_INPUT_DESCRIPTORS = (1 << 5)
+   RETRO_CORE_FLAG_HAS_SET_INPUT_DESCRIPTORS = (1 << 5),
+   RETRO_CORE_FLAG_HAS_SET_EXTENDED_INPUT    = (1 << 6),
 };
 
 struct retro_core_t
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 3176d588ffd..f5dd85b39b4 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -9302,7 +9302,7 @@ static bool setting_append_list_input_player_options(
          if (
                settings->bools.input_descriptor_label_show
                && is_game
-               && (rarch_logical_bind_is_extended_basic(logical_bind) || core_has_set_input_descriptor())
+               && (core_has_set_input_descriptor())
                && (bindish != RARCH_TURBO_ENABLE)
             )
          {
diff --git a/retroarch.c b/retroarch.c
index 896598c9902..99c0e163709 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -5535,6 +5535,7 @@ static void global_free(struct rarch_state *p_rarch)
 #endif
 
    runloop_st->current_core.flags &= ~(RETRO_CORE_FLAG_HAS_SET_INPUT_DESCRIPTORS
+                                     | RETRO_CORE_FLAG_HAS_SET_EXTENDED_INPUT
                                      | RETRO_CORE_FLAG_HAS_SET_SUBSYSTEMS);
 
    global                                = global_get_ptr();
@@ -6734,6 +6735,7 @@ static bool retroarch_parse_input_and_config(
    /* Flush out some states that could have been set
     * by core environment variables. */
    runloop_st->current_core.flags &= ~(RETRO_CORE_FLAG_HAS_SET_INPUT_DESCRIPTORS
+                                     | RETRO_CORE_FLAG_HAS_SET_EXTENDED_INPUT
                                      | RETRO_CORE_FLAG_HAS_SET_SUBSYSTEMS);
 
    /* Load the config file now that we know what it is */
diff --git a/runloop.c b/runloop.c
index d5184dd43c3..8945353c2d7 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1401,16 +1401,18 @@ static void core_performance_counter_stop(struct retro_perf_counter *perf)
       perf->total += cpu_features_get_perf_counter() - perf->start;
 }
 
-static void rarch_set_core_extended_retropad(rarch_system_info_t *sys_info,
-                                             runloop_state_t *runloop_st,
-                                             const struct retro_core_extended_retropad *input) {
-    const struct retro_core_extended_retropad_button* action;
-    unsigned at, bind, usernum;
+/**
+ * Erases input descriptor buttons.
+ *
+ * @param sys_info The current state of the front end.
+ * @param from The starting index, inclusive.
+ * @param to The ending index, exclusive.
+ */
+static void rarch_erase_input_desc_btn(rarch_system_info_t *sys_info, unsigned from, unsigned to)
+{
+    unsigned usernum, at;
     const char** user_inputs;
 
-    /* Debug. */
-    RARCH_LOG("[Core]: Initializing extra core buttons!\n");
-
     /* Erase all the previous extended binds for all users. */
     for (usernum = 0; usernum < MAX_USERS; usernum++)
     {
@@ -1419,10 +1421,26 @@ static void rarch_set_core_extended_retropad(rarch_system_info_t *sys_info,
 
         /* Invalidate all entries. */
         for (at = rarch_first_logical_bind_game_controller();
-            at < rarch_num_bind_game_controller();
-            at++)
-            user_inputs[at] = NULL;;
+             at < rarch_num_bind_game_controller();
+             at++)
+            user_inputs[at] = NULL;
     }
+}
+
+static void rarch_set_core_extended_retropad(rarch_system_info_t *sys_info,
+                                             runloop_state_t *runloop_st,
+                                             const struct retro_core_extended_retropad *input) {
+    const struct retro_core_extended_retropad_button* action;
+    unsigned at, bind, usernum;
+    const char** user_inputs;
+
+    /* Debug. */
+    RARCH_LOG("[Core]: Initializing extra core buttons!\n");
+
+    /* Erase all the previous extended binds for all users. */
+    rarch_erase_input_desc_btn(sys_info,
+                               rarch_first_logical_bind_game_controller(),
+                               rarch_num_bind_game_controller());
 
     /* Set output details, if requested. */
     if (input->out_info != NULL) {
@@ -1459,7 +1477,7 @@ static void rarch_set_core_extended_retropad(rarch_system_info_t *sys_info,
 
     /* Indicate that the input descriptors changed. */
     runloop_st->current_core.flags |=
-        RETRO_CORE_FLAG_HAS_SET_INPUT_DESCRIPTORS;
+        RETRO_CORE_FLAG_HAS_SET_EXTENDED_INPUT;
 }
 
 static void rarch_set_input_descriptors(const void *data,
@@ -1469,8 +1487,13 @@ static void rarch_set_input_descriptors(const void *data,
     const struct retro_input_descriptor *desc = NULL;
     unsigned int p;
 
-    memset((void*)&sys_info->input_desc_btn, 0,
-          sizeof(sys_info->input_desc_btn));
+    /* If extended descriptors were set, only erase the standard ones. */
+    if ((runloop_st->current_core.flags & RETRO_CORE_FLAG_HAS_SET_EXTENDED_INPUT) != 0)
+        rarch_erase_input_desc_btn(sys_info, 0, rarch_first_logical_bind_game_controller());
+
+    /* Otherwise, erase everything to keep legacy behavior. */
+    else
+        rarch_erase_input_desc_btn(sys_info, 0, rarch_num_bind_game_controller());
 
     desc = (const struct retro_input_descriptor*)data;
 
@@ -7874,7 +7897,8 @@ bool core_has_set_input_descriptor(void)
 {
    runloop_state_t *runloop_st = &runloop_state;
    return ((runloop_st->current_core.flags &
-            RETRO_CORE_FLAG_HAS_SET_INPUT_DESCRIPTORS) > 0);
+            RETRO_CORE_FLAG_HAS_SET_INPUT_DESCRIPTORS |
+            RETRO_CORE_FLAG_HAS_SET_EXTENDED_INPUT) > 0);
 }
 
 void runloop_path_set_basename(const char *path)

From da49581f7d4b5022c29ce0346fa7b17c7550385f Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 24 Dec 2023 20:18:46 -0500
Subject: [PATCH 31/35] Swap port and device; Add extra debugging.

---
 libretro-common/include/libretro.h |  6 +++---
 runloop.c                          | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h
index 262e230dfda..72ecf9b6177 100644
--- a/libretro-common/include/libretro.h
+++ b/libretro-common/include/libretro.h
@@ -3384,12 +3384,12 @@ struct retro_core_extended_retropad_button
     /** The controller port or player this is attached to. */
     unsigned port;
 
-    /** The index of the device. */
-    unsigned index;
-
     /** The device that this is associated with, either @c RETRO_DEVICE_JOYPAD or @c RETRO_DEVICE_ANALOG. */
     unsigned device;
 
+    /** The index of the device. */
+    unsigned index;
+
     /**
      * The logical bind ID number of the specific command.
      * The value will be between @c 0 and @c out_num_extra .
diff --git a/runloop.c b/runloop.c
index 8945353c2d7..1a50c77b370 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1435,7 +1435,7 @@ static void rarch_set_core_extended_retropad(rarch_system_info_t *sys_info,
     const char** user_inputs;
 
     /* Debug. */
-    RARCH_LOG("[Core]: Initializing extra core buttons!\n");
+    RARCH_LOG("[Environ]: Setting extended retropad buttons.\n");
 
     /* Erase all the previous extended binds for all users. */
     rarch_erase_input_desc_btn(sys_info,
@@ -1473,8 +1473,15 @@ static void rarch_set_core_extended_retropad(rarch_system_info_t *sys_info,
 
         /* Set description. */
         sys_info->input_desc_btn[usernum][bind] = action->description;
+
+        /* Debug. */
+        RARCH_LOG("[Environ]: Bound %d to %s.\n",
+            bind, action->description);
     }
 
+    /* Debug. */
+    RARCH_LOG("[Environ]: Set %d extended buttons.\n", at);
+
     /* Indicate that the input descriptors changed. */
     runloop_st->current_core.flags |=
         RETRO_CORE_FLAG_HAS_SET_EXTENDED_INPUT;
@@ -1486,9 +1493,15 @@ static void rarch_set_input_descriptors(const void *data,
     unsigned retro_id;
     const struct retro_input_descriptor *desc = NULL;
     unsigned int p;
+    bool did_extra;
+
+    /* Check if extended inputs were set. */
+    did_extra = (runloop_st->current_core.flags & RETRO_CORE_FLAG_HAS_SET_EXTENDED_INPUT) != 0;
+    if (!did_extra)
+        RARCH_LOG("[Environ]: SET_INPUT_DESCRIPTORS: Extra was not previously set.\n");
 
     /* If extended descriptors were set, only erase the standard ones. */
-    if ((runloop_st->current_core.flags & RETRO_CORE_FLAG_HAS_SET_EXTENDED_INPUT) != 0)
+    if (did_extra)
         rarch_erase_input_desc_btn(sys_info, 0, rarch_first_logical_bind_game_controller());
 
     /* Otherwise, erase everything to keep legacy behavior. */

From f802658d377803286e0ce21cfc7cba4cae8d83e0 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 24 Dec 2023 21:16:54 -0500
Subject: [PATCH 32/35] Work on the menus regarding binds.

---
 config.def.keybinds.h         | 18 ++++++++
 input/input_defines.h         |  3 +-
 input/input_driver.c          | 11 ++++-
 menu/cbs/menu_cbs_get_value.c |  6 +--
 menu/cbs/menu_cbs_ok.c        |  8 ++--
 menu/cbs/menu_cbs_sublabel.c  |  2 +-
 menu/cbs/menu_cbs_title.c     |  2 +-
 menu/menu_displaylist.c       | 14 +++---
 menu/menu_driver.h            |  3 +-
 menu/menu_setting.c           |  3 ++
 runloop.c                     | 87 +++++++++++++++++++++--------------
 11 files changed, 103 insertions(+), 54 deletions(-)

diff --git a/config.def.keybinds.h b/config.def.keybinds.h
index d86c8b6413e..00e4ced615e 100644
--- a/config.def.keybinds.h
+++ b/config.def.keybinds.h
@@ -1927,6 +1927,16 @@ static const struct retro_keybind retro_keybinds_1[] = {
       RARCH_OSK, NO_BTN, NO_BTN, 0,
       true
    },
+
+
+   {
+           NULL, NULL,
+           AXIS_NONE, AXIS_NONE, AXIS_NONE,
+           MENU_ENUM_LABEL_INPUT_ANALOG_SENSITIVITY, RETROK_UNKNOWN,
+           RARCH_EXTRA_CORE_COMMAND_START, NO_BTN, NO_BTN, 0,
+           true
+   },
+
 #if 0
    /* Deprecated */
    {
@@ -2194,6 +2204,14 @@ static const struct retro_keybind retro_keybinds_rest[] = {
       RARCH_TURBO_ENABLE, NO_BTN, NO_BTN, 0,
       true
    },
+
+   {
+      NULL, NULL,
+      AXIS_NONE, AXIS_NONE, AXIS_NONE,
+      MENU_ENUM_LABEL_INPUT_SMALL_KEYBOARD_ENABLE, RETROK_UNKNOWN,
+      RARCH_EXTRA_CORE_COMMAND_START, NO_BTN, NO_BTN, 0,
+      true
+   },
 };
 
 #endif
diff --git a/input/input_defines.h b/input/input_defines.h
index 316a8a0d1e5..2d343a7224f 100644
--- a/input/input_defines.h
+++ b/input/input_defines.h
@@ -372,7 +372,8 @@ static INLINE rarch_bind_id rarch_logical_to_bind_game_controller(rarch_logical_
 /**
  * Returns the number of binds that are part of game controllers.
  *
- * Use this instead of @c RARCH_FIRST_CUSTOM_BIND .
+ * Use this instead of @c RARCH_FIRST_CUSTOM_BIND;
+ * Use this instead of @code RARCH_FIRST_CUSTOM_BIND + 8 @endcode.
  *
  * @return The number of binds that are part of game controllers.
  * @since 2023/12/24
diff --git a/input/input_driver.c b/input/input_driver.c
index fb915f7121a..775fa631be5 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -6188,6 +6188,7 @@ void input_remapping_set_defaults(bool clear_cache)
    unsigned usernum, logical;
    settings_t *settings        = config_get_ptr();
    const struct retro_keybind *keybind;
+   bool is_ext;
 
    for (usernum = 0; usernum < MAX_USERS; usernum++)
    {
@@ -6198,12 +6199,18 @@ void input_remapping_set_defaults(bool clear_cache)
          if (!rarch_logical_bind_is_basic(logical))
             continue;
 
-          keybind = &input_config_binds[usernum][logical];
+          is_ext = rarch_logical_bind_is_extended_basic(logical);
+
+         keybind = &input_config_binds[usernum][logical];
+
+         /* Debug. */
+         RARCH_LOG("Keybind user %d log %d -> %p %d\n",
+            usernum, logical, keybind, (keybind != NULL ? keybind->id : -1));
 
          /* Force defaults for extended keys to be unmapped by default. */
          configuration_set_uint(settings,
                settings->uints.input_remap_ids[usernum][logical],
-               (!rarch_logical_bind_is_extended_basic(logical) && keybind) ?
+               (/*!rarch_logical_bind_is_extended_basic(logical) &&*/ keybind) ?
                     keybind->id : RARCH_UNMAPPED);
 
          configuration_set_uint(settings,
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index 1fa79fdf566..9e0eb0f9f5b 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -828,8 +828,8 @@ static void menu_action_setting_disp_set_label_input_desc(
 {
    unsigned remap_idx;
    settings_t *settings   = config_get_ptr();
-   unsigned user_idx      = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) / (RARCH_FIRST_CUSTOM_BIND + 8);
-   unsigned btn_idx       = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) - (RARCH_FIRST_CUSTOM_BIND + 8) * user_idx;
+   unsigned user_idx      = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) / (rarch_num_bind_game_controller());
+   unsigned btn_idx       = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) - (rarch_num_bind_game_controller()) * user_idx;
 
    if (!settings)
       return;
@@ -845,7 +845,7 @@ static void menu_action_setting_disp_set_label_input_desc(
       if (!string_is_empty(descriptor))
       {
          size_t _len = strlcpy(s, descriptor, len);
-         if (remap_idx < RARCH_FIRST_CUSTOM_BIND) { }
+         if (rarch_logical_bind_is_basic(remap_idx)) { }
          else if (remap_idx % 2 == 0)
          {
             s[  _len] = ' ';
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index d5858a3c816..c0e8b51e1c5 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -7137,17 +7137,17 @@ static int action_ok_push_dropdown_item_input_description(const char *path,
 
    if (     !settings
        ||  (entry_type < MENU_SETTINGS_INPUT_DESC_BEGIN)
-       || ((remap_idx >= RARCH_CUSTOM_BIND_LIST_END)
+       || ((remap_idx >= rarch_num_bind_game_controller())
        &&  (remap_idx != RARCH_UNMAPPED)))
       return -1;
 
    /* Determine user/button indices */
    user_idx = (entry_type - MENU_SETTINGS_INPUT_DESC_BEGIN)
-      / (RARCH_FIRST_CUSTOM_BIND + 8);
+      / (rarch_num_bind_game_controller());
    btn_idx  = (entry_type - MENU_SETTINGS_INPUT_DESC_BEGIN)
-      - (RARCH_FIRST_CUSTOM_BIND + 8) * user_idx;
+      - (rarch_num_bind_game_controller()) * user_idx;
 
-   if ((user_idx >= MAX_USERS) || (btn_idx >= RARCH_CUSTOM_BIND_LIST_END))
+   if ((user_idx >= MAX_USERS) || (btn_idx >= rarch_num_bind_game_controller()))
       return -1;
 
    /* Assign new mapping */
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
index 530d73d95ca..e56cd4780dc 100644
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@@ -1579,7 +1579,7 @@ static int action_bind_sublabel_remap_sublabel(
 {
    settings_t *settings = config_get_ptr();
    unsigned port        = (type - MENU_SETTINGS_INPUT_DESC_BEGIN)
-         / (RARCH_FIRST_CUSTOM_BIND + 8);
+         / (rarch_num_bind_game_controller());
 
    if (settings && (port < MAX_USERS))
    {
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index ac4d526cdb6..d3d13c4c65f 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -549,7 +549,7 @@ static int action_get_title_dropdown_input_description(
       const char *path, const char *label, unsigned menu_type, char *s, size_t len)
 {
    unsigned port = (menu_type - MENU_SETTINGS_INPUT_DESC_BEGIN) /
-         (RARCH_FIRST_CUSTOM_BIND + 8);
+         (rarch_num_bind_game_controller());
 
    return action_get_title_dropdown_input_description_common(
       path, port, s, len);
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 7a9ce7b7b38..0536532a9cd 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -5466,11 +5466,11 @@ static int menu_displaylist_parse_input_description_list(
       return 0;
 
    /* Determine user/button indices */
-   user_idx    = (info->type - MENU_SETTINGS_INPUT_DESC_BEGIN) / (RARCH_FIRST_CUSTOM_BIND + 8);
-   btn_idx     = (info->type - MENU_SETTINGS_INPUT_DESC_BEGIN) - (RARCH_FIRST_CUSTOM_BIND + 8) * user_idx;
+   user_idx    = (info->type - MENU_SETTINGS_INPUT_DESC_BEGIN) / (rarch_num_bind_game_controller());
+   btn_idx     = (info->type - MENU_SETTINGS_INPUT_DESC_BEGIN) - (rarch_num_bind_game_controller()) * user_idx;
 
    if (   (user_idx >= MAX_USERS)
-       || (btn_idx >= RARCH_CUSTOM_BIND_LIST_END))
+       || (btn_idx >= rarch_num_bind_game_controller()))
       return 0;
 
    mapped_port = settings->uints.input_remap_ports[user_idx];
@@ -5481,7 +5481,7 @@ static int menu_displaylist_parse_input_description_list(
    /* Get current mapping for selected button */
    current_remap_idx = settings->uints.input_remap_ids[user_idx][btn_idx];
 
-   if (current_remap_idx >= RARCH_CUSTOM_BIND_LIST_END)
+   if (current_remap_idx < 0 || current_remap_idx >= rarch_num_bind_game_controller())
       current_remap_idx = RARCH_UNMAPPED;
 
    /* An annoyance: Menu entries do not have
@@ -5494,11 +5494,11 @@ static int menu_displaylist_parse_input_description_list(
    snprintf(entry_label, sizeof(entry_label), "%u", info->type);
 
    /* Loop over core input definitions */
-   for (j = 0; j < RARCH_CUSTOM_BIND_LIST_END; j++)
+   for (j = 0; j < rarch_num_bind_game_controller(); j++)
    {
       const char *input_desc_btn;
 
-      i = (j < RARCH_ANALOG_BIND_LIST_END) ? input_config_bind_order[j] : j;
+      i = (rarch_logical_bind_is_basic(j) ? input_config_bind_order[j] : j);
       input_desc_btn = sys_info->input_desc_btn[mapped_port][i];
 
       /* Check whether an input is defined for
@@ -5514,7 +5514,7 @@ static int menu_displaylist_parse_input_description_list(
           *   indicators */
          size_t _len = strlcpy(input_description, input_desc_btn,
                sizeof(input_description));
-         if (i >= RARCH_FIRST_CUSTOM_BIND)
+         if (!rarch_logical_bind_is_basic(i))
          {
             input_description   [  _len] = ' ';
             if ((i % 2) == 0)
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index c57593297cc..69622ad8708 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -220,7 +220,7 @@ enum menu_settings_type
 
    /* Binds in the menu, note that every single bind needs to fit! */
    MENU_SETTINGS_BIND_BEGIN,
-   MENU_SETTINGS_BIND_LAST = MENU_SETTINGS_BIND_BEGIN + RARCH_EXTRA_CORE_COMMAND_COUNT + RARCH_ANALOG_RIGHT_Y_MINUS,
+   MENU_SETTINGS_BIND_LAST = MENU_SETTINGS_BIND_BEGIN + rarch_num_bind_game_controller(),
    MENU_SETTINGS_BIND_ALL_LAST = MENU_SETTINGS_BIND_BEGIN + RARCH_EXTRA_CORE_COMMAND_COUNT + RARCH_MENU_TOGGLE,
 
    MENU_SETTINGS_CUSTOM_BIND,
@@ -234,6 +234,7 @@ enum menu_settings_type
    MENU_SETTINGS_CHEAT_BEGIN,
    MENU_SETTINGS_CHEAT_END = MENU_SETTINGS_CHEAT_BEGIN + (MAX_CHEAT_COUNTERS - 1),
 
+   /* Within @c MENU_SETTINGS_INPUT_END , the + 6 are these following keys. */
    MENU_SETTINGS_INPUT_LIBRETRO_DEVICE,
    MENU_SETTINGS_INPUT_ANALOG_DPAD_MODE,
    MENU_SETTINGS_INPUT_INPUT_REMAP_PORT,
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index f5dd85b39b4..5ec3c643e5b 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -9254,6 +9254,9 @@ static bool setting_append_list_input_player_options(
    {
       const char *value_na =
          msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE);
+
+      RARCH_LOG("Filling in bind menu for user %d.\n", user);
+
       for (bindid = 0; bindid < RARCH_BIND_LIST_END; bindid++)
       {
          char label[NAME_MAX_LENGTH];
diff --git a/runloop.c b/runloop.c
index 1a50c77b370..b785bdeafea 100644
--- a/runloop.c
+++ b/runloop.c
@@ -1433,14 +1433,25 @@ static void rarch_set_core_extended_retropad(rarch_system_info_t *sys_info,
     const struct retro_core_extended_retropad_button* action;
     unsigned at, bind, usernum;
     const char** user_inputs;
+    bool did_standard;
 
     /* Debug. */
     RARCH_LOG("[Environ]: Setting extended retropad buttons.\n");
 
+    /* Check if standard inputs were set. */
+    did_standard = (runloop_st->current_core.flags & RETRO_CORE_FLAG_HAS_SET_INPUT_DESCRIPTORS) != 0;
+    if (!did_standard)
+        RARCH_LOG("[Environ]: Standard was not previously set.\n");
+
     /* Erase all the previous extended binds for all users. */
-    rarch_erase_input_desc_btn(sys_info,
-                               rarch_first_logical_bind_game_controller(),
-                               rarch_num_bind_game_controller());
+    if (did_standard)
+        rarch_erase_input_desc_btn(sys_info,
+                                   rarch_first_logical_bind_game_controller(),
+                                   rarch_num_bind_game_controller());
+
+    /* Otherwise erase everything as it has never been set before. */
+    else
+        rarch_erase_input_desc_btn(sys_info, 0, rarch_num_bind_game_controller());
 
     /* Set output details, if requested. */
     if (input->out_info != NULL) {
@@ -1448,40 +1459,48 @@ static void rarch_set_core_extended_retropad(rarch_system_info_t *sys_info,
     }
 
     /* Go through the commands and process them. */
-    for (at = 0; input->actions[at].description != NULL; at++)
+    if (input->actions != NULL)
     {
-        /* Get base action. */
-        action = &input->actions[at];
-
-        /* Map player. */
-        usernum = action->port;
-        if (usernum < 0 || usernum >= MAX_USERS)
-            continue;
-
-        /* We only care about gamepads and their analog equivalents. */
-        if (action->device != RETRO_DEVICE_JOYPAD &&
-            action->device != RETRO_DEVICE_ANALOG)
-            continue;
-
-        /* Ignore logical binds which are out of bounds. */
-        bind = action->logical_id;
-        if (bind < 0 || bind >= RARCH_EXTRA_CORE_COMMAND_COUNT)
-            continue;
-
-        /* Map to logical button internally. */
-        bind = rarch_first_logical_bind_game_controller() + bind;
-
-        /* Set description. */
-        sys_info->input_desc_btn[usernum][bind] = action->description;
+        for (at = 0; input->actions[at].description != NULL; at++)
+        {
+            /* Get base action. */
+            action = &input->actions[at];
+
+            /* Debug. */
+            RARCH_LOG("[Environ]: Wanting extra button %d %d %d %d %d %s %s.\n",
+                      at, action->port, action->device, action->port, action->logical_id,
+                      action->description, action->glyph);
+
+            /* Map player. */
+            usernum = action->port;
+            if (usernum < 0 || usernum >= MAX_USERS)
+                continue;
+
+            /* We only care about gamepads and their analog equivalents. */
+            if (action->device != RETRO_DEVICE_JOYPAD &&
+                action->device != RETRO_DEVICE_ANALOG)
+                continue;
+
+            /* Ignore logical binds which are out of bounds. */
+            bind = action->logical_id;
+            if (bind < 0 || bind >= RARCH_EXTRA_CORE_COMMAND_COUNT)
+                continue;
+
+            /* Map to logical button internally. */
+            bind = rarch_first_logical_bind_game_controller() + bind;
+
+            /* Set description. */
+            sys_info->input_desc_btn[usernum][bind] = action->description;
+
+            /* Debug. */
+            RARCH_LOG("[Environ]: Bound %d to %s.\n",
+                bind, action->description);
+        }
 
         /* Debug. */
-        RARCH_LOG("[Environ]: Bound %d to %s.\n",
-            bind, action->description);
+        RARCH_LOG("[Environ]: Set %d extended buttons.\n", at);
     }
 
-    /* Debug. */
-    RARCH_LOG("[Environ]: Set %d extended buttons.\n", at);
-
     /* Indicate that the input descriptors changed. */
     runloop_st->current_core.flags |=
         RETRO_CORE_FLAG_HAS_SET_EXTENDED_INPUT;
@@ -7910,8 +7929,8 @@ bool core_has_set_input_descriptor(void)
 {
    runloop_state_t *runloop_st = &runloop_state;
    return ((runloop_st->current_core.flags &
-            RETRO_CORE_FLAG_HAS_SET_INPUT_DESCRIPTORS |
-            RETRO_CORE_FLAG_HAS_SET_EXTENDED_INPUT) > 0);
+           (RETRO_CORE_FLAG_HAS_SET_INPUT_DESCRIPTORS |
+            RETRO_CORE_FLAG_HAS_SET_EXTENDED_INPUT)) != 0);
 }
 
 void runloop_path_set_basename(const char *path)

From 4229354750ac860517f10b1e016a3016f889b0cd Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Mon, 25 Dec 2023 10:55:09 -0500
Subject: [PATCH 33/35] Add keybinds for all 128 logical buttons.

---
 config.def.keybinds.h | 65 +++++++++++++++++++++++++++++++++++++------
 configuration.c       |  2 +-
 intl/msg_hash_us.h    |  6 ++++
 msg_hash.h            |  3 ++
 4 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/config.def.keybinds.h b/config.def.keybinds.h
index 00e4ced615e..9c0a3612d08 100644
--- a/config.def.keybinds.h
+++ b/config.def.keybinds.h
@@ -18,6 +18,36 @@
 #ifndef __CONFIG_DEF_KEYBINDS_H
 #define __CONFIG_DEF_KEYBINDS_H
 
+#define JOYPAD_LOGICAL_ENTRY(note) {\
+        NULL, NULL,\
+        AXIS_NONE, AXIS_NONE, AXIS_NONE,\
+        MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LOGICAL, RETROK_UNKNOWN,\
+        RARCH_EXTRA_CORE_COMMAND_START, NO_BTN, NO_BTN, 0,\
+        true\
+    }
+#define JOYPAD_LOGICAL_ENTRY_TEN(note) \
+    JOYPAD_LOGICAL_ENTRY(), \
+    JOYPAD_LOGICAL_ENTRY(), \
+    JOYPAD_LOGICAL_ENTRY(), \
+    JOYPAD_LOGICAL_ENTRY(), \
+    JOYPAD_LOGICAL_ENTRY(), \
+    JOYPAD_LOGICAL_ENTRY(), \
+    JOYPAD_LOGICAL_ENTRY(), \
+    JOYPAD_LOGICAL_ENTRY(), \
+    JOYPAD_LOGICAL_ENTRY(), \
+    JOYPAD_LOGICAL_ENTRY()
+#define JOYPAD_LOGICAL_ENTRY_HUNDRED(note) \
+    JOYPAD_LOGICAL_ENTRY_TEN(), \
+    JOYPAD_LOGICAL_ENTRY_TEN(), \
+    JOYPAD_LOGICAL_ENTRY_TEN(), \
+    JOYPAD_LOGICAL_ENTRY_TEN(), \
+    JOYPAD_LOGICAL_ENTRY_TEN(), \
+    JOYPAD_LOGICAL_ENTRY_TEN(), \
+    JOYPAD_LOGICAL_ENTRY_TEN(), \
+    JOYPAD_LOGICAL_ENTRY_TEN(), \
+    JOYPAD_LOGICAL_ENTRY_TEN(), \
+    JOYPAD_LOGICAL_ENTRY_TEN()
+
 #ifndef IS_SALAMANDER
 
 /* User 1 */
@@ -1928,14 +1958,18 @@ static const struct retro_keybind retro_keybinds_1[] = {
       true
    },
 
-
-   {
-           NULL, NULL,
-           AXIS_NONE, AXIS_NONE, AXIS_NONE,
-           MENU_ENUM_LABEL_INPUT_ANALOG_SENSITIVITY, RETROK_UNKNOWN,
-           RARCH_EXTRA_CORE_COMMAND_START, NO_BTN, NO_BTN, 0,
-           true
-   },
+   /* 128 Logical extra joypad buttons. */
+   JOYPAD_LOGICAL_ENTRY_HUNDRED(0 - 99),
+   JOYPAD_LOGICAL_ENTRY_TEN(100 - 109),
+   JOYPAD_LOGICAL_ENTRY_TEN(110 - 119),
+   JOYPAD_LOGICAL_ENTRY(120),
+   JOYPAD_LOGICAL_ENTRY(121),
+   JOYPAD_LOGICAL_ENTRY(122),
+   JOYPAD_LOGICAL_ENTRY(123),
+   JOYPAD_LOGICAL_ENTRY(124),
+   JOYPAD_LOGICAL_ENTRY(125),
+   JOYPAD_LOGICAL_ENTRY(126),
+   JOYPAD_LOGICAL_ENTRY(127),
 
 #if 0
    /* Deprecated */
@@ -2208,10 +2242,23 @@ static const struct retro_keybind retro_keybinds_rest[] = {
    {
       NULL, NULL,
       AXIS_NONE, AXIS_NONE, AXIS_NONE,
-      MENU_ENUM_LABEL_INPUT_SMALL_KEYBOARD_ENABLE, RETROK_UNKNOWN,
+      MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LOGICAL, RETROK_UNKNOWN,
       RARCH_EXTRA_CORE_COMMAND_START, NO_BTN, NO_BTN, 0,
       true
    },
+
+   /* 128 Logical extra joypad buttons. */
+   JOYPAD_LOGICAL_ENTRY_HUNDRED(0 - 99),
+   JOYPAD_LOGICAL_ENTRY_TEN(100 - 109),
+   JOYPAD_LOGICAL_ENTRY_TEN(110 - 119),
+   JOYPAD_LOGICAL_ENTRY(120),
+   JOYPAD_LOGICAL_ENTRY(121),
+   JOYPAD_LOGICAL_ENTRY(122),
+   JOYPAD_LOGICAL_ENTRY(123),
+   JOYPAD_LOGICAL_ENTRY(124),
+   JOYPAD_LOGICAL_ENTRY(125),
+   JOYPAD_LOGICAL_ENTRY(126),
+   JOYPAD_LOGICAL_ENTRY(127),
 };
 
 #endif
diff --git a/configuration.c b/configuration.c
index b7c80f2434e..d1bc1c6e318 100644
--- a/configuration.c
+++ b/configuration.c
@@ -288,7 +288,7 @@ enum midi_driver_enum
 #define DECLARE_EXTRA_BIND_STRINGY(a) DECLARE_EXTRA_BIND_STRINGY2(a)
 
 /** Declare an extra logical bind, the label used depends on the core. */
-#define DECLARE_EXTRA_BIND(id) {DECLARE_EXTRA_BIND_STRINGY(DECLARE_EXTRA_BIND_PASTE(log, id)), MENU_ENUM_LABEL_VALUE_INPUT_KEY, 0, id, true }
+#define DECLARE_EXTRA_BIND(id) {DECLARE_EXTRA_BIND_STRINGY(DECLARE_EXTRA_BIND_PASTE(log, id)), MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LOGICAL, 0, id, true }
 
 /** Declare ten binds. */
 #define DECLARE_EXTRA_BIND_10(dig) \
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 999390dab45..9c0360414f8 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -15970,3 +15970,9 @@ MSG_HASH(
    MSG_IOS_TOUCH_MOUSE_DISABLED,
    "Touch mouse is disabled"
    )
+
+/* Extra logical buttons. */
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LOGICAL,
+    "Logical Button %d"
+    )
\ No newline at end of file
diff --git a/msg_hash.h b/msg_hash.h
index c3ccb278372..eb1e5cc9aa9 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -4121,6 +4121,9 @@ enum msg_hash_enums
    MSG_3DS_BOTTOM_MENU_SAVE_STATE,
    MSG_3DS_BOTTOM_MENU_LOAD_STATE,
 
+   /* Logical menu input. */
+   MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LOGICAL,
+
    MSG_LAST,
 
    /* Ensure sizeof(enum) == sizeof(int) */

From 24655a18018c1467419f53d60d186b19119890f8 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Mon, 25 Dec 2023 11:00:38 -0500
Subject: [PATCH 34/35] Actually make each bind unique.

---
 config.def.keybinds.h | 60 +++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/config.def.keybinds.h b/config.def.keybinds.h
index 9c0a3612d08..0ed94fde2f3 100644
--- a/config.def.keybinds.h
+++ b/config.def.keybinds.h
@@ -18,35 +18,35 @@
 #ifndef __CONFIG_DEF_KEYBINDS_H
 #define __CONFIG_DEF_KEYBINDS_H
 
-#define JOYPAD_LOGICAL_ENTRY(note) {\
+#define JOYPAD_LOGICAL_ENTRY(index) {\
         NULL, NULL,\
         AXIS_NONE, AXIS_NONE, AXIS_NONE,\
         MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LOGICAL, RETROK_UNKNOWN,\
-        RARCH_EXTRA_CORE_COMMAND_START, NO_BTN, NO_BTN, 0,\
+        RARCH_EXTRA_CORE_COMMAND_START + (index), NO_BTN, NO_BTN, 0,\
         true\
     }
-#define JOYPAD_LOGICAL_ENTRY_TEN(note) \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY(), \
-    JOYPAD_LOGICAL_ENTRY()
-#define JOYPAD_LOGICAL_ENTRY_HUNDRED(note) \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN(), \
-    JOYPAD_LOGICAL_ENTRY_TEN()
+#define JOYPAD_LOGICAL_ENTRY_TEN(base) \
+    JOYPAD_LOGICAL_ENTRY(base), \
+    JOYPAD_LOGICAL_ENTRY(base + 1), \
+    JOYPAD_LOGICAL_ENTRY(base + 2), \
+    JOYPAD_LOGICAL_ENTRY(base + 3), \
+    JOYPAD_LOGICAL_ENTRY(base + 4), \
+    JOYPAD_LOGICAL_ENTRY(base + 5), \
+    JOYPAD_LOGICAL_ENTRY(base + 6), \
+    JOYPAD_LOGICAL_ENTRY(base + 7), \
+    JOYPAD_LOGICAL_ENTRY(base + 8), \
+    JOYPAD_LOGICAL_ENTRY(base + 9)
+#define JOYPAD_LOGICAL_ENTRY_HUNDRED(base) \
+    JOYPAD_LOGICAL_ENTRY_TEN(base), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 10), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 20), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 30), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 40), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 50), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 60), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 70), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 80), \
+    JOYPAD_LOGICAL_ENTRY_TEN(base + 90)
 
 #ifndef IS_SALAMANDER
 
@@ -1959,9 +1959,9 @@ static const struct retro_keybind retro_keybinds_1[] = {
    },
 
    /* 128 Logical extra joypad buttons. */
-   JOYPAD_LOGICAL_ENTRY_HUNDRED(0 - 99),
-   JOYPAD_LOGICAL_ENTRY_TEN(100 - 109),
-   JOYPAD_LOGICAL_ENTRY_TEN(110 - 119),
+   JOYPAD_LOGICAL_ENTRY_HUNDRED(0),
+   JOYPAD_LOGICAL_ENTRY_TEN(100),
+   JOYPAD_LOGICAL_ENTRY_TEN(110),
    JOYPAD_LOGICAL_ENTRY(120),
    JOYPAD_LOGICAL_ENTRY(121),
    JOYPAD_LOGICAL_ENTRY(122),
@@ -2248,9 +2248,9 @@ static const struct retro_keybind retro_keybinds_rest[] = {
    },
 
    /* 128 Logical extra joypad buttons. */
-   JOYPAD_LOGICAL_ENTRY_HUNDRED(0 - 99),
-   JOYPAD_LOGICAL_ENTRY_TEN(100 - 109),
-   JOYPAD_LOGICAL_ENTRY_TEN(110 - 119),
+   JOYPAD_LOGICAL_ENTRY_HUNDRED(0),
+   JOYPAD_LOGICAL_ENTRY_TEN(100),
+   JOYPAD_LOGICAL_ENTRY_TEN(110),
    JOYPAD_LOGICAL_ENTRY(120),
    JOYPAD_LOGICAL_ENTRY(121),
    JOYPAD_LOGICAL_ENTRY(122),

From 5bbfa7c98b847b4d29977ae1259a82a960b52672 Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Mon, 25 Dec 2023 11:07:21 -0500
Subject: [PATCH 35/35] There is no need to paste in the bind order.

---
 input/input_driver.c | 62 ++++++++++++++++++--------------------------
 1 file changed, 25 insertions(+), 37 deletions(-)

diff --git a/input/input_driver.c b/input/input_driver.c
index 775fa631be5..baa3a92fe29 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -91,20 +91,29 @@
       || ((autoconf_bind)->joyaxis != AXIS_NONE)) \
 )
 
-#define INPUT_CONFIG_MASS_BIND_ORDER_PASTE2(a, b) a##b
-#define INPUT_CONFIG_MASS_BIND_ORDER_PASTE(a, b) INPUT_CONFIG_MASS_BIND_ORDER_PASTE2(a, b)
 #define INPUT_CONFIG_MASS_BIND_ORDER(x) (36 + x)
-#define INPUT_CONFIG_MASS_BIND_ORDER_TEN(ten) \
-    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 0)), \
-    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 1)), \
-    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 2)), \
-    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 3)), \
-    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 4)), \
-    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 5)), \
-    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 6)), \
-    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 7)), \
-    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 8)), \
-    INPUT_CONFIG_MASS_BIND_ORDER(INPUT_CONFIG_MASS_BIND_ORDER_PASTE(ten, 9))
+#define INPUT_CONFIG_MASS_BIND_ORDER_TEN(base) \
+    INPUT_CONFIG_MASS_BIND_ORDER(base), \
+    INPUT_CONFIG_MASS_BIND_ORDER(base + 1), \
+    INPUT_CONFIG_MASS_BIND_ORDER(base + 2), \
+    INPUT_CONFIG_MASS_BIND_ORDER(base + 3), \
+    INPUT_CONFIG_MASS_BIND_ORDER(base + 4), \
+    INPUT_CONFIG_MASS_BIND_ORDER(base + 5), \
+    INPUT_CONFIG_MASS_BIND_ORDER(base + 6), \
+    INPUT_CONFIG_MASS_BIND_ORDER(base + 7), \
+    INPUT_CONFIG_MASS_BIND_ORDER(base + 8), \
+    INPUT_CONFIG_MASS_BIND_ORDER(base + 9)
+#define INPUT_CONFIG_MASS_BIND_ORDER_HUNDRED(base) \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(base), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(base + 1), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(base + 2), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(base + 3), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(base + 4), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(base + 5), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(base + 6), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(base + 7), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(base + 8), \
+    INPUT_CONFIG_MASS_BIND_ORDER_TEN(base + 9)
 
 /* Human readable order of input binds */
 const unsigned input_config_bind_order[rarch_num_bind_game_controller()] = {
@@ -134,28 +143,9 @@ const unsigned input_config_bind_order[rarch_num_bind_game_controller()] = {
    RETRO_DEVICE_ID_JOYPAD_ANALOG_R_RIGHT, /* Right Analog Right */
 
    /* The remaining 36 + 128 = 164 entries, just 1:1 mapped... starts at 36. */
-   INPUT_CONFIG_MASS_BIND_ORDER(0),
-   INPUT_CONFIG_MASS_BIND_ORDER(1),
-   INPUT_CONFIG_MASS_BIND_ORDER(2),
-   INPUT_CONFIG_MASS_BIND_ORDER(3),
-   INPUT_CONFIG_MASS_BIND_ORDER(4),
-   INPUT_CONFIG_MASS_BIND_ORDER(5),
-   INPUT_CONFIG_MASS_BIND_ORDER(6),
-   INPUT_CONFIG_MASS_BIND_ORDER(7),
-   INPUT_CONFIG_MASS_BIND_ORDER(8),
-   INPUT_CONFIG_MASS_BIND_ORDER(9),
-   INPUT_CONFIG_MASS_BIND_ORDER_TEN(1),
-   INPUT_CONFIG_MASS_BIND_ORDER_TEN(2),
-   INPUT_CONFIG_MASS_BIND_ORDER_TEN(3),
-   INPUT_CONFIG_MASS_BIND_ORDER_TEN(4),
-   INPUT_CONFIG_MASS_BIND_ORDER_TEN(5),
-   INPUT_CONFIG_MASS_BIND_ORDER_TEN(6),
-   INPUT_CONFIG_MASS_BIND_ORDER_TEN(7),
-   INPUT_CONFIG_MASS_BIND_ORDER_TEN(8),
-   INPUT_CONFIG_MASS_BIND_ORDER_TEN(9),
-   INPUT_CONFIG_MASS_BIND_ORDER_TEN(10),
-   INPUT_CONFIG_MASS_BIND_ORDER_TEN(11),
-   INPUT_CONFIG_MASS_BIND_ORDER(9),
+   INPUT_CONFIG_MASS_BIND_ORDER_HUNDRED(0),
+   INPUT_CONFIG_MASS_BIND_ORDER_TEN(100),
+   INPUT_CONFIG_MASS_BIND_ORDER_TEN(110),
    INPUT_CONFIG_MASS_BIND_ORDER(120),
    INPUT_CONFIG_MASS_BIND_ORDER(121),
    INPUT_CONFIG_MASS_BIND_ORDER(122),
@@ -183,8 +173,6 @@ const unsigned input_config_bind_order[rarch_num_bind_game_controller()] = {
    RARCH_UNMAPPED,
 };
 
-#undef INPUT_CONFIG_MASS_BIND_ORDER_PASTE
-#undef INPUT_CONFIG_MASS_BIND_ORDER_PASTE2
 #undef INPUT_CONFIG_MASS_BIND_ORDER
 #undef INPUT_CONFIG_MASS_BIND_ORDER_TEN