(InputMethod) Improve EventHandler code structures

yuetyam · Oct 23, 2023 · a061df2 · a061df2
1 parent 6d64eab
commit a061df2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/Jyutping/InputMethod/EventHandler.swift b/Jyutping/InputMethod/EventHandler.swift
@@ -1,6 +1,7 @@
 import SwiftUI
 import InputMethodKit
 import CoreIME
+import CommonExtensions
 
 private struct ShiftKey {
         private(set) static var isBuffering: Bool = false
@@ -45,10 +46,7 @@ extension JyutpingInputController {
 
         override func handle(_ event: NSEvent!, client sender: Any!) -> Bool {
                 guard let event = event else { return false }
-                let modifiers = event.modifierFlags
-                let shouldIgnoreCurrentEvent: Bool = modifiers.contains(.command) || modifiers.contains(.option)
-                guard !shouldIgnoreCurrentEvent else { return false }
-                if shouldSwitchInputMethodMode(with: event) {
+                guard !shouldSwitchInputMethodMode(with: event) else {
                         switch appContext.inputForm {
                         case .cantonese:
                                 passBuffer()
@@ -65,6 +63,9 @@ extension JyutpingInputController {
                         }
                 }
                 guard event.type == .keyDown else { return false }
+                let modifiers = event.modifierFlags
+                let shouldIgnoreCurrentEvent: Bool = modifiers.contains(.command) || modifiers.contains(.option)
+                guard !shouldIgnoreCurrentEvent else { return false }
                 let client: IMKTextInput? = (sender as? IMKTextInput) ?? currentClient
                 currentOrigin = client?.position
                 let currentClientID = currentClient?.uniqueClientIdentifierString()
@@ -306,7 +307,7 @@ extension JyutpingInputController {
                                 handleOptions(-1)
                                 return true
                         }
-                case .escapeClear:
+                case .escape, .clear:
                         switch currentInputForm {
                         case .cantonese:
                                 guard inputStage.isBuffering else { return false }
@@ -332,14 +333,13 @@ extension JyutpingInputController {
                                 if candidates.isEmpty {
                                         passBuffer()
                                         let shouldInsertFullWidthSpace: Bool = isShifting || (Options.characterForm == .fullWidth)
-                                        let text: String = shouldInsertFullWidthSpace ? "　" : " "
+                                        let text: String = shouldInsertFullWidthSpace ? String.fullWidthSpace : String.space
                                         client?.insert(text)
                                         return true
                                 } else {
                                         let index = appContext.highlightedIndex
                                         guard let selectedItem = appContext.displayCandidates.fetch(index) else { return true }
-                                        let text = selectedItem.text
-                                        client?.insert(text)
+                                        client?.insert(selectedItem.text)
                                         aftercareSelection(selectedItem)
                                         return true
                                 }

diff --git a/Jyutping/InputMethod/KeyCode/Representative.swift b/Jyutping/InputMethod/KeyCode/Representative.swift
@@ -23,7 +23,8 @@ enum Representative: Hashable {
         case separator
         case `return`
         case backspace
-        case escapeClear
+        case escape
+        case clear
         case space
         case tab
         case previousPage
@@ -153,8 +154,10 @@ extension UInt16 {
                         return .punctuation(.equal)
                 case KeyCode.Symbol.VK_QUOTE:
                         return .separator
-                case KeyCode.Special.VK_ESCAPE, KeyCode.Keypad.VK_KEYPAD_CLEAR:
-                        return .escapeClear
+                case KeyCode.Special.VK_ESCAPE:
+                        return .escape
+                case KeyCode.Keypad.VK_KEYPAD_CLEAR:
+                        return .clear
                 case KeyCode.Special.VK_TAB:
                         return .tab
                 case KeyCode.Special.VK_PAGEUP:
@@ -166,5 +169,3 @@ extension UInt16 {
                 }
         }
 }
-
-