native macOS codings agent orchestrator
Merge pull request #49 from supabitapp/happy-deer
Fix Alt/Option modifier not reaching terminal
+8
-2
+8
-2
supacode/Infrastructure/Ghostty/GhosttySurfaceView.swift
+8
-2
supacode/Infrastructure/Ghostty/GhosttySurfaceView.swift
···
456
456
private func handleGhosttyBinding(_ event: NSEvent, surface: ghostty_surface_t) -> Bool {
457
457
let (translationEvent, translationMods) = translationState(event, surface: surface)
458
458
var key = ghosttyKeyEvent(
459
-
translationEvent, action: GHOSTTY_ACTION_PRESS, translationMods: translationMods)
459
+
translationEvent,
460
+
action: GHOSTTY_ACTION_PRESS,
461
+
originalMods: event.modifierFlags,
462
+
translationMods: translationMods
463
+
)
460
464
let text = ghosttyCharacters(translationEvent) ?? ""
461
465
if let codepoint = text.utf8.first, codepoint >= 0x20 {
462
466
return handleTextBinding(text, event: event, key: &key, surface: surface)
···
738
742
var key = ghosttyKeyEvent(
739
743
resolvedEvent,
740
744
action: action,
745
+
originalMods: event.modifierFlags,
741
746
translationMods: resolvedMods,
742
747
composing: composing
743
748
)
···
799
804
private func ghosttyKeyEvent(
800
805
_ event: NSEvent,
801
806
action: ghostty_input_action_e,
807
+
originalMods: NSEvent.ModifierFlags,
802
808
translationMods: NSEvent.ModifierFlags,
803
809
composing: Bool = false
804
810
) -> ghostty_input_key_s {
···
807
813
keyEvent.keycode = UInt32(event.keyCode)
808
814
keyEvent.text = nil
809
815
keyEvent.composing = composing
810
-
keyEvent.mods = ghosttyMods(event.modifierFlags)
816
+
keyEvent.mods = ghosttyMods(originalMods)
811
817
keyEvent.consumed_mods = ghosttyMods(translationMods.subtracting([.control, .command]))
812
818
keyEvent.unshifted_codepoint = 0
813
819
if event.type == .keyDown || event.type == .keyUp {