starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-16 11:24:36 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

SDLInputSource: Add options for XBox HIDAPI/rawinput

Browse Source
This commit is contained in:
Stenzek
2025-08-13 13:49:30 +10:00
parent 09a3c99c3b
commit 54ab073f1a
5 changed files with 135 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/settings.cpp
View File

@@ -91,6 +91,29 @@ float SettingInfo::FloatStepValue() const
return step_value ? StringUtil::FromChars<float>(step_value).value_or(fallback_value) : fallback_value;
}
void SettingInfo::CopyValue(SettingsInterface* dest_si, const SettingsInterface& src_si, const char* section) const
{
switch (type)
{
case SettingInfo::Type::Boolean:
dest_si->CopyBoolValue(src_si, section, name);
break;
case SettingInfo::Type::Integer:
case SettingInfo::Type::IntegerList:
dest_si->CopyIntValue(src_si, section, name);
break;
case SettingInfo::Type::Float:
dest_si->CopyFloatValue(src_si, section, name);
break;
case SettingInfo::Type::String:
case SettingInfo::Type::Path:
dest_si->CopyStringValue(src_si, section, name);
break;
default:
break;
}
}
GPUSettings::GPUSettings()
{
SetPGXPDepthClearThreshold(DEFAULT_GPU_PGXP_DEPTH_THRESHOLD);

2
src/core/settings.h
View File

@@ -55,6 +55,8 @@ struct SettingInfo
float FloatMinValue() const;
float FloatMaxValue() const;
float FloatStepValue() const;
void CopyValue(SettingsInterface* dest_si, const SettingsInterface& src_si, const char* section) const;
};
struct GPUSettings

22
src/util/input_manager.cpp
View File

@@ -1496,27 +1496,7 @@ void InputManager::CopyConfiguration(SettingsInterface* dest_si, const SettingsI
if (copy_pad_config)
{
for (const SettingInfo& csi : info->settings)
{
switch (csi.type)
{
case SettingInfo::Type::Boolean:
dest_si->CopyBoolValue(src_si, section.c_str(), csi.name);
break;
case SettingInfo::Type::Integer:
case SettingInfo::Type::IntegerList:
dest_si->CopyIntValue(src_si, section.c_str(), csi.name);
break;
case SettingInfo::Type::Float:
dest_si->CopyFloatValue(src_si, section.c_str(), csi.name);
break;
case SettingInfo::Type::String:
case SettingInfo::Type::Path:
dest_si->CopyStringValue(src_si, section.c_str(), csi.name);
break;
default:
break;
}
}
csi.CopyValue(dest_si, src_si, section.c_str());
}
}

99
src/util/sdl_input_source.cpp
View File

@@ -155,6 +155,49 @@ static constexpr std::array<const char*, 4> s_sdl_default_led_colors = {{
"ffff00", // SDL-3
}};
#ifdef _WIN32
static constexpr bool SDL_DEFAULT_XBOX_HIDAPI = false;
#else
static constexpr bool SDL_DEFAULT_XBOX_HIDAPI = true;
#endif
static constexpr const SettingInfo s_sdl_advanced_settings_info[] = {
{SettingInfo::Type::Boolean, "SDLJoystickXboxHIDAPI", TRANSLATE_NOOP("SDLInputSource", "Enable XBox HIDAPI Driver"),
TRANSLATE_NOOP("SDLInputSource", "Enables the HIDAPI driver for XBox controllers."),
SDL_DEFAULT_XBOX_HIDAPI ? "true" : "false", nullptr, nullptr, nullptr, nullptr, nullptr, 0.0f},
#if defined(_WIN32)
{SettingInfo::Type::Boolean, "SDLJoystickRawInput", TRANSLATE_NOOP("SDLInputSource", "Enable Raw Input Drivers"),
TRANSLATE_NOOP("SDLInputSource",
"Enables raw input joystick drivers which can improve handling of XInput-capable devices."),
"false", nullptr, nullptr, nullptr, nullptr, nullptr, 0.0f},
{SettingInfo::Type::Boolean, "SDLJoystickDirectInput", TRANSLATE_NOOP("SDLInputSource", "Enable DirectInput Driver"),
TRANSLATE_NOOP("SDLInputSource", "Enables compatibility with DirectInput controllers."), "true", nullptr, nullptr,
nullptr, nullptr, nullptr, 0.0f},
{SettingInfo::Type::Boolean, "SDLJoystickXInput", TRANSLATE_NOOP("SDLInputSource", "Enable XInput Driver"),
TRANSLATE_NOOP("SDLInputSource", "Enables compatibility with XInput controllers."), "true", nullptr, nullptr,
nullptr, nullptr, nullptr, 0.0f},
{SettingInfo::Type::Boolean, "SDLJoystickWGI", TRANSLATE_NOOP("SDLInputSource", "Enable WGI Driver"),
TRANSLATE_NOOP("SDLInputSource", "Enables compatibility with Windows.Gaming.Input controllers."), "true", nullptr,
nullptr, nullptr, nullptr, nullptr, 0.0f},
{SettingInfo::Type::Boolean, "SDLJoystickGameInput", TRANSLATE_NOOP("SDLInputSource", "Enable GameInput Driver"),
TRANSLATE_NOOP("SDLInputSource", "Enables compatibility with GameInput controllers."), "false", nullptr, nullptr,
nullptr, nullptr, nullptr, 0.0f},
#elif defined(__APPLE__)
{SettingInfo::Type::Boolean, "SDLIOKitDriver", TRANSLATE_NOOP("SDLInputSource", "Enable IOKit Driver"),
TRANSLATE_NOOP("SDLInputSource", "Allows the use of IOKit for controller handling."), "true", nullptr, nullptr,
nullptr, nullptr, nullptr, 0.0f},
{SettingInfo::Type::Boolean, "SDLMFIDriver", TRANSLATE_NOOP("SDLInputSource", "Enable MFI Driver"),
TRANSLATE_NOOP("SDLInputSource", "Allows the use of GCController/MFI for controller handling."), "true", nullptr,
nullptr, nullptr, nullptr, nullptr, 0.0f},
#else
{SettingInfo::Type::Boolean, "SDLJoystickLinuxDigitalHats",
TRANSLATE_NOOP("SDLInputSource", "Force Digital Hat Inputs"),
TRANSLATE_NOOP("SDLInputSource", "Forces joysticks to always treat 'hat' axis inputs (ABS_HAT0X - ABS_HAT3Y) as "
"8-way digital hats without checking whether they may be analog."),
"false", nullptr, nullptr, nullptr, nullptr, nullptr, 0.0f},
#endif
};
static void SetControllerRGBLED(SDL_Gamepad* gp, u32 color)
{
SDL_SetGamepadLED(gp, (color >> 16) & 0xff, (color >> 8) & 0xff, color & 0xff);
@@ -197,25 +240,13 @@ bool SDLInputSource::Initialize(const SettingsInterface& si, std::unique_lock<st
void SDLInputSource::UpdateSettings(const SettingsInterface& si, std::unique_lock<std::mutex>& settings_lock)
{
const bool old_controller_enhanced_mode = m_controller_enhanced_mode;
const bool old_controller_ps5_player_led = m_controller_ps5_player_led;
#ifdef __APPLE__
const bool old_enable_iokit_driver = m_enable_iokit_driver;
const bool old_enable_mfi_driver = m_enable_mfi_driver;
#endif
const bool old_controller_touchpad_as_pointer = m_controller_touchpad_as_pointer;
const u8 old_advanced_options_bits = m_advanced_options_bits;
LoadSettings(si);
#ifdef __APPLE__
const bool drivers_changed =
(m_enable_iokit_driver != old_enable_iokit_driver || m_enable_mfi_driver != old_enable_mfi_driver);
#else
constexpr bool drivers_changed = false;
#endif
if (m_controller_enhanced_mode != old_controller_enhanced_mode ||
m_controller_ps5_player_led != old_controller_ps5_player_led || drivers_changed)
if (m_advanced_options_bits != old_advanced_options_bits ||
m_controller_touchpad_as_pointer != old_controller_touchpad_as_pointer)
{
settings_lock.unlock();
ShutdownSubsystem();
@@ -259,9 +290,18 @@ void SDLInputSource::LoadSettings(const SettingsInterface& si)
m_controller_touchpad_as_pointer = si.GetBoolValue("InputSources", "SDLTouchpadAsPointer", false);
m_sdl_hints = si.GetKeyValueList("SDLHints");
#ifdef __APPLE__
m_joystick_xbox_hidapi = si.GetBoolValue("InputSources", "SDLJoystickXboxHIDAPI", SDL_DEFAULT_XBOX_HIDAPI);
#if defined(_WIN32)
m_joystick_rawinput = si.GetBoolValue("InputSources", "SDLJoystickRawInput", false);
m_joystick_directinput = si.GetBoolValue("InputSources", "SDLJoystickDirectInput", true);
m_joystick_xinput = si.GetBoolValue("InputSources", "SDLJoystickXInput", true);
m_joystick_wgi = si.GetBoolValue("InputSources", "SDLJoystickWGI", true);
m_joystick_gameinput = si.GetBoolValue("InputSources", "SDLJoystickGameInput", false);
#elif defined(__APPLE__)
m_enable_iokit_driver = si.GetBoolValue("InputSources", "SDLIOKitDriver", true);
m_enable_mfi_driver = si.GetBoolValue("InputSources", "SDLMFIDriver", true);
#else
m_joystick_force_hat_input = si.GetBoolValue("InputSources", "SDLJoystickLinuxDigitalHats", false);
#endif
}
@@ -274,6 +314,9 @@ void InputSource::CopySDLSourceSettings(SettingsInterface* dest_si, const Settin
dest_si->CopyBoolValue(src_si, "InputSources", "SDLPS5PlayerLED");
dest_si->CopyBoolValue(src_si, "InputSources", "SDLTouchpadAsPointer");
dest_si->CopySection(src_si, "SDLHints");
for (const SettingInfo& si : s_sdl_advanced_settings_info)
si.CopyValue(dest_si, src_si, "InputSources");
}
u32 SDLInputSource::GetRGBForPlayerId(const SettingsInterface& si, u32 player_id)
@@ -294,6 +337,11 @@ u32 SDLInputSource::ParseRGBForPlayerId(std::string_view str, u32 player_id)
return color;
}
std::span<const SettingInfo> SDLInputSource::GetAdvancedSettingsInfo()
{
return s_sdl_advanced_settings_info;
}
void SDLInputSource::SetHints()
{
if (const std::string upath = Path::Combine(EmuFolders::DataRoot, CONTROLLER_DB_FILENAME);
@@ -318,11 +366,26 @@ void SDLInputSource::SetHints()
SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_WII, "1");
SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS3, "1");
#ifdef __APPLE__
INFO_LOG("XBox HIDAPI is {}.", m_joystick_xbox_hidapi ? "enabled" : "disabled");
SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_XBOX, m_joystick_xbox_hidapi ? "1" : "0");
#if defined(_WIN32)
INFO_LOG("RawInput is {}, DirectInput is {}, XInput is {}, WGI is {}, GameInput is {}.",
m_joystick_rawinput ? "enabled" : "disabled", m_joystick_directinput ? "enabled" : "disabled",
m_joystick_xinput ? "enabled" : "disabled", m_joystick_wgi ? "enabled" : "disabled",
m_joystick_gameinput ? "enabled" : "disabled");
SDL_SetHint(SDL_HINT_JOYSTICK_RAWINPUT, m_joystick_rawinput ? "1" : "0");
SDL_SetHint(SDL_HINT_JOYSTICK_DIRECTINPUT, m_joystick_rawinput ? "1" : "0");
SDL_SetHint(SDL_HINT_XINPUT_ENABLED, m_joystick_xinput ? "1" : "0");
SDL_SetHint(SDL_HINT_JOYSTICK_WGI, m_joystick_wgi ? "1" : "0");
SDL_SetHint(SDL_HINT_JOYSTICK_GAMEINPUT, m_joystick_gameinput ? "1" : "0");
#elif defined(__APPLE__)
INFO_LOG("IOKit is {}, MFI is {}.", m_enable_iokit_driver ? "enabled" : "disabled",
m_enable_mfi_driver ? "enabled" : "disabled");
SDL_SetHint(SDL_HINT_JOYSTICK_IOKIT, m_enable_iokit_driver ? "1" : "0");
SDL_SetHint(SDL_HINT_JOYSTICK_MFI, m_enable_mfi_driver ? "1" : "0");
#else
SDL_SetHint(SDL_HINT_JOYSTICK_LINUX_DIGITAL_HATS, m_joystick_force_hat_input ? "1" : "0");
#endif
for (const std::pair<std::string, std::string>& hint : m_sdl_hints)

35
src/util/sdl_input_source.h
View File

@@ -10,9 +10,11 @@
#include <array>
#include <functional>
#include <mutex>
#include <span>
#include <vector>
class SettingsInterface;
struct SettingInfo;
class SDLInputSource final : public InputSource
{
@@ -49,9 +51,9 @@ public:
static u32 GetRGBForPlayerId(const SettingsInterface& si, u32 player_id);
static u32 ParseRGBForPlayerId(std::string_view str, u32 player_id);
static bool IsHandledInputEvent(const SDL_Event* ev);
static std::span<const SettingInfo> GetAdvancedSettingsInfo();
static void CopySettings(SettingsInterface& dest_si, const SettingsInterface& src_si);
static bool IsHandledInputEvent(const SDL_Event* ev);
static bool ALLOW_EVENT_POLLING;
@@ -106,14 +108,33 @@ private:
std::vector<std::pair<std::string, std::string>> m_sdl_hints;
bool m_sdl_subsystem_initialized = false;
bool m_controller_enhanced_mode = false;
bool m_controller_ps5_player_led = false;
bool m_controller_touchpad_as_pointer = false;
#ifdef __APPLE__
bool m_enable_iokit_driver = false;
bool m_enable_mfi_driver = false;
union
{
struct
{
bool m_controller_enhanced_mode : 1;
bool m_controller_ps5_player_led : 1;
bool m_joystick_xbox_hidapi : 1;
#if defined(_WIN32)
bool m_joystick_rawinput : 1;
bool m_joystick_directinput : 1;
bool m_joystick_xinput : 1;
bool m_joystick_wgi : 1;
bool m_joystick_gameinput : 1;
#elif defined(__APPLE__)
bool m_enable_iokit_driver : 1;
bool m_enable_mfi_driver : 1;
#else
bool m_joystick_force_hat_input : 1;
#endif
};
u8 m_advanced_options_bits = 0;
};
};
class SDLForceFeedbackDevice : public ForceFeedbackDevice