string rewriting IME wip

This commit is contained in:
minjaesong
2021-11-12 14:42:18 +09:00
parent 59b7126254
commit 092d95a5a3
7 changed files with 604 additions and 25 deletions

View File

@@ -343,7 +343,7 @@ let bufAssemble = (isPreview) => {
}
//let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ')
let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `${buf[i]}`).join(' ')
return Object.freeze({"n":"두벌식 표준","v":"one","c":"CuriousTo\uA75Bvald",
return Object.freeze({"n":"두벌식 표준","v":"one","c":"CuriousTo\uA75Bvald","m":"candidates",
"t":states.keylayouts.map(it => [it[0],it[1]]),
// return: [displayed output, composed output]
"accept":(headkey,shiftin,altgrin)=>{

View File

@@ -343,7 +343,7 @@ let bufAssemble = (isPreview) => {
}
//let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ')
let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `${buf[i]}`).join(' ')
return Object.freeze({"n":"두벌식 수정 표준","v":"one","c":"CuriousTo\uA75Bvald",
return Object.freeze({"n":"두벌식 수정 표준","v":"one","c":"CuriousTo\uA75Bvald","m":"candidates",
"t":states.keylayouts.map(it => [it[0],it[1]]),
// return: [displayed output, composed output]
"accept":(headkey,shiftin,altgrin)=>{

View File

@@ -369,7 +369,7 @@ let bufAssemble = (isPreview) => {
return states.buf.join('')
}
let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ')
return Object.freeze({"n":"세벌식 3-90","v":"one","c":"CuriousTo\uA75Bvald",
return Object.freeze({"n":"세벌식 3-90","v":"one","c":"CuriousTo\uA75Bvald","m":"candidates",
"t":states.keylayouts.map(it => [it[0],it[1]]),
// return: [displayed output, composed output]
"accept":(headkey,shiftin,altgrin)=>{

View File

@@ -0,0 +1,512 @@
let states = {"keylayouts":[[""],[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
["0",")"],
["1","!"],
["2","@"],
["3","#"],
["4","$"],
["5","%"],
["6","^"],
["7","&"],
["8","*"],
["9","("],
["*"],
["#"],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
["\u11BC","\u1172","\u1172"],
["\u11BE","\u116E","\u116E"],
["\u11A8","\u1166","\u1166"],
["\u11C2","\u1175","\u1175"],
["\u11B8","\u1162","\u1162"],
["\u11C1","\u1161","\u1161"],
["\u11AE","\u1173","\u1173"],
["\u1102","₩"],
["\u1106","\u1173","\u1173"], // combining EU
["\u110B","'"],
["\u1100",'"'],
["\u110C","\u00B7"],
["\u1112","\u2026"],
["\u1109","\u2014"],
["\u110E","\u116E","\u116E"], // combining U
["\u1111",";","\u119E"], // AREA-A
["\u11BA","\u1164","\u1164"],
["\u11C0","\u1165","\u1165"],
["\u11AB","\u1168","\u1168"],
["\u11BF","\u1167","\u1167"],
["\u1103","¤"],
["\u11BD","\u1169","\u1169"],
["\u11AF","\u1163","\u1163"],
["\u11BB","\u116D","\u116D"],
["\u1105","\u00D7"],
["\u11B7","\u119E","\u119E"],
[",","<"],
[".",">"],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[" "],
[undefined],
[undefined],
[undefined],
["\n"],
["\x08"],
["¤","~"],
["-","_"],
["=","+"],
["[","{"],
["]","}"],
["\\","|"],
["\u1107",":"],
["\u1110",'/'],
["\u110F","?","\u1169"], // combining O
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
["0"],
["1"],
["2"],
["3"],
["4"],
["5"],
["6"],
["7"],
["8"],
["9"],
["/"],
["*"],
["-"],
["+"],
["."],
["."],
["\n"],
["="],
["("],
[")"],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined]
],
"code":0,
"buf":[],
"hasDeadkey":false
}
let reset = () => {
states.code = 0
states.buf = []
states.hasDeadkey = false
}
let inRange = (s,a,b) => (a <= s && s <= b)
let isHangul = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x1100, 0x11FF)
let isChoseong = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x1100, 0x1112)
let isJungseong = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x1161, 0x11A7)
let isJongseong = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x11A8, 0x11C2)
let isJungseongSuper = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x119E, 0x11A2)
let isChoseongDigraph = (s) => s !== undefined && ([0x1100, 0x1103, 0x1107, 0x1109, 0x110C].includes(s.charCodeAt(0)))
let isThisCharChoseongDigraph = (s) => s !== undefined && ([0x1101, 0x1104, 0x1108, 0x110A, 0x110D].includes(s.charCodeAt(0)))
let isThisCharJungseongDigraph = (s) => s !== undefined && ([0x116A, 0x116B, 0x116C, 0x116F, 0x1170, 0x1171, 0x1174, 0x119F, 0x11A0, 0x11A1, 0x11A2].includes(s.charCodeAt(0)))
let isThisCharJongseongDigraph = (s) => s !== undefined && ([0x11A9, 0x11AA, 0x11AC, 0x11AD, 0x11B0, 0x11B1, 0x11B2, 0x11B3, 0x11B4, 0x11B5, 0x11B6, 0x11B9].includes(s.charCodeAt(0))) // ㅆ is an exception!
let isJungseongDigraphO = (s) => s !== undefined && ([0x1161, 0x1162, 0x1175].includes(s.charCodeAt(0)))
let isJungseongDigraphU = (s) => s !== undefined && ([0x1165, 0x1166, 0x1175].includes(s.charCodeAt(0)))
let isJungseongDigraphEU = (s) => s !== undefined && ([0x1175].includes(s.charCodeAt(0)))
let isJungseongDigraphAA = (s) => s !== undefined && ([0x1165, 0x116E, 0x1175, 0x119E].includes(s.charCodeAt(0)))
let isJongseongDigraphG = (s) => s !== undefined && ([0x11A8, 0x11BA].includes(s.charCodeAt(0)))
let isJongseongDigraphN = (s) => s !== undefined && ([0x11BD, 0x11C2].includes(s.charCodeAt(0)))
let isJongseongDigraphR = (s) => s !== undefined && ([0x11A8, 0x11B7, 0x11B8, 0x11BA, 0x11C0, 0x11C1, 0x11C2].includes(s.charCodeAt(0)))
let isJongseongDigraphB = (s) => s !== undefined && ([0x11BA].includes(s.charCodeAt(0)))
let choseongDigraphs = {"\u1100":"\u1101", "\u1103":"\u1104", "\u1107":"\u1108", "\u1109":"\u110A", "\u110C":"\u110D"}
let jungseongDigraphsO = {"\u1161":"\u116A", "\u1162":"\u116B", "\u1175":"\u116C"}
let jungseongDigraphsU = {"\u1165":"\u116F", "\u1166":"\u1170", "\u1175":"\u1171"}
let jungseongDigraphsEU = {"\u1175":"\u1174"}
let jungseongDigraphsAA = {"\u1165":"\u119F", "\u116E":"\u11A0", "\u1175":"\u11A1", "\u119E":"\u11A2"}
let jongseongDigraphsG = {"\u11A8":"\u11A9", "\u11BA":"\u11AA"}
let jongseongDigraphsN = {"\u11BD":"\u11AC", "\u11C2":"\u11AD"}
let jongseongDigraphsR = {"\u11A8":"\u11B0", "\u11B7":"\u11B1", "\u11B8":"\u11B2", "\u11BA":"\u11B3", "\u11C0":"\u11B4", "\u11C1":"\u11B5", "\u11C2":"\u11B6"}
let jongseongDigraphsB = {"\u11BA":"\u11B9"}
let isJungseongDeadkey = (keynum) => [37,43,44,76].includes(keynum)
let detachChoseongDigraph = {
"\u1101":["\u1100","\u1100"],
"\u1104":["\u1103","\u1103"],
"\u1108":["\u1107","\u1107"],
"\u110A":["\u1109","\u1109"],
"\u110D":["\u110C","\u110C"]
}
let detachJungseongDigraph = {
"\u116A":["\u1169","\u1161"],
"\u116B":["\u1169","\u1162"],
"\u116C":["\u1169","\u1175"],
"\u116F":["\u116E","\u1165"],
"\u1170":["\u116E","\u1166"],
"\u1171":["\u116E","\u1175"],
"\u1174":["\u1173","\u1175"],
"\u119F":["\u119E","\u1165"],
"\u11A0":["\u119E","\u116E"],
"\u11A1":["\u119E","\u1175"],
"\u11A2":["\u119E","\u119E"]
}
let detachJongseongDigraph = {
"\u11A9":["\u11A8","\u11A8"],
"\u11AA":["\u11A8","\u11BA"],
"\u11AC":["\u11AB","\u11BD"],
"\u11AD":["\u11AB","\u11C2"],
"\u11B0":["\u11AF","\u11A8"],
"\u11B1":["\u11AF","\u11B7"],
"\u11B2":["\u11AF","\u11B8"],
"\u11B3":["\u11AF","\u11BA"],
"\u11B4":["\u11AF","\u11C0"],
"\u11B5":["\u11AF","\u11C1"],
"\u11B6":["\u11AF","\u11C2"],
"\u11B9":["\u11B8","\u11BA"],
"\u11BB":["\u11BA","\u11BA"]
}
let normaliseLUT = {
// Hangul Jamo Initials → Hangul Compatibility Jamo
"\u1100":"\u3131","\u1101":"\u3132","\u1102":"\u3134","\u1103":"\u3137","\u1104":"\u3138",
"\u1105":"\u3139","\u1106":"\u3141","\u1107":"\u3142","\u1108":"\u3143","\u1109":"\u3145",
"\u110A":"\u3146","\u110B":"\u3147","\u110C":"\u3148","\u110D":"\u3149","\u110E":"\u314A",
"\u110F":"\u314B","\u1110":"\u314C","\u1111":"\u314D","\u1112":"\u314E",
// Hangul Jamo Peaks → Hangul Compatibility Jamo
"\u1161":"\u314F","\u1162":"\u3150","\u1163":"\u3151","\u1164":"\u3152","\u1165":"\u3153",
"\u1166":"\u3154","\u1167":"\u3155","\u1168":"\u3156","\u1169":"\u3157","\u116A":"\u3158",
"\u116B":"\u3159","\u116C":"\u315A","\u116D":"\u315B","\u116E":"\u315C","\u116F":"\u315D",
"\u1170":"\u315E","\u1171":"\u315F","\u1172":"\u3160","\u1173":"\u3161","\u1174":"\u3162",
"\u1175":"\u3163",
// Hangul Jamo Finals → Hangul Compatibility Jamo
"\u11A8":"\u3131","\u11A9":"\u3132","\u11AA":"\u3133","\u11AB":"\u3134","\u11AC":"\u3135",
"\u11AD":"\u3136","\u11AE":"\u3137","\u11AF":"\u3139","\u11B0":"\u313A","\u11B1":"\u313B",
"\u11B2":"\u313C","\u11B3":"\u313D","\u11B4":"\u313E","\u11B5":"\u313F","\u11B6":"\u3140",
"\u11B7":"\u3141","\u11B8":"\u3142","\u11B9":"\u3144","\u11BA":"\u3145","\u11BB":"\u3146",
"\u11BC":"\u3147","\u11BD":"\u3148","\u11BE":"\u314A","\u11BF":"\u314B","\u11C0":"\u314C",
"\u11C1":"\u314D","\u11C2":"\u314E"
}
let normaliseBuf = (it) => normaliseLUT[it] || it
let bufAssemble = () => {
// nothing on the buffer
if (states.buf[0] === undefined && states.buf[1] === undefined && states.buf[2] === undefined)
return ''
// Hangul: I x F
else if (states.buf[1] === undefined && isHangul(states.buf[0]))
return [states.buf[0], "\u1160", states.buf[2]].join('')
// Hangul: x P F
else if (states.buf[0] === undefined && isHangul(states.buf[1]))
return ["\u115F", states.buf[1], states.buf[2]].join('')
// Hangul: x x F
else if (isHangul(states.buf[2]) && states.buf[0] === undefined && states.buf[1] === undefined )
return ["\u115F", "\u1160", states.buf[2]].join('')
// Hangul: I P F → Hangul Syllables (\uAC00..\uD7A3)
else if (!isJungseongSuper(states.buf[1]) && isChoseong(states.buf[0]) && isJungseong(states.buf[1]) && isJongseong(states.buf[2])) {
let i = states.buf[0].charCodeAt(0) - 0x1100
let p = states.buf[1].charCodeAt(0) - 0x1161
let f = states.buf[2].charCodeAt(0) - 0x11A7
return String.fromCodePoint(0xAC00 + (i * 588) + (p * 28) + f)
}
// Hangul: I P → Hangul Syllables (\uAC00..\uD7A3)
else if (!isJungseongSuper(states.buf[1]) && isChoseong(states.buf[0]) && isJungseong(states.buf[1]) && undefined == states.buf[2]) {
let i = states.buf[0].charCodeAt(0) - 0x1100
let p = states.buf[1].charCodeAt(0) - 0x1161
return String.fromCodePoint(0xAC00 + (i * 588) + (p * 28))
}
else
return states.buf.join('')
}
let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ')
return Object.freeze({"n":"SR Shin P2","v":"one","c":"CuriousTo\uA75Bvald","m":"rewrite",
"t":states.keylayouts.map(it => [it[0],it[1]]),
// return: [displayed output, composed output]
"accept":(headkey,shiftin,altgrin)=>{
let layer = 1*shiftin// + 2*altgrin
states.code = 1
let s = states.keylayouts[headkey][layer]
let s2 = states.keylayouts[headkey][2]
let bufIndex = isJungseong(s) ? 1 : isJongseong(s) ? 2 : 0
let isDeadkey = isJungseongDeadkey(headkey)
let hasChoseong = isChoseong(states.buf[0])
let hasJungseong = isJungseong(states.buf[1])
let shiftForJungseong = hasChoseong && !hasJungseong
let deadkeyAcceptable = isDeadkey && !states.hasDeadkey && shiftForJungseong
if (isHangul(s)) {
// auto-change alternative layer if choseong is in the buffer already
// unshift when jungseong is there
// Korean threesetters call this feature "Galmadeuri" Input
// if deadkeyAcceptable? -OR- shiftForJungseong? -OR- (notdeadkey? -AND- A as in GWA)
if (deadkeyAcceptable || shiftForJungseong || (!isDeadkey && states.hasDeadkey)) {
// console.log(`Shiftin--keycode=${headkey}, isDeadkey=${isDeadkey}, hasChoseong=${hasChoseong}, hasJungseong=${hasJungseong}; deadkeyAcceptable=${deadkeyAcceptable}, shiftForJungseong=${shiftForJungseong}, (!isDeadkey && states.hasDeadkey)=${(!isDeadkey && states.hasDeadkey)}`)
s = s2
bufIndex = 1
states.hasDeadkey = deadkeyAcceptable
}
else {
states.hasDeadkey = false
}
// ㄲ ㄸ ㅃ ㅆ ㅉ (only allow when the jung/jongseong is not typed)
if (0 == bufIndex && !states.buf[1] && isChoseongDigraph(states.buf[0]) && states.buf[0] == s) {
states.buf[0] = choseongDigraphs[s]
}
// ㅘ ㅙ ㅚ
else if (1 == bufIndex && "\u1169" == states.buf[1] && isJungseongDigraphO(s)) {
states.buf[1] = jungseongDigraphsO[s]
}
// ㅝ ㅞ ㅟ
else if (1 == bufIndex && "\u116E" == states.buf[1] && isJungseongDigraphU(s)) {
states.buf[1] = jungseongDigraphsU[s]
}
// ㅢ
else if (1 == bufIndex && "\u1173" == states.buf[1] && isJungseongDigraphEU(s)) {
states.buf[1] = jungseongDigraphsEU[s]
}
// ᆟ ᆠ ᆡ ᆢ
else if (1 == bufIndex && "\u119E" == states.buf[1] && isJungseongDigraphAA(s)) {
states.buf[1] = jungseongDigraphsAA[s]
}
// ㄲ ㄳ
else if (2 == bufIndex && "\u11A8" == states.buf[2] && isJongseongDigraphG(s)) {
states.buf[2] = jongseongDigraphsG[s]
}
// ㄵ ㄶ
else if (2 == bufIndex && "\u11AB" == states.buf[2] && isJongseongDigraphN(s)) {
states.buf[2] = jongseongDigraphsN[s]
}
// ㄺ ㄻ ㄼ ㄽ ㄾ ㄿ ㅀ
else if (2 == bufIndex && "\u11AF" == states.buf[2] && isJongseongDigraphR(s)) {
states.buf[2] = jongseongDigraphsR[s]
}
// ㅄ
else if (2 == bufIndex && "\u11B8" == states.buf[2] && isJongseongDigraphB(s)) {
states.buf[2] = jongseongDigraphsB[s]
}
// key inputs that bufIndex collides (end compose and accept incoming char as a new char state)
else if (states.buf[bufIndex] !== undefined) {
reset()
states.buf[bufIndex] = s
// let newbufstr = bufDebugStringify(states.buf)
// console.log(`sending out: ${newbufstr}`)
return ["0", bufAssemble()]
}
else {
let bufferEmpty = (states.buf[0] === undefined)
states.buf[bufIndex] = s
if (bufferEmpty) {
// console.log(`assembling: ${bufDebugStringify(states.buf)} -> 0,${bufAssemble()}`)
return ["0", bufAssemble()]
}
else {
// console.log(`assembling: ${bufDebugStringify(states.buf)} -> 1,${bufAssemble()}`)
return ["1", bufAssemble()]
}
}
return ["1", bufAssemble()]
}
else {
reset()
// directly print out the character without using the buffer
// console.log(`sending1 out: ${s}`)
return ["0", s]
}
},
"backspace":()=>{
// disassemble jung/jongseong digraphs
// let oldbufstr = bufDebugStringify(states.buf)
let last = states.buf.pop()
if (last !== undefined) {
// detach jongseong
if (isThisCharJongseongDigraph(last))
states.buf[2] = detachJongseongDigraph[last][0]
// detach jungseong
else if (isThisCharJungseongDigraph(last))
states.buf[1] = detachJungseongDigraph[last][0]
// detach choseong
else if (isThisCharChoseongDigraph(last))
states.buf[0] = detachChoseongDigraph[last][0]
}
if (states.buf.length == 0) reset()
// let newbufstr = bufDebugStringify(states.buf)
// console.log(`popping assembly: ${oldbufstr} -> 1,${newbufstr}`)
return bufAssemble()
},
"end":()=>{
// console.log(`end composing`)
let ret = bufAssemble()
reset()
return ret
},
"reset":()=>{ reset() },
"composing":()=>(states.code!=0)
})

View File

@@ -260,7 +260,7 @@ let reset = () => {
}
let inRange = (s,a,b) => (a <= s && s <= b)
let isDiacritics = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x0300, 0x036F)
return Object.freeze({"n":"Русс. ЙЦУКЕН","v":"none","c":"CuriousTo\uA75Bvald",
return Object.freeze({"n":"Русс. ЙЦУКЕН","v":"none","c":"CuriousTo\uA75Bvald","m":"candidates",
"t":states.keylayouts.map(it => [it[0],it[1]]),
// return: [displayed output, composed output]
"accept":(headkey,shiftin,altgrin)=>{

View File

@@ -33,7 +33,8 @@ data class TerrarumIMEConf(
val name: String,
val copying: String,
val candidates: TerrarumIMEViewCount,
val symbols: Keysyms
val symbols: Keysyms,
val mode: TerrarumIMEMode
)
enum class TerrarumIMEViewCount {
@@ -46,6 +47,10 @@ enum class TerrarumIMEViewCount {
}
}
enum class TerrarumIMEMode {
CANDIDATES, REWRITE
}
/**
* Key Layout File Structure for Low Layer:
* - n: Displayed name of the keyboard layout
@@ -151,7 +156,13 @@ object IME {
}
private fun String.toCanditates(): List<String> =
this.split(',').mapNotNull { it.ifBlank { null } }
this.split(IMEDictionary.CAND_DELIM).mapNotNull { it.ifBlank { null } }
private fun String.toIMEMode(): TerrarumIMEMode =
when (this.lowercase()) {
"rewrite" -> TerrarumIMEMode.REWRITE
"candidates" -> TerrarumIMEMode.CANDIDATES
else -> throw IllegalArgumentException("Unknown operation mode: $this")
}
private fun parseImeFile(file: File): TerrarumIME {
val code = file.readText(Charsets.UTF_8)
@@ -160,6 +171,7 @@ object IME {
val candidatesCount = jsval.getMember("v").asString().toViewCount()
val copying = jsval.getMember("c").asString()
val keysyms = Array(256) { Array<String?>(4) { null } }
val mode = jsval.getMember("m").asString().toIMEMode()
for (keycode in 0L until 256L) {
val a = jsval.getMember("t").getArrayElement(keycode)
@@ -177,7 +189,7 @@ object IME {
return TerrarumIME(
name,
TerrarumIMEConf(name, copying, candidatesCount, keysyms),
TerrarumIMEConf(name, copying, candidatesCount, keysyms, mode),
{ headkey, shifted, alted, lowLayerKeysym ->
val a = jsval.invokeMember("accept", headkey, shifted, alted, lowLayerKeysym)
a.getArrayElement(0).asString().toCanditates() to a.getArrayElement(1).asString()

View File

@@ -9,6 +9,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch
import com.badlogic.gdx.graphics.glutils.FrameBuffer
import com.jme3.math.FastMath
import net.torvald.terrarum.*
import net.torvald.terrarum.App.printdbg
import net.torvald.terrarum.gamecontroller.*
import net.torvald.terrarum.utils.Clipboard
import net.torvald.terrarumsansbitmap.gdx.CodepointSequence
@@ -174,6 +175,26 @@ class UIItemTextLineInput(
}
}
private fun inputBackspaceOnce(dbgprn: Int = 0) {
if (cursorX > 0) {
while (true) {
cursorX -= 1
// val oldlen = textbuf.size
val oldChar = textbuf.removeAt(cursorX)
val charFore = textbuf.lastOrNull()
// val newlen = textbuf.size
// if (dbgprn > 0) printdbg(this, "${dbgprn}del char U+${oldChar.toString(16)} '${String(intArrayOf(oldChar), 0, if (oldChar > 65535) 2 else 1)}'; length: $oldlen -> $newlen")
// continue deleting hangul pieces because of the font...
if (cursorX == 0 || (charFore !in 0x1100..0x11A7 && charFore !in 0xA960..0xA97F && charFore !in 0xD7B0..0xD7CA)) break
}
cursorDrawX = App.fontGame.getWidth(CodepointSequence(textbuf.subList(0, cursorX)))
tryCursorForward()
}
}
override fun inputStrobed(e: TerrarumKeyboardEvent) {
val oldActive = isActive
@@ -198,8 +219,32 @@ class UIItemTextLineInput(
copyToClipboard()
}
else if (keycodes.contains(Input.Keys.BACKSPACE) || (keycodes.contains(Input.Keys.CAPS_LOCK) && lowLayer.capsMode == TerrarumKeyCapsMode.BACK)) {
printdbg(this, "BACKSPACE hit; ime.composing=${ime?.composing?.invoke()}; buflen=${textbuf.size}")
if (ime != null && ime.composing()) {
candidates = ime.backspace().map { CodepointSequence(it.toCodePoints()) }
if (ime.config.mode == TerrarumIMEMode.CANDIDATES) {
candidates = ime.backspace().map { CodepointSequence(it.toCodePoints()) }
}
else if (ime.config.mode == TerrarumIMEMode.REWRITE) {
candidates = listOf()
val op = ime.backspace()
if (textbuf.isNotEmpty()) {
inputBackspaceOnce(1)
}
if (op.size > 0) {
val codepoints = op[0].toCodePoints()
if (!maxLen.exceeds(textbuf, codepoints)) {
textbuf.addAll(cursorX, codepoints)
cursorX += codepoints.size
cursorDrawX = App.fontGame.getWidth(CodepointSequence(textbuf.subList(0, cursorX)))
tryCursorBack()
}
}
}
}
else if (cursorX <= 0) {
cursorX = 0
@@ -208,17 +253,7 @@ class UIItemTextLineInput(
}
else {
endComposing()
if (cursorX > 0) {
while (true) {
cursorX -= 1
val oldCode = textbuf.removeAt(cursorX)
// continue deleting hangul pieces because of the font...
if (cursorX == 0 || (oldCode !in 0x115F..0x11FF && oldCode !in 0xD7B0..0xD7FF)) break
}
cursorDrawX = App.fontGame.getWidth(CodepointSequence(textbuf.subList(0, cursorX)))
tryCursorForward()
}
inputBackspaceOnce(2)
}
}
else if (keycodes.contains(Input.Keys.LEFT)) {
@@ -252,14 +287,32 @@ class UIItemTextLineInput(
val altgrin = keycodes.contains(Input.Keys.ALT_RIGHT) || keycodes.containsAll(Input.Keys.ALT_LEFT, Input.Keys.CONTROL_LEFT)
val codepoints = if (ime != null) {
val newStatus = ime.acceptChar(headkey, shiftin, altgrin, char)
candidates = newStatus.first.map { CodepointSequence(it.toCodePoints()) }
if (ime.config.mode == TerrarumIMEMode.CANDIDATES) {
val newStatus = ime.acceptChar(headkey, shiftin, altgrin, char)
candidates = newStatus.first.map { CodepointSequence(it.toCodePoints()) }
newStatus.second.toCodePoints()
newStatus.second.toCodePoints()
}
else if (ime.config.mode == TerrarumIMEMode.REWRITE) {
candidates = listOf()
val op = ime.acceptChar(headkey, shiftin, altgrin, char)
// printdbg(this, "delcount: ${op.first[0].toInt()}, rewrite: '${op.second}'")
repeat(op.first[0].toInt()) {
if (textbuf.isNotEmpty()) {
// printdbg(this, "<del 1>")
inputBackspaceOnce()
}
}
op.second.toCodePoints()
}
else throw IllegalArgumentException("Unknown IME Operation mode: ${ime.config.mode}")
}
else char.toCodePoints()
// println("textinput codepoints: ${codepoints.map { it.toString(16) }.joinToString()}")
// printdbg(this, "textinput codepoints: ${codepoints.map { it.toString(16) }.joinToString()}")
if (!maxLen.exceeds(textbuf, codepoints)) {
textbuf.addAll(cursorX, codepoints)
@@ -288,6 +341,8 @@ class UIItemTextLineInput(
else if (oldActive) { // just became deactivated
endComposing()
}
fboUpdateLatch = true
}
override fun update(delta: Float) {
@@ -326,7 +381,7 @@ class UIItemTextLineInput(
}
}
private fun String.toCodePoints() = this.codePoints().toList().filter { it > 0 }
private fun String.toCodePoints() = this.codePoints().toList().filter { it > 0 }.toList()
private fun endComposing() {
getIME()?.let {
@@ -382,7 +437,7 @@ class UIItemTextLineInput(
batch.end()
if (fboUpdateLatch) {
if (true || fboUpdateLatch) {
fboUpdateLatch = false
fbo.inAction(camera as OrthographicCamera, batch) { batch.inUse {
gdxClearAndSetBlend(0f, 0f, 0f, 0f)