floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ctlIME // Move kanji conversion to IME module.

This commit is contained in:
ShikiSuen 2022-06-18 13:59:27 +08:00
parent ad1141a7fd
commit 8076b083fe
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Modules/ControllerModules/InputState.swift
View File

@ -146,7 +146,7 @@ class InputState {
var attributedString: NSAttributedString {
let attributedString = NSAttributedString(
string: composingBuffer,
string: IME.kanjiConversionIfRequired(composingBuffer),
attributes: [
.underlineStyle: NSUnderlineStyle.single.rawValue,
.markedClauseSegment: 0,
@ -260,7 +260,7 @@ class InputState {
}
override var attributedString: NSAttributedString {
let attributedString = NSMutableAttributedString(string: composingBuffer)
let attributedString = NSMutableAttributedString(string: IME.kanjiConversionIfRequired(composingBuffer))
let end = markedRange.upperBound
attributedString.setAttributes(

15
Source/Modules/ControllerModules/KeyHandler_Core.swift
View File

@ -446,4 +446,19 @@ class KeyHandler {
func deleteCompositorReadingToTheFrontOfCursor() {
compositor.deleteReadingToTheFrontOfCursor()
}
// MARK: - 其他工具函式
func kanjiConversionIfRequired(_ text: String) -> String {
if inputMode == InputMode.imeModeCHT {
switch (mgrPrefs.chineseConversionEnabled, mgrPrefs.shiftJISShinjitaiOutputEnabled) {
case (false, true): return vChewingKanjiConverter.cnvTradToJIS(text)
case (true, false): return vChewingKanjiConverter.cnvTradToKangXi(text)
// 本來這兩個開關不該同時開啟的，但萬一被開啟了的話就這樣處理：
case (true, true): return vChewingKanjiConverter.cnvTradToJIS(text)
case (false, false): return text
}
}
return text
}
}

15
Source/Modules/IMEModules/ctlInputMethod.swift
View File

@ -298,20 +298,7 @@ extension ctlInputMethod {
/// 遞交組字區內容。
private func commit(text: String) {
func kanjiConversionIfRequired(_ text: String) -> String {
if keyHandler.inputMode == InputMode.imeModeCHT {
switch (mgrPrefs.chineseConversionEnabled, mgrPrefs.shiftJISShinjitaiOutputEnabled) {
case (false, true): return vChewingKanjiConverter.cnvTradToJIS(text)
case (true, false): return vChewingKanjiConverter.cnvTradToKangXi(text)
// 本來這兩個開關不該同時開啟的，但萬一被開啟了的話就這樣處理：
case (true, true): return vChewingKanjiConverter.cnvTradToJIS(text)
case (false, false): return text
}
}
return text
}
let buffer = kanjiConversionIfRequired(text)
let buffer = keyHandler.kanjiConversionIfRequired(text)
if buffer.isEmpty {
return
}