Give a pane's body its own Text holding the cursor, selections, mode and undo

acme keeps what edits a text in its Text (dat.h:171-190) and the window
holds a body and a tag of that type. The cursor, the selections, the modal
state and the edit-buffer undo move off Pane into Text.zig, Pane holds
them as its body, and the edit and normal-mode operations take the Text
they edit. Nothing changes in behaviour; this is the step that lets the
tag become a second Text.

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

2 files changed, 22 insertions, 22 deletions

diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig
index 645b1c33..484b08c9 100644
--- a/src/ninep/ctl.zig
+++ b/src/ninep/ctl.zig
@@ -297,9 +297,9 @@ test "the pane ctl takes get, lock and unlock, and nothing that a file of its ow
     defer p.deinit();
     const ctl_node = Node.of(serialOf(p), .ctl);
     for ([_][]const u8{
-        "menu",       "nomenu",     "dump echo hi", "font Go Mono", "lock x", "bogus",     "DEL",
-        "name x.txt", "put",        "del",          "delete",       "Look x", "Exec Save", "clean",
-        "dirty",      "cleartag",   "dot=addr",     "addr=dot",     "show",   "mark",      "nomark",
+        "menu",       "nomenu",     "dump echo hi", "font Go Mono", "lock x",   "bogus",     "DEL",
+        "name x.txt", "put",        "del",          "delete",       "Look x",   "Exec Save", "clean",
+        "dirty",      "cleartag",   "dot=addr",     "addr=dot",     "show",     "mark",      "nomark",
         "scroll",     "limit=addr", "get x",        "look /tmp",    "exec Del",
     }) |bad| try testing.expectEqual(E.INVAL, wr(p, ctl_node, bad).errno());
     try testing.expect(p.paneBySerial(serialOf(p)) != null);
@@ -447,27 +447,27 @@ test "look opens spaced paths and locations without editing the source pane" {
     const look_node = Node.of(source.serial, .look);
     const revision = source.file.?.revision;
     const undo_len = source.file.?.history.undo_len;
-    source.cur_col = 3;
+    source.body.cur_col = 3;
     var clicked: [4200]u8 = undefined;
     try testing.expectEqual(Status.ok, wr(p, look_node, try std.fmt.bufPrint(&clicked, "{s}:2:3\n", .{path})).reply.status);
     const opened = p.panes[p.active].?;
     try testing.expect(opened != source);
     try testing.expectEqualStrings(path, opened.file.?.path);
     try testing.expectEqualStrings("first\nsecond\nthird\n", opened.file.?.content);
-    try testing.expectEqual(@as(i32, 1), opened.cur_row);
-    try testing.expectEqual(@as(i32, 2), opened.cur_col);
+    try testing.expectEqual(@as(i32, 1), opened.body.cur_row);
+    try testing.expectEqual(@as(i32, 2), opened.body.cur_col);
     try testing.expectEqualStrings("source stays intact\n", source.file.?.content);
     try testing.expectEqual(revision, source.file.?.revision);
     try testing.expectEqual(undo_len, source.file.?.history.undo_len);
-    try testing.expectEqual(@as(i32, 3), source.cur_col);
+    try testing.expectEqual(@as(i32, 3), source.body.cur_col);
     var expected: [16]u8 = undefined;
     try testing.expectEqualStrings(try std.fmt.bufPrint(&expected, "{d}\n", .{opened.serial}), rd(p, root_look, 0, 4096).bytes);
 
     p.active = 0;
     try testing.expectEqual(Status.ok, wr(p, root_look, try std.fmt.bufPrint(&clicked, "{s}:3:2\n", .{path})).reply.status);
     try testing.expect(p.panes[p.active].? == opened);
-    try testing.expectEqual(@as(i32, 2), opened.cur_row);
-    try testing.expectEqual(@as(i32, 1), opened.cur_col);
+    try testing.expectEqual(@as(i32, 2), opened.body.cur_row);
+    try testing.expectEqual(@as(i32, 1), opened.body.cur_col);
     try testing.expectEqualStrings(try std.fmt.bufPrint(&expected, "{d}\n", .{opened.serial}), rd(p, root_look, 0, 4096).bytes);
 }
 
diff --git a/src/ninep/pane.zig b/src/ninep/pane.zig
index 76854dbc..7e9cf7e7 100644
--- a/src/ninep/pane.zig
+++ b/src/ninep/pane.zig
@@ -124,9 +124,9 @@ fn cellOf(row: i32, col: i32) modal.Cursor {
 
 pub fn dotOf(pane: *Pane) State.Range {
     const text = bodyOf(pane);
-    const head = modal.offsetAt(text, cellOf(pane.cur_row, pane.cur_col));
-    if (!pane.vsel.active) return .{ .q0 = clip(head), .q1 = clip(head) };
-    const anchor = modal.offsetAt(text, cellOf(pane.vsel.row, pane.vsel.col));
+    const head = modal.offsetAt(text, cellOf(pane.body.cur_row, pane.body.cur_col));
+    if (!pane.body.vsel.active) return .{ .q0 = clip(head), .q1 = clip(head) };
+    const anchor = modal.offsetAt(text, cellOf(pane.body.vsel.row, pane.body.vsel.col));
     var hi = @max(head, anchor);
     if (hi < text.len) hi = modal.nextGrapheme(text, hi);
     return .{ .q0 = clip(@min(head, anchor)), .q1 = clip(hi) };
@@ -137,23 +137,23 @@ pub fn setDot(pane: *Pane, r: State.Range) void {
     const q0 = @min(@as(usize, r.q0), text.len);
     const q1 = @max(q0, @min(@as(usize, r.q1), text.len));
     const a = modal.positionAt(text, q0);
-    pane.vsel = .{ .active = q1 > q0, .row = @intCast(a.row), .col = @intCast(a.col), .explicit = true };
+    pane.body.vsel = .{ .active = q1 > q0, .row = @intCast(a.row), .col = @intCast(a.col), .explicit = true };
     const h = modal.positionAt(text, if (q1 > q0) modal.prevGrapheme(text, q1) else q0);
-    pane.cur_row = @intCast(h.row);
-    pane.cur_col = @intCast(h.col);
-    pane.cur_pinned = true;
-    pane.sticky_col = -1;
-    pane.msel.active = false;
+    pane.body.cur_row = @intCast(h.row);
+    pane.body.cur_col = @intCast(h.col);
+    pane.body.cur_pinned = true;
+    pane.body.sticky_col = -1;
+    pane.body.msel.active = false;
     pane.ensureCursorVisible();
 }
 
 pub fn showOffset(pane: *Pane, off: usize) void {
     const text = bodyOf(pane);
     const c = modal.positionAt(text, @min(off, text.len));
-    pane.cur_row = @intCast(c.row);
-    pane.cur_col = @intCast(c.col);
-    pane.cur_pinned = true;
-    pane.sticky_col = -1;
+    pane.body.cur_row = @intCast(c.row);
+    pane.body.cur_col = @intCast(c.col);
+    pane.body.cur_pinned = true;
+    pane.body.sticky_col = -1;
     pane.ensureCursorVisible();
 }