diff --git a/src/net/torvald/terrarum/gamecontroller/InputStrober.kt b/src/net/torvald/terrarum/gamecontroller/InputStrober.kt index ca58652a7..f20d42595 100644 --- a/src/net/torvald/terrarum/gamecontroller/InputStrober.kt +++ b/src/net/torvald/terrarum/gamecontroller/InputStrober.kt @@ -56,7 +56,7 @@ object InputStrober { val keymap = IME.getLowLayerByName(App.getConfigString("basekeyboardlayout")) if (stroboStatus % 2 == 0 && keybuf[0] != 0) { -// println("Key strobed: ${keybuf.joinToString()}; ${oldKeys.joinToString()}; changed = $keyChanged") +// println("Key strobed: ${keybuf.joinToString()}; old: ${oldKeys.joinToString()}; changed = $keyChanged") stroboStatus += 1 stroboTime = System.nanoTime() @@ -82,11 +82,11 @@ object InputStrober { val headKeyCode = if (keyDiff.size < 1) keybuf[0] else keyDiff[0] if (!keyChanged) { -// println("KEY_DOWN '$keysym' ($headKeyCode) $repeatCount; ${keys.joinToString()}") +// println("KEY_DOWN '$keysym' ($headKeyCode) $repeatCount") App.inputStrobed(TerrarumKeyboardEvent(KEY_DOWN, keysym, headKeyCode, repeatCount, keybuf)) } else if (newKeysym != null) { -// println("KEY_DOWC '$newKeysym' ($headKeyCode) $repeatCount; ${keys.joinToString()}") +// println("KEY_DOWC '$newKeysym' ($headKeyCode) $repeatCount") App.inputStrobed(TerrarumKeyboardEvent(KEY_DOWN, newKeysym, headKeyCode, repeatCount, keybuf)) } diff --git a/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt b/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt index f07518456..bbe99fe9f 100644 --- a/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt +++ b/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt @@ -277,7 +277,9 @@ class UIItemTextLineInput( endComposing() copyToClipboard() } - else if (keycodes.contains(Input.Keys.BACKSPACE) || (keycodes.contains(Input.Keys.CAPS_LOCK) && lowLayer.capsMode == TerrarumKeyCapsMode.BACK)) { + else if ( + (headkey == Input.Keys.BACKSPACE && keycodes.contains(Input.Keys.BACKSPACE)) || + (headkey == Input.Keys.CAPS_LOCK && keycodes.contains(Input.Keys.CAPS_LOCK) && lowLayer.capsMode == TerrarumKeyCapsMode.BACK)) { // printdbg(this, "BACKSPACE hit; ime.composing=${ime?.composing?.invoke()}; buflen=${textbuf.size}")