From 6e7e808b6614f98674dba7290bea2ea044c4d5d2 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 29 Jan 2025 02:02:46 -0600 Subject: DolphinQt/Mapping: Add setting to enable waiting for alternate mappings using the OR-operator. --- .../DolphinQt/Config/Mapping/MappingCommon.cpp | 57 ++++++++++++++-------- 1 file changed, 37 insertions(+), 20 deletions(-) (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp') diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp index edce169c28..37407f2298 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp @@ -19,8 +19,10 @@ namespace MappingCommon { constexpr auto INPUT_DETECT_INITIAL_TIME = std::chrono::seconds(3); -constexpr auto INPUT_DETECT_CONFIRMATION_TIME = std::chrono::milliseconds(0); +constexpr auto INPUT_DETECT_CONFIRMATION_TIME = std::chrono::milliseconds(750); constexpr auto INPUT_DETECT_MAXIMUM_TIME = std::chrono::seconds(5); +// Ignore the mouse-click when queuing more buttons with "alternate mappings" enabled. +constexpr auto INPUT_DETECT_ENDING_IGNORE_TIME = std::chrono::milliseconds(50); class MappingProcessor : public QWidget { @@ -50,7 +52,7 @@ public: button->StartMapping(); std::vector device_strings{default_device.ToString()}; - if (m_parent->IsMappingAllDevices()) + if (m_parent->IsCreateOtherDeviceMappingsEnabled()) device_strings = g_controller_interface.GetAllDeviceStrings(); m_input_detector = std::make_unique(); @@ -63,33 +65,39 @@ public: if (!m_input_detector) return; - m_input_detector->Update(INPUT_DETECT_INITIAL_TIME, INPUT_DETECT_CONFIRMATION_TIME, + const auto confirmation_time = + INPUT_DETECT_CONFIRMATION_TIME * (m_parent->IsWaitForAlternateMappingsEnabled() ? 1 : 0); + + m_input_detector->Update(INPUT_DETECT_INITIAL_TIME, confirmation_time, INPUT_DETECT_MAXIMUM_TIME); if (m_input_detector->IsComplete()) { - auto detections = m_input_detector->TakeResults(); - ciface::MappingCommon::RemoveSpuriousTriggerCombinations(&detections); - // No inputs detected. Cancel this and any other queued mappings. - if (detections.empty()) - { + if (!FinalizeMapping(m_input_detector->TakeResults())) CancelMapping(); - return; - } + } + } - const auto& default_device = m_parent->GetController()->GetDefaultDevice(); - auto& button = m_clicked_mapping_buttons.front(); - auto* const control_reference = button->GetControlReference(); + bool FinalizeMapping(ciface::Core::InputDetector::Results detections) + { + if (!ciface::MappingCommon::ContainsCompleteDetection(detections)) + return false; - control_reference->SetExpression( - BuildExpression(detections, default_device, ciface::MappingCommon::Quote::On)); - m_parent->Save(); + ciface::MappingCommon::RemoveSpuriousTriggerCombinations(&detections); - m_parent->GetController()->UpdateSingleControlReference(g_controller_interface, - control_reference); - UnQueueInputDetection(button); - } + const auto& default_device = m_parent->GetController()->GetDefaultDevice(); + auto& button = m_clicked_mapping_buttons.front(); + auto* const control_reference = button->GetControlReference(); + + control_reference->SetExpression( + BuildExpression(detections, default_device, ciface::MappingCommon::Quote::On)); + m_parent->Save(); + + m_parent->GetController()->UpdateSingleControlReference(g_controller_interface, + control_reference); + UnQueueInputDetection(button); + return true; } void UpdateInputDetectionStartTimer() @@ -121,6 +129,15 @@ public: button->setText(QStringLiteral("[ ... ]")); m_clicked_mapping_buttons.push_back(button); + + if (m_input_detector) + { + // Ignore the mouse-click that queued this new detection and finalize the current mapping. + auto results = m_input_detector->TakeResults(); + ciface::MappingCommon::RemoveDetectionsAfterTimePoint( + &results, ciface::Core::DeviceContainer::Clock::now() - INPUT_DETECT_ENDING_IGNORE_TIME); + FinalizeMapping(std::move(results)); + } UpdateInputDetectionStartTimer(); } -- cgit v1.2.3