From a0346658a3266a06c5f4ef73dd1e1bd90a43938c Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Fri, 28 Jun 2024 18:37:08 +0800 Subject: Revert the key type from U32 to U16 It was changed in the first place to accommodate SDL2's bigger size need, since SDL2 was still used by all ports. This would conflict when maint-b gets merge later, so just revert it beforehand. With this commit, it would fail to compile for Linux & FreeBSD on main branch temporarily. --- indra/llwindow/llkeyboard.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/llwindow/llkeyboard.cpp') diff --git a/indra/llwindow/llkeyboard.cpp b/indra/llwindow/llkeyboard.cpp index f154351ce3..b3dcac6222 100644 --- a/indra/llwindow/llkeyboard.cpp +++ b/indra/llwindow/llkeyboard.cpp @@ -195,9 +195,9 @@ void LLKeyboard::resetKeys() } -BOOL LLKeyboard::translateKey(const U32 os_key, KEY *out_key) +BOOL LLKeyboard::translateKey(const U16 os_key, KEY *out_key) { - std::map::iterator iter; + std::map::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 U32 os_key, KEY *out_key) } -U32 LLKeyboard::inverseTranslateKey(const KEY translated_key) +U16 LLKeyboard::inverseTranslateKey(const KEY translated_key) { - std::map::iterator iter; + std::map::iterator iter; iter = mInvTranslateKeyMap.find(translated_key); if (iter == mInvTranslateKeyMap.end()) { -- cgit v1.2.3