From 50914b0e04ac0129b11bff0f0007d5cedbfc7f8d Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Thu, 5 Nov 2026 20:39:55 -0300 Subject: fields #37, a column is one Column: the four parallel arrays a column's own state was kept in (col_panes, col_n, col_weight, col_serial) are the session's cols: [MAX_COLS]Column, a struct of panes, n, weight and serial (acme's Column, cols.c), so a column shifted, saved or reset is one assignment where it was four (layout.reorderColumn, dropColumn, insertColumn, firstColumn, joinFits, Finder.open; joinFits and the resets now give back a column's panes beyond its count too, which nothing reads); its tag stays the session's col_tags, as a view opened takes the live one's columns but tags of its own (views.open), and col_x and col_w stay with the rects, worked out each sync; the uses in 20 files read p.cols[c].n for p.col_n[c] and so on, tests that compared the arrays whole compare the columns whole (or their weights, layout.zig's weightsOf); views.zig's per-view fields name cols; a dump written before this change loads its columns as the default once: an Upgrade or Restore from it comes back with its columns empty and its panes in none of them, and the wire's semantics change (the digest walks cols); dump.zig and Handover.zig, the persistence agent's, are edited only where they name these fields; gates on tui: core-test 960/960, behaviour-test 238/238, pane-test 171/172 (1 skipped), snap all 108 scripts ok; gui unit-test 1518/1519 (1 skipped) Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge --- src/views.zig | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/views.zig') diff --git a/src/views.zig b/src/views.zig index f54e9eb2..46959783 100644 --- a/src/views.zig +++ b/src/views.zig @@ -33,8 +33,7 @@ pub const max = 4; /// what drawing it keeps (its frame and its timings). pub const fields = [_][:0]const u8{ "screen_w", "screen_h", "cell_pixels", "row_metrics", - "ncol", "col_weight", "col_panes", "col_n", - "col_tags", "col_serial", "finder", "rects", + "ncol", "cols", "col_tags", "finder", "rects", "col_x", "col_w", "active", "jumps", "njumps", "jcur", "jump_force", "active_column", @@ -367,17 +366,17 @@ fn unpark(p: *Pardes, k: u8) void { // now) leave its layout, and its keyboard leaves them. for (0..p.ncol) |c| { var n: usize = 0; - for (p.col_panes[c][0..p.col_n[c]]) |id| { + for (p.cols[c].panes[0..p.cols[c].n]) |id| { const pane = p.panes[id] orelse continue; if (pane.serial != slot.serials[id]) continue; - p.col_panes[c][n] = id; + p.cols[c].panes[n] = id; n += 1; } - p.col_n[c] = n; + p.cols[c].n = n; } if (layout.findPane(p, p.active) == null) { - for (0..p.ncol) |c| if (p.col_n[c] > 0) { - p.active = p.col_panes[c][0]; + for (0..p.ncol) |c| if (p.cols[c].n > 0) { + p.active = p.cols[c].panes[0]; break; }; } @@ -450,7 +449,7 @@ pub fn open(p: *Pardes) ?u8 { /// How a view is laid out and focused: what a new one takes of the live /// one (`open`), and what one going leaves the view that stays (`closeKeeping`). -const laid_out = .{ "ncol", "col_weight", "col_panes", "col_n", "col_serial", "finder", "active", "active_column", "jumps", "njumps", "jcur" }; +const laid_out = .{ "ncol", "cols", "finder", "active", "active_column", "jumps", "njumps", "jcur" }; const sized = .{ "screen_w", "screen_h", "cell_pixels", "row_metrics" }; /// View `k` gone, and the view that stays live laid out as `k` was: its -- cgit v1.3