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/exec.zig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/exec.zig') diff --git a/src/exec.zig b/src/exec.zig index 11d003b5..63bb4c1c 100644 --- a/src/exec.zig +++ b/src/exec.zig @@ -1134,12 +1134,12 @@ pub fn placeNew(p: *Pardes, from: usize, origin: ?usize, id: usize, kind: NewPan // (Pardes.unplaced) once whatever made it is done with it. if (!layout.placedRoomy(p, id, &before)) if (layout.findPane(p, id)) |f| { layout.removePane(p, id); - for (p.col_panes[f.col][0..p.col_n[f.col]]) |k| p.rects[k] = before[k]; + for (p.cols[f.col].panes[0..p.cols[f.col].n]) |k| p.rects[k] = before[k]; layout.snapColWeights(p, f.col); if (!layout.splitTallest(p, f.col, id) or !layout.placedRoomy(p, id, &before)) { if (layout.findPane(p, id) != null) { layout.removePane(p, id); - for (p.col_panes[f.col][0..p.col_n[f.col]]) |k| p.rects[k] = before[k]; + for (p.cols[f.col].panes[0..p.cols[f.col].n]) |k| p.rects[k] = before[k]; layout.snapColWeights(p, f.col); } // No pane to halve, but the column has the rows for the new @@ -1157,16 +1157,16 @@ pub fn placeNew(p: *Pardes, from: usize, origin: ?usize, id: usize, kind: NewPan while (c > 0) { c -= 1; if (c == f.col or c == finder_column) continue; - for (p.col_panes[c][0..p.col_n[c]]) |k| p.rects[k] = before[k]; + for (p.cols[c].panes[0..p.cols[c].n]) |k| p.rects[k] = before[k]; layout.snapColWeights(p, c); - if (p.col_n[c] == 0) { + if (p.cols[c].n == 0) { layout.insert(p, c, 0, id); break; } if (layout.splitTallest(p, c, id) and layout.placedRoomy(p, id, &before)) break; if (layout.findPane(p, id) != null) layout.removePane(p, id); } else { - layout.insert(p, f.col, p.col_n[f.col], id); + layout.insert(p, f.col, p.cols[f.col].n, id); p.unplaced.set(id); // Refused holding no weight: its column's rows come // back as they were. @@ -1176,7 +1176,7 @@ pub fn placeNew(p: *Pardes, from: usize, origin: ?usize, id: usize, kind: NewPan return; } } else { - layout.insert(p, f.col, p.col_n[f.col], id); + layout.insert(p, f.col, p.cols[f.col].n, id); // Refused, it closes at the step's end holding no weight, so // its column's rows come back as they were, none rounded off. p.panes[id].?.vweight = 0; -- cgit v1.3