summaryrefslogtreecommitdiff
path: root/src/detached
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-09-22 02:21:03 -0300
committerGabriel Schneider <[email protected]>2026-10-01 00:12:14 -0300
commit43b9d696f9e25ad7589527b91a74666e71ff0472 (patch)
tree52ed8573c53a7a6f6ca956b4f473035126a15354 /src/detached
parent760448928186382da4ef9d942af1a2b7546ef54c (diff)
downloadpardes-43b9d696f9e25ad7589527b91a74666e71ff0472.tar.gz
pardes-43b9d696f9e25ad7589527b91a74666e71ff0472.zip
Notices become tagline bands at the top of the body
A message, a leader chord and a prompt used to share one row of body text at the bottom of a pane, wearing the tagline font and nothing else about a tagline. Now each one is a TagLayer of its own, emitted through the same renderHeaderLayer the pane and column tags go through, so it gets the tagline height, the small-font metrics, the band offset and the border for free -- none of which a body-grid row can have by changing its font role. The text is right aligned. The prompt stays on the canonical grid because it owns a cursor, and a cursor has to sit on a real cell. The body starts BELOW the bands rather than under them, the way tree-sitter context rows already worked. Pane.body_offset is how many rows they took and Pardes.bodyTop(pane, rect) is the one place that answers "where does the body begin" -- replacing fifteen copies of `if (tag_bottom) r.y else r.y + BOX_H` spread across the paint, hit-test, scroll, PDF and image paths, which is what let the bands and the text under them come adrift. Every notice is painted on the grid as well, because the grid is what a terminal client draws and a band it cannot see is a message it never gets; the GUI skips grid cells a tag layer covers, so nothing is drawn twice. Three bugs the bands exposed, fixed here: - a prompt band flush with the right edge put its caret one column past the pane, which the detached wire refuses -- so every frame was dropped for as long as the prompt was open. The band now reserves that column. - a click on a band mapped to Sel row 0, which is the TAG row: clicking chrome expanded a word out of the tagline and ran it as a builtin. - a watched file reloading under the editor changed the core without going through update, so needs_frame was never set and the reload was never drawn. Pardes.invalidate() is the name for that, and the file and theme reloads call it. A session can now drive its own 9P namespace instead of being refused one: ownMountSuffix answers what a path names inside this editors own tree and resolve, readLimit and write serve it from memory rather than making the syscall that never returns. The match is anchored to whole components under the registrys 9p/pardes/<name>, because a bare /pardes/<name> anywhere in a string would claim ~/src/pardes/<name>/README -- and, before write learned the same trick, write the trees bytes over the real file. readFileLimit and writeFile refuse instead, having no core to answer from. A toggle setting SETS when given `on` or `off` and only flips when it is bare, so the report LocationsConfig prints can be fed back as configuration and mean what it says. Snapshots: 97/98, from 0/98. The goldens were several commits stale and 17 scripts had stopped running; `config <line>` is a new script command that appends to the per-script startup config, so a script that clicks body coordinates pins `Verbose off` instead of counting the rows an announcement moves. nested-optout is left failing on purpose: two levels of nesting prepend vaxis F3 codepoints to typed lines, which is a real bug and is written down in docs/divergences.md with a repro. Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
Diffstat (limited to 'src/detached')
-rw-r--r--src/detached/client.zig26
-rw-r--r--src/detached/wire.zig7
2 files changed, 30 insertions, 3 deletions
diff --git a/src/detached/client.zig b/src/detached/client.zig
index 9481cd54..a027c0bb 100644
--- a/src/detached/client.zig
+++ b/src/detached/client.zig
@@ -1266,8 +1266,32 @@ test "detached session: a frontend that stops reading is dropped, not waited for
// for, which is the whole claim: one slow peer costs its own slot.
try testing.expect(h.session.clients[0].attached);
try testing.expect(!h.core.quit);
+ // A message is a tagline band now, not a grid run, so "still being drawn
+ // for" is checked on the layers the frontend decoded rather than on nruns.
try good.send(.{ .event = .{ .command = "Msg still here" } });
- try testing.expect((try h.pumpUntilChange(&good)).nruns > 0);
+ try testing.expect(try pumpUntilNotice(&h, &good, "still here"));
+}
+
+/// Pump until this client has a notice band carrying `want`.
+fn pumpUntilNotice(h: *Harness, c: *Client, want: []const u8) !bool {
+ var line: [256]u8 = undefined;
+ for (0..Harness.rounds) |_| {
+ try h.pump();
+ try c.wait(5);
+ while (try c.next()) |_| {}
+ for (&c.tag_layers) |*layer| {
+ if (layer.cols == 0 or layer.kind != .notice) continue;
+ var n: usize = 0;
+ for (layer.cells[0..layer.cols]) |cell| {
+ const g = cell.grapheme();
+ if (n + g.len > line.len) break;
+ @memcpy(line[n..][0..g.len], g);
+ n += g.len;
+ }
+ if (std.mem.indexOf(u8, line[0..n], want) != null) return true;
+ }
+ }
+ return false;
}
/// A connected socket with nothing said on it yet, for the tests whose peer is
diff --git a/src/detached/wire.zig b/src/detached/wire.zig
index 245bc9f4..6805d980 100644
--- a/src/detached/wire.zig
+++ b/src/detached/wire.zig
@@ -4,7 +4,10 @@ const std = @import("std");
const pardes = @import("../pardes.zig");
const limits = @import("../memory.zig").limits;
-pub const version: u16 = 6;
+/// 7: tag layers gained the `.notice` kind, so a frame can carry a tag value
+/// an older frontend would reject mid-session. The greeting is where that has
+/// to be refused, which is what this number is for.
+pub const version: u16 = 7;
pub const Error = error{ Truncated, Overlong, BadTag, BadValue, Trailing, NoSpace };
@@ -220,7 +223,7 @@ pub const Frame = struct {
layer.viewport.y >= f.rows or (switch (layer.kind) {
.workspace => layer.id != 0,
.column => layer.id >= pardes.MAX_COLS,
- .pane => layer.id >= pardes.MAX_PANES,
+ .pane, .notice => layer.id >= pardes.MAX_PANES,
})) return error.BadValue;
const cursor = try getCursor(&r, layer.cols, 1);
layer.cursor = if (cursor) |c| .{ .col = c.x, .bar = c.bar } else null;