Merge pull request #1913 from centraldogma99/fix/korean-input-keyboard-shortcuts

Fix keyboard shortcuts not working with Korean input mode

Author: lawrencecchen

Sources/AppDelegate.swift

@@ -8889,7 +8889,11 @@ final class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCent
     private func handleCustomShortcut(event: NSEvent) -> Bool {
         // `charactersIgnoringModifiers` can be nil for some synthetic NSEvents and certain special keys.
         // Treat nil as "" and rely on keyCode/layout-aware fallback logic where needed.
-        let chars = (event.charactersIgnoringModifiers ?? "").lowercased()
+        // When a non-Latin input source is active (Korean, Chinese, Japanese, etc.),
+        // charactersIgnoringModifiers returns non-ASCII characters that never match
+        // Latin shortcut keys. Normalize via KeyboardLayout so downstream comparisons
+        // (Cmd+1-9, Ctrl+1-9, omnibar N/P, command palette, etc.) work correctly.
+        let chars = KeyboardLayout.normalizedCharacters(for: event)
         let flags = event.modifierFlags.intersection(.deviceIndependentFlagsMask)
         let hasControl = flags.contains(.control)
         let hasCommand = flags.contains(.command)

Sources/KeyboardLayout.swift

@@ -15,25 +15,41 @@ class KeyboardLayout {
 
     /// Translate a physical keyCode to the character AppKit would use for shortcut matching,
     /// preserving command-aware layouts such as "Dvorak - QWERTY Command".
-    /// CJK input sources (Korean, Chinese, Japanese) lack kTISPropertyUnicodeKeyLayoutData,
-    /// so we fall back to TISCopyCurrentASCIICapableKeyboardInputSource() in that case.
+    /// Some CJK input sources lack kTISPropertyUnicodeKeyLayoutData, and others (Korean
+    /// 두벌식) have it but UCKeyTranslate still returns non-ASCII characters. In either
+    /// case we fall back to TISCopyCurrentASCIICapableKeyboardInputSource().
     static func character(
         forKeyCode keyCode: UInt16,
         modifierFlags: NSEvent.ModifierFlags = []
     ) -> String? {
         if let source = TISCopyCurrentKeyboardInputSource()?.takeRetainedValue(),
-           let result = characterFromInputSource(source, forKeyCode: keyCode, modifierFlags: modifierFlags) {
+           let result = characterFromInputSource(source, forKeyCode: keyCode, modifierFlags: modifierFlags),
+           result.allSatisfy(\.isASCII) {
             return result
         }
-        // Current input source has no Unicode layout data (e.g. Korean, Chinese, Japanese IME).
-        // Fall back to the ASCII-capable source so shortcut matching still works.
+        // Current input source has no Unicode layout data or returned a non-ASCII
+        // character (e.g. Korean 두벌식 has layout data but UCKeyTranslate still
+        // produces Hangul). Fall back to the ASCII-capable source so shortcut
+        // matching still works.
         if let asciiSource = TISCopyCurrentASCIICapableKeyboardInputSource()?.takeRetainedValue(),
            let result = characterFromInputSource(asciiSource, forKeyCode: keyCode, modifierFlags: modifierFlags) {
             return result
         }
         return nil
     }
 
+    /// Return the ASCII-normalized equivalent of `event.charactersIgnoringModifiers`,
+    /// falling back through the ASCII-capable input source for non-Latin input methods.
+    /// Use this wherever code compares raw event characters against Latin shortcut keys.
+    static func normalizedCharacters(for event: NSEvent) -> String {
+        let raw = (event.charactersIgnoringModifiers ?? "").lowercased()
+        if raw.allSatisfy(\.isASCII) { return raw }
+        if let layoutChar = character(forKeyCode: event.keyCode, modifierFlags: []) {
+            return layoutChar
+        }
+        return raw
+    }
+
     private static func characterFromInputSource(
         _ source: TISInputSource,
         forKeyCode keyCode: UInt16,

Sources/Panels/BrowserPanelView.swift

@@ -3735,7 +3735,10 @@ private struct OmnibarTextFieldRepresentable: NSViewRepresentable {
 #endif
             let keyCode = event.keyCode
             let modifiers = event.modifierFlags.intersection([.command, .control, .shift, .option, .function])
-            let lowered = event.charactersIgnoringModifiers?.lowercased() ?? ""
+            // When a non-Latin input source is active (Korean, Chinese, Japanese),
+            // charactersIgnoringModifiers returns non-ASCII characters. Normalize
+            // via KeyboardLayout so Cmd/Ctrl+N/P navigation works across input sources.
+            let lowered = KeyboardLayout.normalizedCharacters(for: event)
             let hasCommandOrControl = modifiers.contains(.command) || modifiers.contains(.control)
 
             // Cmd/Ctrl+N and Cmd/Ctrl+P should repeat while held.

Sources/Panels/BrowserPopupWindowController.swift

@@ -50,7 +50,7 @@ private class BrowserPopupPanel: NSPanel {
         // Cmd+W: close this popup panel only
         let flags = event.modifierFlags.intersection(.deviceIndependentFlagsMask)
         if flags == .command,
-           event.charactersIgnoringModifiers == "w" {
+           KeyboardLayout.normalizedCharacters(for: event) == "w" {
             #if DEBUG
             dlog("popup.panel.cmdW close")
             #endif