From 10b1d0c50bae589e026ba7c72b3e956c66f613dd Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Sat, 26 Mar 2022 11:47:00 +0800
Subject: [PATCH] ctlIME // Revised keyLayout conditioning.

---
 .../Modules/IMEModules/ctlInputMethod.swift   | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/Source/Modules/IMEModules/ctlInputMethod.swift b/Source/Modules/IMEModules/ctlInputMethod.swift
index abc0f9a6..e8371f9e 100644
--- a/Source/Modules/IMEModules/ctlInputMethod.swift
+++ b/Source/Modules/IMEModules/ctlInputMethod.swift
@@ -63,6 +63,11 @@ class ctlInputMethod: IMKInputController {
 
     // MARK: - Keyboard Layout Specifier
 
+    func getKeyLayoutFlagsCondition(_ event: NSEvent!) -> Bool {
+        event.modifierFlags.intersection(.deviceIndependentFlagsMask).contains(NSEvent.ModifierFlags(rawValue: ~(NSEvent.ModifierFlags.shift.rawValue))) ||
+            (event.modifierFlags.intersection(.deviceIndependentFlagsMask).contains(.shift) && mgrPrefs.functionKeyKeyboardLayoutOverrideIncludeShiftKey)
+    }
+
     @objc func setKeyLayout(isfunctionKeyboardLayout: Bool = false) {
         let client = client().self as IMKTextInput
         client.overrideKeyboard(withKeyboardNamed: isfunctionKeyboardLayout ? mgrPrefs.functionKeyboardLayout : mgrPrefs.basisKeyboardLayout)
@@ -197,22 +202,15 @@ class ctlInputMethod: IMKInputController {
 
     override func handle(_ event: NSEvent!, client: Any!) -> Bool {
 
-        // 這裡仍舊需要判斷 flags。之前使輸入法狀態卡住無法敲漢字的問題已在 KeyHandler 內修復。
-        // 這裡不判斷 flags 的話，用方向鍵前後定位光標之後，再次試圖觸發組字區時、反而會在首次按鍵時失敗。
-        // 同時注意：必須將 event.type == .flagsChanged 放在最外圍、且在其結尾插入 return false，
-        // 否則，每次處理這種判斷時都會觸發 NSInternalInconsistencyException。
-        if (mgrPrefs.functionKeyboardLayout != mgrPrefs.basisKeyboardLayout) && (event.type == .flagsChanged) {
-            if (event.modifierFlags == .capsLock ||
-                event.modifierFlags.contains(.command) ||
-                event.modifierFlags.contains(.option) ||
-                event.modifierFlags.contains(.control) ||
-                event.modifierFlags.contains(.function) ||
-                       (event.modifierFlags.contains(.shift) && mgrPrefs.functionKeyKeyboardLayoutOverrideIncludeShiftKey)) {
-                (client as? IMKTextInput)?.overrideKeyboard(withKeyboardNamed: mgrPrefs.functionKeyboardLayout)
-            } else {
-                (client as? IMKTextInput)?.overrideKeyboard(withKeyboardNamed: mgrPrefs.basisKeyboardLayout)
+        if mgrPrefs.functionKeyboardLayout != mgrPrefs.basisKeyboardLayout {
+            // 這裡仍舊需要判斷 flags。之前使輸入法狀態卡住無法敲漢字的問題已在 KeyHandler 內修復。
+            // 這裡不判斷 flags 的話，用方向鍵前後定位光標之後，再次試圖觸發組字區時、反而會在首次按鍵時失敗。
+            // 同時注意：必須在 event.type == .flagsChanged 結尾插入 return false，
+            // 否則，每次處理這種判斷時都會觸發 NSInternalInconsistencyException。
+            if event.type == .flagsChanged {
+                (client as? IMKTextInput)?.overrideKeyboard(withKeyboardNamed: getKeyLayoutFlagsCondition(event) ? mgrPrefs.functionKeyboardLayout : mgrPrefs.basisKeyboardLayout)
+                return false
             }
-            return false
         }
 
         // 準備修飾鍵，用來判定是否需要利用就地新增語彙時的 Enter 鍵來砍詞。