marketing-shibata50/cmux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix IME key events blocked by ctrl fast path and missing layout change detection

Browse source 
The ctrl fast path unconditionally returned after calling ghostty_surface_key,
even when it returned false (e.g. ignore keybindings), preventing IMEs from
receiving Ctrl-modified key events. Now falls through to interpretKeyEvents
when the key is not handled.

Also adds keyboard layout change detection around interpretKeyEvents (matching
Ghostty upstream) so that IME-triggered layout switches cause an early return
instead of sending the key to Ghostty.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
yasunogithub 2026-02-25 00:30:17 +09:00
parent 65f5b9be6d
commit b6c5e3fe9e
3 changed files with 38 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Sources/GhosttyTerminalView.swift
View file

@ -2916,7 +2916,10 @@ class GhosttyNSView: NSView, NSUserInterfaceValidations {
"ign=\(cmuxScalarHex(event.charactersIgnoringModifiers)) mods=\(event.modifierFlags.rawValue)"
)
#endif
return
// If Ghostty handled the key (action/encoding), we're done.
// If not (e.g. `ignore` keybind), fall through to interpretKeyEvents
// so the IME gets a chance to process this event.
if handled { return }
}
let action = event.isARepeat ? GHOSTTY_ACTION_REPEAT : GHOSTTY_ACTION_PRESS
@ -2971,9 +2974,25 @@ class GhosttyNSView: NSView, NSUserInterfaceValidations {
// so we can detect when composition ends.
let markedTextBefore = markedText.length > 0
// Capture the keyboard layout ID before interpretation so we can
// detect if an IME changed it (e.g. toggling input methods).
// We only check when not already in a preedit state.
let keyboardIdBefore: String? = if (!markedTextBefore) {
KeyboardLayout.id
} else {
nil
}
// Let the input system handle the event (for IME, dead keys, etc.)
interpretKeyEvents([translationEvent])
// If the keyboard layout changed, an input method grabbed the event.
// Sync preedit and return without sending the key to Ghostty.
if !markedTextBefore, let kbBefore = keyboardIdBefore, kbBefore != KeyboardLayout.id {
syncPreedit(clearIfNeeded: markedTextBefore)
return
}
// Sync the preedit state with Ghostty so it can render the IME
// composition overlay (e.g. for Korean, Japanese, Chinese input).
syncPreedit(clearIfNeeded: markedTextBefore)