PCSX2/archived-pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-01-31 01:15:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

SDLInputSource: Support full axis binds of gamepad axes

Browse Source
This commit is contained in:
TheLastRar
2025-11-28 17:59:03 +00:00
committed by Ty
parent 6d9e0482b4
commit 03aaf7db6a
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pcsx2/Input/SDLInputSource.cpp
View File

@@ -870,10 +870,10 @@ std::optional<InputBindingKey> SDLInputSource::ParseKeyString(const std::string_
key.data = 0;
return key;
}
else if (binding[0] == '+' || binding[0] == '-')
else if (binding[0] == '+' || binding[0] == '-' || binding.starts_with("Full"))
{
// likely an axis
const std::string_view axis_name(binding.substr(1));
const std::string_view axis_name(binding.substr(binding[0] == 'F' ? 4 : 1));
if (axis_name.starts_with("JoyAxis"))
{
@@ -882,7 +882,9 @@ std::optional<InputBindingKey> SDLInputSource::ParseKeyString(const std::string_
{
key.source_subtype = InputSubclass::ControllerAxis;
key.data = *value + std::size(s_sdl_axis_setting_names);
key.modifier = (binding[0] == '-') ? InputModifier::Negate : InputModifier::None;
key.modifier = (binding[0] == 'F') ? InputModifier::FullAxis :
(binding[0] == '-') ? InputModifier::Negate :
InputModifier::None;
key.invert = (end == "~");
return key;
}
@@ -894,23 +896,13 @@ std::optional<InputBindingKey> SDLInputSource::ParseKeyString(const std::string_
// found an axis!
key.source_subtype = InputSubclass::ControllerAxis;
key.data = i;
key.modifier = (binding[0] == '-') ? InputModifier::Negate : InputModifier::None;
key.modifier = (binding[0] == 'F') ? InputModifier::FullAxis :
(binding[0] == '-') ? InputModifier::Negate :
InputModifier::None;
return key;
}
}
}
else if (binding.starts_with("FullJoyAxis"))
{
std::string_view end;
if (auto value = StringUtil::FromChars<u32>(binding.substr(11), 10, &end))
{
key.source_subtype = InputSubclass::ControllerAxis;
key.data = *value + std::size(s_sdl_axis_setting_names);
key.modifier = InputModifier::FullAxis;
key.invert = (end == "~");
return key;
}
}
else if (binding.starts_with("Hat"))
{
std::string_view hat_dir;