diff options
| author | JosJuice <josjuice@gmail.com> | 2026-09-03 21:28:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-03 21:28:31 +0200 |
| commit | ca8c6ee45e419296226e4da8c2b2adaaf54e0299 (patch) | |
| tree | 1fafc32ef6e4471ca314c860b55e91d76f99b184 /Source/Core | |
| parent | 5ff90a0471d7ac6905290c508559db1c4da5193f (diff) | |
| parent | b572e4ca5a74481fad0bd14e4c5f9719945d61d8 (diff) | |
Merge pull request #14830 from JoshuaVandaele/sdl-miscs
SDLGamepad: Add Misc 2 through 6
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.h | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.cpp b/Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.cpp index 682e24c28a..babe433fc1 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.cpp +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.cpp @@ -333,6 +333,9 @@ bool Gamepad::Button::IsMatchingName(std::string_view name) const return true; // Match the old "Button 0"-like names. + if (m_binding.output_type == SDL_GAMEPAD_BINDTYPE_BUTTON) + return name == GetLegacyButtonName(m_binding.output.button); + switch (m_binding.input_type) { case SDL_GAMEPAD_BINDTYPE_BUTTON: diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.h b/Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.h index e4c16287cc..a36ca38302 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.h +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.h @@ -385,7 +385,7 @@ struct SDLMotionAxis }; using SDLMotionAxisList = std::array<SDLMotionAxis, 6>; -static constexpr std::array<const char*, 21> s_sdl_button_names = { +static constexpr std::array<const char*, 26> s_sdl_button_names = { "Button S", // SDL_GAMEPAD_BUTTON_SOUTH "Button E", // SDL_GAMEPAD_BUTTON_EAST "Button W", // SDL_GAMEPAD_BUTTON_WEST @@ -407,6 +407,11 @@ static constexpr std::array<const char*, 21> s_sdl_button_names = { "Paddle 3", // SDL_GAMEPAD_BUTTON_RIGHT_PADDLE2 "Paddle 4", // SDL_GAMEPAD_BUTTON_LEFT_PADDLE2 "Touchpad", // SDL_GAMEPAD_BUTTON_TOUCHPAD + "Misc 2", // SDL_GAMEPAD_BUTTON_MISC2 + "Misc 3", // SDL_GAMEPAD_BUTTON_MISC3 + "Misc 4", // SDL_GAMEPAD_BUTTON_MISC4 + "Misc 5", // SDL_GAMEPAD_BUTTON_MISC5 + "Misc 6" // SDL_GAMEPAD_BUTTON_MISC6 }; static constexpr std::array<const char*, 6> s_sdl_axis_names = { "Left X", // SDL_GAMEPAD_AXIS_LEFTX |