summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2024-02-06 05:34:05 +0100
committerNarr the Reg <juangerman-13@hotmail.com>2024-02-06 23:51:39 +0100
commit12f86f89fc2f8c77e99fdec37c8d3d4f63487192 (patch)
treeb5d7ad2ad94f396a7c3de414681271a8ae95af4a /src
parentMerge pull request #12905 from liamwhite/hwc-release (diff)
downloadyuzu-12f86f89fc2f8c77e99fdec37c8d3d4f63487192.tar
yuzu-12f86f89fc2f8c77e99fdec37c8d3d4f63487192.tar.gz
yuzu-12f86f89fc2f8c77e99fdec37c8d3d4f63487192.tar.bz2
yuzu-12f86f89fc2f8c77e99fdec37c8d3d4f63487192.tar.lz
yuzu-12f86f89fc2f8c77e99fdec37c8d3d4f63487192.tar.xz
yuzu-12f86f89fc2f8c77e99fdec37c8d3d4f63487192.tar.zst
yuzu-12f86f89fc2f8c77e99fdec37c8d3d4f63487192.zip
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/configuration/configure_hotkeys.cpp41
-rw-r--r--src/yuzu/configuration/configure_hotkeys.h13
-rw-r--r--src/yuzu/hotkeys.cpp3
3 files changed, 37 insertions, 20 deletions
diff --git a/src/yuzu/configuration/configure_hotkeys.cpp b/src/yuzu/configuration/configure_hotkeys.cpp
index 3d18670ce..3f68de12d 100644
--- a/src/yuzu/configuration/configure_hotkeys.cpp
+++ b/src/yuzu/configuration/configure_hotkeys.cpp
@@ -45,15 +45,23 @@ ConfigureHotkeys::ConfigureHotkeys(Core::HID::HIDCore& hid_core, QWidget* parent
controller = hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
- connect(timeout_timer.get(), &QTimer::timeout, [this] { SetPollingResult({}, true); });
+ connect(timeout_timer.get(), &QTimer::timeout, [this] {
+ const bool is_button_pressed = pressed_buttons != Core::HID::NpadButton::None ||
+ pressed_home_button || pressed_capture_button;
+ SetPollingResult(!is_button_pressed);
+ });
connect(poll_timer.get(), &QTimer::timeout, [this] {
- const auto buttons = controller->GetNpadButtons();
- const auto home_pressed = controller->GetHomeButtons().home != 0;
- const auto capture_pressed = controller->GetCaptureButtons().capture != 0;
- if (home_pressed || capture_pressed) {
- SetPollingResult(buttons.raw, false);
- return;
+ pressed_buttons |= controller->GetNpadButtons().raw;
+ pressed_home_button |= this->controller->GetHomeButtons().home != 0;
+ pressed_capture_button |= this->controller->GetCaptureButtons().capture != 0;
+ if (pressed_buttons != Core::HID::NpadButton::None || pressed_home_button ||
+ pressed_capture_button) {
+ const QString button_name =
+ GetButtonCombinationName(pressed_buttons, pressed_home_button,
+ pressed_capture_button) +
+ QStringLiteral("...");
+ model->setData(button_model_index, button_name);
}
});
RetranslateUI();
@@ -154,16 +162,14 @@ void ConfigureHotkeys::ConfigureController(QModelIndex index) {
const auto previous_key = model->data(index);
- input_setter = [this, index, previous_key](const Core::HID::NpadButton button,
- const bool cancel) {
+ input_setter = [this, index, previous_key](const bool cancel) {
if (cancel) {
model->setData(index, previous_key);
return;
}
- const auto home_pressed = this->controller->GetHomeButtons().home != 0;
- const auto capture_pressed = this->controller->GetCaptureButtons().capture != 0;
+
const QString button_string =
- GetButtonCombinationName(button, home_pressed, capture_pressed);
+ GetButtonCombinationName(pressed_buttons, pressed_home_button, pressed_capture_button);
const auto [key_sequence_used, used_action] = IsUsedControllerKey(button_string);
@@ -177,17 +183,22 @@ void ConfigureHotkeys::ConfigureController(QModelIndex index) {
}
};
+ button_model_index = index;
+ pressed_buttons = Core::HID::NpadButton::None;
+ pressed_home_button = false;
+ pressed_capture_button = false;
+
model->setData(index, tr("[waiting]"));
timeout_timer->start(2500); // Cancel after 2.5 seconds
- poll_timer->start(200); // Check for new inputs every 200ms
+ poll_timer->start(100); // Check for new inputs every 100ms
// We need to disable configuration to be able to read npad buttons
controller->DisableConfiguration();
}
-void ConfigureHotkeys::SetPollingResult(Core::HID::NpadButton button, const bool cancel) {
+void ConfigureHotkeys::SetPollingResult(const bool cancel) {
timeout_timer->stop();
poll_timer->stop();
- (*input_setter)(button, cancel);
+ (*input_setter)(cancel);
// Re-Enable configuration
controller->EnableConfiguration();
diff --git a/src/yuzu/configuration/configure_hotkeys.h b/src/yuzu/configuration/configure_hotkeys.h
index 5fd1bcbfe..20ea3b515 100644
--- a/src/yuzu/configuration/configure_hotkeys.h
+++ b/src/yuzu/configuration/configure_hotkeys.h
@@ -4,6 +4,7 @@
#pragma once
#include <memory>
+#include <QStandardItemModel>
#include <QWidget>
namespace Common {
@@ -54,14 +55,20 @@ private:
void RestoreControllerHotkey(QModelIndex index);
void RestoreHotkey(QModelIndex index);
+ void SetPollingResult(bool cancel);
+ QString GetButtonCombinationName(Core::HID::NpadButton button, bool home, bool capture) const;
+
std::unique_ptr<Ui::ConfigureHotkeys> ui;
QStandardItemModel* model;
- void SetPollingResult(Core::HID::NpadButton button, bool cancel);
- QString GetButtonCombinationName(Core::HID::NpadButton button, bool home, bool capture) const;
+ bool pressed_home_button;
+ bool pressed_capture_button;
+ QModelIndex button_model_index;
+ Core::HID::NpadButton pressed_buttons;
+
Core::HID::EmulatedController* controller;
std::unique_ptr<QTimer> timeout_timer;
std::unique_ptr<QTimer> poll_timer;
- std::optional<std::function<void(Core::HID::NpadButton, bool)>> input_setter;
+ std::optional<std::function<void(bool)>> input_setter;
};
diff --git a/src/yuzu/hotkeys.cpp b/src/yuzu/hotkeys.cpp
index b7693ad0d..170f14684 100644
--- a/src/yuzu/hotkeys.cpp
+++ b/src/yuzu/hotkeys.cpp
@@ -193,8 +193,7 @@ void ControllerShortcut::ControllerUpdateEvent(Core::HID::ControllerTriggerType
if (!Settings::values.controller_navigation) {
return;
}
- if (button_sequence.npad.raw == Core::HID::NpadButton::None &&
- button_sequence.capture.raw == 0 && button_sequence.home.raw == 0) {
+ if (button_sequence.npad.raw == Core::HID::NpadButton::None) {
return;
}