From b673857d7dfc72f38d9242b315cd590b859795ff Mon Sep 17 00:00:00 2001
From: german77 <juangerman-13@hotmail.com>
Date: Sat, 13 Nov 2021 23:25:45 -0600
Subject: core/hid: Improve accuracy of the keyboard implementation

---
 src/input_common/drivers/keyboard.cpp | 53 ++++++++++++++++++++++++++++++++---
 src/input_common/drivers/keyboard.h   |  7 +++++
 2 files changed, 56 insertions(+), 4 deletions(-)

(limited to 'src/input_common/drivers')

diff --git a/src/input_common/drivers/keyboard.cpp b/src/input_common/drivers/keyboard.cpp
index 549704e89..328fe1ac1 100644
--- a/src/input_common/drivers/keyboard.cpp
+++ b/src/input_common/drivers/keyboard.cpp
@@ -3,26 +3,71 @@
 // Refer to the license.txt file included
 
 #include "common/param_package.h"
+#include "common/settings_input.h"
 #include "input_common/drivers/keyboard.h"
 
 namespace InputCommon {
 
-constexpr PadIdentifier identifier = {
+constexpr PadIdentifier key_identifier = {
     .guid = Common::UUID{Common::INVALID_UUID},
     .port = 0,
     .pad = 0,
 };
+constexpr PadIdentifier modifier_identifier = {
+    .guid = Common::UUID{Common::INVALID_UUID},
+    .port = 0,
+    .pad = 1,
+};
 
 Keyboard::Keyboard(const std::string& input_engine_) : InputEngine(input_engine_) {
-    PreSetController(identifier);
+    PreSetController(key_identifier);
+    PreSetController(modifier_identifier);
 }
 
 void Keyboard::PressKey(int key_code) {
-    SetButton(identifier, key_code, true);
+    SetButton(key_identifier, key_code, true);
 }
 
 void Keyboard::ReleaseKey(int key_code) {
-    SetButton(identifier, key_code, false);
+    SetButton(key_identifier, key_code, false);
+}
+
+void Keyboard::SetModifiers(int key_modifiers) {
+    for (int i = 0; i < 32; ++i) {
+        bool key_value = ((key_modifiers >> i) & 0x1) != 0;
+        SetButton(modifier_identifier, i, key_value);
+        // Use the modifier to press the key button equivalent
+        switch (i) {
+        case Settings::NativeKeyboard::LeftControl:
+            SetButton(key_identifier, Settings::NativeKeyboard::LeftControlKey, key_value);
+            break;
+        case Settings::NativeKeyboard::LeftShift:
+            SetButton(key_identifier, Settings::NativeKeyboard::LeftShiftKey, key_value);
+            break;
+        case Settings::NativeKeyboard::LeftAlt:
+            SetButton(key_identifier, Settings::NativeKeyboard::LeftAltKey, key_value);
+            break;
+        case Settings::NativeKeyboard::LeftMeta:
+            SetButton(key_identifier, Settings::NativeKeyboard::LeftMetaKey, key_value);
+            break;
+        case Settings::NativeKeyboard::RightControl:
+            SetButton(key_identifier, Settings::NativeKeyboard::RightControlKey, key_value);
+            break;
+        case Settings::NativeKeyboard::RightShift:
+            SetButton(key_identifier, Settings::NativeKeyboard::RightShiftKey, key_value);
+            break;
+        case Settings::NativeKeyboard::RightAlt:
+            SetButton(key_identifier, Settings::NativeKeyboard::RightAltKey, key_value);
+            break;
+        case Settings::NativeKeyboard::RightMeta:
+            SetButton(key_identifier, Settings::NativeKeyboard::RightMetaKey, key_value);
+            break;
+        default:
+            // Other modifier keys should be pressed with PressKey since they stay enabled until
+            // next press
+            break;
+        }
+    }
 }
 
 void Keyboard::ReleaseAllKeys() {
diff --git a/src/input_common/drivers/keyboard.h b/src/input_common/drivers/keyboard.h
index 46fe78576..2ab92fd6c 100644
--- a/src/input_common/drivers/keyboard.h
+++ b/src/input_common/drivers/keyboard.h
@@ -28,6 +28,13 @@ public:
      */
     void ReleaseKey(int key_code);
 
+    /**
+     * Sets the status of all keyboard modifier keys
+     * @param key_modifiers the code of the key to release
+     */
+    void SetModifiers(int key_modifiers);
+
+    /// Sets all keys to the non pressed state
     void ReleaseAllKeys();
 
     /// Used for automapping features
-- 
cgit v1.2.3