Proper GLFW text input

ChangeLog.md

@@ -5,6 +5,7 @@
     [ 20140318 ]
     * Updated imgui to version 1.36
     * Can now display all compiled/linked library versions
+    * GLFW windowing interface now supports proper text input
 
     [ 20140313 ]
     * Renderer now limits room list size

include/system/WindowGLFW.h

@@ -44,6 +44,7 @@ class WindowGLFW {
     static void sizeCallback(GLFWwindow* w, int width, int height);
     static void cursorCallback(GLFWwindow* w, double xpos, double ypos);
     static void keyCallback(GLFWwindow* w, int key, int scancode, int action, int mods);
+    static void charCallback(GLFWwindow* w, unsigned int codepoint);
     static void buttonCallback(GLFWwindow* w, int button, int action, int mods);
     static void scrollCallback(GLFWwindow* w, double xoffset, double yoffset);
 

src/system/WindowGLFW.cpp

@@ -5,6 +5,7 @@
  * \author xythobuz
  */
 
+#include <codecvt>
 #include <sstream>
 
 #define GLFW_INCLUDE_NONE
@@ -53,6 +54,7 @@ int WindowGLFW::initialize() {
     glfwSetWindowSizeCallback(window, WindowGLFW::sizeCallback);
     glfwSetCursorPosCallback(window, WindowGLFW::cursorCallback);
     glfwSetKeyCallback(window, WindowGLFW::keyCallback);
+    glfwSetCharCallback(window, WindowGLFW::charCallback);
     glfwSetMouseButtonCallback(window, WindowGLFW::buttonCallback);
     glfwSetScrollCallback(window, WindowGLFW::scrollCallback);
 
@@ -138,9 +140,7 @@ std::string WindowGLFW::getVersion(bool linked) {
     }
 }
 
-void WindowGLFW::inputPositionCallback(int x, int y) {
-
-}
+void WindowGLFW::inputPositionCallback(int x, int y) { }
 
 void WindowGLFW::errorCallback(int error, const char* desc) {
     Log::get(LOG_ERROR) << "GLFW Error (" << error << "): " << desc << Log::endl;
@@ -180,23 +180,31 @@ void WindowGLFW::keyCallback(GLFWwindow* w, int key, int scancode, int action, i
         UI::handleKeyboard(leftguiKey, modSuper);
     }
 
-    if (textinput && (action != GLFW_RELEASE)) {
-        //! \fixme GLFW does not support UTF8 text input?!
-        if ((key >= '0') && (key <= '9')) {
-            char s[2] = { (char)key, '\0' };
-            UI::handleText(s, false);
-        } else if ((key >= 'A') && (key <= 'Z')) {
-            key = key - 'A' + 'a';
-            char s[2] = { (char)key, '\0' };
-            UI::handleText(s, false);
-            key = key - 'a' + 'A';
-        }
-    }
-
     KeyboardButton b = convertAsciiButton(key);
     UI::handleKeyboard(b, (action != GLFW_RELEASE));
 }
 
+void WindowGLFW::charCallback(GLFWwindow* w, unsigned int codepoint) {
+    static std::codecvt_utf8<char32_t> conv;
+    static mbstate_t state;
+    static const int bufferSize = 42;
+    static char buffer[bufferSize + 1];
+
+    if (textinput) {
+        char32_t inBuff[2] = { codepoint, '\0' };
+        const char32_t* in = nullptr;
+        char* ex = nullptr;
+        auto res = conv.out(state, inBuff, inBuff + 1, in, buffer, buffer + bufferSize, ex);
+        if (res != 0) {
+            Log::get(LOG_DEBUG) << "UTF-32 to UTF-8 conversion error (" << res << ")" << Log::endl;
+            return;
+        }
+
+        *ex = '\0';
+        UI::handleText(buffer, false);
+    }
+}
+
 void WindowGLFW::buttonCallback(GLFWwindow* w, int button, int action, int mods) {
     if (((mods & GLFW_MOD_SHIFT) != 0) != modShift) {
         modShift = (mods & GLFW_MOD_SHIFT) != 0;
@@ -253,7 +261,7 @@ KeyboardButton WindowGLFW::convertAsciiButton(int key) {
         return static_cast<KeyboardButton>(key);
     }
 
-    //! \fixme GLFW requires keyboard layout? Currently US is hard coded
+    //! \fixme GLFW requires keyboard layout, currently US is hard coded!
     switch (key) {
         case ' ':
             return spaceKey;