summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar David Marcec2020-05-12 12:40:50 +1000
committerGravatar David Marcec2020-05-12 12:40:50 +1000
commita79f060ea2a8dd24f399309d052db74c6456224b (patch)
tree1944d4cda7343e3f1c3cbd425c5c807f468b6af0 /src
parentMerge pull request #3896 from jroweboy/remove-clang-format-check-from-patreon (diff)
downloadyuzu-a79f060ea2a8dd24f399309d052db74c6456224b.tar.gz
yuzu-a79f060ea2a8dd24f399309d052db74c6456224b.tar.xz
yuzu-a79f060ea2a8dd24f399309d052db74c6456224b.zip
hid: Clear keyboard states & fix logic issue
Previously we never cleared the states of the entries and the key would stay held down, also looping over the key bytes for each key lead to setting every bit for the key state instead of the key we wanted
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/hid/controllers/keyboard.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/hle/service/hid/controllers/keyboard.cpp b/src/core/hle/service/hid/controllers/keyboard.cpp
index 358cb9329..9a8d354ba 100644
--- a/src/core/hle/service/hid/controllers/keyboard.cpp
+++ b/src/core/hle/service/hid/controllers/keyboard.cpp
@@ -38,10 +38,11 @@ void Controller_Keyboard::OnUpdate(const Core::Timing::CoreTiming& core_timing,
38 cur_entry.sampling_number = last_entry.sampling_number + 1; 38 cur_entry.sampling_number = last_entry.sampling_number + 1;
39 cur_entry.sampling_number2 = cur_entry.sampling_number; 39 cur_entry.sampling_number2 = cur_entry.sampling_number;
40 40
41 cur_entry.key.fill(0);
42 cur_entry.modifier = 0;
43
41 for (std::size_t i = 0; i < keyboard_keys.size(); ++i) { 44 for (std::size_t i = 0; i < keyboard_keys.size(); ++i) {
42 for (std::size_t k = 0; k < KEYS_PER_BYTE; ++k) { 45 cur_entry.key[i / KEYS_PER_BYTE] |= (keyboard_keys[i]->GetStatus() << (i % KEYS_PER_BYTE));
43 cur_entry.key[i / KEYS_PER_BYTE] |= (keyboard_keys[i]->GetStatus() << k);
44 }
45 } 46 }
46 47
47 for (std::size_t i = 0; i < keyboard_mods.size(); ++i) { 48 for (std::size_t i = 0; i < keyboard_mods.size(); ++i) {