From 4a504fd37043ceaea6d3e405cddabfca57547b6c Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Mon, 28 Mar 2022 11:14:36 +0800 Subject: [PATCH] (ctl)IME // Deprecating modifierFlags conditions. --- Source/Modules/IME.swift | 9 --------- .../Modules/IMEModules/ctlInputMethod.swift | 19 ------------------- 2 files changed, 28 deletions(-) diff --git a/Source/Modules/IME.swift b/Source/Modules/IME.swift index 5f898e26..8c56f79c 100644 --- a/Source/Modules/IME.swift +++ b/Source/Modules/IME.swift @@ -19,15 +19,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR TH import Cocoa @objc public class IME: NSObject { - // 直接在 AppleKeyboardConverter 內使用 KeyParser 判定修飾鍵狀態的話,會出現蛇吞自己尾巴的現象。 - // 所以就藉由 ctlInputMethod 的這幾個常態變數來判斷。 - // 這裡不會列出全部的 modifier flags,只會列出可能會影響符號輸入的 flags、主要用於 AppleKeyboardConverter。 - @objc static var isOptionPressed: Bool = false - @objc static var isShiftPressed: Bool = false - @objc static var isCapsLockOn: Bool = false - @objc static var isCommandPressed: Bool = false - @objc static var isNumericPad: Bool = false - @objc static var isFunction: Bool = false // MARK: - Functions diff --git a/Source/Modules/IMEModules/ctlInputMethod.swift b/Source/Modules/IMEModules/ctlInputMethod.swift index fbb4d106..ca77e413 100644 --- a/Source/Modules/IMEModules/ctlInputMethod.swift +++ b/Source/Modules/IMEModules/ctlInputMethod.swift @@ -73,25 +73,6 @@ class ctlInputMethod: IMKInputController { client.overrideKeyboard(withKeyboardNamed: isfunctionKeyboardLayout ? mgrPrefs.functionKeyboardLayout : mgrPrefs.basisKeyboardLayout) } - func updateModifierFlags(_ event: NSEvent!) { - // 這裡不會列出全部的 modifier flags,只會列出可能會影響符號輸入的 flags、主要用於 AppleKeyboardConverter。 - IME.isShiftPressed = event.modifierFlags.intersection(.deviceIndependentFlagsMask).contains(.shift) - IME.isOptionPressed = event.modifierFlags.intersection(.deviceIndependentFlagsMask).contains(.option) - IME.isCapsLockOn = event.modifierFlags.intersection(.deviceIndependentFlagsMask).contains(.capsLock) - IME.isCommandPressed = event.modifierFlags.intersection(.deviceIndependentFlagsMask).contains(.command) - IME.isNumericPad = event.modifierFlags.intersection(.deviceIndependentFlagsMask).contains(.numericPad) - IME.isFunction = event.modifierFlags.intersection(.deviceIndependentFlagsMask).contains(.function) - } - - func resetModifierFlags() { - IME.isShiftPressed = false - IME.isOptionPressed = false - IME.isCapsLockOn = false - IME.isCommandPressed = false - IME.isNumericPad = false - IME.isFunction = false - } - // MARK: - IMKInputController methods override init!(server: IMKServer!, delegate: Any!, client inputClient: Any!) {