Try to fix arrow keys being marked as numpad on Mac.

Mysticial · Mysticial · commit 28b7f696a2c9 · 2025-12-16T22:05:37.000-08:00
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp
@@ -91,15 +91,16 @@ void KeyboardHidTracker::on_key_release(const QKeyEvent& key){
 
 KeyboardInputState KeyboardHidTracker::keys_to_state(const std::set<uint32_t>& pressed_native_keys) const{
     const QtKeyMap& qkey_map = QtKeyMap::instance();
-    const std::map<QtKeyMap::QtKey, KeyboardKey>& hid_map = get_keyid_to_hid_map();
+    const KeyboardInputMappings& hid_map = get_keyid_to_hid_map();
 
     KeyboardInputState ret;
     for (uint32_t native_key : pressed_native_keys){
         std::set<QtKeyMap::QtKey> qkeys = qkey_map.get_QtKeys(native_key);
-        for (QtKeyMap::QtKey qkey : qkeys){
-            auto iter = hid_map.find(qkey);
-            if (iter != hid_map.end()){
-                ret.add(iter->second);
+        for (const QtKeyMap::QtKey& qkey : qkeys){
+//            cout << "qkey = " << qkey.key << " : " << qkey.keypad << endl;
+            KeyboardKey key = hid_map.get(qkey);
+            if (key != KeyboardKey::KEY_NONE){
+                ret.add(key);
             }
 //            log_qtkey(m_logger, qkey);
         }
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.h b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.h
@@ -22,7 +22,7 @@ class QKeyEvent;
 namespace PokemonAutomation{
 
 
-class KeyboardHidTracker : public ControllerInputSource{
+class KeyboardHidTracker final : public ControllerInputSource{
 public:
     ~KeyboardHidTracker();
     KeyboardHidTracker();
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.cpp
@@ -8,27 +8,35 @@
 #include "Common/Cpp/Concurrency/SpinLock.h"
 #include "GlobalQtKeyMap.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 
 
 
-void QtKeyMap::record(const QKeyEvent& event){
+QtKeyMap::QtKey QtKeyMap::record(const QKeyEvent& event){
     int qt_key = event.key();
     uint32_t native_key = event.nativeVirtualKey();
+
+    QtKeyMap::QtKey ret{Qt::Key_unknown};
+
     if (native_key == 0 && (qt_key == 0 || qt_key == Qt::Key_unknown)){
         // both native key and Qt key event is 0 or unknown, meaning we really don't know
         // what key event it is. Skip
-        return;
+        return ret;
     }
-    
-    Qt::Key qkey = (Qt::Key)qt_key;
+
+    ret.key = (Qt::Key)qt_key;
+    ret.keypad = (event.modifiers() & Qt::KeypadModifier) != 0;
+
+//    cout << "key: " << ret.key << ", keypad = " << ret.keypad << endl;
+
     WriteSpinLock lg(m_lock);
-    m_map[native_key].insert(
-        QtKey{
-            qkey,
-            (event.modifiers() & Qt::KeypadModifier) != 0
-        }
-    );
+    m_map[native_key].insert(ret);
+
+    return ret;
 }
 
 std::set<QtKeyMap::QtKey> QtKeyMap::get_QtKeys(uint32_t native_key) const{
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.h b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.h
@@ -42,7 +42,7 @@ class QtKeyMap{
         return map;
     }
 
-    void record(const QKeyEvent& event);
+    QtKeyMap::QtKey record(const QKeyEvent& event);
 
     std::set<QtKey> get_QtKeys(uint32_t native_key) const;
 
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.cpp
@@ -38,20 +38,17 @@ KeyboardHidBindingCellWidget::KeyboardHidBindingCellWidget(QWidget& parent, Keyb
 
 
 void KeyboardHidBindingCellWidget::keyPressEvent(QKeyEvent* event){
-    QtKeyMap::instance().record(*event);
+    QtKeyMap::QtKey qkey = QtKeyMap::instance().record(*event);
 
-    const std::map<QtKeyMap::QtKey, KeyboardKey>& MAP = get_keyid_to_hid_map();
-    auto iter = MAP.find(QtKeyMap::QtKey(
-        (Qt::Key)event->key(),
-        (event->modifiers() & Qt::KeypadModifier) != 0
-    ));
+    const KeyboardInputMappings& MAP = get_keyid_to_hid_map();
+    KeyboardKey key = MAP.get(qkey);
 
-    if (iter == MAP.end()){
+    if (key == KeyboardKey::KEY_NONE){
         global_logger_tagged().log("Unable to map Qt::Key to HID ID: " + std::to_string(event->key()));
         return;
     }
 
-    m_value.set(iter->second);
+    m_value.set(key);
 }
 
 
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardHidButtons.h b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardHidButtons.h
@@ -16,6 +16,8 @@ namespace PokemonAutomation{
 
 //  Taken from: https://gist.github.com/MightyPork/6da26e382a7ad91b5496ee55fdc73db2
 enum KeyboardKey : uint8_t{
+    KEY_NONE    =   0x00,
+
     KEY_A   =   0x04,
     KEY_B   =   0x05,
     KEY_C   =   0x06,
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings.cpp
@@ -9,12 +9,78 @@
 #include "CommonFramework/GlobalSettingsPanel.h"
 #include "KeyboardInput_KeyMappings.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 
 
 
 
-const std::map<QtKeyMap::QtKey, KeyboardKey>& get_keyid_to_hid_map(){
+KeyboardInputMappings::KeyboardInputMappings(std::initializer_list<KeyboardInputMappingEntry> list){
+    for (auto iter = list.begin(); iter != list.end(); ++iter){
+        add(*iter);
+    }
+//    for (auto& item : m_map){
+//        cout << item.first << " : " << (int)item.second.standard << ", " << (int)item.second.keypad << endl;
+//    }
+}
+void KeyboardInputMappings::add(const KeyboardInputMappingEntry& entry){
+    Entry& key = m_map[entry.key.key];
+
+    if (entry.key.keypad){
+        if (key.keypad != KeyboardKey::KEY_NONE){
+            throw InternalProgramError(
+                nullptr,
+                PA_CURRENT_FUNCTION,
+                "Duplicate Keyboard Mapping: " + std::to_string((int)key.keypad)
+            );
+        }
+        key.keypad = entry.hid_id;
+    }else{
+        if (key.standard != KeyboardKey::KEY_NONE){
+            throw InternalProgramError(
+                nullptr,
+                PA_CURRENT_FUNCTION,
+                "Duplicate Keyboard Mapping: " + std::to_string((int)key.keypad)
+            );
+        }
+        key.standard = entry.hid_id;
+    }
+}
+KeyboardKey KeyboardInputMappings::get(const QtKeyMap::QtKey& key) const{
+//    cout << key.key << " : " << key.keypad << endl;
+    auto iter = m_map.find(key.key);
+    if (iter == m_map.end()){
+        return KeyboardKey::KEY_NONE;
+    }
+
+    //  If we don't override keypad, just return standard.
+    if (iter->second.keypad == KeyboardKey::KEY_NONE){
+        return iter->second.standard;
+    }
+
+    bool keypad = key.keypad;
+    if (keypad){
+        return iter->second.keypad;
+    }
+
+    return iter->second.standard;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+const KeyboardInputMappings& get_keyid_to_hid_map(){
     KeyboardLayout layout = *GlobalSettings::instance().KEYBOARD_CONTROLS_LAYOUT;
     switch (layout){
     case KeyboardLayout::QWERTY:
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings.h b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings.h
@@ -14,13 +14,55 @@
 namespace PokemonAutomation{
 
 
-const std::map<QtKeyMap::QtKey, KeyboardKey>& get_keyid_to_hid_map();
+struct KeyboardInputMappingKey{
+    Qt::Key key;
+    bool keypad;
+
+    KeyboardInputMappingKey(Qt::Key key)
+        : key(key)
+        , keypad(false)
+    {}
+    KeyboardInputMappingKey(Qt::Key key, bool keypad)
+        : key(key)
+        , keypad(keypad)
+    {}
+};
+
+struct KeyboardInputMappingEntry{
+    KeyboardInputMappingKey key;
+    KeyboardKey hid_id;
+};
+
+
+
+class KeyboardInputMappings{
+public:
+    KeyboardInputMappings(std::initializer_list<KeyboardInputMappingEntry> list);
+
+    void add(const KeyboardInputMappingEntry& entry);
+
+    KeyboardKey get(const QtKeyMap::QtKey& key) const;
+
+private:
+    struct Entry{
+        KeyboardKey standard = KeyboardKey::KEY_NONE;
+        KeyboardKey keypad = KeyboardKey::KEY_NONE;
+    };
+    std::map<Qt::Key, Entry> m_map;
+};
+
+
+
+
+
+
+const KeyboardInputMappings& get_keyid_to_hid_map();
 
 const std::map<Qt::Key, std::string>& QTKEY_TO_STRING();
 const std::map<KeyboardKey, std::string>& KEYBOARDKEY_TO_STRING();
 
-const std::map<QtKeyMap::QtKey, KeyboardKey>& KEYID_TO_HID_QWERTY();
-const std::map<QtKeyMap::QtKey, KeyboardKey>& KEYID_TO_HID_AZERTY();
+const KeyboardInputMappings& KEYID_TO_HID_QWERTY();
+const KeyboardInputMappings& KEYID_TO_HID_AZERTY();
 
 
 
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings_AZERTY.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings_AZERTY.cpp
@@ -10,8 +10,8 @@ namespace PokemonAutomation{
 
 
 
-const std::map<QtKeyMap::QtKey, KeyboardKey>& KEYID_TO_HID_AZERTY(){
-    static const std::map<QtKeyMap::QtKey, KeyboardKey> database{
+const KeyboardInputMappings& KEYID_TO_HID_AZERTY(){
+    static const KeyboardInputMappings database{
         {Qt::Key::Key_Q,                KeyboardKey::KEY_A},    // Q key -> HID A position
         {Qt::Key::Key_B,                KeyboardKey::KEY_B},
         {Qt::Key::Key_C,                KeyboardKey::KEY_C},
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings_QWERTY.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings_QWERTY.cpp
@@ -10,8 +10,8 @@ namespace PokemonAutomation{
 
 
 
-const std::map<QtKeyMap::QtKey, KeyboardKey>& KEYID_TO_HID_QWERTY(){
-    static const std::map<QtKeyMap::QtKey, KeyboardKey> database{
+const KeyboardInputMappings& KEYID_TO_HID_QWERTY(){
+    static const KeyboardInputMappings database{
         {Qt::Key::Key_A,                KeyboardKey::KEY_A},
         {Qt::Key::Key_B,                KeyboardKey::KEY_B},
         {Qt::Key::Key_C,                KeyboardKey::KEY_C},
diff --git a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp
@@ -71,7 +71,7 @@ class KeyboardState : public ControllerState{
 
 
 
-
+#if 0
 void log_qtkey(Logger& logger, const QtKeyMap::QtKey& qtkey){
     std::stringstream ss;
     ss << "Pressed key " << QTKEY_TO_STRING().at(qtkey.key);
@@ -81,14 +81,15 @@ void log_qtkey(Logger& logger, const QtKeyMap::QtKey& qtkey){
         ss << " (main keyboard)";
     }
 
-    const std::map<QtKeyMap::QtKey, KeyboardKey>& qwerty_hid_map = KEYID_TO_HID_QWERTY();
+    const KeyboardInputMappings& qwerty_hid_map = KEYID_TO_HID_QWERTY();
+    KeyboardKey key = qwerty_hid_map.get();
     if (auto iter = qwerty_hid_map.find(qtkey); iter != qwerty_hid_map.end()){
         ss << " mapped to QWERTY HID key " << KEYBOARDKEY_TO_STRING().at(iter->second);
     }else{
         ss << " has no QWERTY HID mapping";
     }
 
-    const std::map<QtKeyMap::QtKey, KeyboardKey>& azerty_hid_map = KEYID_TO_HID_AZERTY();
+    const KeyboardInputMappings& azerty_hid_map = KEYID_TO_HID_AZERTY();
     if (auto iter = azerty_hid_map.find(qtkey); iter != azerty_hid_map.end()){
         ss << " mapped to AZERTY HID key " << KEYBOARDKEY_TO_STRING().at(iter->second);
     }
@@ -98,7 +99,7 @@ void log_qtkey(Logger& logger, const QtKeyMap::QtKey& qtkey){
 
     logger.log(ss.str(), COLOR_BLUE);
 }
-
+#endif
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class QtKeyMap{`
`42`	`42`	`return map;`
`43`	`43`	`}`
`44`	`44`
`45`		`- void record(const QKeyEvent& event);`
	`45`	`+ QtKeyMap::QtKey record(const QKeyEvent& event);`
`46`	`46`
`47`	`47`	`std::set<QtKey> get_QtKeys(uint32_t native_key) const;`
`48`	`48`