curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 12:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

better handling of null keysymbol

Browse Source
This commit is contained in:
minjaesong
2024-09-12 23:56:40 +09:00
parent 831114ef15
commit 34a7a9285d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/gamecontroller/IME.kt
View File

@@ -257,7 +257,7 @@ object IME {
{ headkey, shifted, alted, lowLayerKeysym -> { headkey, shifted, alted, lowLayerKeysym ->
val a = jsval.invokeMember("accept", headkey, shifted, alted, lowLayerKeysym) val a = jsval.invokeMember("accept", headkey, shifted, alted, lowLayerKeysym)
// println(a.getArrayElement(0).asString().map { it.code.toString(16) }) // println(a.getArrayElement(0).asString().map { it.code.toString(16) })
a.getArrayElement(0).asString().toCanditates() to a.getArrayElement(1).asString() a.getArrayElement(0).asString().toCanditates() to a.getArrayElement(1).let { if (it.isNull) "" else it.asString() }
}, { }, {
jsval.invokeMember("backspace").asString().toCanditates() jsval.invokeMember("backspace").asString().toCanditates()
}, { }, {

4
src/net/torvald/terrarum/gamecontroller/InputStrober.kt
View File

@@ -83,7 +83,7 @@ object InputStrober {
if (!keyChanged) { if (!keyChanged) {
// println("KEY_DOWN '$keysym' ($headKeyCode) $repeatCount") // println("KEY_DOWN '$keysym' ($headKeyCode) $repeatCount")
App.inputStrobed(TerrarumKeyboardEvent(KEY_DOWN, keysym, headKeyCode, repeatCount, keybuf)) App.inputStrobed(TerrarumKeyboardEvent(KEY_DOWN, keysym ?: "", headKeyCode, repeatCount, keybuf))
} }
else if (newKeysym != null) { else if (newKeysym != null) {
// println("KEY_DOWC '$newKeysym' ($headKeyCode) $repeatCount") // println("KEY_DOWC '$newKeysym' ($headKeyCode) $repeatCount")
@@ -159,7 +159,7 @@ object InputStrober {
data class TerrarumKeyboardEvent( data class TerrarumKeyboardEvent(
val type: Int, val type: Int,
val character: String?, // representative key symbol val character: String, // representative key symbol
val headkey: Int, // representative keycode val headkey: Int, // representative keycode
val repeatCount: Int, val repeatCount: Int,
val keycodes: IntArray val keycodes: IntArray

2
src/net/torvald/terrarum/modulebasegame/ui/UIIMEConfig.kt
View File

@@ -453,7 +453,7 @@ open private class UIItemInputKeycap(
else if (parent.shiftin && keysym0[1]?.isNotEmpty() == true) keysym0[1] else if (parent.shiftin && keysym0[1]?.isNotEmpty() == true) keysym0[1]
else keysym0[0]) ?: keysymLow else keysym0[0]) ?: keysymLow
if (keysym.isEmpty()) { if (keysym.isEmpty() || keysym.length == 8 && keysym.contains("null")) {
return return
} }