Control, Command 입력되면 초기화, 쌓인 입력이 먼저 처리되도록 초기화 순서 변경

kiding · kiding · commit df2de67e344a · 2025-01-06T04:37:30.000+09:00
단축키로 창이나 커서를 움직이는 경우 중복 입력되거나 조합이 종료되지 않아 유실되는 문제 해결
diff --git a/SokIM/AppDelegate.swift b/SokIM/AppDelegate.swift
@@ -174,19 +174,18 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     @objc func reset() {
         debug()
 
-        if let sender = eventContext.sender {
-            eventContext.strategy.flush(from: state, to: sender)
+        if getKeyboardCapsLock() {
+            setKeyboardCapsLock(enabled: false)
         }
 
         var inputs = inputMonitor.flush()
         filterInputs(&inputs, event: nil)
         inputs.forEach { state.next($0) }
-        state = State(engine: state.engine)
-
-        if getKeyboardCapsLock() {
-            setKeyboardCapsLock(enabled: false)
+        if let sender = eventContext.sender {
+            eventContext.strategy.flush(from: state, to: sender)
         }
 
+        state = State(engine: state.engine)
         eventContext = EventContext()
         InputContext.reset()
     }
diff --git a/SokIM/InputMonitor.swift b/SokIM/InputMonitor.swift
@@ -149,6 +149,12 @@ class InputMonitor {
         if let key = ModifierUsage(rawValue: usage) {
             modifier[key] = type
 
+            // 별도 처리: Control, Command 입력되면 조합 종료 및 초기화
+            if (type, key) == (.keyDown, .leftControl) || (type, key) == (.keyDown, .rightControl)
+                || (type, key) == (.keyDown, .leftCommand) || (type, key) == (.keyDown, .rightCommand) {
+                AppDelegate.shared().reset()
+            }
+
             // 별도 처리: 오른쪽 Command: 한/A 표시만 우선 갱신, 실제 처리는 State에서
             if (type, key) == (.keyDown, .rightCommand)
                 && Preferences.rotateShortcut == .rightCommand {
