Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-09-11 21:06:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

SDLGamepad: Add Misc 2 through 6

Browse Source 
SDL 3 has more misc buttons for "additional controller buttons" (e.g. left/right trigger clicks on a GameCube controller, or for the second touchpad click on the Steam Controller) which use these additional named Misc buttons. Taken from [SDL_GamepadButton](https://wiki.libsdl.org/SDL3/SDL_GamepadButton)
This commit is contained in:
Joshua Vandaële
2026-08-28 07:37:18 +02:00
parent 4f8af23db5
commit b572e4ca5a
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.cpp
View File

@@ -327,6 +327,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:

7
Source/Core/InputCommon/ControllerInterface/SDL/SDLGamepad.h
View File

@@ -380,7 +380,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
@@ -402,6 +402,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