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

KeyHandler // Refactoring a little.

This commit is contained in:
ShikiSuen 2022-05-13 12:32:25 +08:00
parent b64e48239e
commit f31373a104
2 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,6 @@ class KeyHandler: NSObject {
_walkedNodes.removeAll() _walkedNodes.removeAll()
} }
// 這個函數得獨立出來給 ObjC 使用。
func setInputMode(_ value: String) { func setInputMode(_ value: String) {
// 下面這句的「isKindOfClass」是做類型檢查， // 下面這句的「isKindOfClass」是做類型檢查，
// 為了應對出現輸入法 plist 被改壞掉這樣的極端情況。 // 為了應對出現輸入法 plist 被改壞掉這樣的極端情況。
@ -122,7 +121,7 @@ class KeyHandler: NSObject {
let walker = Megrez.Walker(grid: _builder.grid()) let walker = Megrez.Walker(grid: _builder.grid())
// the reverse walk traces the grid from the end // the reverse walk traces the grid from the end
let walked: [Megrez.NodeAnchor] = walker.reverseWalk(at: _builder.grid().width(), nodesLimit: 3, balanced: true) let walked = walker.reverseWalk(at: _builder.grid().width(), nodesLimit: 3, balanced: true)
// then we use ".reversed()" to reverse the nodes so that we get the forward-walked nodes // then we use ".reversed()" to reverse the nodes so that we get the forward-walked nodes
_walkedNodes.removeAll() _walkedNodes.removeAll()

10
Source/Modules/ControllerModules/KeyHandler_HandleInput.swift
View File

@ -37,12 +37,10 @@ extension KeyHandler {
) -> Bool { ) -> Bool {
let charCode: UniChar = input.charCode let charCode: UniChar = input.charCode
var state = state // Turn this incoming constant into variable. var state = state // Turn this incoming constant into variable.
let inputText: String = input.inputText ?? ""
// Ignore the input if its inputText is empty. // Ignore the input if its inputText is empty.
// Reason: such inputs may be functional key combinations. // Reason: such inputs may be functional key combinations.
guard let inputText: String = input.inputText, !inputText.isEmpty else {
if inputText.isEmpty {
return false return false
} }
@ -238,8 +236,7 @@ extension KeyHandler {
// MARK: Calling candidate window using Space or Down or PageUp / PageDn. // MARK: Calling candidate window using Space or Down or PageUp / PageDn.
if let currentState = state as? InputState.NotEmpty { if let currentState = state as? InputState.NotEmpty, _composer.isEmpty,
if _composer.isEmpty,
input.isExtraChooseCandidateKey || input.isExtraChooseCandidateKeyReverse || input.isSpace input.isExtraChooseCandidateKey || input.isExtraChooseCandidateKeyReverse || input.isSpace
|| input.isPageDown || input.isPageUp || input.isTab || input.isPageDown || input.isPageUp || input.isTab
|| (input.useVerticalMode && (input.isVerticalModeOnlyChooseCandidateKey)) || (input.useVerticalMode && (input.isVerticalModeOnlyChooseCandidateKey))
@ -249,7 +246,7 @@ extension KeyHandler {
if input.isShiftHold || !mgrPrefs.chooseCandidateUsingSpace { if input.isShiftHold || !mgrPrefs.chooseCandidateUsingSpace {
if getBuilderCursorIndex() >= getBuilderLength() { if getBuilderCursorIndex() >= getBuilderLength() {
let composingBuffer = currentState.composingBuffer let composingBuffer = currentState.composingBuffer
if (composingBuffer.count) != 0 { if !composingBuffer.isEmpty {
stateCallback(InputState.Committing(poppedText: composingBuffer)) stateCallback(InputState.Committing(poppedText: composingBuffer))
} }
clear() clear()
@ -268,7 +265,6 @@ extension KeyHandler {
stateCallback(buildCandidate(state: currentState, useVerticalMode: input.useVerticalMode)) stateCallback(buildCandidate(state: currentState, useVerticalMode: input.useVerticalMode))
return true return true
} }
}
// MARK: - // MARK: -