summaryrefslogtreecommitdiff
path: root/src/replica.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/replica.zig')
-rw-r--r--src/replica.zig51
1 files changed, 24 insertions, 27 deletions
diff --git a/src/replica.zig b/src/replica.zig
index fa6cfadb..b746ddb6 100644
--- a/src/replica.zig
+++ b/src/replica.zig
@@ -30,9 +30,8 @@ const walk = @import("walk.zig");
const wire = @import("wire.zig");
const daemon = @import("daemon.zig");
const writeAll = daemon.writeAll;
-const screen_state = @import("term/screen_state.zig");
const c_heap = @import("c_heap");
-const terminal = pardes.panes.terminal;
+const Term = pardes.Term;
const Allocator = std.mem.Allocator;
const Pardes = pardes.Pardes;
@@ -330,7 +329,7 @@ fn writeScreenHead(out: *std.ArrayListUnmanaged(u8), gpa: Allocator, pane: u8, s
/// pane, and what each peer was sent of it.
pub const Screens = struct {
gpa: Allocator,
- enc: screen_state.Encoder,
+ enc: Term.Encoder,
tracks: [pardes.MAX_PANES]?Tracked = @splat(null),
peers: std.ArrayListUnmanaged(*[pardes.MAX_PANES]PeerOf) = .empty,
free_peers: std.ArrayListUnmanaged(u16) = .empty,
@@ -338,8 +337,8 @@ pub const Screens = struct {
/// Nanoseconds: what each flush spent encoding, for every peer.
encode_ns: u64 = 0,
- const Tracked = struct { serial: u32, state: *terminal.State, track: screen_state.Track };
- const PeerOf = struct { serial: u32 = 0, peer: screen_state.Peer = .{}, shadow: screen_state.ShadowSent = .{} };
+ const Tracked = struct { serial: u32, state: *Term.State, track: Term.Track };
+ const PeerOf = struct { serial: u32 = 0, peer: Term.Peer = .{}, shadow: pardes.Kind.ShadowSent = .{} };
pub fn init(gpa: Allocator) Screens {
return .{ .gpa = gpa, .enc = .init(gpa) };
@@ -347,7 +346,7 @@ pub const Screens = struct {
/// `core` is the session's, its terminals still there.
pub fn deinit(s: *Screens, core: *Pardes) void {
- for (&s.tracks, 0..) |*slot, id| if (slot.*) |*tr| tr.track.deinit(s.gpa, if (s.live(core, id, tr)) &tr.state.vt else null);
+ for (&s.tracks, 0..) |*slot, id| if (slot.*) |*tr| Term.untrack(&tr.track, s.gpa, if (s.live(core, id, tr)) tr.state else null);
for (s.peers.items) |p| {
for (p) |*pp| {
pp.peer.deinit(s.gpa);
@@ -402,12 +401,11 @@ pub const Screens = struct {
pp.peer.reset();
pp.serial = pane.serial;
}
- var marks: [terminal.marks_len]u8 = undefined;
s.out.clearRetainingCapacity();
try writeScreenHead(&s.out, s.gpa, @intCast(id), pane.serial, kind_delta);
var w: std.Io.Writer.Allocating = .fromArrayList(s.gpa, &s.out);
defer s.out = w.toArrayList();
- if (!try screen_state.encode(&s.enc, &tr.track, &pp.peer, &state.vt, state.changes, terminal.marksOf(state, &marks), &w.writer)) continue;
+ if (!try Term.encode(state, &s.enc, &tr.track, &pp.peer, &w.writer)) continue;
try out.append(s.gpa, try s.gpa.dupe(u8, w.written()));
}
}
@@ -440,14 +438,14 @@ pub const Screens = struct {
// lacks, each a message before the frame naming them.
for (frame.places[0..@min(frame.n, 64)]) |*pl| {
// A row past a strip's bound cannot cross: not shown there.
- if (@as(usize, pl.w) * 4 > screen_state.strip_max) continue;
+ if (@as(usize, pl.w) * 4 > pardes.Kind.strip_max) continue;
var owed = try pp.shadow.owed(x.s.gpa, pl);
while (owed != 0) : (owed &= owed - 1) {
x.s.out.clearRetainingCapacity();
try writeScreenHead(&x.s.out, x.s.gpa, @intCast(id), pane.serial, kind_raster);
var w: std.Io.Writer.Allocating = .fromArrayList(x.s.gpa, &x.s.out);
defer x.s.out = w.toArrayList();
- try screen_state.encodeStrip(pl, @ctz(owed), &w.writer);
+ try pardes.Kind.encodeStrip(pl, @ctz(owed), &w.writer);
try x.out.append(x.s.gpa, try x.s.gpa.dupe(u8, w.written()));
}
}
@@ -455,7 +453,7 @@ pub const Screens = struct {
try writeScreenHead(&x.s.out, x.s.gpa, @intCast(id), pane.serial, kind_shadow);
var w: std.Io.Writer.Allocating = .fromArrayList(x.s.gpa, &x.s.out);
defer x.s.out = w.toArrayList();
- if (!try screen_state.encodeShadow(x.s.gpa, &pp.shadow, &frame, k.pointer, &w.writer)) continue;
+ if (!try pardes.Kind.encodeShadow(x.s.gpa, &pp.shadow, &frame, k.pointer, &w.writer)) continue;
try x.out.append(x.s.gpa, try x.s.gpa.dupe(u8, w.written()));
};
}
@@ -473,7 +471,7 @@ pub const Screens = struct {
for (core.panes, 0..) |slot, id| {
const pane = slot orelse continue;
const state = pane.terminal orelse continue;
- if (!state.read) continue;
+ if (!Term.wasRead(state)) continue;
const pp = &s.peers.items[peer][id];
if (pp.serial != pane.serial or pp.peer.holes.items.len == 0) continue;
const tr = try s.track(core, id);
@@ -485,7 +483,7 @@ pub const Screens = struct {
try writeScreenHead(&s.out, s.gpa, @intCast(id), pane.serial, kind_rows);
var w: std.Io.Writer.Allocating = .fromArrayList(s.gpa, &s.out);
defer s.out = w.toArrayList();
- try screen_state.encodeRows(&s.enc, &tr.track, &state.vt, lo, hi, &w.writer);
+ try Term.encodeRows(state, &s.enc, &tr.track, lo, hi, &w.writer);
try out.append(s.gpa, try s.gpa.dupe(u8, w.written()));
lo = hi;
}
@@ -497,7 +495,7 @@ pub const Screens = struct {
/// Every peer is filled: the steps' reads are forgotten.
pub fn filled(_: *Screens, core: *Pardes) void {
for (core.panes) |slot| if (slot) |pane| if (pane.terminal) |state| {
- state.read = false;
+ Term.clearRead(state);
};
}
@@ -506,7 +504,7 @@ pub const Screens = struct {
if (s.tracks[id]) |*tr| {
if (s.live(core, id, tr)) return tr;
// Its pane closed (its emulator, the pin with it, gone).
- tr.track.deinit(s.gpa, null);
+ Term.untrack(&tr.track, s.gpa, null);
}
s.tracks[id] = .{ .serial = pane.serial, .state = pane.terminal.?, .track = .init(s.gpa) };
return &s.tracks[id].?;
@@ -533,7 +531,7 @@ pub const Screens = struct {
try writeScreenHead(&s.out, s.gpa, m.pane, m.serial, kind_rows);
var w: std.Io.Writer.Allocating = .fromArrayList(s.gpa, &s.out);
defer s.out = w.toArrayList();
- try screen_state.encodeRows(&s.enc, &tr.track, &state.vt, std.mem.readInt(u64, m.payload[0..8], .little), std.mem.readInt(u64, m.payload[8..16], .little), &w.writer);
+ try Term.encodeRows(state, &s.enc, &tr.track, std.mem.readInt(u64, m.payload[0..8], .little), std.mem.readInt(u64, m.payload[8..16], .little), &w.writer);
return try s.gpa.dupe(u8, w.written());
},
else => {},
@@ -679,14 +677,14 @@ pub const Replica = struct {
views: [pardes.MAX_PANES]View = @splat(.{}),
screen_out: std.ArrayListUnmanaged(u8) = .empty,
/// Its Shadows' rasters, from the session's strips (17.3).
- blobs: screen_state.Blobs = .{},
+ blobs: pardes.Kind.Blobs = .{},
/// Its predicted echo (src/term/echo.zig), drawn over its core's terminals:
/// fed by its keys, its units and its deltas here, and by `echoFrame`.
- echo: pardes.echo.Echo = .{},
+ echo: Term.Echo = .{},
const ScreenOf = struct {
serial: u32,
- rep: screen_state.Replica = .{},
+ rep: Term.Replica = .{},
/// A delta was refused, and a reset asked for: those in flight
/// before it are refused unasked.
refused: bool = false,
@@ -1144,7 +1142,7 @@ pub const Replica = struct {
// A pane of a kind: the authority's frame of it, drawn as it is.
if (m.kind == kind_shadow) if (pane.addon) |k| {
const sh = k.shadow orelse sh: {
- const made = k.gpa.create(screen_state.Shadow) catch return null;
+ const made = k.gpa.create(pardes.Kind.Shadow) catch return null;
made.* = .{};
k.shadow = made;
break :sh made;
@@ -1168,7 +1166,7 @@ pub const Replica = struct {
switch (m.kind) {
kind_delta => {
const t0 = nowNs();
- const applied = sc.rep.apply(state.gpa, terminal.terminalIo(), &state.vt, m.payload) catch |err| {
+ const applied = Term.apply(state, &sc.rep, m.payload) catch |err| {
if (err != error.BaseMismatch) r.fail("a terminal's delta did not apply");
if (sc.refused) return null;
sc.refused = true;
@@ -1176,7 +1174,6 @@ pub const Replica = struct {
};
if (r.stats.samples) r.stats.apply_ns.append(r.gpa, nowNs() - t0) catch {};
sc.refused = false;
- terminal.takeMarks(state, applied.extra);
r.echo.delta(c, m.pane, sc.rep.top);
// Its rows as the core keeps them read are another grid's.
c.shell_rows.markStale(pane);
@@ -1190,7 +1187,7 @@ pub const Replica = struct {
},
kind_rows => {
sc.asked = null;
- sc.rep.applyRows(state.gpa, &state.vt, m.payload) catch r.fail("a terminal's rows did not apply");
+ Term.applyRows(state, &sc.rep, m.payload) catch r.fail("a terminal's rows did not apply");
c.shell_rows.markStale(pane);
r.overTerminals();
return null;
@@ -1225,13 +1222,13 @@ pub const Replica = struct {
const pane = c.panes[id] orelse continue;
if (pane.serial != sc.serial) continue;
const state = pane.terminal orelse continue;
- const shown = sc.rep.shown(&state.vt);
+ const shown = Term.shown(state, &sc.rep);
var holes: std.ArrayList([2]u64) = .empty;
defer holes.deinit(r.gpa);
sc.rep.missing(shown[0], shown[1], &holes, r.gpa) catch return null;
if (holes.items.len == 0) continue;
const want: [2]u64 = .{ holes.items[0][0], holes.items[holes.items.len - 1][1] };
- sc.rep.blank(&state.vt, want[0], want[1]);
+ Term.blank(state, &sc.rep, want[0], want[1]);
sc.asked = want;
var range: [16]u8 = undefined;
std.mem.writeInt(u64, range[0..8], want[0], .little);
@@ -3460,8 +3457,8 @@ test "a delta applied under a speculation outlives its rollback: the terminal st
defer dump_a.deinit();
var dump_r: std.Io.Writer.Allocating = .init(gpa);
defer dump_r.deinit();
- try screen_state.dumpScreen(&a.core.panes[shell].?.terminal.?.vt, &dump_a.writer);
- try screen_state.dumpScreen(&r.core().panes[shell].?.terminal.?.vt, &dump_r.writer);
+ try Term.dumpScreen(a.core.panes[shell].?.terminal.?, &dump_a.writer);
+ try Term.dumpScreen(r.core().panes[shell].?.terminal.?, &dump_r.writer);
try std.testing.expectEqualStrings(dump_a.written(), dump_r.written());
const rows_a = try pardes.edit.shellRows(a.core, a.core.panes[shell].?);
const rows_r = try pardes.edit.shellRows(r.core(), r.core().panes[shell].?);