summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2022-02-20 18:32:39 +0100
committerJosJuice <josjuice@gmail.com>2022-03-06 14:30:49 +0100
commit1bc057614e6d101e4f26db18fa60af2e9e2d0be7 (patch)
tree95894784ebd817c0f43e17c6d4ee6bb851ca206b /Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
parent9af9e791f6a19d62197ad0d2e0fc39ed744cd506 (diff)
Move parts of MappingCommon out of DolphinQt
Some of the functions in MappingCommon would be useful to use on mobile in the future.
Diffstat (limited to 'Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp')
-rw-r--r--Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp139
1 files changed, 6 insertions, 133 deletions
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
index fde917c2b1..0fdcb376af 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
@@ -3,8 +3,7 @@
#include "DolphinQt/Config/Mapping/MappingCommon.h"
-#include <tuple>
-#include <vector>
+#include <chrono>
#include <QApplication>
#include <QPushButton>
@@ -14,6 +13,7 @@
#include "DolphinQt/QtUtils/BlockUserInputFilter.h"
#include "InputCommon/ControlReference/ControlReference.h"
+#include "InputCommon/ControllerInterface/MappingCommon.h"
#include "Common/Thread.h"
@@ -25,44 +25,10 @@ constexpr auto INPUT_DETECT_MAXIMUM_TIME = std::chrono::seconds(5);
constexpr auto OUTPUT_TEST_TIME = std::chrono::seconds(2);
-// Pressing inputs at the same time will result in the & operator vs a hotkey expression.
-constexpr auto HOTKEY_VS_CONJUNCION_THRESHOLD = std::chrono::milliseconds(50);
-
-// Some devices (e.g. DS4) provide an analog and digital input for the trigger.
-// We prefer just the analog input for simultaneous digital+analog input detections.
-constexpr auto SPURIOUS_TRIGGER_COMBO_THRESHOLD = std::chrono::milliseconds(150);
-
-QString GetExpressionForControl(const QString& control_name,
- const ciface::Core::DeviceQualifier& control_device,
- const ciface::Core::DeviceQualifier& default_device, Quote quote)
-{
- QString expr;
-
- // non-default device
- if (control_device != default_device)
- {
- expr += QString::fromStdString(control_device.ToString());
- expr += QLatin1Char{':'};
- }
-
- // append the control name
- expr += control_name;
-
- if (quote == Quote::On)
- {
- // If our expression contains any non-alpha characters
- // we should quote it
- const QRegularExpression reg(QStringLiteral("[^a-zA-Z]"));
- if (reg.match(expr).hasMatch())
- expr = QStringLiteral("`%1`").arg(expr);
- }
-
- return expr;
-}
-
QString DetectExpression(QPushButton* button, ciface::Core::DeviceContainer& device_container,
const std::vector<std::string>& device_strings,
- const ciface::Core::DeviceQualifier& default_device, Quote quote)
+ const ciface::Core::DeviceQualifier& default_device,
+ ciface::MappingCommon::Quote quote)
{
const auto filter = new BlockUserInputFilter(button);
@@ -83,7 +49,7 @@ QString DetectExpression(QPushButton* button, ciface::Core::DeviceContainer& dev
device_container.DetectInput(device_strings, INPUT_DETECT_INITIAL_TIME,
INPUT_DETECT_CONFIRMATION_TIME, INPUT_DETECT_MAXIMUM_TIME);
- RemoveSpuriousTriggerCombinations(&detections);
+ ciface::MappingCommon::RemoveSpuriousTriggerCombinations(&detections);
const auto timer = new QTimer(button);
@@ -100,7 +66,7 @@ QString DetectExpression(QPushButton* button, ciface::Core::DeviceContainer& dev
button->setText(old_text);
- return BuildExpression(detections, default_device, quote);
+ return QString::fromStdString(BuildExpression(detections, default_device, quote));
}
void TestOutput(QPushButton* button, OutputReference* reference)
@@ -118,97 +84,4 @@ void TestOutput(QPushButton* button, OutputReference* reference)
button->setText(old_text);
}
-void RemoveSpuriousTriggerCombinations(
- std::vector<ciface::Core::DeviceContainer::InputDetection>* detections)
-{
- const auto is_spurious = [&](auto& detection) {
- return std::any_of(detections->begin(), detections->end(), [&](auto& d) {
- // This is a suprious digital detection if a "smooth" (analog) detection is temporally near.
- return &d != &detection && d.smoothness > 1 &&
- abs(d.press_time - detection.press_time) < SPURIOUS_TRIGGER_COMBO_THRESHOLD;
- });
- };
-
- detections->erase(std::remove_if(detections->begin(), detections->end(), is_spurious),
- detections->end());
-}
-
-QString
-BuildExpression(const std::vector<ciface::Core::DeviceContainer::InputDetection>& detections,
- const ciface::Core::DeviceQualifier& default_device, Quote quote)
-{
- std::vector<const ciface::Core::DeviceContainer::InputDetection*> pressed_inputs;
-
- QStringList alternations;
-
- const auto get_control_expression = [&](auto& detection) {
- // Return the parent-most name if there is one for better hotkey strings.
- // Detection of L/R_Ctrl will be changed to just Ctrl.
- // Users can manually map L_Ctrl if they so desire.
- const auto input = (quote == Quote::On) ?
- detection.device->GetParentMostInput(detection.input) :
- detection.input;
-
- ciface::Core::DeviceQualifier device_qualifier;
- device_qualifier.FromDevice(detection.device.get());
-
- return MappingCommon::GetExpressionForControl(QString::fromStdString(input->GetName()),
- device_qualifier, default_device, quote);
- };
-
- bool new_alternation = false;
-
- const auto handle_press = [&](auto& detection) {
- pressed_inputs.emplace_back(&detection);
- new_alternation = true;
- };
-
- const auto handle_release = [&]() {
- if (!new_alternation)
- return;
-
- new_alternation = false;
-
- QStringList alternation;
- for (auto* input : pressed_inputs)
- alternation.push_back(get_control_expression(*input));
-
- const bool is_hotkey = pressed_inputs.size() >= 2 &&
- (pressed_inputs[1]->press_time - pressed_inputs[0]->press_time) >
- HOTKEY_VS_CONJUNCION_THRESHOLD;
-
- if (is_hotkey)
- {
- alternations.push_back(QStringLiteral("@(%1)").arg(alternation.join(QLatin1Char('+'))));
- }
- else
- {
- alternation.sort();
- alternations.push_back(alternation.join(QLatin1Char('&')));
- }
- };
-
- for (auto& detection : detections)
- {
- // Remove since released inputs.
- for (auto it = pressed_inputs.begin(); it != pressed_inputs.end();)
- {
- if (!((*it)->release_time > detection.press_time))
- {
- handle_release();
- it = pressed_inputs.erase(it);
- }
- else
- ++it;
- }
-
- handle_press(detection);
- }
-
- handle_release();
-
- alternations.removeDuplicates();
- return alternations.join(QLatin1Char('|'));
-}
-
} // namespace MappingCommon