chore: upgrade libghostty and preserve terminal behavior (#3906)

1 files changed, 89 insertions, 22 deletions

diff --git a/vendor/libghostty-vt/pkg/macos/build.zig b/vendor/libghostty-vt/pkg/macos/build.zig
index 0525e481..5569baad 100644
--- a/vendor/libghostty-vt/pkg/macos/build.zig
+++ b/vendor/libghostty-vt/pkg/macos/build.zig
@@ -2,6 +2,66 @@ const std = @import("std");
 const builtin = @import("builtin");
 const apple_sdk = @import("apple_sdk");
 
+const Framework = struct {
+    const Tag = enum { all, macos };
+
+    tag: Tag,
+    name: []const u8,
+    headers: []const []const u8,
+};
+
+const frameworks = [_]Framework{
+    .{ .tag = .all, .name = "CoreFoundation", .headers = &.{"CoreFoundation.h"} },
+    .{ .tag = .all, .name = "CoreGraphics", .headers = &.{"CoreGraphics.h"} },
+    .{ .tag = .all, .name = "CoreText", .headers = &.{"CoreText.h"} },
+    .{ .tag = .all, .name = "CoreVideo", .headers = &.{ "CoreVideo.h", "CVPixelBuffer.h" } },
+    .{ .tag = .all, .name = "QuartzCore", .headers = &.{"CALayer.h"} },
+    .{ .tag = .all, .name = "IOSurface", .headers = &.{"IOSurfaceRef.h"} },
+    .{ .tag = .macos, .name = "Carbon", .headers = &.{"Carbon.h"} },
+};
+
+const extra_headers = [_][]const u8{
+    "dispatch/dispatch.h",
+    "os/log.h",
+    "os/signpost.h",
+};
+
+const framework_header_fmt = "#include <{s}/{s}>\n";
+const extra_header_fmt = "#include <{s}>\n";
+
+fn cSourceLen(tag: Framework.Tag) usize {
+    var len: usize = 0;
+    for (frameworks) |framework| {
+        if (tag != .macos and framework.tag == .macos) continue;
+        for (framework.headers) |h| len += std.fmt.count(framework_header_fmt, .{ framework.name, h });
+    }
+    for (extra_headers) |h| len += std.fmt.count(extra_header_fmt, .{h});
+    return len;
+}
+
+fn genCSource(comptime tag: Framework.Tag) [cSourceLen(tag):0]u8 {
+    const len = cSourceLen(tag);
+    var buf: [len:0]u8 = undefined;
+    var writer: std.Io.Writer = .fixed(&buf);
+    for (frameworks) |framework| {
+        if (tag != .macos and framework.tag == .macos) continue;
+        for (framework.headers) |h| writer.print(framework_header_fmt, .{ framework.name, h }) catch unreachable;
+    }
+    for (extra_headers) |h| writer.print(extra_header_fmt, .{h}) catch unreachable;
+    buf[len] = 0;
+    return buf;
+}
+
+const c_source_macos = genCSource(.macos);
+const c_source_other = genCSource(.all);
+
+fn linkFrameworks(tag: Framework.Tag, module: *std.Build.Module) !void {
+    for (frameworks) |framework| {
+        if (tag != .macos and framework.tag == .macos) continue;
+        module.linkFramework(framework.name, .{});
+    }
+}
+
 pub fn build(b: *std.Build) !void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
@@ -12,6 +72,29 @@ pub fn build(b: *std.Build) !void {
         .optimize = optimize,
     });
 
+    translate: {
+        const translate_c = b.lazyImport(@This(), "translate_c") orelse break :translate;
+        const translate_c_dep = b.lazyDependency("translate_c", .{}) orelse break :translate;
+        const macos_c: translate_c.Translator = .init(translate_c_dep, .{
+            .c_source_file = b.addWriteFiles().add(
+                "macos_c.h",
+                if (target.result.os.tag == .macos) &c_source_macos else &c_source_other,
+            ),
+            .target = target,
+            .optimize = optimize,
+            .libc_file = if (target.result.os.tag.isDarwin()) libc_file: {
+                switch (try apple_sdk.pathsForTarget(b, target.result)) {
+                    inline else => |paths| break :libc_file paths.libc,
+                }
+            } else null,
+        });
+
+        // Blocks need to be enabled to use MacOS headers
+        macos_c.run.addArg("-fblocks");
+
+        module.addImport("macos_c", macos_c.mod);
+    }
+
     const lib = b.addLibrary(.{
         .name = "macos",
         .root_module = b.createModule(.{
@@ -21,34 +104,18 @@ pub fn build(b: *std.Build) !void {
         .linkage = .static,
     });
 
-    lib.addCSourceFile(.{
+    lib.root_module.addCSourceFile(.{
         .file = b.path("os/zig_macos.c"),
         .flags = &.{"-std=c99"},
     });
-    lib.addCSourceFile(.{
+    lib.root_module.addCSourceFile(.{
         .file = b.path("text/ext.c"),
     });
-    lib.linkFramework("CoreFoundation");
-    lib.linkFramework("CoreGraphics");
-    lib.linkFramework("CoreText");
-    lib.linkFramework("CoreVideo");
-    lib.linkFramework("QuartzCore");
-    lib.linkFramework("IOSurface");
-    if (target.result.os.tag == .macos) {
-        lib.linkFramework("Carbon");
-        module.linkFramework("Carbon", .{});
-    }
-
-    if (target.result.os.tag.isDarwin()) {
-        module.linkFramework("CoreFoundation", .{});
-        module.linkFramework("CoreGraphics", .{});
-        module.linkFramework("CoreText", .{});
-        module.linkFramework("CoreVideo", .{});
-        module.linkFramework("QuartzCore", .{});
-        module.linkFramework("IOSurface", .{});
 
-        try apple_sdk.addPaths(b, lib);
+    inline for (.{ lib.root_module, module }) |mod| {
+        try linkFrameworks(if (target.result.os.tag == .macos) .macos else .all, mod);
     }
+    try apple_sdk.addPaths(b, lib);
     b.installArtifact(lib);
 
     {
@@ -63,7 +130,7 @@ pub fn build(b: *std.Build) !void {
         if (target.result.os.tag.isDarwin()) {
             try apple_sdk.addPaths(b, test_exe);
         }
-        test_exe.linkLibrary(lib);
+        test_exe.root_module.linkLibrary(lib);
 
         var it = module.import_table.iterator();
         while (it.next()) |entry| {