From 7ee955a55c31801e6ed5624e7ec677aa60c25540 Mon Sep 17 00:00:00 2001 From: zonble Date: Fri, 28 Jan 2022 03:24:06 +0800 Subject: [PATCH] Cleans-up KeyHandlerInput. --- Source/KeyHandlerInput.swift | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/Source/KeyHandlerInput.swift b/Source/KeyHandlerInput.swift index 60118392..a223bde5 100644 --- a/Source/KeyHandlerInput.swift +++ b/Source/KeyHandlerInput.swift @@ -15,21 +15,10 @@ import Cocoa } @objc class KeyHandlerInput: NSObject { - @objc private (set) var event: NSEvent @objc private (set) var useVerticalMode: Bool - - @objc var inputText: String? { - event.characters - } - - @objc var keyCode: UInt16 { - event.keyCode - } - - @objc var flags: NSEvent.ModifierFlags { - event.modifierFlags - } - + @objc private (set) var inputText: String? + @objc private (set) var keyCode: UInt16 + @objc private (set) var flags: NSEvent.ModifierFlags @objc private (set) var charCode: UInt16 @objc private (set) var cursorForwardKey: KeyCode @objc private (set) var cursorBackwardKey: KeyCode @@ -39,7 +28,9 @@ import Cocoa @objc private (set) var emacsKey: McBopomofoEmacsKey @objc init(event: NSEvent, isVerticalMode: Bool) { - self.event = event + self.inputText = event.characters + self.keyCode = event.keyCode + self.flags = event.modifierFlags self.useVerticalMode = isVerticalMode let charCode: UInt16 = { guard let inputText = event.characters, inputText.count > 0 else { @@ -72,11 +63,13 @@ import Cocoa } @objc var isLeft: Bool { - self.keyCode == KeyCode.left.rawValue + NSLog("isLeft called \(self.keyCode == KeyCode.left.rawValue)") + return self.keyCode == KeyCode.left.rawValue } @objc var isRight: Bool { - self.keyCode == KeyCode.right.rawValue + NSLog("isRight called \(self.keyCode == KeyCode.right.rawValue)") + return self.keyCode == KeyCode.right.rawValue } @objc var isPageUp: Bool {