Merge remote-tracking branch 'origin/master'

Author: elect86

README.md

@@ -68,8 +68,13 @@ ImGui supports also other languages, such as japanese, initiliazed [here](https:
 ```kotlin
 IO.fonts.addFontFromFileTTF("extraFonts/ArialUni.ttf", 18f, glyphRanges = IO.fonts.glyphRangesJapanese)!!
 ```
+or [here](https://github.com/kotlin-graphics/imgui/blob/master/src/test/java/imgui/Test_lwjgl.java#L50-L51)
+```java
+Font font = io.getFonts().addFontFromFileTTF("extraFonts/ArialUni.ttf", 18f, new FontConfig(), io.getFonts().getGlyphRangesJapanese());
+assert (font != null);
+```
 
-![Imgur](https://i.imgur.com/ASwYzBo.png?1)
+![Imgur](https://i.imgur.com/vul0VbT.png?1)
 
 
 ### References

src/main/kotlin/imgui/Context.kt

@@ -179,6 +179,9 @@ object Context {
     /** Last cursor position passed to the OS Input Method Editor   */
     var osImePosSet = Vec2(-1f)
 
+    var imeInProgress = false
+    var imeLastKey = 0
+
 
     //------------------------------------------------------------------
     // Logging

src/main/kotlin/imgui/Ref.kt

@@ -42,7 +42,7 @@ object Ref {
     var bPtr = 0
     var cPtr = 0
 
-    val size = 100
+    val size = 500
 
     val ints = IntArray(size)
     val floats = FloatArray(size)

src/main/kotlin/imgui/font.kt

@@ -625,7 +625,7 @@ class FontAtlas {
             var i = 0
             inRange[0] = cfg.glyphRanges[i++]
             inRange[1] = cfg.glyphRanges[i++]
-            while(inRange[0] != 0 && inRange[1] != 0) {
+            while (inRange[0] != 0 && inRange[1] != 0) {
                 fontGlyphsCount += (inRange[1] - inRange[0]) + 1
                 inRange[0] = cfg.glyphRanges.getOrElse(i++, { 0 })
                 inRange[1] = cfg.glyphRanges.getOrElse(i++, { 0 })
@@ -635,7 +635,7 @@ class FontAtlas {
             tmp.rangesCount = fontRangesCount
             bufRangesN += fontRangesCount
             i = 0
-            while(i < fontRangesCount) {
+            while (i < fontRangesCount) {
                 inRange[0] = cfg.glyphRanges[i * 2]
                 inRange[1] = cfg.glyphRanges[i * 2 + 1]
                 val range = tmp.ranges[i++]

src/main/kotlin/imgui/imgui/internal.kt

@@ -2,6 +2,7 @@ package imgui.imgui
 
 import gli_.has
 import gli_.hasnt
+import glm_.c
 import glm_.f
 import glm_.func.common.max
 import glm_.func.common.min
@@ -1430,8 +1431,19 @@ interface imgui_internal {
         var clearActiveId = false
 
         var selectAll = g.activeId != id && flags has Itf.AutoSelectAll
-        if (focusRequested || userClicked || userScrolled) {
-            if (g.activeId != id) {
+//        println(g.imeLastKey)
+        if (focusRequested || userClicked || userScrolled || g.imeLastKey != 0) {
+            if (g.activeId != id || g.imeLastKey != 0) {
+                // JVM, put char if no more in ime mode and last key is valid
+//                println("${g.imeInProgress}, ${g.imeLastKey}")
+                if(!g.imeInProgress && g.imeLastKey != 0) {
+                    for(i in 0 until buf.size)
+                        if(buf[i] == NUL) {
+                            buf[i] = g.imeLastKey.c
+                            break
+                        }
+                    g.imeLastKey = 0
+                }
                 /*  Start edition
                     Take a copy of the initial buffer value (both in original UTF-8 format and converted to wchar)
                     From the moment we focused we are ignoring the content of 'buf' (unless we are in read-only mode)   */
@@ -1531,7 +1543,8 @@ interface imgui_internal {
                     is Alt+Ctrl - to input certain characters.  */
                 if (!(IO.keyCtrl && !IO.keyAlt) && isEditable)
                     IO.inputCharacters.filter { it != NUL }.map {
-                        withChar { c -> // Insert character if they pass filtering
+                        withChar { c ->
+                            // Insert character if they pass filtering
                             if (inputTextFilterCharacter(c.apply { set(it) }, flags/*, callback, user_data*/))
                                 editState.onKeyPressed(c().i)
                         }
@@ -1766,7 +1779,7 @@ interface imgui_internal {
                 }
                 // Copy back to user buffer
                 if (isEditable && !Arrays.equals(editState.tempTextBuffer, buf)) {
-                    repeat(buf.size) { buf[it] = editState.tempTextBuffer[it] }
+                    for(i in 0 until buf.size) buf[i] = editState.tempTextBuffer[i]
                     valueChanged = true
                 }
             }
@@ -1914,7 +1927,7 @@ interface imgui_internal {
             }
 
             drawWindow.drawList.addText(g.font, g.fontSize, renderPos - renderScroll, Col.Text.u32, bufDisplay,
-                    editState.curLenA, 0f, if (isMultiline) null else clipRect)
+                    editState.curLenA, 0f, clipRect.takeIf { isMultiline })
 
             // Draw blinking cursor
             val cursorIsVisible = !IO.optCursorBlink || g.inputTextState.cursorAnim <= 0f || glm.mod(g.inputTextState.cursorAnim, 1.2f) <= 0.8f

src/main/kotlin/imgui/impl/LwjglGL3.kt

@@ -20,6 +20,7 @@ import gln.vertexArray.glBindVertexArray
 import gln.vertexArray.glVertexAttribPointer
 import gln.vertexArray.withVertexArray
 import imgui.*
+import imgui.Context as g
 import org.lwjgl.glfw.GLFW.*
 import org.lwjgl.glfw.GLFWNativeWin32.glfwGetWin32Window
 import org.lwjgl.opengl.GL11.*
@@ -99,40 +100,11 @@ object LwjglGL3 {
             window.scrollCallback = scrollCallback
             window.keyCallback = keyCallback
             window.charCallback = charCallback // TODO check if used (jogl doesnt have)
-            if (Platform.get() == Platform.WINDOWS) {
-                val hwnd = glfwGetWin32Window(window.handle)
-                val glfwProc = GetWindowLongPtr(hwnd, GWL_WNDPROC)
-                windowProc = object : WindowProc() {
-                    override fun invoke(hwnd: Long, msg: Int, w: Long, l: Long) = when (msg) {
-                        0x02E0 -> { // WM_DPICHANGED
-                            with(RECT.create(l)) {
-                                SetWindowPos(hwnd, NULL, left(), top(), right() - left(), bottom() - top(), SWP_NOZORDER or SWP_NOACTIVATE)
-                            }
-                            NULL
-                        }
-                        WM_IME_STARTCOMPOSITION -> println("Ime startComposition w: $w l: $l").let { 0L }
-                        WM_IME_ENDCOMPOSITION -> println("Ime endComposition w: $w l: $l").let { 0L }
-                        WM_IME_COMPOSITION /*,WM_IME_KEYLAST*/ -> println("Ime composition/keyLast w: $w l: $l").let { 0L }
-                        WM_IME_SETCONTEXT -> println("Ime setContex w: $w l: $l").let { 0L }
-                        WM_IME_NOTIFY -> println("Ime notify w: $w l: $l").let { 0L }
-                        WM_IME_CONTROL -> println("Ime control w: $w l: $l").let { 0L }
-                        WM_IME_COMPOSITIONFULL -> println("Ime compositionFull w: $w l: $l").let { 0L }
-                        WM_IME_SELECT -> println("Ime select w: $w l: $l").let { 0L }
-                        WM_IME_CHAR -> println("Ime char w: $w l: $l").let { 0L }
-                        WM_IME_REQUEST -> println("Ime request w: $w l: $l").let { 0L }
-                        WM_IME_KEYDOWN -> println("Ime keyDown w: $w l: $l").let { 0L }
-                        WM_IME_KEYUP -> println("Ime keyUp w: $w l: $l").let { 0L }
-                        else -> nCallWindowProc(glfwProc, hwnd, msg, w, l)
-                    }
-                }
-                SetWindowLongPtr(hwnd, GWL_WNDPROC, windowProc!!.address())
-            }
+            imeListner.install(window.handle)
         }
         return true
     }
 
-    var windowProc: Callback? = null
-
     var vtxSize = 1 shl 5 // 32768
     var idxSize = 1 shl 6 // 65536
     var vtxBuffer = bufferBig(vtxSize)