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

KeyHandlerInput // Attempt to detect flag changes.

This commit is contained in:
ShikiSuen 2022-03-04 22:56:38 +08:00
parent 68e9f67609
commit 09988ea0fe
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,7 @@ class KeyHandlerInput: NSObject {
@objc private (set) var inputTextIgnoringModifiers: String? @objc private (set) var inputTextIgnoringModifiers: String?
@objc private (set) var charCode: UInt16 @objc private (set) var charCode: UInt16
@objc private (set) var keyCode: UInt16 @objc private (set) var keyCode: UInt16
private var isFlagChanged: Bool
private var flags: NSEvent.ModifierFlags private var flags: NSEvent.ModifierFlags
private var cursorForwardKey: KeyCode private var cursorForwardKey: KeyCode
private var cursorBackwardKey: KeyCode private var cursorBackwardKey: KeyCode
@ -68,6 +69,7 @@ class KeyHandlerInput: NSObject {
self.keyCode = keyCode self.keyCode = keyCode
self.charCode = AppleKeyboardConverter.cnvApple2ABC(charCode) self.charCode = AppleKeyboardConverter.cnvApple2ABC(charCode)
self.flags = flags self.flags = flags
self.isFlagChanged = false
useVerticalMode = isVerticalMode useVerticalMode = isVerticalMode
emacsKey = EmacsKeyHelper.detect(charCode: AppleKeyboardConverter.cnvApple2ABC(charCode), flags: flags) emacsKey = EmacsKeyHelper.detect(charCode: AppleKeyboardConverter.cnvApple2ABC(charCode), flags: flags)
cursorForwardKey = useVerticalMode ? .down : .right cursorForwardKey = useVerticalMode ? .down : .right
@ -84,6 +86,7 @@ class KeyHandlerInput: NSObject {
inputTextIgnoringModifiers = AppleKeyboardConverter.cnvStringApple2ABC(event.charactersIgnoringModifiers ?? "") inputTextIgnoringModifiers = AppleKeyboardConverter.cnvStringApple2ABC(event.charactersIgnoringModifiers ?? "")
keyCode = event.keyCode keyCode = event.keyCode
flags = event.modifierFlags flags = event.modifierFlags
isFlagChanged = (event.type == .flagsChanged) ? true : false
useVerticalMode = isVerticalMode 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 {