curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-11 11:04:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

ModLoader: load IME unconditionally when found

Browse Source
This commit is contained in:
minjaesong
2023-09-08 15:31:11 +09:00
parent 64ef30e445
commit cc55e563f0
2 changed files with 71 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,12 +97,12 @@ object IME {
File(KEYLAYOUT_DIR).listFiles { file, s -> s.endsWith(".$KEYLAYOUT_EXTENSION") }.sortedBy { it.name }.forEach {
printdbg(this, "Registering Low layer ${it.nameWithoutExtension.lowercase()}")
lowLayers[it.nameWithoutExtension.lowercase()] = parseKeylayoutFile(it)
registerLowLayer(it.nameWithoutExtension.lowercase(), parseKeylayoutFile(it))
}
File(KEYLAYOUT_DIR).listFiles { file, s -> s.endsWith(".$IME_EXTENSION") }.sortedBy { it.name }.forEach {
printdbg(this, "Registering High layer ${it.nameWithoutExtension.lowercase()}")
highLayers[it.nameWithoutExtension.lowercase()] = parseImeFile(it)
registerHighLayer(it.nameWithoutExtension.lowercase(), parseImeFile(it))
}
@@ -132,6 +132,14 @@ object IME {
iconPixmap.dispose()
}
fun registerLowLayer(name: String, layout: TerrarumKeyLayout) {
lowLayers[name] = layout
}
fun registerHighLayer(name: String, ime: TerrarumIME) {
highLayers[name] = ime
}
@JvmStatic fun invoke() {}
fun getLowLayerByName(name: String): TerrarumKeyLayout {
@@ -164,7 +172,7 @@ object IME {
else -> throw IllegalArgumentException("Unknown candidates mode: $this")
}
private fun parseKeylayoutFile(file: File): TerrarumKeyLayout {
fun parseKeylayoutFile(file: File): TerrarumKeyLayout {
val src = file.readText(Charsets.UTF_8)
val jsval = context.eval("js", "'use strict';Object.freeze($src)")
val name = jsval.getMember("n").asString()
@@ -200,7 +208,7 @@ object IME {
else -> throw IllegalArgumentException("Unknown operation mode: $this")
}
private fun parseImeFile(file: File): TerrarumIME {
fun parseImeFile(file: File): TerrarumIME {
val code = file.readText(Charsets.UTF_8)
val jsval = context.eval("js", "\"use strict\";(function(){$code})()")
val name = jsval.getMember("n").asString()