Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 15:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: Purge controller bind migration

Browse source 
About a year and a half is long enough.
This commit is contained in:
Stenzek 2024-04-11 20:09:50 +10:00
parent fec36471b8
commit 7b93edada1
No known key found for this signature in database
3 changed files with 0 additions and 170 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/duckstation-qt/qthost.cpp
View file

@ -353,7 +353,6 @@ bool QtHost::InitializeConfig(std::string settings_filename)
} }
s_base_settings_interface->SetUIntValue("Main", "SettingsVersion", SETTINGS_VERSION); s_base_settings_interface->SetUIntValue("Main", "SettingsVersion", SETTINGS_VERSION);
s_base_settings_interface->SetBoolValue("ControllerPorts", "ControllerSettingsMigrated", true);
SetDefaultSettings(*s_base_settings_interface, true, true); SetDefaultSettings(*s_base_settings_interface, true, true);
// Flag for running the setup wizard if this is our first run. We want to run it next time if they don't finish it. // Flag for running the setup wizard if this is our first run. We want to run it next time if they don't finish it.
@ -388,14 +387,6 @@ bool QtHost::InitializeConfig(std::string settings_filename)
Log::SetConsoleOutputParams(true, s_base_settings_interface->GetBoolValue("Logging", "LogTimestamps", true)); Log::SetConsoleOutputParams(true, s_base_settings_interface->GetBoolValue("Logging", "LogTimestamps", true));
} }
// TEMPORARY: Migrate controller settings to new interface.
if (!s_base_settings_interface->GetBoolValue("ControllerPorts", "ControllerSettingsMigrated", false))
{
s_base_settings_interface->SetBoolValue("ControllerPorts", "ControllerSettingsMigrated", true);
if (InputManager::MigrateBindings(*s_base_settings_interface.get()))
s_base_settings_interface->Save();
}
InstallTranslator(nullptr); InstallTranslator(nullptr);
return true; return true;
} }

158
src/util/input_manager.cpp
View file

@ -1760,164 +1760,6 @@ void InputManager::ReloadBindings(SettingsInterface& si, SettingsInterface& bind
UpdateHostMouseMode(); UpdateHostMouseMode();
} }
bool InputManager::MigrateBindings(SettingsInterface& si)
{
static constexpr const char* buttons_to_migrate[][2] = {
{"ButtonUp", "Up"},
{"ButtonDown", "Down"},
{"ButtonLeft", "Left"},
{"ButtonRight", "Right"},
{"ButtonSelect", "Select"},
{"ButtonStart", "Start"},
{"ButtonTriangle", "Triangle"},
{"ButtonCross", "Cross"},
{"ButtonCircle", "Circle"},
{"ButtonSquare", "Square"},
{"ButtonL1", "L1"},
{"ButtonL2", "L2"},
{"ButtonR1", "R1"},
{"ButtonR2", "R2"},
{"ButtonL3", "L3"},
{"ButtonR3", "R3"},
{"ButtonAnalog", "Analog"},
};
static constexpr const char* axes_to_migrate[][3] = {
{"AxisLeftX", "LLeft", "LRight"},
{"AxisLeftY", "LUp", "LDown"},
{"AxisRightX", "RLeft", "RRight"},
{"AxisRightY", "RUp", "RDown"},
};
static constexpr const char* button_mapping[] = {
"A", // SDL_CONTROLLER_BUTTON_A
"B", // SDL_CONTROLLER_BUTTON_B
"X", // SDL_CONTROLLER_BUTTON_X
"Y", // SDL_CONTROLLER_BUTTON_Y
"Back", // SDL_CONTROLLER_BUTTON_BACK
"Guide", // SDL_CONTROLLER_BUTTON_GUIDE
"Start", // SDL_CONTROLLER_BUTTON_START
"LeftStick", // SDL_CONTROLLER_BUTTON_LEFTSTICK
"RightStick", // SDL_CONTROLLER_BUTTON_RIGHTSTICK
"LeftShoulder", // SDL_CONTROLLER_BUTTON_LEFTSHOULDER
"RightShoulder", // SDL_CONTROLLER_BUTTON_RIGHTSHOULDER
"DPadUp", // SDL_CONTROLLER_BUTTON_DPAD_UP
"DPadDown", // SDL_CONTROLLER_BUTTON_DPAD_DOWN
"DPadLeft", // SDL_CONTROLLER_BUTTON_DPAD_LEFT
"DPadRight", // SDL_CONTROLLER_BUTTON_DPAD_RIGHT
};
static constexpr const char* axis_mapping[] = {
"LeftX", // SDL_CONTROLLER_AXIS_LEFTX
"LeftY", // SDL_CONTROLLER_AXIS_LEFTY
"RightX", // SDL_CONTROLLER_AXIS_RIGHTX
"RightY", // SDL_CONTROLLER_AXIS_RIGHTY
"LeftTrigger", // SDL_CONTROLLER_AXIS_TRIGGERLEFT
"RightTrigger", // SDL_CONTROLLER_AXIS_TRIGGERRIGHT
};
TinyString new_bind;
u32 num_changes = 0;
for (u32 pad = 0; pad < NUM_CONTROLLER_AND_CARD_PORTS; pad++)
{
const std::string old_section(fmt::format("Controller{}", pad + 1));
const std::string new_section(Controller::GetSettingsSection(pad));
if (si.ContainsValue(old_section.c_str(), "Type"))
si.SetStringValue(new_section.c_str(), "Type", si.GetStringValue(old_section.c_str(), "Type").c_str());
for (u32 i = 0; i < std::size(buttons_to_migrate); i++)
{
const char* old_key = buttons_to_migrate[i][0];
const char* new_key = buttons_to_migrate[i][1];
if (si.ContainsValue(new_section.c_str(), new_key) || !si.ContainsValue(old_section.c_str(), old_key))
continue;
const std::string old_bind(si.GetStringValue(old_section.c_str(), old_key));
unsigned cnum, bnum;
char dir;
if (std::sscanf(old_bind.c_str(), "Controller%u/Button%u", &cnum, &bnum) == 2)
{
if (bnum >= std::size(button_mapping))
continue;
new_bind.format("SDL-{}/{}", cnum, button_mapping[bnum]);
si.SetStringValue(new_section.c_str(), new_key, new_bind);
Log_DevPrintf("%s -> %s", old_bind.c_str(), new_bind.c_str());
num_changes++;
}
else if (std::sscanf(old_bind.c_str(), "Controller%u/%cAxis%u", &cnum, &dir, &bnum) == 3)
{
if (bnum >= std::size(axis_mapping))
continue;
new_bind.format("SDL-{}/{}{}", cnum, dir, axis_mapping[bnum]);
si.SetStringValue(new_section.c_str(), new_key, new_bind);
Log_DevPrintf("%s -> %s", old_bind.c_str(), new_bind.c_str());
num_changes++;
}
else if (old_bind.starts_with("Keyboard/Keypad+"))
{
new_bind.format("Keyboard/Numpad{}", old_bind.substr(16));
si.SetStringValue(new_section.c_str(), new_key, new_bind);
Log_DevPrintf("%s -> %s", old_bind.c_str(), new_bind.c_str());
num_changes++;
}
else if (old_bind.starts_with("Keyboard/"))
{
// pass through as-is
si.SetStringValue(new_section.c_str(), new_key, old_bind.c_str());
num_changes++;
}
}
// we have to handle axes differently :(
for (u32 i = 0; i < std::size(axes_to_migrate); i++)
{
const char* old_key = axes_to_migrate[i][0];
const char* new_neg_key = axes_to_migrate[i][1];
const char* new_pos_key = axes_to_migrate[i][2];
if (!si.ContainsValue(old_section.c_str(), old_key) || si.ContainsValue(new_section.c_str(), new_neg_key) ||
si.ContainsValue(new_section.c_str(), new_pos_key))
{
continue;
}
const std::string old_bind(si.GetStringValue(old_section.c_str(), old_key));
unsigned cnum, bnum;
if (std::sscanf(old_bind.c_str(), "Controller%u/Axis%u", &cnum, &bnum) == 2)
{
if (bnum >= std::size(axis_mapping))
continue;
new_bind.format("SDL-{}/-{}", cnum, axis_mapping[bnum]);
si.SetStringValue(new_section.c_str(), new_neg_key, new_bind);
new_bind.format("SDL-{}/+{}", cnum, axis_mapping[bnum]);
si.SetStringValue(new_section.c_str(), new_pos_key, new_bind);
Log_DevPrintf("%s -> %s", old_bind.c_str(), new_bind.c_str());
num_changes++;
}
}
if (si.ContainsValue(old_section.c_str(), "Rumble"))
{
const std::string rumble_source(si.GetStringValue(old_section.c_str(), "Rumble"));
unsigned cnum;
if (std::sscanf(rumble_source.c_str(), "Controller%u", &cnum) == 1)
{
new_bind.format("SDL-{}/LargeMotor", cnum);
si.SetStringValue(new_section.c_str(), "LargeMotor", new_bind);
new_bind.format("SDL-{}/SmallMotor", cnum);
si.SetStringValue(new_section.c_str(), "SmallMotor", new_bind);
num_changes++;
}
}
}
return (num_changes > 0);
}
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Source Management // Source Management
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------

3
src/util/input_manager.h
View file

@ -256,9 +256,6 @@ bool IsInputSourceEnabled(SettingsInterface& si, InputSourceType type);
/// Re-parses the config and registers all hotkey and pad bindings. /// Re-parses the config and registers all hotkey and pad bindings.
void ReloadBindings(SettingsInterface& si, SettingsInterface& binding_si); void ReloadBindings(SettingsInterface& si, SettingsInterface& binding_si);
/// Migrates any bindings from the pre-InputManager configuration.
bool MigrateBindings(SettingsInterface& si);
/// Re-parses the sources part of the config and initializes any backends. /// Re-parses the sources part of the config and initializes any backends.
void ReloadSources(SettingsInterface& si, std::unique_lock<std::mutex>& settings_lock); void ReloadSources(SettingsInterface& si, std::unique_lock<std::mutex>& settings_lock);