reset에서 flush한 Input을 처리하도록 수정

kiding · kiding · commit 3450c509eec5 · 2023-10-22T01:14:45.000+09:00
다른 입력기를 사용하는 상태에서 한/A 전환 시 실제 한/A 전환이 반영되지 않고 메뉴 막대와 상태가 어긋나는 문제 수정
diff --git a/SokIM/AppDelegate.swift b/SokIM/AppDelegate.swift
@@ -1,7 +1,4 @@
-// TODO: "Automatically switch to a document's input source"를 InputContext로 구현
-// TODO: Safari: 구글 문서, iCloud Pages 한/글/을/입/력 문제... string 가져오기? Safari에서 downgrade 하는 방법 찾기
-// TODO: D->M downgrade: NotificationCenter to Context & memory
-
+// swiftlint:disable type_body_length
 import Cocoa
 import InputMethodKit
 
@@ -181,7 +178,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             eventContext.strategy.flush(from: state, to: sender)
         }
         if withInputMonitor {
-            inputMonitor.flush()
+            var inputs = inputMonitor.flush()
+            filterContexts(&inputs)
+            inputs.forEach { state.next($0) }
         }
         state = State(engine: state.engine)
         if getKeyboardCapsLock() {
@@ -333,6 +332,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
     }
 
+    /** 암호 입력 필드를 위한 ABC 입력기 제한 기능 */
     @objc private func suppressABC(_ aNotification: Notification) {
         debug("\(String(describing: aNotification))")
 
@@ -387,10 +387,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
         guard IsSecureEventInputEnabled() else { return }
 
+        resetWithInputMonitor()
         state.engine = state.engines.A
         statusBar.setEngine(state.engines.A)
-        resetWithInputMonitor()
 
         debug("abcOnSecureInput 성공")
     }
 }
+// swiftlint:enable type_body_length

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`		`-// TODO: "Automatically switch to a document's input source"를 InputContext로 구현`
`2`		`-// TODO: Safari: 구글 문서, iCloud Pages 한/글/을/입/력 문제... string 가져오기? Safari에서 downgrade 하는 방법 찾기`
`3`		`-// TODO: D->M downgrade: NotificationCenter to Context & memory`
`4`		`-`
	`1`	`+// swiftlint:disable type_body_length`
`5`	`2`	`import Cocoa`
`6`	`3`	`import InputMethodKit`
`7`	`4`
`@@ -181,7 +178,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {`
`181`	`178`	`eventContext.strategy.flush(from: state, to: sender)`
`182`	`179`	`}`
`183`	`180`	`if withInputMonitor {`
`184`		`- inputMonitor.flush()`
	`181`	`+ var inputs = inputMonitor.flush()`
	`182`	`+ filterContexts(&inputs)`
	`183`	`+ inputs.forEach { state.next($0) }`
`185`	`184`	`}`
`186`	`185`	`state = State(engine: state.engine)`
`187`	`186`	`if getKeyboardCapsLock() {`
`@@ -333,6 +332,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {`
`333`	`332`	`}`
`334`	`333`	`}`
`335`	`334`
	`335`	`+ /** 암호 입력 필드를 위한 ABC 입력기 제한 기능 */`
`336`	`336`	`@objc private func suppressABC(_ aNotification: Notification) {`
`337`	`337`	`debug("\(String(describing: aNotification))")`
`338`	`338`
`@@ -387,10 +387,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {`
`387`	`387`
`388`	`388`	`guard IsSecureEventInputEnabled() else { return }`
`389`	`389`
	`390`	`+ resetWithInputMonitor()`
`390`	`391`	`state.engine = state.engines.A`
`391`	`392`	`statusBar.setEngine(state.engines.A)`
`392`		`- resetWithInputMonitor()`
`393`	`393`
`394`	`394`	`debug("abcOnSecureInput 성공")`
`395`	`395`	`}`
`396`	`396`	`}`
	`397`	`+// swiftlint:enable type_body_length`