summaryrefslogtreecommitdiff
path: root/src/ninep/ctl.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/ninep/ctl.zig')
-rw-r--r--src/ninep/ctl.zig34
1 files changed, 20 insertions, 14 deletions
diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig
index a65b3562..78fe15c1 100644
--- a/src/ninep/ctl.zig
+++ b/src/ninep/ctl.zig
@@ -527,7 +527,7 @@ fn checkBuiltin(p: *Pardes, req: Req, line: []const u8, scope: builtins.Scope) ?
const here = if (std.meta.stringToEnum(Builtin, word)) |b| builtins.registry.here(p, b) else false;
const b = (if (here) std.meta.stringToEnum(Builtin, word) else null) orelse {
// An addon's word: its kind's to take or refuse as it runs.
- if (pardes.Kind.word(word) != null) return null;
+ if (p.kinds.word(word) != null) return null;
// A setting this build's frontend cannot show (Lift, GripWidth on a
// terminal, the window's own words in a terminal's view) is known,
// and says so rather than sound misspelt.
@@ -898,12 +898,12 @@ fn writeCommands(p: *const Pardes, w: *std.Io.Writer) !void {
try w.writeByte('\n');
}
// The addons' words, after the core's: `(addon <name>)` says whose.
- for (pardes.Kind.wordsOf()) |kw| try w.print("{s}{s} {s} -- {s} (addon {s})\n", .{
- std.mem.span(kw.w.name),
- if (kw.w.arg != pardes.Kind.c.PA_ARG_NONE) " arg" else "",
- if (kw.w.opens != 0) "both" else "pane",
- if (kw.w.doc == null) "" else std.mem.span(kw.w.doc),
- pardes.Kind.headName(kw.ops),
+ for (p.kinds.words[0..p.kinds.nwords]) |*kw| try w.print("{s}{s} {s} -- {s} (addon {s})\n", .{
+ kw.name.slice(),
+ if (kw.arg != pardes.Kind.c.PA_ARG_NONE) " arg" else "",
+ if (kw.opens != 0) "both" else "pane",
+ kw.doc.slice(),
+ p.kinds.kinds[kw.kind].nameOf(),
});
}
@@ -1536,7 +1536,7 @@ test "an address looked at in an image pane names the image, never an empty subj
const p = try withFile(testing.allocator, "x\n");
defer p.deinit();
const id = p.freeSlot().?;
- const doc = try pardes.Kind.open(p, id, &pardes.image.kind, "/tmp/pardes-pic.ppm", null);
+ const doc = try pardes.Kind.open(p, id, pardes.Kind.image, "/tmp/pardes-pic.ppm", null);
_ = wr(p, Node.of(doc.serial, .look), ":/x/\n");
try testing.expect(th.logHas(p, "look: /tmp/pardes-pic.ppm is no text to address"));
}
@@ -1545,7 +1545,7 @@ test "Save and Save path on an image pane are refused with why, never a silent s
const p = try withFile(testing.allocator, "x\n");
defer p.deinit();
const id = p.freeSlot().?;
- const doc = try pardes.Kind.open(p, id, &pardes.image.kind, "/tmp/pardes-pic.ppm", null);
+ const doc = try pardes.Kind.open(p, id, pardes.Kind.image, "/tmp/pardes-pic.ppm", null);
for ([_][]const u8{ "Save\n", "Save /tmp/pardes-copy.ppm\n" }) |line| {
const r = wr(p, Node.of(doc.serial, .ctl), line);
try testing.expectEqual(Status.err, r.reply.status);
@@ -1575,7 +1575,13 @@ test "a builtin for one kind of pane is refused on another, and still acts on it
try testing.expectEqual(Status.err, wr(p, Node.of(serial, .ctl), line).reply.status);
};
const id = p.freeSlot().?;
- const doc = try pardes.Kind.open(p, id, &pardes.image.kind, "/tmp/pardes-pic.ppm", null);
+ // A picture shown: the core's art words follow the kind's prefix.
+ pardes.image.start(testing.io, testing.allocator);
+ defer pardes.image.stop();
+ const doc = try pardes.Kind.open(p, id, pardes.Kind.image, "/tmp/pardes-pic.ppm", "P6\n1 1\n255\n\x01\x02\x03");
+ while (p.nextEffect()) |e| p.perform(e);
+ pardes.exec.placeNew(p, 0, 0, id, .doc);
+ _ = try p.render(p.scratch.allocator());
const r = wr(p, Node.of(doc.serial, .ctl), "Mode\n");
try testing.expectEqualStrings("Mode: only a text or terminal pane has modes", r.reply.ename);
const glyphs = doc.addon.?.art.glyph;
@@ -2149,7 +2155,7 @@ test "a language server question that finds nothing, cannot be answered, or is a
try testing.expectEqual(@as(u16, 0), p.fs.late_failure_len);
// An image's body takes no write.
const slot = p.freeSlot().?;
- const img = try pardes.Kind.open(p, slot, &pardes.image.kind, "/tmp/pardes-no-such.png", "not a png");
+ const img = try pardes.Kind.open(p, slot, pardes.Kind.image, "/tmp/pardes-no-such.png", "not a png");
try testing.expectEqual(E.INVAL, wr(p, Node.of(img.serial, .body), "text\n").errno());
}
@@ -2791,7 +2797,7 @@ test "a Save whose directory is missing because one above refuses says permissio
test "a body write to an image pane says its body takes none, not that terminals have no text" {
const p = try withFile(testing.allocator, "x\n");
defer p.deinit();
- const doc = try pardes.Kind.open(p, p.freeSlot().?, &pardes.image.kind, "/tmp/pardes-pic.ppm", null);
+ const doc = try pardes.Kind.open(p, p.freeSlot().?, pardes.Kind.image, "/tmp/pardes-pic.ppm", null);
try testing.expectEqualStrings(pane_files.e_no_body, wr(p, Node.of(doc.serial, .body), "x").reply.ename);
}
@@ -2821,7 +2827,7 @@ test "a Rename that reaches other files previews them, says so, and is the pane
test "Edit on an image pane is refused as a data write there is, EINVAL, before it runs" {
const p = try withFile(testing.allocator, "x\n");
defer p.deinit();
- const doc = try pardes.Kind.open(p, p.freeSlot().?, &pardes.image.kind, "/tmp/pardes-pic.ppm", null);
+ const doc = try pardes.Kind.open(p, p.freeSlot().?, pardes.Kind.image, "/tmp/pardes-pic.ppm", null);
const edit = wr(p, Node.of(doc.serial, .ctl), "Edit ,d\n");
const data = wr(p, Node.of(doc.serial, .data), "x");
try testing.expectEqual(E.INVAL, edit.errno());
@@ -2832,7 +2838,7 @@ test "Edit on an image pane is refused as a data write there is, EINVAL, before
test "Petscii, Palette and Ascii take the state their tag word names, set rather than flipped" {
const p = try withFile(testing.allocator, "x\n");
defer p.deinit();
- const doc = try pardes.Kind.open(p, p.freeSlot().?, &pardes.image.kind, "/tmp/pardes-pic.ppm", null);
+ const doc = try pardes.Kind.open(p, p.freeSlot().?, pardes.Kind.image, "/tmp/pardes-pic.ppm", null);
const ctl_node = Node.of(doc.serial, .ctl);
for ([_][]const u8{ "Petscii on\n", "Petscii on\n" }) |line| {
try testing.expectEqual(Status.ok, wr(p, ctl_node, line).reply.status);