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

PAD:SDL: Let users set their own hints from the config

This commit is contained in:
TellowKrinkle 2021-11-30 03:22:42 -06:00 committed by tellowkrinkle
parent e688840703
commit 3d0654dd48
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcsx2/PAD/Linux/Config.cpp
View File

@ -84,6 +84,9 @@ void PADSaveConfig()
for (auto const& it : g_conf.sdl2_mapping)
fprintf(f, "SDL2 = %s\n", it.c_str());
for (auto const& pair : g_conf.sdl2_hints)
fprintf(f, "SDL_HINT_%s = %s\n", pair.first.c_str(), pair.second.c_str());
fclose(f);
}
@ -139,9 +142,20 @@ void PADLoadConfig()
have_user_setting = true;
}
char sdl2[512];
while (fscanf(f, "SDL2 = %511[^\n]\n", sdl2) == 1)
g_conf.sdl2_mapping.push_back(std::string(sdl2));
char extra_name[512];
char extra_value[512];
while (fscanf(f, "%511[^ =] = %511[^\n]\n", extra_name, extra_value) == 2)
{
static constexpr const char* HINT_PREFIX = "SDL_HINT_";
if (strcmp(extra_name, "SDL2") == 0)
{
g_conf.sdl2_mapping.push_back(std::string(extra_value));
}
else if (strncmp(extra_name, HINT_PREFIX, strlen(HINT_PREFIX)) == 0)
{
g_conf.sdl2_hints.push_back({extra_name + strlen(HINT_PREFIX), extra_value});
}
}
if (!have_user_setting)
DefaultKeyboardValues();

1
pcsx2/PAD/Linux/Config.h
View File

@ -44,6 +44,7 @@ public:
std::map<u32, u32> keysym_map[GAMEPAD_NUMBER];
std::array<size_t, GAMEPAD_NUMBER> unique_id;
std::vector<std::string> sdl2_mapping;
std::vector<std::pair<std::string, std::string>> sdl2_hints;
PADconf() { init(); }

3
pcsx2/PAD/Linux/SDL/joystick.cpp
View File

@ -43,6 +43,9 @@ void JoystickInfo::EnumerateJoysticks(std::vector<std::unique_ptr<Device>>& vjoy
// New as of SDL 2.0.18, so use string
SDL_SetHint("SDL_JOYSTICK_HIDAPI_SWITCH_HOME_LED", "0");
for (const auto& hint : g_conf.sdl2_hints)
SDL_SetHint(hint.first.c_str(), hint.second.c_str());
if (SDL_Init(flag) < 0)
return;