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

InputHandler // Let cassette mode respond to possible final key.

This commit is contained in:
ShikiSuen 2022-10-25 09:45:02 +08:00
parent 03236671af
commit e47d5749e9
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Modules/InputHandler_HandleComposition.swift
View File

@ -174,16 +174,24 @@ extension InputHandler {
private func handleCassetteComposition(input: InputSignalProtocol) -> Bool? { private func handleCassetteComposition(input: InputSignalProtocol) -> Bool? {
guard let delegate = delegate else { return nil } guard let delegate = delegate else { return nil }
var wildcardKey: String { currentLM.currentCassette.wildcardKey } // 花牌鍵。 var wildcardKey: String { currentLM.currentCassette.wildcardKey } // 花牌鍵。
let isWildcardKeyInput: Bool = (input.text == wildcardKey && !wildcardKey.isEmpty)
var keyConsumedByStrokes = false var keyConsumedByStrokes = false
let skipStrokeHandling = let skipStrokeHandling =
input.isReservedKey || input.isNumericPadKey || input.isNonLaptopFunctionKey input.isReservedKey || input.isNumericPadKey || input.isNonLaptopFunctionKey
|| input.isControlHold || input.isOptionHold || input.isShiftHold || input.isCommandHold || input.isControlHold || input.isOptionHold || input.isShiftHold || input.isCommandHold
var isStrokesFull: Bool { calligrapher.count >= currentLM.currentCassette.maxKeyLength } var isLongestPossibleKeyFormed: Bool {
guard !isWildcardKeyInput, !wildcardKey.isEmpty else { return false }
return !currentLM.currentCassette.hasUnigramsFor(key: calligrapher + wildcardKey) && !calligrapher.isEmpty
}
var isStrokesFull: Bool {
calligrapher.count >= currentLM.currentCassette.maxKeyLength || isLongestPossibleKeyFormed
}
prehandling: if !skipStrokeHandling && currentLM.currentCassette.allowedKeys.contains(input.text) { prehandling: if !skipStrokeHandling && currentLM.currentCassette.allowedKeys.contains(input.text) {
if calligrapher.isEmpty, input.text == wildcardKey { if calligrapher.isEmpty, isWildcardKeyInput {
delegate.callError("3606B9C0") delegate.callError("3606B9C0")
var newEmptyState = IMEState.ofEmpty() var newEmptyState = IMEState.ofEmpty()
newEmptyState.tooltip = NSLocalizedString("Wildcard key cannot be the initial key.", comment: "") + "　　" newEmptyState.tooltip = NSLocalizedString("Wildcard key cannot be the initial key.", comment: "") + "　　"
@ -195,7 +203,7 @@ extension InputHandler {
calligrapher = String(calligrapher.dropLast(1)) calligrapher = String(calligrapher.dropLast(1))
} }
calligrapher.append(input.text) calligrapher.append(input.text)
if input.text == wildcardKey { if isWildcardKeyInput {
break prehandling break prehandling
} }
keyConsumedByStrokes = true keyConsumedByStrokes = true
@ -206,12 +214,12 @@ extension InputHandler {
} }
} }
var compoundStrokes = isStrokesFull || (input.text == wildcardKey && !calligrapher.isEmpty) var combineStrokes = isStrokesFull || (isWildcardKeyInput && !calligrapher.isEmpty)
// 如果當前的按鍵是 Enter 或 Space 的話，這時就可以取出 calligrapher 內的筆畫來做檢查了。 // 如果當前的按鍵是 Enter 或 Space 的話，這時就可以取出 calligrapher 內的筆畫來做檢查了。
// 來看看詞庫內到底有沒有對應的讀音索引。這裡用了類似「|=」的判斷處理方式。 // 來看看詞庫內到底有沒有對應的讀音索引。這裡用了類似「|=」的判斷處理方式。
compoundStrokes = compoundStrokes || (!calligrapher.isEmpty && (input.isSpace || input.isEnter)) combineStrokes = combineStrokes || (!calligrapher.isEmpty && (input.isSpace || input.isEnter))
if compoundStrokes { if combineStrokes {
// 向語言模型詢問是否有對應的記錄。 // 向語言模型詢問是否有對應的記錄。
if !currentLM.hasUnigramsFor(key: calligrapher) { if !currentLM.hasUnigramsFor(key: calligrapher) {
delegate.callError("B49C0979_Cassette：語彙庫內無「\(calligrapher)」的匹配記錄。") delegate.callError("B49C0979_Cassette：語彙庫內無「\(calligrapher)」的匹配記錄。")