diff options
author | Erik Kundiman <erik@megapahit.org> | 2023-08-15 16:28:26 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2023-08-15 23:24:06 +0800 |
commit | 6d31ea65d2c597397971fb97fc17610277104e1b (patch) | |
tree | ac19cde920e9dccac900dfa6a47599cfeedef893 /indra/llwindow/llkeyboard.cpp | |
parent | ee14fd56f2b49e4fb38822c85bab4d342117a177 (diff) |
SDL 1.2 to 2.0 migration
Both keycodes and scancodes are now 32 bits, so the key type is
lengthened from U16 to U32.
Diffstat (limited to 'indra/llwindow/llkeyboard.cpp')
-rw-r--r-- | indra/llwindow/llkeyboard.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llwindow/llkeyboard.cpp b/indra/llwindow/llkeyboard.cpp index e65cc7563e..ac8c97d34e 100644 --- a/indra/llwindow/llkeyboard.cpp +++ b/indra/llwindow/llkeyboard.cpp @@ -195,9 +195,9 @@ void LLKeyboard::resetKeys() } -BOOL LLKeyboard::translateKey(const U16 os_key, KEY *out_key) +BOOL LLKeyboard::translateKey(const U32 os_key, KEY *out_key) { - std::map<U16, KEY>::iterator iter; + std::map<U32, KEY>::iterator iter; // Only translate keys in the map, ignore all other keys for now iter = mTranslateKeyMap.find(os_key); @@ -215,9 +215,9 @@ BOOL LLKeyboard::translateKey(const U16 os_key, KEY *out_key) } -U16 LLKeyboard::inverseTranslateKey(const KEY translated_key) +U32 LLKeyboard::inverseTranslateKey(const KEY translated_key) { - std::map<KEY, U16>::iterator iter; + std::map<KEY, U32>::iterator iter; iter = mInvTranslateKeyMap.find(translated_key); if (iter == mInvTranslateKeyMap.end()) { |