From 163b3e46c74dcb0d054563325a8787e5f8b647d7 Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Sat, 26 Mar 2022 18:52:21 +0800
Subject: [PATCH] ctlIME // +updateModifierFlags.

---
 Source/Modules/IMEModules/ctlInputMethod.swift | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Source/Modules/IMEModules/ctlInputMethod.swift b/Source/Modules/IMEModules/ctlInputMethod.swift
index ff13483d..3f7e1861 100644
--- a/Source/Modules/IMEModules/ctlInputMethod.swift
+++ b/Source/Modules/IMEModules/ctlInputMethod.swift
@@ -73,6 +73,16 @@ 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)
+    }
+
     // MARK: - IMKInputController methods
 
     override init!(server: IMKServer!, delegate: Any!, client inputClient: Any!) {
@@ -207,6 +217,8 @@ class ctlInputMethod: IMKInputController {
     }
 
     override func handle(_ event: NSEvent!, client: Any!) -> Bool {
+        // 更新全局共用狀態開關的參數。
+        updateModifierFlags(event)
 
         if mgrPrefs.functionKeyboardLayout != mgrPrefs.basisKeyboardLayout {
             // 這裡仍舊需要判斷 flags。之前使輸入法狀態卡住無法敲漢字的問題已在 KeyHandler 內修復。