From 782f3bd21c09afb4b0bfeede40c1178056cad156 Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Sun, 28 Jan 2024 17:06:33 +0800
Subject: [PATCH] InputHandler // + handleNumPadKeyInput().

---
 .../InputHandler_HandleStates.swift           | 33 ++++++++++++++++---
 .../InputHandler_TriageInput.swift            |  7 +---
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_HandleStates.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_HandleStates.swift
index 05b8bc2c..0dfa5c85 100644
--- a/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_HandleStates.swift
+++ b/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_HandleStates.swift
@@ -1043,11 +1043,9 @@ extension InputHandler {
     delegate.switchState(IMEState.ofEmpty())
 
     // 字母鍵摁 Shift 的話，無須額外處理，因為直接就會敲出大寫字母。
-    if (input.isUpperCaseASCIILetterKey && delegate.isASCIIMode)
-      || (handleCapsLock && input.isShiftHold)
-    {
-      return false
-    }
+    var shiftCapsLockHandling = input.isUpperCaseASCIILetterKey && delegate.isASCIIMode
+    shiftCapsLockHandling = shiftCapsLockHandling || handleCapsLock && input.isShiftHold
+    guard !shiftCapsLockHandling else { return false }
 
     // 不再讓威注音處理由 Shift 切換到的英文模式的按鍵輸入。
     if delegate.isASCIIMode, !handleCapsLock { return false }
@@ -1143,6 +1141,31 @@ extension InputHandler {
     return false
   }
 
+  // MARK: - 處理數字小鍵盤的文字輸入行為（NumPad）
+
+  /// 處理數字小鍵盤的文字輸入行為。
+  /// - Parameter input: 輸入訊號。
+  /// - Returns: 告知 IMK「該按鍵是否已經被輸入法攔截處理」。
+  func handleNumPadKeyInput(input: InputSignalProtocol) -> Bool {
+    guard let delegate = delegate, input.isNumericPadKey else { return false }
+    let inputText = input.text
+    guard inputText.count == 1, input.isASCII else { return false }
+    guard KeyCode(rawValue: input.keyCode) == nil else { return false } // 排除功能鍵。
+    let behaviorValue = prefs.numPadCharInputBehavior
+    let fullWidthResult = behaviorValue % 2 != 0 // 能被二整除的都是半形。
+    triagePrefs: switch (behaviorValue, isConsideredEmptyForNow) {
+    case (2, _), (3, _), (4, false), (5, false):
+      currentLM.config.numPadFWHWStatus = fullWidthResult
+      if handlePunctuation("_NumPad_\(inputText)") { return true }
+    default: break triagePrefs // 包括 case 0 & 1。
+    }
+    currentLM.config.numPadFWHWStatus = nil
+    delegate.switchState(IMEState.ofEmpty())
+    let charToCommit = inputText.applyingTransformFW2HW(reverse: fullWidthResult)
+    delegate.switchState(IMEState.ofCommitting(textToCommit: charToCommit))
+    return true
+  }
+
   // MARK: - 處理磁帶模式的符號選單輸入
 
   func handleCassetteSymbolTable(input: InputSignalProtocol) -> Bool {
diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_TriageInput.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_TriageInput.swift
index e81b8942..b5f2c754 100644
--- a/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_TriageInput.swift
+++ b/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_TriageInput.swift
@@ -22,7 +22,6 @@ public extension InputHandler {
   func triageInput(event input: InputSignalProtocol) -> Bool {
     guard let delegate = delegate else { return false }
     var state: IMEStateProtocol { delegate.state }
-    let inputText = input.text
 
     // MARK: - 按鍵碼分診（Triage by KeyCode）
 
@@ -142,11 +141,7 @@ public extension InputHandler {
       }
 
       // 處理九宮格數字鍵盤區域。
-      if input.isNumericPadKey {
-        delegate.switchState(IMEState.ofEmpty())
-        delegate.switchState(IMEState.ofCommitting(textToCommit: inputText.lowercased()))
-        return true
-      }
+      if handleNumPadKeyInput(input: input) { return true }
 
       // 判斷是否響應傳統的漢音鍵盤符號模式熱鍵。
       haninSymbolInput: if prefs.classicHaninKeyboardSymbolModeShortcutEnabled {