ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Input:SDL: Allow use of axes and buttons outside the normal range

This commit is contained in:
TellowKrinkle 2022-09-12 17:11:32 -05:00 committed by tellowkrinkle
parent 3ba72e8728
commit 38c1b031c2
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pcsx2/Frontend/SDLInputSource.cpp
View File

@ -249,6 +249,17 @@ std::optional<InputBindingKey> SDLInputSource::ParseKeyString(
{ {
// likely an axis // likely an axis
const std::string_view axis_name(binding.substr(1)); const std::string_view axis_name(binding.substr(1));
if (StringUtil::StartsWith(axis_name, "Axis"))
{
if (auto value = StringUtil::FromChars<u32>(axis_name.substr(4)))
{
key.source_subtype = InputSubclass::ControllerAxis;
key.data = *value;
key.negative = (binding[0] == '-');
return key;
}
}
for (u32 i = 0; i < std::size(s_sdl_axis_names); i++) for (u32 i = 0; i < std::size(s_sdl_axis_names); i++)
{ {
if (axis_name == s_sdl_axis_names[i]) if (axis_name == s_sdl_axis_names[i])
@ -264,6 +275,15 @@ std::optional<InputBindingKey> SDLInputSource::ParseKeyString(
else else
{ {
// must be a button // must be a button
if (StringUtil::StartsWith(binding, "Button"))
{
if (auto value = StringUtil::FromChars<u32>(binding.substr(6)))
{
key.source_subtype = InputSubclass::ControllerButton;
key.data = *value;
return key;
}
}
for (u32 i = 0; i < std::size(s_sdl_button_names); i++) for (u32 i = 0; i < std::size(s_sdl_button_names); i++)
{ {
if (binding == s_sdl_button_names[i]) if (binding == s_sdl_button_names[i])
@ -285,14 +305,20 @@ std::string SDLInputSource::ConvertKeyToString(InputBindingKey key)
if (key.source_type == InputSourceType::SDL) if (key.source_type == InputSourceType::SDL)
{ {
if (key.source_subtype == InputSubclass::ControllerAxis && key.data < std::size(s_sdl_axis_names)) if (key.source_subtype == InputSubclass::ControllerAxis)
{ {
ret = StringUtil::StdStringFromFormat( char modifier = key.negative ? '-' : '+';
"SDL-%u/%c%s", key.source_index, key.negative ? '-' : '+', s_sdl_axis_names[key.data]); if (key.data < std::size(s_sdl_axis_names))
ret = StringUtil::StdStringFromFormat("SDL-%u/%c%s", key.source_index, modifier, s_sdl_axis_names[key.data]);
else
ret = StringUtil::StdStringFromFormat("SDL-%u/%cAxis%u", key.source_index, modifier, key.data);
} }
else if (key.source_subtype == InputSubclass::ControllerButton && key.data < std::size(s_sdl_button_names)) else if (key.source_subtype == InputSubclass::ControllerButton)
{ {
ret = StringUtil::StdStringFromFormat("SDL-%u/%s", key.source_index, s_sdl_button_names[key.data]); if (key.data < std::size(s_sdl_button_names))
ret = StringUtil::StdStringFromFormat("SDL-%u/%s", key.source_index, s_sdl_button_names[key.data]);
else
ret = StringUtil::StdStringFromFormat("SDL-%u/Button%u", key.source_index, key.data);
} }
else if (key.source_subtype == InputSubclass::ControllerMotor) else if (key.source_subtype == InputSubclass::ControllerMotor)
{ {