From 1355e62898c6ba03f2fd45f19c0df7e23c1410cd Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 12 Aug 2020 00:38:51 -0400
Subject: [PATCH] Directly pass UTF32 in SDL text input callback
---
indra/llwindow/llwindowsdl.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 03ac9c2f10c..343065cd152 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -1911,11 +1911,11 @@ void LLWindowSDL::gatherInput()
}
case SDL_TEXTINPUT:
{
- auto string = utf8str_to_utf16str(event.text.text);
+ auto string = utf8str_to_wstring(event.text.text);
for (auto key : string)
{
- mKeyVirtualKey = key;
- handleUnicodeUTF16(key, gKeyboard->currentMask(FALSE));
+ //mKeyVirtualKey = key;
+ mCallbacks->handleUnicodeChar(key, gKeyboard->currentMask(FALSE));
}
break;
}
--
GitLab