summaryrefslogtreecommitdiff
path: root/src/terminal.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/terminal.zig')
-rw-r--r--src/terminal.zig49
1 files changed, 31 insertions, 18 deletions
diff --git a/src/terminal.zig b/src/terminal.zig
index 2bc96a6e..42268f0a 100644
--- a/src/terminal.zig
+++ b/src/terminal.zig
@@ -259,6 +259,9 @@ pub const State = struct {
defer gpa.free(bytes);
try w.writeAll(std.mem.asBytes(&@as(u64, bytes.len)));
try w.writeAll(bytes);
+ // A join's (dump.zig `dumpJoin`): its size alone, an emulator made
+ // afresh there, which its first delta replaces.
+ if (pardes.dump.slim_terminals) return w.writeAll(std.mem.asBytes(&[2]u16{ s.vt.cols, s.vt.rows }));
try ghostty_vt.snapshot.encode(gpa, w, &s.vt, .{ .continuation = .ground });
}
@@ -283,12 +286,17 @@ pub const State = struct {
defer arena.deinit();
const parts = try pardes.walk.load(Parts, arena.allocator(), bytes[8..][0..n], null);
var reader: std.Io.Reader = .fixed(bytes[8 + n ..]);
- var decoded = try ghostty_vt.snapshot.decodeExact(gpa, terminalIo(), &reader, .{
- .max_continuation_bytes = 0,
- .kitty_image_storage_limit = if (images_enabled) TerminalImages.storage_limit else 0,
- });
- defer decoded.deinit(gpa);
- out.* = .{ .gpa = gpa, .vt = decoded.toOwned(), .stream = undefined };
+ if (reader.buffer.len == 4) {
+ const size = std.mem.bytesToValue([2]u16, bytes[8 + n ..][0..4]);
+ out.* = .{ .gpa = gpa, .vt = try emulator(gpa, @max(1, size[0]), @max(1, size[1])), .stream = undefined };
+ } else {
+ var decoded = try ghostty_vt.snapshot.decodeExact(gpa, terminalIo(), &reader, .{
+ .max_continuation_bytes = 0,
+ .kitty_image_storage_limit = if (images_enabled) TerminalImages.storage_limit else 0,
+ });
+ defer decoded.deinit(gpa);
+ out.* = .{ .gpa = gpa, .vt = decoded.toOwned(), .stream = undefined };
+ }
if (comptime images_enabled) inline for (.{ .primary, .alternate }) |key| {
if (out.vt.screens.get(key)) |screen| screen.kitty_images.image_limits = .allWithTempDir(tempDir());
};
@@ -846,18 +854,9 @@ pub fn deinitEmulator(pane: *Pane, gpa: std.mem.Allocator) void {
pane.terminal = null;
}
-/// Allocate the live emulator half of a terminal pane. Slot ownership, serial
-/// assignment, and spawn effects remain core lifecycle invariants.
-pub fn create(gpa: std.mem.Allocator, cols: u16, rows: u16) !*Pane {
- if (authorityOnly()) return error.OutOfMemory;
- const pane = try createDoc(gpa, cols, rows);
- errdefer gpa.destroy(pane);
- if (comptime !enabled) return pane;
- const own = if (pardes.tape.screenReplica()) emulator_gpa else gpa;
- const state = try own.create(State);
- errdefer own.destroy(state);
- state.gpa = own;
- state.vt = try ghostty_vt.Terminal.init(terminalIo(), own, .{
+/// A terminal pane's emulator, `cols` by `rows`, as `create` makes one.
+fn emulator(gpa: std.mem.Allocator, cols: u16, rows: u16) !ghostty_vt.Terminal {
+ return ghostty_vt.Terminal.init(terminalIo(), gpa, .{
.cols = cols,
.rows = rows,
.max_scrollback_bytes = 16 * 1024 * 1024,
@@ -870,6 +869,20 @@ pub fn create(gpa: std.mem.Allocator, cols: u16, rows: u16) !*Pane {
// it could send itself: it runs as the user, under pardes.
.kitty_image_loading_limits = if (images_enabled) .allWithTempDir(tempDir()) else if (@FieldType(ghostty_vt.Terminal.Options, "kitty_image_loading_limits") == void) {} else .direct,
});
+}
+
+/// Allocate the live emulator half of a terminal pane. Slot ownership, serial
+/// assignment, and spawn effects remain core lifecycle invariants.
+pub fn create(gpa: std.mem.Allocator, cols: u16, rows: u16) !*Pane {
+ if (authorityOnly()) return error.OutOfMemory;
+ const pane = try createDoc(gpa, cols, rows);
+ errdefer gpa.destroy(pane);
+ if (comptime !enabled) return pane;
+ const own = if (pardes.tape.screenReplica()) emulator_gpa else gpa;
+ const state = try own.create(State);
+ errdefer own.destroy(state);
+ state.gpa = own;
+ state.vt = try emulator(own, cols, rows);
state.stream = .init(.{ .handler = .{ .inner = state.vt.vtHandler() }, .allocator = own });
state.reply_len = 0;
state.changes = 0;