Merge pull request #1633 from KAlO2/android_event

fix: android platform MotionEvent and KeyEvent handling

Author: robertosfield

include/vsg/platform/android/Android_Window.h

@@ -29,27 +29,33 @@ namespace vsgAndroid
     public:
         KeyboardMap();
 
-        using AKeyCodeToKeySymbolMap = std::map<uint32_t, vsg::KeySymbol>;
+        using AKeyCodeToKeySymbolMap = std::unordered_map<uint32_t, vsg::KeySymbol>;
 
-        bool getKeySymbol(uint32_t keycode, uint32_t metastate, vsg::KeySymbol& keySymbol, vsg::KeySymbol& modifiedKeySymbol, vsg::KeyModifier& keyModifier)
+        /// This method should be called after the APP_CMD_INIT_WINDOW message.
+        static void initializeKeyCharacterMap(void* vm);
+
+        /// This method should be called after the APP_CMD_DESTROY message.
+        static void releaseKeyCharacterMap();
+
+        static int32_t getUnicodeChar(int32_t keyCode, int32_t metaState);
+
+        bool getKeySymbol(int32_t keyCode, int32_t metaState, vsg::KeySymbol& keySymbol, vsg::KeySymbol& modifiedKeySymbol, vsg::KeyModifier& keyModifier) const
         {
-            auto itr = _keycodeMap.find(keycode);
+            auto itr = _keycodeMap.find(keyCode);
             if (itr == _keycodeMap.end()) return false;
 
             keySymbol = itr->second;
-            modifiedKeySymbol = keySymbol;
 
             uint16_t modifierMask = 0;
 
-            if (metastate & AMETA_ALT_ON) modifierMask |= vsg::KeyModifier::MODKEY_Alt;
-            if (metastate & AMETA_CTRL_ON) modifierMask |= vsg::KeyModifier::MODKEY_Control;
-            if (metastate & AMETA_SHIFT_ON) modifierMask |= vsg::KeyModifier::MODKEY_Shift;
-            if (metastate & AMETA_CAPS_LOCK_ON) modifierMask |= vsg::KeyModifier::MODKEY_CapsLock;
-            if (metastate & AMETA_NUM_LOCK_ON) modifierMask |= vsg::KeyModifier::MODKEY_NumLock;
+            if (metaState & AMETA_ALT_ON) modifierMask |= vsg::KeyModifier::MODKEY_Alt;
+            if (metaState & AMETA_CTRL_ON) modifierMask |= vsg::KeyModifier::MODKEY_Control;
+            if (metaState & AMETA_SHIFT_ON) modifierMask |= vsg::KeyModifier::MODKEY_Shift;
+            if (metaState & AMETA_CAPS_LOCK_ON) modifierMask |= vsg::KeyModifier::MODKEY_CapsLock;
+            if (metaState & AMETA_NUM_LOCK_ON) modifierMask |= vsg::KeyModifier::MODKEY_NumLock;
 
             keyModifier = (vsg::KeyModifier)modifierMask;
-
-            // need to get the modified key somehow but seems we may need to talk to java for that :(
+            modifiedKeySymbol = static_cast<vsg::KeySymbol>(getUnicodeChar(keyCode, metaState));
 
             return true;
         }
@@ -99,7 +105,7 @@ namespace vsgAndroid
 
         ANativeWindow* _window;
 
-        int64_t _first_android_timestamp = 0;
+        int64_t _uptimeMs = 0;
         vsg::clock::time_point _first_android_time_point;
 
         vsg::ref_ptr<KeyboardMap> _keyboard;