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

InputHandler // Reorder when `%quick` inputs are handled.

This commit is contained in:
ShikiSuen 2023-06-19 23:02:36 +08:00
parent 7df892c541
commit 0a711697bb
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Modules/InputHandler_HandleCandidate.swift
View File

@ -151,7 +151,7 @@ extension InputHandler {
} }
var index: Int? var index: Int?
let matched: String = [.ofAssociates, .ofInputting].contains(state.type) let matched: String = [.ofAssociates].contains(state.type)
? input.inputTextIgnoringModifiers ?? "" : input.text ? input.inputTextIgnoringModifiers ?? "" : input.text
checkSelectionKey: for keyPair in delegate.selectionKeys.enumerated() { checkSelectionKey: for keyPair in delegate.selectionKeys.enumerated() {
guard matched.lowercased() == keyPair.element.lowercased() else { continue } guard matched.lowercased() == keyPair.element.lowercased() else { continue }

8
Source/Modules/InputHandler_HandleComposition.swift
View File

@ -216,7 +216,6 @@ extension InputHandler {
var wildcardKey: String { currentLM.cassetteWildcardKey } // 花牌鍵。 var wildcardKey: String { currentLM.cassetteWildcardKey } // 花牌鍵。
let inputText = input.text let inputText = input.text
let isWildcardKeyInput: Bool = (inputText == wildcardKey && !wildcardKey.isEmpty) let isWildcardKeyInput: Bool = (inputText == wildcardKey && !wildcardKey.isEmpty)
let calligrapherBackup = calligrapher
let skipStrokeHandling = let skipStrokeHandling =
input.isReservedKey || input.isNumericPadKey || input.isNonLaptopFunctionKey input.isReservedKey || input.isNumericPadKey || input.isNonLaptopFunctionKey
@ -286,13 +285,6 @@ extension InputHandler {
} }
// 向語言模型詢問是否有對應的記錄。 // 向語言模型詢問是否有對應的記錄。
if !currentLM.hasUnigramsFor(keyArray: [calligrapher]) { if !currentLM.hasUnigramsFor(keyArray: [calligrapher]) {
// 此時立即處理 `%quick` 選字行為。
let quickCandidates: Bool = state.type == .ofInputting && state.isCandidateContainer
if quickCandidates, handleCandidate(input: input) {
if !calligrapher.isEmpty { calligrapher = calligrapherBackup }
return true
}
delegate.callError("B49C0979_Cassette：語彙庫內無「\(calligrapher)」的匹配記錄。") delegate.callError("B49C0979_Cassette：語彙庫內無「\(calligrapher)」的匹配記錄。")
calligrapher.removeAll() calligrapher.removeAll()
// 根據「組字器是否為空」來判定回呼哪一種狀態。 // 根據「組字器是否為空」來判定回呼哪一種狀態。

7
Source/Modules/InputHandler_TriageInput.swift
View File

@ -152,10 +152,8 @@ extension InputHandler {
let hasQuickCandidates: Bool = state.type == .ofInputting && state.isCandidateContainer let hasQuickCandidates: Bool = state.type == .ofInputting && state.isCandidateContainer
if input.modifierFlags == .shift {
// 處理 `%quick` 選字行為（有摁住 Shift）。 // 處理 `%quick` 選字行為（有摁住 Shift）。
guard !(hasQuickCandidates && handleCandidate(input: input)) else { return true } guard !(hasQuickCandidates && handleCandidate(input: input)) else { return true }
}
// 注音按鍵輸入與漢音鍵盤符號輸入處理。 // 注音按鍵輸入與漢音鍵盤符號輸入處理。
if isHaninKeyboardSymbolMode, [[], .shift].contains(input.modifierFlags) { if isHaninKeyboardSymbolMode, [[], .shift].contains(input.modifierFlags) {
@ -164,11 +162,6 @@ extension InputHandler {
return compositionHandled return compositionHandled
} }
if input.modifierFlags != .shift {
// 處理 `%quick` 選字行為（沒有摁住 Shift）。
guard !(hasQuickCandidates && handleCandidate(input: input)) else { return true }
}
// ----- // -----
// 手動呼叫選字窗。 // 手動呼叫選字窗。