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

IME candidates separator to use \x1E instead of a comma

Browse Source
This commit is contained in:
minjaesong
2021-11-12 10:11:02 +09:00
parent 23e9dd3114
commit 9ec4ea026d
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
assets/keylayout/zh_cn_cangjie5.ime
View File

@@ -264,12 +264,12 @@ let reset = () => {
states.candidates = ""
}
let getCandidatesUsingBuf = () => {
states.candidates = states.dict.getCangjie(states.buf) // comma-separated values
states.candidates = states.dict.getCangjie(states.buf) // \x1E-separated values
states.code = 1 + (states.candidates.length == 0)
// console.log(`cangjie in, buf: ${states.buf}, candidates: ${states.candidates}`)
return `${states.buf},${states.candidates}`
return `${states.buf}\u001E${states.candidates}`
}
return Object.freeze({"n":"五仓简体 Qwerty","v":"many","c":"CuriousTo\uA75Bvald, 倉頡之友 。馬來西亞 http://www.chinesecj.com",
return Object.freeze({"n":"五仓简体 Qwerty","v":"many","c":"CuriousTo\uA75Bvald, 倉頡之友 。馬來西亞 http://www.chinesecj.com","m":"candidates",
"t":states.keylayouts.map(it => [(it[2]||it[0]),it[1]]),
// return: [displayed output, composed output]
"accept":(headkey,shiftin,altgrin)=>{
@@ -280,7 +280,7 @@ return Object.freeze({"n":"五仓简体 Qwerty","v":"many","c":"CuriousTo\uA75Bv
if (states.code == 1 && 48 <= cjkeyAsc && cjkeyAsc <= 57) {
let raw = ''+states.buf
let selection = states.candidates.split(',')[cjkeyAsc - 49]
let selection = states.candidates.split('\u001E')[cjkeyAsc - 49]
reset()
return ['', selection || raw]
}

8
assets/keylayout/zh_tw_cangjie5.ime
View File

@@ -264,12 +264,12 @@ let reset = () => {
states.candidates = ""
}
let getCandidatesUsingBuf = () => {
states.candidates = states.dict.getCangjie(states.buf) // comma-separated values
states.candidates = states.dict.getCangjie(states.buf) // \x1E-separated values
states.code = 1 + (states.candidates.length == 0)
// console.log(`cangjie in, buf: ${states.buf}, candidates: ${states.candidates}`)
return `${states.buf},${states.candidates}`
return `${states.buf}\u001E${states.candidates}`
}
return Object.freeze({"n":"五倉正體 Qwerty","v":"many","c":"CuriousTo\uA75Bvald, 倉頡之友 。馬來西亞 http://www.chinesecj.com",
return Object.freeze({"n":"五倉正體 Qwerty","v":"many","c":"CuriousTo\uA75Bvald, 倉頡之友 。馬來西亞 http://www.chinesecj.com","m":"candidates",
"t":states.keylayouts.map(it => [(it[2]||it[0]),it[1]]),
// return: [displayed output, composed output]
"accept":(headkey,shiftin,altgrin)=>{
@@ -280,7 +280,7 @@ return Object.freeze({"n":"五倉正體 Qwerty","v":"many","c":"CuriousTo\uA75Bv
if (states.code == 1 && 48 <= cjkeyAsc && cjkeyAsc <= 57) {
let raw = ''+states.buf
let selection = states.candidates.split(',')[cjkeyAsc - 49]
let selection = states.candidates.split('\u001E')[cjkeyAsc - 49]
reset()
return ['', selection || raw]
}

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

@@ -3,7 +3,7 @@ package net.torvald.terrarum.gamecontroller
import net.torvald.terrarum.App.printdbg
import java.io.File
typealias IMECanditates = List<String>
typealias IMECandidates = List<String>
typealias IMEOutput = String
typealias Keysyms = Array<Array<String?>>
@@ -22,8 +22,8 @@ data class TerrarumIME(
val name: String,
val config: TerrarumIMEConf,
// (headkey, shiftin, altgrin, lowLayerKeysym)
val acceptChar: (Int, Boolean, Boolean, String) -> Pair<IMECanditates, IMEOutput>,
val backspace: () -> IMECanditates,
val acceptChar: (Int, Boolean, Boolean, String) -> Pair<IMECandidates, IMEOutput>,
val backspace: () -> IMECandidates,
val endCompose: () -> IMEOutput,
val reset: () -> Unit,
val composing: () -> Boolean

10
src/net/torvald/terrarum/gamecontroller/IMEProviderDelegate.kt
View File

@@ -19,6 +19,10 @@ class IMEProviderDelegate(val ime: IME) {
class IMEDictionary(private val filename: String) {
companion object {
const val CAND_DELIM = '\u001E'
}
private val candidates = HashMap<String, String>(16384)
private val keys = SortedArrayList<String>(16384) // keys on the .han file are absofreakinlutely not sorted
@@ -30,7 +34,7 @@ class IMEDictionary(private val filename: String) {
if (it.contains(',')) {
val (key, value) = it.split(',')
if (candidates.containsKey(key)) {
candidates[key] += ",$value"
candidates[key] += "$CAND_DELIM$value"
}
else {
candidates[key] = value
@@ -80,8 +84,8 @@ class IMEDictionary(private val filename: String) {
val keysym = allRelevantKeys[index]
if (!keysym.startsWith(key)) break
val outstr = ",${candidates[keysym]}"
outsize += outstr.count { it == ',' }
val outstr = "$CAND_DELIM${candidates[keysym]}"
outsize += outstr.count { it == CAND_DELIM }
out.append(outstr)
index += 1