diff options
| author | Can Celik <ogulcancelik@gmail.com> | 2026-09-10 21:51:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-10 21:51:57 +0300 |
| commit | 425c86179791cd32e2d4ce0ae7f269940b4b0663 (patch) | |
| tree | e52c4383a6d69216cbe2a32638bf90841d7e2189 /vendor/libghostty-vt/src/terminal/tmux | |
| parent | 90e947a6e26e02f10ec7f1694c4eb5b78a86406b (diff) | |
chore: upgrade libghostty and preserve terminal behavior (#3906)
Diffstat (limited to 'vendor/libghostty-vt/src/terminal/tmux')
| -rw-r--r-- | vendor/libghostty-vt/src/terminal/tmux/control.zig | 2 | ||||
| -rw-r--r-- | vendor/libghostty-vt/src/terminal/tmux/output.zig | 24 | ||||
| -rw-r--r-- | vendor/libghostty-vt/src/terminal/tmux/viewer.zig | 31 |
3 files changed, 29 insertions, 28 deletions
diff --git a/vendor/libghostty-vt/src/terminal/tmux/control.zig b/vendor/libghostty-vt/src/terminal/tmux/control.zig index 3b94eb16..b06560dd 100644 --- a/vendor/libghostty-vt/src/terminal/tmux/control.zig +++ b/vendor/libghostty-vt/src/terminal/tmux/control.zig @@ -117,7 +117,7 @@ pub const Parser = struct { const line = written[idx..]; if (parseBlockTerminator(line)) |terminator| { - const output = std.mem.trimRight( + const output = std.mem.trimEnd( u8, written[0..idx], "\r\n", diff --git a/vendor/libghostty-vt/src/terminal/tmux/output.zig b/vendor/libghostty-vt/src/terminal/tmux/output.zig index 6b8073e4..9e21703b 100644 --- a/vendor/libghostty-vt/src/terminal/tmux/output.zig +++ b/vendor/libghostty-vt/src/terminal/tmux/output.zig @@ -70,23 +70,17 @@ pub fn format( /// format variables. This can be used with `parseFormatStruct` to /// parse an output string into a format struct. pub fn FormatStruct(comptime vars: []const Variable) type { - var fields: [vars.len]std.builtin.Type.StructField = undefined; - for (vars, &fields) |variable, *field| { - field.* = .{ - .name = @tagName(variable), - .type = variable.Type(), - .default_value_ptr = null, - .is_comptime = false, - .alignment = @alignOf(variable.Type()), - }; + var names: [vars.len][]const u8 = undefined; + var types: [vars.len]type = undefined; + var attrs: [vars.len]std.builtin.Type.StructField.Attributes = undefined; + + for (vars, &names, &types, &attrs) |variable, *name, *ty, *attr| { + name.* = @tagName(variable); + ty.* = variable.Type(); + attr.* = .{ .@"align" = @alignOf(variable.Type()) }; } - return @Type(.{ .@"struct" = .{ - .layout = .auto, - .fields = &fields, - .decls = &.{}, - .is_tuple = false, - } }); + return @Struct(.auto, null, &names, &types, &attrs); } /// Possible variables in a tmux format string that we support. diff --git a/vendor/libghostty-vt/src/terminal/tmux/viewer.zig b/vendor/libghostty-vt/src/terminal/tmux/viewer.zig index 585c9540..5f080089 100644 --- a/vendor/libghostty-vt/src/terminal/tmux/viewer.zig +++ b/vendor/libghostty-vt/src/terminal/tmux/viewer.zig @@ -156,6 +156,9 @@ const COMMAND_QUEUE_INITIAL = 8; /// session. /// pub const Viewer = struct { + /// I/O implementation used for all internal state. + io: std.Io, + /// Allocator used for all internal state. alloc: Allocator, @@ -265,12 +268,13 @@ pub const Viewer = struct { /// /// The given allocator is used for all internal state. You must /// call deinit when you're done with the viewer to free it. - pub fn init(alloc: Allocator) Allocator.Error!Viewer { + pub fn init(io: std.Io, alloc: Allocator) Allocator.Error!Viewer { // Create our initial command queue var command_queue: CommandQueue = try .init(alloc, COMMAND_QUEUE_INITIAL); errdefer command_queue.deinit(alloc); return .{ + .io = io, .alloc = alloc, .state = .startup_block, // The default value here is meaningless. We don't get started @@ -639,6 +643,7 @@ pub const Viewer = struct { panes.deinit(self.alloc); } for (windows) |window| try initLayout( + self.io, self.alloc, &self.panes, &panes, @@ -723,7 +728,7 @@ pub const Viewer = struct { session_id: usize, ) (Allocator.Error || std.Io.Writer.Error)!void { // Build up a new viewer. Its the easiest way to reset ourselves. - var replacement: Viewer = try .init(self.alloc); + var replacement: Viewer = try .init(self.io, self.alloc); errdefer replacement.deinit(); // Our actions must start out empty so we don't mix arenas @@ -1115,6 +1120,7 @@ pub const Viewer = struct { } fn initLayout( + io: std.Io, gpa_alloc: Allocator, panes_old: *const PanesMap, panes_new: *PanesMap, @@ -1125,6 +1131,7 @@ pub const Viewer = struct { .horizontal, .vertical => |layouts| { for (layouts) |l| { try initLayout( + io, gpa_alloc, panes_old, panes_new, @@ -1149,7 +1156,7 @@ pub const Viewer = struct { // TODO: We need to gracefully handle overflow of our // max cols/width here. In practice we shouldn't hit this // so we cast but its not safe. - var t: Terminal = try .init(gpa_alloc, .{ + var t: Terminal = try .init(io, gpa_alloc, .{ .cols = @intCast(layout.width), .rows = @intCast(layout.height), }); @@ -1494,7 +1501,7 @@ fn testViewer(viewer: *Viewer, steps: []const TestStep) !void { } test "immediate exit" { - var viewer = try Viewer.init(testing.allocator); + var viewer = try Viewer.init(testing.io, testing.allocator); defer viewer.deinit(); try testViewer(&viewer, &.{ @@ -1514,7 +1521,7 @@ test "immediate exit" { } test "session changed resets state" { - var viewer = try Viewer.init(testing.allocator); + var viewer = try Viewer.init(testing.io, testing.allocator); defer viewer.deinit(); try testViewer(&viewer, &.{ @@ -1605,7 +1612,7 @@ test "session changed resets state" { } test "initial flow" { - var viewer = try Viewer.init(testing.allocator); + var viewer = try Viewer.init(testing.io, testing.allocator); defer viewer.deinit(); try testViewer(&viewer, &.{ @@ -1786,7 +1793,7 @@ test "initial flow" { } test "layout change" { - var viewer = try Viewer.init(testing.allocator); + var viewer = try Viewer.init(testing.io, testing.allocator); defer viewer.deinit(); try testViewer(&viewer, &.{ @@ -1857,7 +1864,7 @@ test "layout change" { } test "layout_change does not return command when queue not empty" { - var viewer = try Viewer.init(testing.allocator); + var viewer = try Viewer.init(testing.io, testing.allocator); defer viewer.deinit(); try testViewer(&viewer, &.{ @@ -1918,7 +1925,7 @@ test "layout_change does not return command when queue not empty" { } test "layout_change returns command when queue was empty" { - var viewer = try Viewer.init(testing.allocator); + var viewer = try Viewer.init(testing.io, testing.allocator); defer viewer.deinit(); try testViewer(&viewer, &.{ @@ -1985,7 +1992,7 @@ test "layout_change returns command when queue was empty" { } test "window_add queues list_windows when queue empty" { - var viewer = try Viewer.init(testing.allocator); + var viewer = try Viewer.init(testing.io, testing.allocator); defer viewer.deinit(); try testViewer(&viewer, &.{ @@ -2046,7 +2053,7 @@ test "window_add queues list_windows when queue empty" { } test "window_add queues list_windows when queue not empty" { - var viewer = try Viewer.init(testing.allocator); + var viewer = try Viewer.init(testing.io, testing.allocator); defer viewer.deinit(); try testViewer(&viewer, &.{ @@ -2102,7 +2109,7 @@ test "window_add queues list_windows when queue not empty" { } test "two pane flow with pane state" { - var viewer = try Viewer.init(testing.allocator); + var viewer = try Viewer.init(testing.io, testing.allocator); defer viewer.deinit(); try testViewer(&viewer, &.{ |
