summaryrefslogtreecommitdiff
path: root/src/core/frontend/input_interpreter.cpp
diff options
context:
space:
mode:
authorGravatar Morph2021-03-20 07:55:59 -0400
committerGravatar Morph2021-04-15 01:53:17 -0400
commitaa3adf6c3fc20171abcbd2678ed7ad6b3bd21a8e (patch)
treed81c7856c62646ed24a29360ad183731369592b9 /src/core/frontend/input_interpreter.cpp
parentqt_themes: Add styles for the On-Screen Keyboard and OverlayDialog (diff)
downloadyuzu-aa3adf6c3fc20171abcbd2678ed7ad6b3bd21a8e.tar.gz
yuzu-aa3adf6c3fc20171abcbd2678ed7ad6b3bd21a8e.tar.xz
yuzu-aa3adf6c3fc20171abcbd2678ed7ad6b3bd21a8e.zip
input_interpreter: Fix button hold being interpreted incorrectly on init
We reset all the button states to 0 except the first index (which has all the buttons as pressed) to prevent a button hold being interpreted as a button that was pressed once on the first poll.
Diffstat (limited to 'src/core/frontend/input_interpreter.cpp')
-rw-r--r--src/core/frontend/input_interpreter.cpp15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/core/frontend/input_interpreter.cpp b/src/core/frontend/input_interpreter.cpp
index ec5fe660e..9f6a90e8f 100644
--- a/src/core/frontend/input_interpreter.cpp
+++ b/src/core/frontend/input_interpreter.cpp
@@ -12,7 +12,9 @@ InputInterpreter::InputInterpreter(Core::System& system)
12 : npad{system.ServiceManager() 12 : npad{system.ServiceManager()
13 .GetService<Service::HID::Hid>("hid") 13 .GetService<Service::HID::Hid>("hid")
14 ->GetAppletResource() 14 ->GetAppletResource()
15 ->GetController<Service::HID::Controller_NPad>(Service::HID::HidController::NPad)} {} 15 ->GetController<Service::HID::Controller_NPad>(Service::HID::HidController::NPad)} {
16 ResetButtonStates();
17}
16 18
17InputInterpreter::~InputInterpreter() = default; 19InputInterpreter::~InputInterpreter() = default;
18 20
@@ -25,6 +27,17 @@ void InputInterpreter::PollInput() {
25 button_states[current_index] = button_state; 27 button_states[current_index] = button_state;
26} 28}
27 29
30void InputInterpreter::ResetButtonStates() {
31 previous_index = 0;
32 current_index = 0;
33
34 button_states[0] = 0xFFFFFFFF;
35
36 for (std::size_t i = 1; i < button_states.size(); ++i) {
37 button_states[i] = 0;
38 }
39}
40
28bool InputInterpreter::IsButtonPressed(HIDButton button) const { 41bool InputInterpreter::IsButtonPressed(HIDButton button) const {
29 return (button_states[current_index] & (1U << static_cast<u8>(button))) != 0; 42 return (button_states[current_index] & (1U << static_cast<u8>(button))) != 0;
30} 43}