From 4676c995ce480fd26a434b7aa7c8ccedb060250e Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Sat, 8 Oct 2022 18:57:57 +0800
Subject: [PATCH] Repo // Fix selection key errors of vertical IMKCandidates.

---
 Source/Modules/KeyHandler_Core.swift            | 1 +
 Source/Modules/KeyHandler_HandleCandidate.swift | 6 ++++--
 Source/Modules/SessionCtl_Delegates.swift       | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Source/Modules/KeyHandler_Core.swift b/Source/Modules/KeyHandler_Core.swift
index e5a5ab68..4b8673ff 100644
--- a/Source/Modules/KeyHandler_Core.swift
+++ b/Source/Modules/KeyHandler_Core.swift
@@ -19,6 +19,7 @@ import Tekkon
 
 /// KeyHandler 委任協定
 public protocol KeyHandlerDelegate {
+  var selectionKeys: String { get }
   var clientBundleIdentifier: String { get }
   func candidateController() -> CtlCandidateProtocol
   func candidateSelectionCalledByKeyHandler(at index: Int)
diff --git a/Source/Modules/KeyHandler_HandleCandidate.swift b/Source/Modules/KeyHandler_HandleCandidate.swift
index 766d3179..43c77903 100644
--- a/Source/Modules/KeyHandler_HandleCandidate.swift
+++ b/Source/Modules/KeyHandler_HandleCandidate.swift
@@ -232,8 +232,10 @@ extension KeyHandler {
     let match: String =
       (state.type == .ofAssociates) ? input.inputTextIgnoringModifiers ?? "" : input.text
 
-    for j in 0..<PrefMgr.shared.candidateKeys.count {
-      let label = PrefMgr.shared.candidateKeys.charComponents[j]
+    let selectionKeys = delegate?.selectionKeys ?? PrefMgr.shared.candidateKeys
+
+    for j in 0..<selectionKeys.count {
+      let label = selectionKeys.charComponents[j]
       if match.compare(label, options: .caseInsensitive, range: nil, locale: .current) == .orderedSame {
         index = j
         break
diff --git a/Source/Modules/SessionCtl_Delegates.swift b/Source/Modules/SessionCtl_Delegates.swift
index 88e7e104..d992c1ea 100644
--- a/Source/Modules/SessionCtl_Delegates.swift
+++ b/Source/Modules/SessionCtl_Delegates.swift
@@ -53,7 +53,9 @@ extension SessionCtl: KeyHandlerDelegate {
 // MARK: - Candidate Controller Delegate
 
 extension SessionCtl: CtlCandidateDelegate {
-  var selectionKeys: String { PrefMgr.shared.candidateKeys }
+  var selectionKeys: String {
+    PrefMgr.shared.useIMKCandidateWindow ? "123456789" : PrefMgr.shared.candidateKeys
+  }
 
   func buzz() {
     IMEApp.buzz()