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/ScreenSet.zig | |
| parent | 90e947a6e26e02f10ec7f1694c4eb5b78a86406b (diff) | |
chore: upgrade libghostty and preserve terminal behavior (#3906)
Diffstat (limited to 'vendor/libghostty-vt/src/terminal/ScreenSet.zig')
| -rw-r--r-- | vendor/libghostty-vt/src/terminal/ScreenSet.zig | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/vendor/libghostty-vt/src/terminal/ScreenSet.zig b/vendor/libghostty-vt/src/terminal/ScreenSet.zig index 4d3689e3..28fced98 100644 --- a/vendor/libghostty-vt/src/terminal/ScreenSet.zig +++ b/vendor/libghostty-vt/src/terminal/ScreenSet.zig @@ -30,19 +30,20 @@ active: *Screen, /// All screens that are initialized. all: std.EnumMap(Key, *Screen), -/// Monotonic generation counter for each screen key. This changes whenever a -/// screen is removed so external handles can distinguish a newly initialized -/// screen from stale references into destroyed screen storage. +/// Monotonic generation counter for each screen key. This changes whenever +/// screen storage is removed or replaced so external handles can distinguish a +/// newly initialized screen from stale references into destroyed storage. generations: std.EnumMap(Key, usize), pub fn init( + io: std.Io, alloc: Allocator, opts: Screen.Options, ) Allocator.Error!ScreenSet { // We need to initialize our initial primary screen const screen = try alloc.create(Screen); errdefer alloc.destroy(screen); - screen.* = try .init(alloc, opts); + screen.* = try .init(io, alloc, opts); return .{ .active_key = .primary, .active = screen, @@ -73,6 +74,7 @@ pub fn generation(self: *const ScreenSet, key: Key) usize { /// Get the screen for the given key, initializing it if necessary. pub fn getInit( self: *ScreenSet, + io: std.Io, alloc: Allocator, key: Key, opts: Screen.Options, @@ -80,7 +82,7 @@ pub fn getInit( if (self.get(key)) |screen| return screen; const screen = try alloc.create(Screen); errdefer alloc.destroy(screen); - screen.* = try .init(alloc, opts); + screen.* = try .init(io, alloc, opts); self.all.put(key, screen); return screen; } @@ -108,14 +110,15 @@ pub fn switchTo(self: *ScreenSet, key: Key) void { test ScreenSet { const alloc = testing.allocator; - var set: ScreenSet = try .init(alloc, .default); + const io = testing.io; + var set: ScreenSet = try .init(io, alloc, .default); defer set.deinit(alloc); try testing.expectEqual(.primary, set.active_key); try testing.expectEqual(@as(usize, 0), set.generation(.primary)); try testing.expectEqual(@as(usize, 0), set.generation(.alternate)); // Initialize a secondary screen - _ = try set.getInit(alloc, .alternate, .default); + _ = try set.getInit(io, alloc, .alternate, .default); try testing.expectEqual(@as(usize, 0), set.generation(.alternate)); set.switchTo(.alternate); @@ -124,7 +127,8 @@ test ScreenSet { test "ScreenSet generations" { const alloc = testing.allocator; - var set: ScreenSet = try .init(alloc, .default); + const io = testing.io; + var set: ScreenSet = try .init(io, alloc, .default); defer set.deinit(alloc); try testing.expectEqual(@as(usize, 0), set.generation(.primary)); @@ -135,7 +139,7 @@ test "ScreenSet generations" { try testing.expectEqual(@as(usize, 0), set.generation(.alternate)); // Initializing a screen doesn't change the generation. - _ = try set.getInit(alloc, .alternate, .default); + _ = try set.getInit(io, alloc, .alternate, .default); try testing.expectEqual(@as(usize, 0), set.generation(.alternate)); const alternate_generation = set.generation(.alternate); @@ -144,7 +148,7 @@ test "ScreenSet generations" { // Reinitializing keeps the generation from the last removal, so stale // handles can distinguish the new screen from the destroyed screen. - _ = try set.getInit(alloc, .alternate, .default); + _ = try set.getInit(io, alloc, .alternate, .default); try testing.expectEqual(alternate_generation +% 1, set.generation(.alternate)); try testing.expectEqual(@as(usize, 0), set.generation(.primary)); } |
