diff --git a/pcsx2-qt/Settings/ControllerGlobalSettingsWidget.cpp b/pcsx2-qt/Settings/ControllerGlobalSettingsWidget.cpp index 9382f8f862..3496001dd3 100644 --- a/pcsx2-qt/Settings/ControllerGlobalSettingsWidget.cpp +++ b/pcsx2-qt/Settings/ControllerGlobalSettingsWidget.cpp @@ -37,11 +37,13 @@ ControllerGlobalSettingsWidget::ControllerGlobalSettingsWidget(QWidget* parent, #ifdef SDL_BUILD SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.enableSDLSource, "InputSources", "SDL", true); SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.enableSDLEnhancedMode, "InputSources", "SDLControllerEnhancedMode", false); + SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.enableSDLRawInput, "InputSources", "SDLRawInput", false); connect(m_ui.enableSDLSource, &QCheckBox::stateChanged, this, &ControllerGlobalSettingsWidget::updateSDLOptionsEnabled); connect(m_ui.ledSettings, &QToolButton::clicked, this, &ControllerGlobalSettingsWidget::ledSettingsClicked); #else m_ui.enableSDLSource->setEnabled(false); m_ui.ledSettings->setEnabled(false); + m_ui.enableSDLRawInput->setEnabled(false); #endif SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.enableMouseMapping, "UI", "EnableMouseMapping", false); @@ -113,6 +115,7 @@ void ControllerGlobalSettingsWidget::updateSDLOptionsEnabled() const bool enabled = m_ui.enableSDLSource->isChecked(); m_ui.enableSDLEnhancedMode->setEnabled(enabled); m_ui.ledSettings->setEnabled(enabled); + m_ui.enableSDLRawInput->setEnabled(enabled); } void ControllerGlobalSettingsWidget::ledSettingsClicked() diff --git a/pcsx2-qt/Settings/ControllerGlobalSettingsWidget.ui b/pcsx2-qt/Settings/ControllerGlobalSettingsWidget.ui index 412e2efe43..085760544b 100644 --- a/pcsx2-qt/Settings/ControllerGlobalSettingsWidget.ui +++ b/pcsx2-qt/Settings/ControllerGlobalSettingsWidget.ui @@ -58,6 +58,13 @@ SDL Input Source + + + + Enable SDL Input Source + + + @@ -68,13 +75,6 @@ - - - - Enable SDL Input Source - - - @@ -97,6 +97,13 @@ + + + + Enable SDL Raw Input + + + diff --git a/pcsx2/Frontend/FullscreenUI.cpp b/pcsx2/Frontend/FullscreenUI.cpp index aa354451cb..3a7c77db9b 100644 --- a/pcsx2/Frontend/FullscreenUI.cpp +++ b/pcsx2/Frontend/FullscreenUI.cpp @@ -3741,6 +3741,9 @@ void FullscreenUI::DrawControllerSettingsPage() DrawToggleSetting(bsi, ICON_FA_WIFI " SDL DualShock 4 / DualSense Enhanced Mode", "Provides vibration and LED control support over Bluetooth.", "InputSources", "SDLControllerEnhancedMode", false, bsi->GetBoolValue("InputSources", "SDL", true), false); + DrawToggleSetting(bsi, ICON_FA_COG " SDL Raw Input", + "Allow SDL to use raw access to input devices.", "InputSources", "SDLRawInput", false, + bsi->GetBoolValue("InputSources", "SDL", true), false); #endif #ifdef _WIN32 DrawToggleSetting(bsi, ICON_FA_COG " Enable XInput Input Source", diff --git a/pcsx2/Frontend/SDLInputSource.cpp b/pcsx2/Frontend/SDLInputSource.cpp index b1889ae852..4993e43514 100644 --- a/pcsx2/Frontend/SDLInputSource.cpp +++ b/pcsx2/Frontend/SDLInputSource.cpp @@ -142,10 +142,11 @@ bool SDLInputSource::Initialize(SettingsInterface& si, std::unique_lock& settings_lock) { const bool old_controller_enhanced_mode = m_controller_enhanced_mode; + const bool old_controller_raw_mode = m_controller_raw_mode; LoadSettings(si); - if (m_controller_enhanced_mode != old_controller_enhanced_mode) + if (m_controller_enhanced_mode != old_controller_enhanced_mode || m_controller_raw_mode != old_controller_raw_mode) { settings_lock.unlock(); ShutdownSubsystem(); @@ -170,6 +171,7 @@ void SDLInputSource::Shutdown() void SDLInputSource::LoadSettings(SettingsInterface& si) { m_controller_enhanced_mode = si.GetBoolValue("InputSources", "SDLControllerEnhancedMode", false); + m_controller_raw_mode = si.GetBoolValue("InputSources", "SDLRawInput", false); m_sdl_hints = si.GetKeyValueList("SDLHints"); for (u32 i = 0; i < MAX_LED_COLORS; i++) @@ -208,6 +210,7 @@ u32 SDLInputSource::ParseRGBForPlayerId(const std::string_view& str, u32 player_ void SDLInputSource::SetHints() { + SDL_SetHint(SDL_HINT_JOYSTICK_RAWINPUT, m_controller_raw_mode ? "1" : "0"); SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, m_controller_enhanced_mode ? "1" : "0"); SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE, m_controller_enhanced_mode ? "1" : "0"); // Enable Wii U Pro Controller support diff --git a/pcsx2/Frontend/SDLInputSource.h b/pcsx2/Frontend/SDLInputSource.h index e04ca70759..61aa22bc97 100644 --- a/pcsx2/Frontend/SDLInputSource.h +++ b/pcsx2/Frontend/SDLInputSource.h @@ -97,6 +97,7 @@ private: bool m_sdl_subsystem_initialized = false; bool m_controller_enhanced_mode = false; + bool m_controller_raw_mode = false; std::array m_led_colors{}; std::vector> m_sdl_hints; };