From d620a1899d6878a9bc1412e052dd2aedc7b1d4d0 Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Tue, 4 Oct 2022 16:47:33 +0800
Subject: [PATCH] SessionCtl // Disable recent new Caps Lock features for macOS
 11 and earlier.

---
 Source/Modules/SessionCtl_Core.swift          | 16 ++++++-
 Source/Modules/SessionCtl_HandleEvent.swift   | 26 +++++------
 .../PrefUI/suiPrefPaneExperience.swift        |  9 +++-
 .../WindowNIBs/Base.lproj/frmPrefWindow.xib   | 43 ++++++-------------
 4 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/Source/Modules/SessionCtl_Core.swift b/Source/Modules/SessionCtl_Core.swift
index b40ad780..dd843a4f 100644
--- a/Source/Modules/SessionCtl_Core.swift
+++ b/Source/Modules/SessionCtl_Core.swift
@@ -178,8 +178,20 @@ extension SessionCtl {
     keyHandler.ensureKeyboardParser()
 
     Self.theShiftKeyDetector.alsoToggleWithLShift = PrefMgr.shared.togglingAlphanumericalModeWithLShift
-    if isASCIIMode, !isCapsLocked, PrefMgr.shared.disableShiftTogglingAlphanumericalMode { isASCIIMode = false }
-    if isCapsLocked || PrefMgr.shared.disableShiftTogglingAlphanumericalMode { isASCIIMode = isCapsLocked }  // 同步 Caps Lock 狀態。
+
+    if #unavailable(macOS 12) {
+      if #available(macOS 10.15, *) {
+        if isASCIIMode, PrefMgr.shared.disableShiftTogglingAlphanumericalMode { isASCIIMode = false }
+      }
+    } else {
+      if isASCIIMode, !isCapsLocked, PrefMgr.shared.disableShiftTogglingAlphanumericalMode {
+        isASCIIMode = false
+      }
+      // 同步 Caps Lock 狀態。
+      else if isCapsLocked || PrefMgr.shared.disableShiftTogglingAlphanumericalMode {
+        isASCIIMode = isCapsLocked
+      }
+    }
 
     /// 必須加上下述條件，否則會在每次切換至輸入法本體的視窗（比如偏好設定視窗）時會卡死。
     /// 這是很多 macOS 副廠輸入法的常見失誤之處。
diff --git a/Source/Modules/SessionCtl_HandleEvent.swift b/Source/Modules/SessionCtl_HandleEvent.swift
index e9d6b01b..0c6ddd37 100644
--- a/Source/Modules/SessionCtl_HandleEvent.swift
+++ b/Source/Modules/SessionCtl_HandleEvent.swift
@@ -35,19 +35,21 @@ extension SessionCtl {
       return false
     }
 
-    // Caps Lock 通知與切換處理。
-    if event.type == .flagsChanged, event.keyCode == KeyCode.kCapsLock.rawValue {
-      DispatchQueue.main.async {
-        let isCapsLockTurnedOn = event.modifierFlags.intersection(.deviceIndependentFlagsMask).contains(.capsLock)
-        let status = NSLocalizedString("NotificationSwitchASCII", comment: "")
-        if PrefMgr.shared.showNotificationsWhenTogglingCapsLock {
-          Notifier.notify(
-            message: isCapsLockTurnedOn
-              ? "Caps Lock" + NSLocalizedString("Alphanumerical Input Mode", comment: "") + "\n" + status
-              : NSLocalizedString("Chinese Input Mode", comment: "") + "\n" + status
-          )
+    // Caps Lock 通知與切換處理，要求至少 macOS 12 Monterey。
+    if #available(macOS 12, *) {
+      if event.type == .flagsChanged, event.keyCode == KeyCode.kCapsLock.rawValue {
+        DispatchQueue.main.async {
+          let isCapsLockTurnedOn = event.modifierFlags.intersection(.deviceIndependentFlagsMask).contains(.capsLock)
+          let status = NSLocalizedString("NotificationSwitchASCII", comment: "")
+          if PrefMgr.shared.showNotificationsWhenTogglingCapsLock {
+            Notifier.notify(
+              message: isCapsLockTurnedOn
+                ? "Caps Lock" + NSLocalizedString("Alphanumerical Input Mode", comment: "") + "\n" + status
+                : NSLocalizedString("Chinese Input Mode", comment: "") + "\n" + status
+            )
+          }
+          self.isASCIIMode = isCapsLockTurnedOn
         }
-        self.isASCIIMode = isCapsLockTurnedOn
       }
     }
 
diff --git a/Source/Modules/UIModules/PrefUI/suiPrefPaneExperience.swift b/Source/Modules/UIModules/PrefUI/suiPrefPaneExperience.swift
index 2afb228c..f5ee671b 100644
--- a/Source/Modules/UIModules/PrefUI/suiPrefPaneExperience.swift
+++ b/Source/Modules/UIModules/PrefUI/suiPrefPaneExperience.swift
@@ -64,6 +64,13 @@ struct suiPrefPaneExperience: View {
     }
   }()
 
+  var macOSMontereyOrLaterDetected: Bool {
+    if #available(macOS 12, *) {
+      return true
+    }
+    return false
+  }
+
   var body: some View {
     ScrollView {
       VStack {
@@ -203,7 +210,7 @@ struct suiPrefPaneExperience: View {
             isOn: $selShowNotificationsWhenTogglingCapsLock.onChange {
               PrefMgr.shared.showNotificationsWhenTogglingCapsLock = selShowNotificationsWhenTogglingCapsLock
             }
-          )
+          ).disabled(!macOSMontereyOrLaterDetected)
         }
         Preferences.Section(label: { Text(LocalizedStringKey("Misc Settings:")) }) {
           Toggle(
diff --git a/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib b/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib
index 0ae9f045..5ee176fe 100644
--- a/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib
+++ b/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib
@@ -41,10 +41,10 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qDj-B9-mZf">
-                    <rect key="frame" x="20" y="31" width="796" height="367"/>
+                    <rect key="frame" x="20" y="54" width="796" height="344"/>
                     <subviews>
                         <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="j9R-fB-ttM">
-                            <rect key="frame" x="0.0" y="49" width="402" height="318"/>
+                            <rect key="frame" x="0.0" y="26" width="402" height="318"/>
                             <subviews>
                                 <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fO5-4y-X0y">
                                     <rect key="frame" x="0.0" y="277" width="365" height="41"/>
@@ -267,10 +267,10 @@
                             </customSpacing>
                         </stackView>
                         <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VOm-nN-5IB">
-                            <rect key="frame" x="410" y="0.0" width="386" height="367"/>
+                            <rect key="frame" x="410" y="0.0" width="386" height="344"/>
                             <subviews>
                                 <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="7" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="s47-wG-vKA">
-                                    <rect key="frame" x="0.0" y="284" width="386" height="83"/>
+                                    <rect key="frame" x="0.0" y="261" width="386" height="83"/>
                                     <subviews>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iCL-n8-VTP">
                                             <rect key="frame" x="-2" y="68" width="323" height="15"/>
@@ -320,7 +320,7 @@
                                     </customSpacing>
                                 </stackView>
                                 <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="NOW-jd-XBh">
-                                    <rect key="frame" x="0.0" y="211" width="386" height="61"/>
+                                    <rect key="frame" x="0.0" y="188" width="386" height="61"/>
                                     <subviews>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="J0f-Aw-dxC">
                                             <rect key="frame" x="-2" y="46" width="336" height="15"/>
@@ -366,10 +366,10 @@
                                     </customSpacing>
                                 </stackView>
                                 <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jxD-fv-UYx">
-                                    <rect key="frame" x="0.0" y="0.0" width="380" height="199"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="380" height="176"/>
                                     <subviews>
                                         <button translatesAutoresizingMaskIntoConstraints="NO" id="109">
-                                            <rect key="frame" x="-1" y="183.5" width="285" height="16"/>
+                                            <rect key="frame" x="-1" y="160.5" width="285" height="16"/>
                                             <buttonCell key="cell" type="check" title="Enable Space key for calling candidate window" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="110">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="cellTitle"/>
@@ -379,7 +379,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bE0-Lq-Pj7">
-                                            <rect key="frame" x="-1" y="160.5" width="266" height="16"/>
+                                            <rect key="frame" x="-1" y="137.5" width="266" height="16"/>
                                             <buttonCell key="cell" type="check" title="Use ESC key to clear the entire input buffer" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="f2j-xD-4xK">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="cellTitle"/>
@@ -389,7 +389,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mzw-F2-aAQ">
-                                            <rect key="frame" x="-1" y="137.5" width="295" height="16"/>
+                                            <rect key="frame" x="-1" y="114.5" width="295" height="16"/>
                                             <buttonCell key="cell" type="check" title="Emulating select-candidate-per-character mode" bezelStyle="regularSquare" imagePosition="left" controlSize="small" inset="2" id="ArK-Vk-OoT">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="cellTitle"/>
@@ -399,7 +399,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="j8R-Hj-3dj">
-                                            <rect key="frame" x="-1" y="114.5" width="340" height="16"/>
+                                            <rect key="frame" x="-1" y="91.5" width="340" height="16"/>
                                             <buttonCell key="cell" type="check" title="Automatically correct reading combinations when typing" bezelStyle="regularSquare" imagePosition="left" controlSize="small" inset="2" id="chkAutoCorrectReadingCombination">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="cellTitle"/>
@@ -409,7 +409,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6MM-WC-Mpd">
-                                            <rect key="frame" x="-1" y="91.5" width="381" height="16"/>
+                                            <rect key="frame" x="-1" y="68.5" width="381" height="16"/>
                                             <buttonCell key="cell" type="check" title="Allow using Enter key to confirm associated candidate selection" bezelStyle="regularSquare" imagePosition="left" controlSize="small" inset="2" id="chkAlsoConfirmAssociatedCandidatesByEnter">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="cellTitle"/>
@@ -419,7 +419,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HaB-rc-AcW">
-                                            <rect key="frame" x="-1" y="68.5" width="295" height="16"/>
+                                            <rect key="frame" x="-1" y="45.5" width="295" height="16"/>
                                             <buttonCell key="cell" type="check" title="Allow backspace-editing miscomposed readings" bezelStyle="regularSquare" imagePosition="left" controlSize="small" inset="2" id="chkKeepReadingUponCompositionError">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="cellTitle"/>
@@ -429,7 +429,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xe6-Pu-3Fa">
-                                            <rect key="frame" x="-1" y="45.5" width="223" height="16"/>
+                                            <rect key="frame" x="-1" y="22.5" width="223" height="16"/>
                                             <buttonCell key="cell" type="check" title="Trim unfinished readings on commit" bezelStyle="regularSquare" imagePosition="left" controlSize="small" inset="2" id="tglTrimUnfinishedReadingsOnCommit">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="cellTitle"/>
@@ -439,7 +439,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7QM-7z-tpq">
-                                            <rect key="frame" x="-1" y="22.5" width="233" height="16"/>
+                                            <rect key="frame" x="-1" y="-0.5" width="233" height="16"/>
                                             <buttonCell key="cell" type="check" title="Always show tooltip texts horizontally" bezelStyle="regularSquare" imagePosition="left" controlSize="small" inset="2" id="lblAlwaysShowTooltipTextsHorizontally">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="cellTitle"/>
@@ -448,19 +448,6 @@
                                                 <binding destination="32" name="value" keyPath="values.AlwaysShowTooltipTextsHorizontally" id="szi-4g-EIC"/>
                                             </connections>
                                         </button>
-                                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="233">
-                                            <rect key="frame" x="-1" y="-0.5" width="271" height="16"/>
-                                            <buttonCell key="cell" type="check" title="Show notifications when toggling Caps Lock" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="shc-Nu-UsM">
-                                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                                <font key="font" metaFont="cellTitle"/>
-                                                <connections>
-                                                    <binding destination="32" name="value" keyPath="values.ShowNotificationsWhenTogglingCapsLock" id="0e1-3G-eIc"/>
-                                                </connections>
-                                            </buttonCell>
-                                            <connections>
-                                                <binding destination="32" name="value" keyPath="values.ShowNotificationsWhenTogglingCapsLock" id="AJj-wK-AYK"/>
-                                            </connections>
-                                        </button>
                                     </subviews>
                                     <visibilityPriorities>
                                         <integer value="1000"/>
@@ -471,7 +458,6 @@
                                         <integer value="1000"/>
                                         <integer value="1000"/>
                                         <integer value="1000"/>
-                                        <integer value="1000"/>
                                     </visibilityPriorities>
                                     <customSpacing>
                                         <real value="3.4028234663852886e+38"/>
@@ -482,7 +468,6 @@
                                         <real value="3.4028234663852886e+38"/>
                                         <real value="3.4028234663852886e+38"/>
                                         <real value="3.4028234663852886e+38"/>
-                                        <real value="3.4028234663852886e+38"/>
                                     </customSpacing>
                                 </stackView>
                             </subviews>