Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-15 00:06:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2646 from ghostty-org/push-xnylkvxuuroq

Browse Source 
macos: allow additional modifiers through for ctrl+enter
This commit is contained in:
Mitchell Hashimoto
2024-11-11 10:50:56 -08:00
committed by GitHub
parent 72659d48ac f6ea15dd21
commit 70b984ebaf
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
macos/Sources/Ghostty/SurfaceView_AppKit.swift
View File

@ -704,12 +704,6 @@ extension Ghostty {
/// Special case handling for some control keys /// Special case handling for some control keys
override func performKeyEquivalent(with event: NSEvent) -> Bool { override func performKeyEquivalent(with event: NSEvent) -> Bool {
// Only process keys when Control is the only modifier
if (!event.modifierFlags.contains(.control) ||
!event.modifierFlags.isDisjoint(with: [.shift, .command, .option])) {
return false
}
// Only process key down events // Only process key down events
if (event.type != .keyDown) { if (event.type != .keyDown) {
return false return false
@ -722,11 +716,23 @@ extension Ghostty {
return false return false
} }
// Only process keys when Control is active. All known issues we're
// resolving happen only in this scenario. This probably isn't fully robust
// but we can broaden the scope as we find more cases.
if (!event.modifierFlags.contains(.control)) {
return false
}
let equivalent: String let equivalent: String
switch (event.charactersIgnoringModifiers) { switch (event.charactersIgnoringModifiers) {
case "/": case "/":
// Treat C-/ as C-_. We do this because C-/ makes macOS make a beep // Treat C-/ as C-_. We do this because C-/ makes macOS make a beep
// sound and we don't like the beep sound. // sound and we don't like the beep sound.
if (!event.modifierFlags.contains(.control) ||
!event.modifierFlags.isDisjoint(with: [.shift, .command, .option])) {
return false
}
equivalent = "_" equivalent = "_"
case "\r": case "\r":
@ -742,7 +748,7 @@ extension Ghostty {
let newEvent = NSEvent.keyEvent( let newEvent = NSEvent.keyEvent(
with: .keyDown, with: .keyDown,
location: event.locationInWindow, location: event.locationInWindow,
modifierFlags: .control, modifierFlags: event.modifierFlags,
timestamp: event.timestamp, timestamp: event.timestamp,
windowNumber: event.windowNumber, windowNumber: event.windowNumber,
context: nil, context: nil,