The tree serves the layout: /layout, /tag and /col/<n>/tag

A script could not see where the panes sit or edit the tags a person
clicks in. /layout lists each column, its index, x and width in cells,
current or not, empty or full, and its panes' serials, then the active
column; /tag is the workspace tag and /col/<n>/tag a column's, read and
written as a pane tag is (one line: a newline written in is a space, and a
truncating write drops the one ending it); /index's lines end with the
pane's column; the log says newcol <n> and delcol <n>. acme serves no
column files, and the docs say so.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

1 files changed, 11 insertions, 4 deletions

diff --git a/src/ninep/pane.zig b/src/ninep/pane.zig
index 3eafdbce..6542d747 100644
--- a/src/ninep/pane.zig
+++ b/src/ninep/pane.zig
@@ -265,6 +265,12 @@ pub fn fileSize(p: *Pardes, id: usize, f: PaneFile) u64 {
 
 // ---- the index ----
 
+/// The column a pane is in, as /layout and /col number them; the last word
+/// of its /index line.
+pub fn columnOf(p: *const Pardes, id: usize) usize {
+    return if (pardes.layout.findPane(p, id)) |at| at.col else 0;
+}
+
 pub fn indexLen(p: *Pardes) u64 {
     var n: u64 = 0;
     var last: u32 = 0;
@@ -274,6 +280,7 @@ pub fn indexLen(p: *Pardes) u64 {
         var digits: [16]u8 = undefined;
         n += (std.fmt.bufPrint(&digits, "{d}", .{serial}) catch unreachable).len;
         n += 1 + kindOf(pane).len + 3 + nameOf(pane).len + 1;
+        n += 1 + (std.fmt.bufPrint(&digits, "{d}", .{columnOf(p, p.paneBySerial(serial).?)}) catch unreachable).len;
     }
     return n;
 }
@@ -703,7 +710,7 @@ test "index lists serial kind dirty flag and name and stat reports its length" {
     const a = rd(p, index, 0, 4096);
     try testing.expectEqual(Status.ok, a.reply.status);
     var want: [64]u8 = undefined;
-    const clean_row = try std.fmt.bufPrint(&want, "{d} text 0 /test.txt\n", .{pane.serial});
+    const clean_row = try std.fmt.bufPrint(&want, "{d} text 0 /test.txt 0\n", .{pane.serial});
     try testing.expect(std.mem.indexOf(u8, a.bytes, clean_row) != null);
     const at = std.mem.indexOf(u8, a.bytes, clean_row).?;
     const stat = call(p, .{ .tag = 1, .op = .getattr, .node = index });
@@ -712,7 +719,7 @@ test "index lists serial kind dirty flag and name and stat reports its length" {
 
     pane.file.?.saved_revision = pane.file.?.revision -% 1;
     var dirty_want: [64]u8 = undefined;
-    const dirty_row = try std.fmt.bufPrint(&dirty_want, "{d} text 1 /test.txt\n", .{pane.serial});
+    const dirty_row = try std.fmt.bufPrint(&dirty_want, "{d} text 1 /test.txt 0\n", .{pane.serial});
     try testing.expect(std.mem.indexOf(u8, rd(p, index, 0, 4096).bytes, dirty_row) != null);
     const kind = at + std.mem.indexOfScalar(u8, clean_row, ' ').? + 1;
     try testing.expectEqualStrings("text", rd(p, index, kind, 4).bytes);
@@ -722,7 +729,7 @@ test "index lists serial kind dirty flag and name and stat reports its length" {
     try testing.expectEqual(@as(u64, both.bytes.len), indexLen(p));
     var expected: [4200]u8 = undefined;
     const made = p.panes[p.paneBySerial(serial).?].?;
-    try testing.expect(std.mem.endsWith(u8, both.bytes, try std.fmt.bufPrint(&expected, "\n{d} text 0 {s}\n", .{ serial, nameOf(made) })));
+    try testing.expect(std.mem.endsWith(u8, both.bytes, try std.fmt.bufPrint(&expected, "\n{d} text 0 {s} {d}\n", .{ serial, nameOf(made), columnOf(p, p.paneBySerial(serial).?) })));
 }
 
 test "a terminal is listed as term with its directory as name" {
@@ -734,7 +741,7 @@ test "a terminal is listed as term with its directory as name" {
     try testing.expect(std.mem.indexOf(
         u8,
         rd(p, @intFromEnum(tree.TopFile.index), 0, 4096).bytes,
-        try std.fmt.bufPrint(&want, "{d} term 0 /work/dir\n", .{pane.serial}),
+        try std.fmt.bufPrint(&want, "{d} term 0 /work/dir 0\n", .{pane.serial}),
     ) != null);
     try testing.expectEqualStrings("/work/dir\n", rd(p, Node.of(pane.serial, .name), 0, 4096).bytes);
     const refused = wr(p, Node.of(pane.serial, .name), "/elsewhere\n");