summaryrefslogtreecommitdiff
path: root/src/ninep
diff options
context:
space:
mode:
Diffstat (limited to 'src/ninep')
-rw-r--r--src/ninep/ctl.zig38
-rw-r--r--src/ninep/tree.zig2
2 files changed, 27 insertions, 13 deletions
diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig
index 1b9d73f5..2859304a 100644
--- a/src/ninep/ctl.zig
+++ b/src/ninep/ctl.zig
@@ -524,10 +524,12 @@ fn checkBuiltin(p: *Pardes, req: Req, line: []const u8, scope: builtins.Scope) ?
break now;
} else typed;
const arg = if (sp) |s| std.mem.trim(u8, line[s + 1 ..], " \t") else "";
- const b = std.meta.stringToEnum(Builtin, word) orelse {
+ 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 {
// A setting this build's frontend cannot show (Lift, GripWidth on a
- // terminal) is known, and says so rather than sound misspelt.
- if (builtins.absentWhy(word) orelse if (config.Runtime.find(word) != null) @as([]const u8, "GUI-only") else null) |absent| {
+ // terminal, the window's own words in a terminal's view) is known,
+ // and says so rather than sound misspelt.
+ if (builtins.absentWhy(word) orelse if (config.Runtime.find(word) != null or std.meta.stringToEnum(Builtin, word) != null) @as([]const u8, "GUI-only") else null) |absent| {
var why: [64]u8 = undefined;
// EINVAL, a request this build cannot take, in words 9ns reads
// as that: `invalid`.
@@ -618,18 +620,24 @@ const e_prompt = "control message needs its argument";
/// What is not a setting -- platform, themes, where the config came from --
/// is /status's or the DumpConfig window's.
fn writeSettings(p: *Pardes, w: *std.Io.Writer) !void {
- try writeSettingsOf(p, &p.settings, w);
+ try writeSettingsFor(p, &p.settings, w, builtins.viewCapabilities(p));
try w.writeAll("LocationsConfig ");
try p.locations_config.write(w);
try w.writeByte('\n');
- if (comptime builtins.Pet.enabled) try w.print("Pet {s}\n", .{@tagName(p.settings.pet)});
+ if (comptime builtins.Pet.enabled) if (builtins.registry.here(p, .Pet)) try w.print("Pet {s}\n", .{@tagName(p.settings.pet)});
}
/// The setting words of `s`, one a line, as the root ctl reads them; a Dump
/// keeps those that differ from a fresh session's (dump.zig).
pub fn writeSettingsOf(p: *Pardes, s: *const config.Runtime, w: *std.Io.Writer) !void {
- inline for (config.Runtime.settings) |setting| {
+ return writeSettingsFor(p, s, w, builtins.capabilities);
+}
+
+/// ...those a frontend of `caps` takes (the root ctl's: the live view's).
+fn writeSettingsFor(p: *Pardes, s: *const config.Runtime, w: *std.Io.Writer, caps: config.Runtime.Capabilities) !void {
+ inline for (config.Runtime.settings) |setting| skip: {
if (comptime !setting.enabled(builtins.capabilities)) continue;
+ if (!setting.enabled(caps)) break :skip;
const word = setting.word;
switch (setting.action) {
.toggle => |field| try w.print("{s} {s}\n", .{ word, if (@field(s, @tagName(field))) "on" else "off" }),
@@ -909,8 +917,10 @@ fn stripCitations(text: []u8) []u8 {
return text[0..out];
}
-fn writeCommands(w: *std.Io.Writer) !void {
+fn writeCommands(p: *const Pardes, w: *std.Io.Writer) !void {
for (std.enums.values(Builtin)) |b| {
+ // A window's own word is none in a terminal's view.
+ if (!builtins.registry.here(p, b)) continue;
// Edit is a pane's word the root's ctl takes too, at the active pane.
const scope: []const u8 = if (b == .Edit) "both" else if (builtins.registry.scope(b) == .session) "root" else "pane";
try w.print("{s}{s} {s}", .{
@@ -938,16 +948,16 @@ fn writeCommands(w: *std.Io.Writer) !void {
}
}
-pub fn commandsLen() u64 {
+pub fn commandsLen(p: *const Pardes) u64 {
var buf: [256]u8 = undefined;
var counting: std.Io.Writer.Discarding = .init(&buf);
- writeCommands(&counting.writer) catch return 0;
+ writeCommands(p, &counting.writer) catch return 0;
return counting.fullCount();
}
pub fn readCommands(p: *Pardes, req: Req) Reply {
var text: std.Io.Writer.Allocating = .init(p.scratch.allocator());
- writeCommands(&text.writer) catch return Reply.fail(req.tag, E.NOMEM);
+ writeCommands(p, &text.writer) catch return Reply.fail(req.tag, E.NOMEM);
p.fs.stage(p.gpa).appendSlice(p.gpa, text.written()) catch return Reply.fail(req.tag, E.NOMEM);
return tree.stagedReply(p, req);
}
@@ -1362,7 +1372,9 @@ test "commands lists every builtin with its argument and the ctl that takes it"
// Then, where the source has one, ` -- ` and what it does.
if (words.next()) |dashes| try testing.expectEqualStrings("--", dashes);
}
- try testing.expectEqual(std.enums.values(Builtin).len, lines);
+ var here: usize = 0;
+ for (std.enums.values(Builtin)) |b| here += @intFromBool(builtins.registry.here(p, b));
+ try testing.expectEqual(here, lines);
for ([_][]const u8{ "\nDel arg pane -- ", "\nNewcol root -- ", "\nSave arg pane", "\nVerbose arg root on,off", "\nPlacement arg root acme,pardes", "\nUndo pane -- ", "\nEdit arg both -- acme's Edit" }) |row|
try testing.expect(std.mem.indexOf(u8, listed.bytes, row) != null);
}
@@ -1738,6 +1750,8 @@ test "status reads the editor, and look and exec validate whole batches" {
const gpa = testing.allocator;
const p = try withFile(gpa, "Msg root\n");
defer p.deinit();
+ // A terminal's view first (a window's build starts windowed).
+ p.windowed = false;
const status = rd(p, root_status, 0, 4096);
try testing.expectEqual(Status.ok, status.reply.status);
var lines = std.mem.tokenizeScalar(u8, status.bytes, '\n');
@@ -2855,7 +2869,7 @@ test "a setting this frontend cannot show says GUI-only, and DumpDir reads back
const p = try withFile(testing.allocator, "x\n");
defer p.deinit();
const root_ctl = @backingInt(tree.TopFile.ctl);
- if (!builtins.capabilities.lift) {
+ if (!builtins.viewCapabilities(p).lift) {
try testing.expectEqualStrings("Lift is GUI-only, invalid here \"Lift\"", wr(p, root_ctl, "Lift on\n").reply.ename);
try testing.expectEqualStrings("GripWidth is GUI-only, invalid here \"GripWidth\"", wr(p, root_ctl, "GripWidth 120\n").reply.ename);
// A builtin the GUI alone has, written to a ctl or an exec, never
diff --git a/src/ninep/tree.zig b/src/ninep/tree.zig
index bda2c1d1..bd87f5bc 100644
--- a/src/ninep/tree.zig
+++ b/src/ninep/tree.zig
@@ -678,7 +678,7 @@ fn topSize(p: *Pardes, f: TopFile) u64 {
// one (a 9ns mount's splice), and a follower's reads go past it.
.log => 0,
.ctl => ctl.rootLen(p),
- .commands => ctl.commandsLen(),
+ .commands => ctl.commandsLen(p),
.focus => focus: {
if (p.header_focus) break :focus 0;
const pn = p.panes[p.active] orelse break :focus 0;