summaryrefslogtreecommitdiff
path: root/src/Query.zig
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-10-24 13:47:11 -0300
committerGabriel Schneider <[email protected]>2026-10-24 15:43:44 -0300
commitf3405aaef8db79094b2741a9caaeaa5328ab6288 (patch)
tree5130b95da1d545a5f669710feca9bfa4dfba1a98 /src/Query.zig
parent9db48c4c8a9b2d239680a59d451cd8c1e290ff56 (diff)
downloadpardes-f3405aaef8db79094b2741a9caaeaa5328ab6288.tar.gz
pardes-f3405aaef8db79094b2741a9caaeaa5328ab6288.zip
Store 2/3: one bounded store every window shares (Store.zig): Recent as records read on use, the panes a session closes kept as one-pane dumps; Panes lists them (closed), Enter or a look at @pN brings one back beside the pane that took its rows
An append-only log under $XDG_STATE_HOME/pardes/store, framed records with a CRC, flock on store.lock (never blocking a step), a stat on use, garbage passed over and compacted away by the next writer, compaction by rename, 100 MiB cap. dump.dumpPane/restorePane lifted out of dumpState/initDump; layout.giveBack; Options.recent_path is store_path. Host calls yield one at a time; /recent refreshes only when no step is out. Tests: two windows and a busy lock, the cap, garbage/torn/partial records, a closed pane's reopen with the layout invariant; fs.py: two live sessions over 9P.
Diffstat (limited to 'src/Query.zig')
-rw-r--r--src/Query.zig57
1 files changed, 45 insertions, 12 deletions
diff --git a/src/Query.zig b/src/Query.zig
index a871b71e..98419c7b 100644
--- a/src/Query.zig
+++ b/src/Query.zig
@@ -580,6 +580,8 @@ fn startSource(p: *Pardes, id: usize, q: *Query, source: Source, owner_id: ?usiz
if (p.fs.serving) Stream.step(p);
},
.recent => {
+ // Every window's files: what the others wrote since, read.
+ p.store.refresh(p);
var out: std.Io.Writer.Allocating = .init(gpa);
defer out.deinit();
Output.recentText(p, &out.writer, true) catch {};
@@ -591,15 +593,29 @@ fn startSource(p: *Pardes, id: usize, q: *Query, source: Source, owner_id: ?usiz
q.names.add(gpa, rel, 0, path_end, Names.baseOf(rel[0..path_end]), 0) catch break;
}
},
- .panes => for (p.panes) |slot| {
- const other = slot orelse continue;
- if (other == rp or other.query != null) continue;
- var buf: [4096 + 32]u8 = undefined;
- const what: []const u8 = if (other.file) |f| f.path else if (other.command) |c| c else other.cwdSlice();
- const row = std.fmt.bufPrint(&buf, config.pane_addr ++ "{d} {s}", .{ other.serial, Names.relative(what, dir) }) catch continue;
- const key_at = std.mem.indexOfScalar(u8, row, ' ').? + 1;
- const ln = row[0 .. std.mem.indexOfAny(u8, row, "\r\n") orelse row.len];
- q.names.add(gpa, ln, key_at, ln.len -| key_at, Names.baseOf(ln[@min(key_at, ln.len)..]), other.serial) catch break;
+ .panes => {
+ for (p.panes) |slot| {
+ const other = slot orelse continue;
+ if (other == rp or other.query != null) continue;
+ var buf: [4096 + 32]u8 = undefined;
+ const what: []const u8 = if (other.file) |f| f.path else if (other.command) |c| c else other.cwdSlice();
+ const row = std.fmt.bufPrint(&buf, config.pane_addr ++ "{d} {s}", .{ other.serial, Names.relative(what, dir) }) catch continue;
+ const key_at = std.mem.indexOfScalar(u8, row, ' ').? + 1;
+ const ln = row[0 .. std.mem.indexOfAny(u8, row, "\r\n") orelse row.len];
+ q.names.add(gpa, ln, key_at, ln.len -| key_at, Names.baseOf(ln[@min(key_at, ln.len)..]), other.serial) catch break;
+ }
+ // Then the panes this session closed, the latest first, each
+ // `(closed)` and dimmer (makeNameRows): Enter brings one back
+ // where it was. Its name alone is matched, not the word.
+ var i = p.store.closed.items.len;
+ while (i > 0) : (i -= 1) {
+ const c = p.store.closed.items[i - 1];
+ var buf: [4096 + 48]u8 = undefined;
+ const row = std.fmt.bufPrint(&buf, config.pane_addr ++ "{d} {s}" ++ closed_word, .{ c.serial, Names.relative(c.name, dir) }) catch continue;
+ const key_at = std.mem.indexOfScalar(u8, row, ' ').? + 1;
+ const key_len = row.len - closed_word.len - key_at;
+ q.names.add(gpa, row, key_at, key_len, Names.baseOf(row[key_at..][0..key_len]), c.serial) catch break;
+ }
},
.symbols => {
const oid = owner_id orelse return;
@@ -622,6 +638,9 @@ fn startSource(p: *Pardes, id: usize, q: *Query, source: Source, owner_id: ?usiz
}
}
+/// What a Panes row of a closed pane ends with.
+const closed_word = " (closed)";
+
/// The owner's declarations, from a parse that already exists: its sticky
/// headers' (TreeContext) at this revision, or the locations cache's. None
/// is made here, on the loop, unless `small` and the text is small: a
@@ -1020,13 +1039,21 @@ fn makeNameRows(p: *Pardes, id: usize, pat: []const u8) !void {
}
try q.items.append(p.gpa, .{ .kind = .hit, .ref = cand.ref });
try writeRow(p, &out, &rows, row, meta);
+ // A closed pane's row is dimmer, the gutter's colour, between its
+ // marks (spans are walked in order, never overlapping).
+ const dim = q.source == .panes and p.paneBySerial(cand.ref) == null;
+ const dimmed: pardes.CellStyle = .{ .fg = .{ .rgb = chrome.lineno } };
+ var gap: usize = 0;
var k: usize = 0;
while (k < nmarks) {
var e = k + 1;
while (e < nmarks and marks[e] == marks[e - 1] + 1) e += 1;
+ if (dim and marks[k] > gap) try spans.append(p.gpa, .{ .start = @intCast(at + gap), .end = @intCast(at + marks[k]), .style = dimmed });
try spans.append(p.gpa, .{ .start = @intCast(at + marks[k]), .end = @intCast(at + marks[e - 1] + 1), .style = tint });
+ gap = marks[e - 1] + 1;
k = e;
}
+ if (dim and row.len > gap) try spans.append(p.gpa, .{ .start = @intCast(at + gap), .end = @intCast(at + row.len), .style = dimmed });
}
if (q.names.hits.items.len > shown) try noteRow(p, q, &out, &rows, " ... and more: type more of the name");
if (q.source == .find) try skippedRow(p, q, rp, &out, &rows);
@@ -1636,9 +1663,15 @@ pub fn land(p: *Pardes, id: usize, row: ?usize) void {
look.focusPaneLine(p, oid, .{ .line = it.ref }, .center);
return;
},
- .panes => if (p.paneBySerial(it.ref)) |tid| {
- p.active = tid;
- if (layout.findPane(p, tid)) |at| p.setActiveColumn(at.col);
+ .panes => {
+ if (p.paneBySerial(it.ref)) |tid| {
+ p.active = tid;
+ if (layout.findPane(p, tid)) |at| p.setActiveColumn(at.col);
+ return;
+ }
+ // A pane this session closed: back where it was, from the
+ // pane that asked (the owner, not this one, which may go).
+ _ = p.store.reopen(p, it.ref, owner_id orelse id);
return;
},
else => {},