Add unicode naming for keys (dev/keyboardManager) (#1978)

* Added key names

* Display names in detect keyboard UI

* Added keyboard layout for edit keyboard window

* Removed commented code

* removed unused code

* fixed argument modifiers

* Added newline at EOF

* Added unicode changes to edit shortcuts window

src/modules/keyboardmanager/common/KeyboardManagerState.h

@@ -1,5 +1,6 @@
 #pragma once
 #include "Helpers.h"
+#include "LayoutMap.h"
 #include "Shortcut.h"
 #include "RemapShortcut.h"
 #include <interface/lowlevel_keyboard_event_data.h>
@@ -30,10 +31,14 @@ private:
     HWND currentUIWindow;
     std::mutex currentUIWindow_mutex;
 
-    // Object to store the shortcut detected in the detect shortcut UI window. This is used in both the backend and the UI.
+    // Object to store the shortcut detected in the detect shortcut UI window. Gets cleared on releasing keys. This is used in both the backend and the UI.
     Shortcut detectedShortcut;
     std::mutex detectedShortcut_mutex;
 
+    // Object to store the shortcut state displayed in the UI window. Always stores last displayed shortcut irrespective of releasing keys. This is used in both the backend and the UI.
+    Shortcut currentShortcut;
+    std::mutex currentShortcut_mutex;
+
     // Store detected remap key in the remap UI window. This is used in both the backend and the UI.
     DWORD detectedRemapKey;
     std::mutex detectedRemapKey_mutex;
@@ -67,6 +72,9 @@ public:
     std::map<std::wstring, std::map<Shortcut, RemapShortcut>> appSpecificShortcutReMap;
     std::mutex appSpecificShortcutReMap_mutex;
 
+    // Stores the keyboard layout
+    LayoutMap keyboardMap;
+
     // Constructor
     KeyboardManagerState();