1 files changed, 15 insertions, 10 deletions
diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig
index 8ac60ec5..b4144fd2 100644
--- a/src/ninep/ctl.zig
+++ b/src/ninep/ctl.zig
@@ -343,6 +343,9 @@ fn writeSettings(p: *Pardes, w: *std.Io.Writer) !void {
             .tagline_size => try w.print("{s} {d}\n", .{ word, s.font.tagline_percent }),
             .window_opacity => try w.print("{s} {d}\n", .{ word, s.window_opacity }),
             .window_blur => try w.print("{s} {d}\n", .{ word, s.window_blur }),
+            .choice => |which| switch (which) {
+                inline else => |field| try w.print("{s} {s}\n", .{ word, @tagName(@field(s, @tagName(field))) }),
+            },
             .message_ms => |which| try w.print("{s} {d}\n", .{ word, @field(s, "message_" ++ @tagName(which) ++ "_ms") }),
             // Bare, it names the default directory.
             .dump_dir => if (s.dump_dir.len > 0) try w.print("{s} {s}\n", .{ word, s.dump_dir.get() }) else try w.print("{s}\n", .{word}),
@@ -350,6 +353,10 @@ fn writeSettings(p: *Pardes, w: *std.Io.Writer) !void {
             .scene => |effect| if (s.post.level(effect) == 0) try w.print("{s} off\n", .{word}) else try w.print("{s} {d}\n", .{ word, s.post.level(effect) }),
             .shader => for (s.post.list()) |entry| if (entry.scene == null) try w.print("{s} {s}\n", .{ word, entry.path.get() }),
             .shader_animation => try w.print("{s} {s}\n", .{ word, @tagName(s.shader_animation) }),
+            .lift => try w.print("{s} {s}\n", .{ word, @tagName(s.lift) }),
+            .motion => try w.print("{s} {s}\n", .{ word, @tagName(s.motion) }),
+            .inactive_dim => try w.print("{s} {d}\n", .{ word, s.inactive_dim }),
+            .grip_width => try w.print("{s} {d}\n", .{ word, s.grip_width }),
         }
     }
     try w.writeAll("LocationsConfig ");
@@ -1190,7 +1197,7 @@ test "Joincol with no column to the right and Theme with no such theme say so" {
     try testing.expect(std.mem.indexOf(u8, pane.msg[0..pane.msg_len], "no theme \"drak\"") != null);
 }
 
-test "a look that fills a column's stillborn scratch is answered with the scratch already gone" {
+test "a look after Newcol fills the empty column the keyboard is on" {
     const gpa = testing.allocator;
     const p = try withFile(gpa, "x\n");
     defer p.deinit();
@@ -1200,14 +1207,12 @@ test "a look that fills a column's stillborn scratch is answered with the scratc
     var dir: [4096]u8 = undefined;
     const at = dir[0..try tmp.dir.realPath(testing.io, &dir)];
     var line: [4200]u8 = undefined;
-    // Newcol makes a column of one empty +New; a file looked from it
-    // joins that column and takes the scratch's place.
+    // Newcol makes an empty column and gives its tag the keyboard; no pane
+    // has it, so focus reads empty.
     try testing.expectEqual(tree.Status.ok, wr(p, @intFromEnum(tree.TopFile.ctl), "Newcol\n").reply.status);
-    const scratch = p.panes[p.active].?.serial;
-    try testing.expectEqual(tree.Status.ok, wr(p, Node.of(scratch, .look), try std.fmt.bufPrint(&line, "{s}/f.txt\n", .{at})).reply.status);
-    try testing.expect(p.paneBySerial(scratch) == null);
-    var want: [32]u8 = undefined;
-    const gone = try std.fmt.bufPrint(&want, "{d} ", .{scratch});
-    var rows = std.mem.splitScalar(u8, rd(p, @intFromEnum(tree.TopFile.index), 0, 4096).bytes, '\n');
-    while (rows.next()) |row| try testing.expect(!std.mem.startsWith(u8, row, gone));
+    try testing.expectEqual(@as(usize, 0), p.col_n[p.ncol - 1]);
+    try testing.expectEqualStrings("", rd(p, @intFromEnum(tree.TopFile.focus), 0, 64).bytes);
+    try testing.expectEqual(tree.Status.ok, wr(p, @intFromEnum(tree.TopFile.look), try std.fmt.bufPrint(&line, "{s}/f.txt\n", .{at})).reply.status);
+    try testing.expectEqual(@as(usize, 1), p.col_n[p.ncol - 1]);
+    try testing.expectEqual(p.active, p.col_panes[p.ncol - 1][0]);
 }