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

InputHandler // Implement (BOOL)handleCandidateInput:ignoringModifiers:.

This commit is contained in:
ShikiSuen 2024-01-18 13:18:19 +08:00
parent 71dc1afc48
commit 5e1208bc5e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_HandleCandidate.swift
View File

@ -18,14 +18,17 @@ import Shared
extension InputHandler { extension InputHandler {
/// 當且僅當選字窗出現時，對於經過初次篩選處理的輸入訊號的處理均藉由此函式來進行。 /// 當且僅當選字窗出現時，對於經過初次篩選處理的輸入訊號的處理均藉由此函式來進行。
/// - Parameter input: 輸入訊號。 /// - Parameters:
/// - input: 輸入訊號。
/// - ignoringModifiers: 是否需要忽視修飾鍵。
/// - Returns: 告知 IMK「該按鍵是否已經被輸入法攔截處理」。 /// - Returns: 告知 IMK「該按鍵是否已經被輸入法攔截處理」。
func handleCandidate(input: InputSignalProtocol) -> Bool { func handleCandidate(input: InputSignalProtocol, ignoringModifiers: Bool = false) -> Bool {
guard let delegate = delegate else { return false } guard let delegate = delegate else { return false }
guard var ctlCandidate = delegate.candidateController() else { return false } guard var ctlCandidate = delegate.candidateController() else { return false }
let state = delegate.state let state = delegate.state
guard state.isCandidateContainer else { return false } // 會自動判斷「isEmpty」。 guard state.isCandidateContainer else { return false } // 會自動判斷「isEmpty」。
guard ctlCandidate.visible else { return false } guard ctlCandidate.visible else { return false }
let inputText = ignoringModifiers ? (input.inputTextIgnoringModifiers ?? input.text) : input.text
// MARK: 選字窗內使用熱鍵升權、降權、刪詞。 // MARK: 選字窗內使用熱鍵升權、降權、刪詞。
@ -184,7 +187,7 @@ extension InputHandler {
let cassetteShift = currentLM.areCassetteCandidateKeysShiftHeld let cassetteShift = currentLM.areCassetteCandidateKeysShiftHeld
shaltShiftHold = shaltShiftHold || cassetteShift shaltShiftHold = shaltShiftHold || cassetteShift
} }
let matched: String = shaltShiftHold ? input.inputTextIgnoringModifiers ?? "" : input.text let matched: String = shaltShiftHold ? input.inputTextIgnoringModifiers ?? "" : inputText
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 }
index = Int(keyPair.offset) index = Int(keyPair.offset)
@ -210,27 +213,27 @@ extension InputHandler {
let punctuationNamePrefix: String = generatePunctuationNamePrefix(withKeyCondition: input) let punctuationNamePrefix: String = generatePunctuationNamePrefix(withKeyCondition: input)
let parser = currentKeyboardParser let parser = currentKeyboardParser
let arrCustomPunctuations: [String] = [ let arrCustomPunctuations: [String] = [
punctuationNamePrefix, parser, input.text, punctuationNamePrefix, parser, inputText,
] ]
let customPunctuation: String = arrCustomPunctuations.joined() let customPunctuation: String = arrCustomPunctuations.joined()
/// 看看這個輸入是否是不需要修飾鍵的那種標點鍵輸入。 /// 看看這個輸入是否是不需要修飾鍵的那種標點鍵輸入。
let arrPunctuations: [String] = [ let arrPunctuations: [String] = [
punctuationNamePrefix, input.text, punctuationNamePrefix, inputText,
] ]
let punctuation: String = arrPunctuations.joined() let punctuation: String = arrPunctuations.joined()
let isInputValid: Bool = let isInputValid: Bool =
prefs.cassetteEnabled prefs.cassetteEnabled
? currentLM.isThisCassetteKeyAllowed(key: input.text) : composer.inputValidityCheck(key: input.charCode) ? currentLM.isThisCassetteKeyAllowed(key: inputText) : composer.inputValidityCheck(key: input.charCode)
var shouldAutoSelectCandidate: Bool = var shouldAutoSelectCandidate: Bool =
isInputValid || currentLM.hasUnigramsFor(keyArray: [customPunctuation]) isInputValid || currentLM.hasUnigramsFor(keyArray: [customPunctuation])
|| currentLM.hasUnigramsFor(keyArray: [punctuation]) || currentLM.hasUnigramsFor(keyArray: [punctuation])
if !shouldAutoSelectCandidate, input.isUpperCaseASCIILetterKey { if !shouldAutoSelectCandidate, input.isUpperCaseASCIILetterKey {
let letter = "_letter_\(input.text)" let letter = "_letter_\(inputText)"
if currentLM.hasUnigramsFor(keyArray: [letter]) { shouldAutoSelectCandidate = true } if currentLM.hasUnigramsFor(keyArray: [letter]) { shouldAutoSelectCandidate = true }
} }

7
Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_HandleComposition.swift
View File

@ -30,12 +30,9 @@ extension InputHandler {
// 處理 `%symboldef` 選字行為。 // 處理 `%symboldef` 選字行為。
if handleCassetteSymbolTable(input: input) { if handleCassetteSymbolTable(input: input) {
return true return true
} else if hasQuickCandidates, input.text != currentLM.cassetteWildcardKey, } else if hasQuickCandidates, input.text != currentLM.cassetteWildcardKey {
let itim = input.inputTextIgnoringModifiers,
let newEv = (input as? NSEvent)?.reinitiate(characters: itim)
{
// 處理 `%quick` 選字行為（當且僅當與 `%symboldef` 衝突的情況下）。 // 處理 `%quick` 選字行為（當且僅當與 `%symboldef` 衝突的情況下）。
guard !(handleQuickCandidate && handleCandidate(input: newEv)) else { return true } guard !(handleQuickCandidate && handleCandidate(input: input, ignoringModifiers: true)) else { return true }
} else { } else {
// 處理 `%quick` 選字行為。 // 處理 `%quick` 選字行為。
guard !(hasQuickCandidates && handleQuickCandidate && handleCandidate(input: input)) else { return true } guard !(hasQuickCandidates && handleQuickCandidate && handleCandidate(input: input)) else { return true }