diff --git a/macos/Sources/AppDelegate.swift b/macos/Sources/AppDelegate.swift index c7748cfa8..4f7a16c4e 100644 --- a/macos/Sources/AppDelegate.swift +++ b/macos/Sources/AppDelegate.swift @@ -15,12 +15,18 @@ class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject { @Published var confirmQuit: Bool = false /// Various menu items so that we can programmatically sync the keyboard shortcut with the Ghostty config. + @IBOutlet private var menuQuit: NSMenuItem? + @IBOutlet private var menuNewWindow: NSMenuItem? @IBOutlet private var menuNewTab: NSMenuItem? @IBOutlet private var menuSplitHorizontal: NSMenuItem? @IBOutlet private var menuSplitVertical: NSMenuItem? @IBOutlet private var menuClose: NSMenuItem? @IBOutlet private var menuCloseWindow: NSMenuItem? + + @IBOutlet private var menuCopy: NSMenuItem? + @IBOutlet private var menuPaste: NSMenuItem? + @IBOutlet private var menuPreviousSplit: NSMenuItem? @IBOutlet private var menuNextSplit: NSMenuItem? @IBOutlet private var menuSelectSplitAbove: NSMenuItem? @@ -97,6 +103,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject { private func syncMenuShortcuts() { guard ghostty.config != nil else { return } + syncMenuShortcut(action: "quit", menuItem: self.menuQuit) + syncMenuShortcut(action: "new_window", menuItem: self.menuNewWindow) syncMenuShortcut(action: "new_tab", menuItem: self.menuNewTab) syncMenuShortcut(action: "close_surface", menuItem: self.menuClose) @@ -104,6 +112,9 @@ class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject { syncMenuShortcut(action: "new_split:right", menuItem: self.menuSplitHorizontal) syncMenuShortcut(action: "new_split:down", menuItem: self.menuSplitVertical) + syncMenuShortcut(action: "copy_to_clipboard", menuItem: self.menuCopy) + syncMenuShortcut(action: "paste_from_clipboard", menuItem: self.menuPaste) + syncMenuShortcut(action: "goto_split:previous", menuItem: self.menuPreviousSplit) syncMenuShortcut(action: "goto_split:next", menuItem: self.menuNextSplit) syncMenuShortcut(action: "goto_split:top", menuItem: self.menuSelectSplitAbove) diff --git a/macos/Sources/MainMenu.xib b/macos/Sources/MainMenu.xib index 3aadb6200..1de314192 100644 --- a/macos/Sources/MainMenu.xib +++ b/macos/Sources/MainMenu.xib @@ -16,10 +16,13 @@ + + + @@ -62,7 +65,8 @@ - + + @@ -119,22 +123,18 @@ - + + - + + - - - - - -