mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-09-21 04:58:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

macOS: fix AppleScript send key for non-control keys

Browse Source 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Lukas
2026-08-25 10:10:16 +02:00
parent 9c3ec931d6
commit 6229d4eb62
8 changed files with 228 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
macos/Tests/Features/AppleScript/ScriptKeyEventCommandTests.swift
View File

@@ -110,34 +110,19 @@ struct ScriptKeyEventCommandTests {
@Test func pressCarriesLayoutText() throws {
let event = try parse("a")
// let expected = try #require(KeyboardLayout.character(for: keyCodeA, modifiers: []))
// #expect(event.text == String(expected))
// #expect(event.unshiftedCodepoint == expected.unicodeScalars.first?.value)
// #expect(event.consumedMods == [])
Issue.record(
"""
press should carry the layout's text and unshifted codepoint; \
got text \(String(describing: event.text)), \
codepoint \(event.unshiftedCodepoint)
""",
severity: .warning
)
let expected = try #require(KeyboardLayout.character(for: keyCodeA, modifiers: []))
#expect(event.text == String(expected))
#expect(event.unshiftedCodepoint == expected.unicodeScalars.first?.value)
#expect(event.consumedMods == [])
}
@Test func shiftShiftsTextAndIsConsumed() throws {
let event = try parse("a", modifiers: "shift")
// let expected = try #require(KeyboardLayout.character(for: keyCodeA, modifiers: .shift))
// let unshifted = try #require(KeyboardLayout.character(for: keyCodeA, modifiers: []))
// #expect(event.text == String(expected))
// #expect(event.consumedMods == .shift)
// #expect(event.unshiftedCodepoint == unshifted.unicodeScalars.first?.value)
Issue.record(
"""
shift should apply to the translated text and be consumed; \
got text \(String(describing: event.text))
""",
severity: .warning
)
let expected = try #require(KeyboardLayout.character(for: keyCodeA, modifiers: .shift))
let unshifted = try #require(KeyboardLayout.character(for: keyCodeA, modifiers: []))
#expect(event.text == String(expected))
#expect(event.consumedMods == .shift)
#expect(event.unshiftedCodepoint == unshifted.unicodeScalars.first?.value)
}
/// The original bug scenario: `send key "c" with modifiers "control"`
@@ -145,34 +130,20 @@ struct ScriptKeyEventCommandTests {
/// unconsumed, so core can encode the control sequence itself.
@Test func controlKeepsBaseTextAndIsNotConsumed() throws {
let event = try parse("c", modifiers: "control")
// let expected = try #require(KeyboardLayout.character(
// for: 0x08, // W3C KeyC
// modifiers: []))
// #expect(event.text == String(expected))
// #expect(event.mods == .ctrl)
// #expect(event.consumedMods == [])
Issue.record(
"""
ctrl should be stripped from translation ("c", not 0x03) and \
stay unconsumed; got text \(String(describing: event.text))
""",
severity: .warning
)
let expected = try #require(KeyboardLayout.character(
for: 0x08, // W3C KeyC
modifiers: []))
#expect(event.text == String(expected))
#expect(event.mods == .ctrl)
#expect(event.consumedMods == [])
}
@Test func optionIncludedInTranslationIsConsumed() throws {
// macos-option-as-alt=false: option participates in translation.
let event = try parse("a", modifiers: "option")
// let expected = try #require(KeyboardLayout.character(for: keyCodeA, modifiers: .option))
// #expect(event.text == String(expected))
// #expect(event.consumedMods == .alt)
Issue.record(
"""
option in the translation mods should apply to the text and be \
consumed; got text \(String(describing: event.text))
""",
severity: .warning
)
let expected = try #require(KeyboardLayout.character(for: keyCodeA, modifiers: .option))
#expect(event.text == String(expected))
#expect(event.consumedMods == .alt)
}
@Test func optionExcludedFromTranslationIsNotConsumed() throws {
@@ -180,16 +151,9 @@ struct ScriptKeyEventCommandTests {
// option, so it stays unconsumed and core can encode it (e.g. ESC
// prefix).
let event = try parse("a", modifiers: "option") { $0.subtracting(.alt) }
// let expected = try #require(KeyboardLayout.character(for: keyCodeA, modifiers: []))
// #expect(event.text == String(expected))
// #expect(event.consumedMods == [])
Issue.record(
"""
option excluded from the translation mods should leave the base \
text and stay unconsumed; got text \(String(describing: event.text))
""",
severity: .warning
)
let expected = try #require(KeyboardLayout.character(for: keyCodeA, modifiers: []))
#expect(event.text == String(expected))
#expect(event.consumedMods == [])
}
@Test func releaseCarriesNoText() throws {
@@ -198,16 +162,9 @@ struct ScriptKeyEventCommandTests {
modifiers: "shift",
action: "GIrl".fourCharCode
)
// let unshifted = try #require(KeyboardLayout.character(for: keyCodeA, modifiers: []))
// #expect(event.text == nil)
// #expect(event.unshiftedCodepoint == unshifted.unicodeScalars.first?.value)
Issue.record(
"""
release should carry no text but still report the unshifted \
codepoint; got codepoint \(event.unshiftedCodepoint)
""",
severity: .warning
)
let unshifted = try #require(KeyboardLayout.character(for: keyCodeA, modifiers: []))
#expect(event.text == nil)
#expect(event.unshiftedCodepoint == unshifted.unicodeScalars.first?.value)
}
/// Keys whose layout translation is a control character (or a PUA