Terminal.zig is terminal.zig: a file of functions and no fields takes a namespace's lowercase name

The last of the deferred renames, now that the tty and theme agents have landed: panes.terminal at its importers, the alias lines in Text.zig and File.zig and panes.zig's own uses following. dump.zig's Terminal struct, a dump record, is not this. The served sources list and docs/design.typ name the new file. test/perf.zig's references change, so the three perf baselines take its new harness id with their numbers as recorded. No behaviour changes.

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

4 files changed, 17 insertions, 17 deletions

diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig
index 5bf354eb..060e0d6c 100644
--- a/src/ninep/ctl.zig
+++ b/src/ninep/ctl.zig
@@ -344,7 +344,7 @@ pub fn paneText(p: *Pardes, pane: *Pane, buf: []u8) []const u8 {
         pane.serial,
         pane_files.tagOf(p, pane).len,
         // A terminal's body is its history, read whole on an open's first read.
-        if (pane.isTerminal()) panes.Terminal.screenTextLen(pane) else pane_files.bodyOf(pane).len,
+        if (pane.isTerminal()) panes.terminal.screenTextLen(pane) else pane_files.bodyOf(pane).len,
         @as(u32, 0),
         @intFromBool(pane_files.dirtyOf(pane)),
         pane.cols,
diff --git a/src/ninep/pane.zig b/src/ninep/pane.zig
index 3c1e181e..3fad1fae 100644
--- a/src/ninep/pane.zig
+++ b/src/ninep/pane.zig
@@ -258,7 +258,7 @@ pub fn fileSize(p: *Pardes, id: usize, f: PaneFile) u64 {
     const pf = &pane.fs;
     return switch (f) {
         // A terminal's body reads its screen and history, as text.
-        .body => if (pane.file == null and pane.isTerminal()) panes.Terminal.screenTextLen(pane) else if (pdfText(p, pane)) |t| t.len else bodyOf(pane).len,
+        .body => if (pane.file == null and pane.isTerminal()) panes.terminal.screenTextLen(pane) else if (pdfText(p, pane)) |t| t.len else bodyOf(pane).len,
         .data, .xdata => bodyOf(pane).len,
         .tag => tagOf(p, pane).len,
         .name => nameOf(pane).len + 1,
@@ -399,7 +399,7 @@ fn readBody(p: *Pardes, req: Req, id: usize, pane: *Pane) Reply {
         return tree.stagedReply(p, req);
     }
     if (req.handle != 0 and pane.isTerminal()) return screen.readSnapshot(p, req, pane);
-    const text = panes.Terminal.screenTextAlloc(pane, p.gpa) catch
+    const text = panes.terminal.screenTextAlloc(pane, p.gpa) catch
         return Reply.fail(req.tag, E.NOMEM);
     defer p.gpa.free(text);
     const out = p.fs.stage(p.gpa);
diff --git a/src/ninep/pty.zig b/src/ninep/pty.zig
index 8ba9f4df..0f5202cc 100644
--- a/src/ninep/pty.zig
+++ b/src/ninep/pty.zig
@@ -139,9 +139,9 @@ pub fn readStatus(p: *Pardes, req: Req, id: usize, pane: *Pane) Reply {
     // or a line is typed at the prompt. Before the shell's first prompt a
     // run waits for it rather than answer busy, so that is not busy.
     // A build with no terminal panes (the board) has no marks to read.
-    const marks = if (comptime !pardes.panes.Terminal.enabled) null else if (pane.terminal) |state| &state.stream.handler else null;
+    const marks = if (comptime !pardes.panes.terminal.enabled) null else if (pane.terminal) |state| &state.stream.handler else null;
     const busy = p.hostTtyTaken(id) or (!pane.fs.unmarked and (waitingRun(p, pane) != null or
-        (if (marks) |m| m.prompts > 0 and (m.phase != .input or !pardes.panes.Terminal.promptInputEmpty(pane)) else false)));
+        (if (marks) |m| m.prompts > 0 and (m.phase != .input or !pardes.panes.terminal.promptInputEmpty(pane)) else false)));
     const out = p.fs.stage(p.gpa);
     const size = winsize(pane);
     out.print(p.gpa, "{d:>11} {d:>11} {d:>11}\n", .{ size[0], size[1], @intFromBool(busy) }) catch {};
@@ -222,7 +222,7 @@ pub fn writeRun(p: *Pardes, req: Req, id: usize, pane: *Pane) Reply {
     if (std.mem.trim(u8, line, " \t").len == 0) return tree.failText(req.tag, E.INVAL, e_bad_line);
     if (line.len == 0) return tree.failText(req.tag, E.INVAL, e_bad_line);
     for (line) |c| if (c < ' ' and c != '\t') return tree.failText(req.tag, E.INVAL, e_bad_line);
-    if (comptime !pardes.panes.Terminal.enabled) return tree.failText(req.tag, E.INVAL, e_bad_line);
+    if (comptime !pardes.panes.terminal.enabled) return tree.failText(req.tag, E.INVAL, e_bad_line);
     const pf = &pane.fs;
     const state = pane.terminal orelse return tree.failText(req.tag, E.INVAL, e_bad_line);
     const marks = &state.stream.handler;
@@ -235,7 +235,7 @@ pub fn writeRun(p: *Pardes, req: Req, id: usize, pane: *Pane) Reply {
     } else if (pf.unmarked) {
         answer(p, slot, "error no prompt marks", .{});
     } else if (waitingRun(p, pane) != null or (marks.prompts > 0 and (marks.phase != .input or
-        !pardes.panes.Terminal.promptInputEmpty(pane) or p.hostTtyTaken(id))))
+        !pardes.panes.terminal.promptInputEmpty(pane) or p.hostTtyTaken(id))))
     {
         // Something is running or someone has typed at the prompt: sending
         // now would type into the middle of it. The phase is pardes's own
@@ -288,7 +288,7 @@ pub fn readRun(p: *Pardes, req: Req) Reply {
 /// for the prompt means whoever reads the answer can send the next command
 /// at once instead of finding the shell still drawing it.
 pub fn noteMarks(p: *Pardes, id: usize, pane: *Pane) void {
-    if (comptime !pardes.panes.Terminal.enabled) return;
+    if (comptime !pardes.panes.terminal.enabled) return;
     const state = pane.terminal orelse return;
     const pf = &pane.fs;
     const slot = waitingRun(p, pane) orelse return;
@@ -299,13 +299,13 @@ pub fn noteMarks(p: *Pardes, id: usize, pane: *Pane) void {
             pf.run = null;
             return;
         }
-        if (marks.phase != .input or !pardes.panes.Terminal.promptInputEmpty(pane) or p.hostTtyTaken(id)) return;
+        if (marks.phase != .input or !pardes.panes.terminal.promptInputEmpty(pane) or p.hostTtyTaken(id)) return;
         slot.want = marks.started +% 1;
         slot.prompts = marks.prompts;
         slot.declined = marks.declined;
         p.emitWrite(id, slot.line);
         p.emitWrite(id, "\r");
-        pardes.panes.Terminal.noteCommand(pane, slot.line);
+        pardes.panes.terminal.noteCommand(pane, slot.line);
         slot.phase = .sent;
         return;
     }
@@ -319,7 +319,7 @@ pub fn noteMarks(p: *Pardes, id: usize, pane: *Pane) void {
         // typed into an empty prompt, so throw it away with Ctrl-C, which
         // drops the whole pending command, and answer at the prompt after
         // that, so the next line finds the shell clear.
-        const empty = pardes.panes.Terminal.promptInputEmpty(pane);
+        const empty = pardes.panes.terminal.promptInputEmpty(pane);
         switch (slot.cleared) {
             .no => {
                 if (marks.continuation) {
@@ -360,7 +360,7 @@ pub fn noteMarks(p: *Pardes, id: usize, pane: *Pane) void {
 /// Answers a run whose command ended with `status`: the header and the
 /// output it printed.
 fn finish(p: *Pardes, slot: *Run, pane: *Pane, status_code: ?i32) void {
-    const printed = pardes.panes.Terminal.commandOutput(pane, p.gpa, output_rows) catch
+    const printed = pardes.panes.terminal.commandOutput(pane, p.gpa, output_rows) catch
         return answer(p, slot, "error out of memory", .{});
     defer p.gpa.free(printed.text);
     // Keep the tail, cut at a line start so the first line kept is whole.
@@ -400,7 +400,7 @@ pub fn shellExited(p: *Pardes, pane: *Pane, status: ?u8) void {
     const code = status orelse return;
     if (waitingRun(p, pane)) |slot| if (slot.phase == .sent) {
         pane.fs.run = null;
-        pardes.panes.Terminal.endOutputHere(pane);
+        pardes.panes.terminal.endOutputHere(pane);
         finish(p, slot, pane, code);
     };
     var buf: [4]u8 = undefined;
@@ -963,10 +963,10 @@ test "a run's answer says cut when its output's start is gone, and reads a bound
     // A resize between its start and end reflows the pins with the text.
     h = sh.send(p, node);
     sh.put(p, c ++ "one\r\ntwo\r\n");
-    pardes.panes.Terminal.resizeGrid(pane, gpa, 50, 20);
+    pardes.panes.terminal.resizeGrid(pane, gpa, 50, 20);
     sh.put(p, d ++ prompt);
     try testing.expectEqualStrings("exit 0\none\ntwo\n", sh.answered(p, node, h, into));
-    pardes.panes.Terminal.resizeGrid(pane, gpa, pane.cols, pane.rows);
+    pardes.panes.terminal.resizeGrid(pane, gpa, pane.cols, pane.rows);
 
     // A full-screen program leaves nothing on the primary screen, and a D
     // with no status is not a success.
diff --git a/src/ninep/screen.zig b/src/ninep/screen.zig
index f496da03..b991c3e4 100644
--- a/src/ninep/screen.zig
+++ b/src/ninep/screen.zig
@@ -47,7 +47,7 @@ pub fn readSnapshot(p: *Pardes, req: Req, pane: ?*Pane) Reply {
     const snapshot = &(tree.openOf(p, req) orelse return Reply.fail(req.tag, E.INVAL)).what.snapshot;
     if (snapshot.* == null) {
         const terminal = pane orelse return Reply.fail(req.tag, E.INVAL);
-        snapshot.* = panes.Terminal.screenTextAlloc(terminal, p.gpa) catch return Reply.fail(req.tag, E.NOMEM);
+        snapshot.* = panes.terminal.screenTextAlloc(terminal, p.gpa) catch return Reply.fail(req.tag, E.NOMEM);
     }
     const bytes = snapshot.*.?;
     const off = @min(req.off, bytes.len);
@@ -129,7 +129,7 @@ test "terminal body handles keep one history snapshot across fragmented reads" {
     const node = Node.of(serialOf(p), .body);
     p.update(.{ .output = .{ .pane = 0, .bytes = "old caf\xc3\xa9\r\nold tail" } });
     while (p.nextEffect()) |_| {}
-    const original = try panes.Terminal.screenTextAlloc(p.panes[0].?, gpa);
+    const original = try panes.terminal.screenTextAlloc(p.panes[0].?, gpa);
     defer gpa.free(original);
     const opened = call(p, .{ .tag = 1, .op = .open, .node = node });
     try testing.expectEqual(Status.ok, opened.reply.status);