Skip to content

Commit c364f9a

Browse files
nicosuavenicosuave
committed
Merge branch 'upstream-main'
# Conflicts: # src/shell-integration/bash/ghostty.bash
2 parents 72ae0ce + 769fff5 commit c364f9a

57 files changed

Lines changed: 9954 additions & 4035 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.zig.zon‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@
116116
// Other
117117
.apple_sdk = .{ .path = "./pkg/apple-sdk" },
118118
.iterm2_themes = .{
119-
.url = "https://deps.files.ghostty.org/ghostty-themes-release-20260112-150707-28c8f5b.tgz",
120-
.hash = "N-V-__8AAIdIAwDt5PxH-cwCxEcTfw4jBV8sR6fZ_XLh-cR7",
119+
.url = "https://deps.files.ghostty.org/ghostty-themes-release-20260126-150817-02c580d.tgz",
120+
.hash = "N-V-__8AAM5RAwB5jHC1P1uqrabiz_ieQvfrIYNzs4eAY__c",
121121
.lazy = true,
122122
},
123123
},

‎build.zig.zon.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.zig.zon.nix‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.zig.zon.txt‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
formatter = forAllPlatforms (pkgs: pkgs.alejandra);
102102

103103
apps = forBuildablePlatforms (pkgs: let
104-
runVM = module: desc: let
104+
runVM = module: let
105105
vm = import ./nix/vm/create.nix {
106106
inherit (pkgs.stdenv.hostPlatform) system;
107107
inherit module nixpkgs;

‎flatpak/zig-packages.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@
6767
},
6868
{
6969
"type": "archive",
70-
"url": "https://deps.files.ghostty.org/ghostty-themes-release-20260112-150707-28c8f5b.tgz",
71-
"dest": "vendor/p/N-V-__8AAIdIAwDt5PxH-cwCxEcTfw4jBV8sR6fZ_XLh-cR7",
72-
"sha256": "348a85d762aa5e122b3fe2f206d83a5ad907c4d51d58ecb388076af12e3946b5"
70+
"url": "https://deps.files.ghostty.org/ghostty-themes-release-20260126-150817-02c580d.tgz",
71+
"dest": "vendor/p/N-V-__8AAM5RAwB5jHC1P1uqrabiz_ieQvfrIYNzs4eAY__c",
72+
"sha256": "8d66d9012d864881fc90675a7c9b9af3538c258f1d8c441486f4ed9a74fdd282"
7373
},
7474
{
7575
"type": "archive",

‎macos/Sources/Features/Command Palette/TerminalCommandPalette.swift‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,16 @@ struct TerminalCommandPaletteView: View {
120120
/// Custom commands from the command-palette-entry configuration.
121121
private var terminalOptions: [CommandOption] {
122122
guard let appDelegate = NSApp.delegate as? AppDelegate else { return [] }
123-
return appDelegate.ghostty.config.commandPaletteEntries.map { c in
124-
CommandOption(
125-
title: c.title,
126-
description: c.description
127-
) {
128-
onAction(c.action)
123+
return appDelegate.ghostty.config.commandPaletteEntries
124+
.filter(\.isSupported)
125+
.map { c in
126+
CommandOption(
127+
title: c.title,
128+
description: c.description
129+
) {
130+
onAction(c.action)
131+
}
129132
}
130-
}
131133
}
132134

133135
/// Commands for jumping to other terminal surfaces.

‎macos/Sources/Features/Terminal/Window Styles/Terminal.xib‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24093.7" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24093.7"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24506"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<objects>
@@ -17,7 +17,7 @@
1717
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
1818
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
1919
<rect key="contentRect" x="0.0" y="0.0" width="800" height="600"/>
20-
<rect key="screenRect" x="0.0" y="0.0" width="3008" height="1661"/>
20+
<rect key="screenRect" x="0.0" y="0.0" width="1512" height="949"/>
2121
<view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
2222
<rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
2323
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

‎macos/Sources/Features/Terminal/Window Styles/TerminalTabsTitlebarTahoe.xib‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24093.7" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24093.7"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24506"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<objects>
@@ -17,7 +17,7 @@
1717
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
1818
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
1919
<rect key="contentRect" x="0.0" y="0.0" width="800" height="600"/>
20-
<rect key="screenRect" x="0.0" y="0.0" width="3008" height="1661"/>
20+
<rect key="screenRect" x="0.0" y="0.0" width="1512" height="949"/>
2121
<view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
2222
<rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
2323
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

‎macos/Sources/Ghostty/Ghostty.App.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1335,7 +1335,7 @@ extension Ghostty {
13351335
mode: ghostty_action_inspector_e) {
13361336
switch (target.tag) {
13371337
case GHOSTTY_TARGET_APP:
1338-
Ghostty.logger.warning("toggle split zoom does nothing with an app target")
1338+
Ghostty.logger.warning("toggle inspector does nothing with an app target")
13391339
return
13401340

13411341
case GHOSTTY_TARGET_SURFACE:

0 commit comments

Comments
 (0)