Cleans-up KeyHandlerInput.
This commit is contained in:
parent
87702f76c5
commit
7ee955a55c
|
@ -15,21 +15,10 @@ import Cocoa
|
||||||
}
|
}
|
||||||
|
|
||||||
@objc class KeyHandlerInput: NSObject {
|
@objc class KeyHandlerInput: NSObject {
|
||||||
@objc private (set) var event: NSEvent
|
|
||||||
@objc private (set) var useVerticalMode: Bool
|
@objc private (set) var useVerticalMode: Bool
|
||||||
|
@objc private (set) var inputText: String?
|
||||||
@objc var inputText: String? {
|
@objc private (set) var keyCode: UInt16
|
||||||
event.characters
|
@objc private (set) var flags: NSEvent.ModifierFlags
|
||||||
}
|
|
||||||
|
|
||||||
@objc var keyCode: UInt16 {
|
|
||||||
event.keyCode
|
|
||||||
}
|
|
||||||
|
|
||||||
@objc var flags: NSEvent.ModifierFlags {
|
|
||||||
event.modifierFlags
|
|
||||||
}
|
|
||||||
|
|
||||||
@objc private (set) var charCode: UInt16
|
@objc private (set) var charCode: UInt16
|
||||||
@objc private (set) var cursorForwardKey: KeyCode
|
@objc private (set) var cursorForwardKey: KeyCode
|
||||||
@objc private (set) var cursorBackwardKey: KeyCode
|
@objc private (set) var cursorBackwardKey: KeyCode
|
||||||
|
@ -39,7 +28,9 @@ import Cocoa
|
||||||
@objc private (set) var emacsKey: McBopomofoEmacsKey
|
@objc private (set) var emacsKey: McBopomofoEmacsKey
|
||||||
|
|
||||||
@objc init(event: NSEvent, isVerticalMode: Bool) {
|
@objc init(event: NSEvent, isVerticalMode: Bool) {
|
||||||
self.event = event
|
self.inputText = event.characters
|
||||||
|
self.keyCode = event.keyCode
|
||||||
|
self.flags = event.modifierFlags
|
||||||
self.useVerticalMode = isVerticalMode
|
self.useVerticalMode = isVerticalMode
|
||||||
let charCode: UInt16 = {
|
let charCode: UInt16 = {
|
||||||
guard let inputText = event.characters, inputText.count > 0 else {
|
guard let inputText = event.characters, inputText.count > 0 else {
|
||||||
|
@ -72,11 +63,13 @@ import Cocoa
|
||||||
}
|
}
|
||||||
|
|
||||||
@objc var isLeft: Bool {
|
@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 {
|
@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 {
|
@objc var isPageUp: Bool {
|
||||||
|
|
Loading…
Reference in New Issue