summaryrefslogtreecommitdiff
path: root/src/views.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/views.zig')
-rw-r--r--src/views.zig54
1 files changed, 42 insertions, 12 deletions
diff --git a/src/views.zig b/src/views.zig
index 361d14a3..b9731089 100644
--- a/src/views.zig
+++ b/src/views.zig
@@ -523,6 +523,19 @@ pub const Present = struct { ctx: ?*anyopaque, f: ?*const fn (?*anyopaque, *cons
/// are the slot's again (else a frame drawn would take them from a view,
/// and a replica that draws nothing would keep them).
fn drawParked(p: *Pardes, k: u8, present: Present) !void {
+ try unparked(p, k, present, drawLive);
+ copy(&drawn_fields, &p.parked[k].?.view, p);
+}
+
+fn drawLive(present: Present, p: *Pardes) anyerror!void {
+ _ = p.frame_arena.reset(.{ .retain_with_limit = pardes.memory.limits.frame_kept });
+ const surface = try p.render(p.frame_arena.allocator());
+ if (present.f) |f| f(present.ctx, surface);
+}
+
+/// `f(ctx, p)` with parked view `k` unparked, its slot's selections its own
+/// again after (`drawParked`).
+fn unparked(p: *Pardes, k: u8, ctx: anytype, comptime f: fn (@TypeOf(ctx), *Pardes) anyerror!void) !void {
var sels: [MAX_PANES]struct { []Text.SelRange, u16 } = undefined;
for (p.panes, 0..) |s, id| if (s) |pane| {
sels[id] = .{ pane.pv[k].body.sels, pane.pv[k].body.nsel };
@@ -532,10 +545,7 @@ fn drawParked(p: *Pardes, k: u8, present: Present) !void {
pane.pv[k].body.sels = sels[id][0];
pane.pv[k].body.nsel = sels[id][1];
};
- _ = p.frame_arena.reset(.{ .retain_with_limit = pardes.memory.limits.frame_kept });
- const surface = try p.render(p.frame_arena.allocator());
- if (present.f) |f| f(present.ctx, surface);
- copy(&drawn_fields, &p.parked[k].?.view, p);
+ try f(ctx, p);
}
/// View `k` drawn and presented outside any step, by a replica client
@@ -543,12 +553,32 @@ fn drawParked(p: *Pardes, k: u8, present: Present) !void {
/// view put back after exactly as it was, so the replica's digest is the
/// authority's still. No post_present, as there.
pub fn drawOne(p: *Pardes, k: u8, present: Present) !void {
- if (k == p.view or !isOpen(p, k)) {
- _ = p.frame_arena.reset(.{ .retain_with_limit = pardes.memory.limits.frame_kept });
- const surface = try p.render(p.frame_arena.allocator());
- if (present.f) |f| f(present.ctx, surface);
- return;
- }
+ if (k == p.view or !isOpen(p, k)) return drawLive(present, p);
+ const Draw = struct {
+ fn draw(pr: Present, q: *Pardes, kk: u8) anyerror!void {
+ try drawParked(q, kk, pr);
+ }
+ };
+ try withParked(p, k, present, Draw.draw);
+}
+
+/// `f(ctx, p)` with view `k` live, outside any step, and the live view put
+/// back after exactly as it was, as `drawOne` draws one: what a replica
+/// client's frontend reads of its own view (its pointer's cells, its size)
+/// while another client's input was the session's last. `f` reads only.
+pub fn within(p: *Pardes, k: u8, ctx: anytype, comptime f: fn (@TypeOf(ctx), *Pardes) anyerror!void) !void {
+ if (k == p.view or !isOpen(p, k)) return f(ctx, p);
+ const Read = struct {
+ fn read(x: @TypeOf(ctx), q: *Pardes, kk: u8) anyerror!void {
+ try unparked(q, kk, x, f);
+ }
+ };
+ try withParked(p, k, ctx, Read.read);
+}
+
+/// The live view parked, `f(ctx, p, k)`, and the live view put back after
+/// exactly as it was.
+fn withParked(p: *Pardes, k: u8, ctx: anytype, comptime f: fn (@TypeOf(ctx), *Pardes, u8) anyerror!void) !void {
const live = p.view;
park(p);
defer {
@@ -562,10 +592,10 @@ pub fn drawOne(p: *Pardes, k: u8, present: Present) !void {
pane.cols = pv.cols;
pane.rows = pv.rows;
}
- if (pane.file) |*f| f.scroll = pv.scroll;
+ if (pane.file) |*file| file.scroll = pv.scroll;
};
}
- try drawParked(p, k, present);
+ try f(ctx, p, k);
}
// ---- tests ----