summaryrefslogtreecommitdiff
path: root/src/mouse.zig
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-11-17 02:31:20 -0300
committerGabriel Schneider <[email protected]>2026-11-17 12:15:01 -0300
commitf749eb712d990a9b03f1db372d5311e77bd32edd (patch)
treeee4d9966f1eb293054b7ed865c9d4d6eb49e432b /src/mouse.zig
parent8f6621f9f70db86d56266a59b56dfb92b324b0d9 (diff)
parentb3d32656413734952bc918c2d4cfd12fede6c214 (diff)
downloadpardes-f749eb712d990a9b03f1db372d5311e77bd32edd.tar.gz
pardes-f749eb712d990a9b03f1db372d5311e77bd32edd.zip
integration: the terminal behind src/Term.zig, with the diff viewer and the plumber's first phase
A merge of term-phase0 and pardes-next. File.zig's recolorSyntax keeps the theme's grounds and names Term.Filter and Term.Span; the changelog keeps both sides' entries, the palette sentence in the place of the entry the terminal work cut down. core-test 985/985 on tui; the diff, pager and tree process cases pass, goldens unchanged. Co-Authored-By: Claude Fable 5.2 <[email protected]> Claude-Session: https://claude.ai/code/session_016Y9MNBECMWcJD5pdS4SR6T
Diffstat (limited to 'src/mouse.zig')
-rw-r--r--src/mouse.zig261
1 files changed, 19 insertions, 242 deletions
diff --git a/src/mouse.zig b/src/mouse.zig
index 06f3a755..a5ea9bed 100644
--- a/src/mouse.zig
+++ b/src/mouse.zig
@@ -1,6 +1,5 @@
//! The mouse: what a pointer is over, the three buttons' presses, drags and
-//! releases (acme's chords, border and seam drags, gestures), and the
-//! chrome targets a shell asks about.
+//! releases (acme's chords, grip and seam drags, gestures).
const pardes = @import("pardes.zig");
const tagline = @import("tagline.zig");
const exec = @import("exec.zig");
@@ -19,7 +18,6 @@ const Pane = panes.Pane;
const MAX_PANES = pardes.MAX_PANES;
const Layer = @import("Layer.zig");
const Jump = @import("Jump.zig");
-const TOPBAR_H = pardes.TOPBAR_H;
const BOX_H = pardes.BOX_H;
const TAG_TEXT_INSET = pardes.TAG_TEXT_INSET;
const Builtin = pardes.Builtin;
@@ -29,7 +27,6 @@ const Pardes = pardes.Pardes;
pub const Drag = union(enum) {
none,
- border_v: struct { left_col: usize, cur_x: u16, corner: ?struct { col: usize, idx: usize } = null, cur_y: u16 = 0 },
border_h: struct { col: usize, top_idx: usize, cur_y: u16 },
move: struct { id: usize, cur_x: u16, cur_y: u16 },
/// `grab`: how far into the grip it was pressed, so the column's left
@@ -58,7 +55,7 @@ pub const Drag = union(enum) {
fn button(drag: Drag) ?Mouse.Button {
return switch (drag) {
.none => null,
- .border_v, .border_h, .move, .column_move => config.select_button,
+ .border_h, .move, .column_move => config.select_button,
.select => |selection| selection.button,
};
}
@@ -126,38 +123,6 @@ fn seamRowOf(p: *const Pardes, c: usize, k: usize) u16 {
return r.y + r.h -| 1;
}
-pub const ChromeTarget = struct { col: u16, row: u16 };
-
-/// The chrome a press at `col`, `row` takes: the tag rows; then,
-/// on the cell, a pane's grip, a column's handle or a seam; then a cell
-/// away, any of a pane's tag, a handle or a seam.
-pub fn chromeTarget(p: *const Pardes, col: u16, row: u16) ?ChromeTarget {
- const v = p.view();
- if (row < p.topBarHeight() + layout.columnBarHeight(p)) return .{ .col = col, .row = row };
- for ([_]u16{ 0, 1 }) |slack| {
- for (p.panes, 0..) |slot, id| {
- const pane = slot orelse continue;
- const rect = v.rects[id];
- const tag = p.tagTop(pane, rect);
- const edge = if (slack == 0) rect.x + config.GUTTER else rect.x + rect.w;
- if (row >= tag and row < tag + pane.tag_rows and col >= rect.x and col < rect.x + rect.w and col < edge)
- return .{ .col = col, .row = row };
- }
- for (0..p.view().ncol -| 1) |column| {
- const handle = v.col_x[column] + v.col_w[column] -| 1;
- if (@max(col, handle) - @min(col, handle) == slack) return .{ .col = handle, .row = row };
- }
- for (0..p.view().ncol) |column| {
- if (col < v.col_x[column] or col >= v.col_x[column] + v.col_w[column]) continue;
- for (0..p.view().cols[column].n -| 1) |index| {
- const seam = seamRowOf(p, column, index);
- if (@max(row, seam) - @min(row, seam) == slack) return .{ .col = col, .row = seam };
- }
- }
- }
- return null;
-}
-
pub fn paneAt(p: *const Pardes, col: u16, row: u16) ?usize {
for (p.panes, 0..) |slot, id| {
if (slot == null) continue;
@@ -781,18 +746,6 @@ pub fn handleMouse(p: *Pardes, event: Mouse) void {
return;
}
}
- for (0..p.view().ncol -| 1) |c| {
- if (mcol == v.col_x[c] + v.col_w[c] -| 1) {
- const corner: @FieldType(@FieldType(Drag, "border_v"), "corner") = if (seamIdxAt(p, c, mrow)) |k|
- .{ .col = c, .idx = k }
- else if (seamIdxAt(p, c + 1, mrow)) |k|
- .{ .col = c + 1, .idx = k }
- else
- null;
- v.drag = .{ .border_v = .{ .left_col = c, .cur_x = mcol, .corner = corner, .cur_y = mrow } };
- return;
- }
- }
// Two panes are resized on the rule between them, never on a
// row of text; with no rule, by the grip, as acme moves a
// window by its button.
@@ -923,12 +876,6 @@ fn seamIdxAt(p: *const Pardes, c: usize, mrow: u16) ?usize {
return null;
}
-fn clampBorderCol(lx: u16, lw: u16, rw: u16, mcol: u16) u16 {
- const lo = lx + config.MINW;
- const hi = lx +| lw +| rw -| config.MINW;
- return if (lo <= hi) std.math.clamp(mcol, lo, hi) else mcol;
-}
-
fn clampBorderRow(ay: u16, ah: u16, bh: u16, mrow: u16) u16 {
const lo = ay + BOX_H - 1;
const hi = ay +| ah +| bh -| (BOX_H + 1);
@@ -938,20 +885,6 @@ fn clampBorderRow(ay: u16, ah: u16, bh: u16, mrow: u16) u16 {
pub fn dragUpdate(p: *Pardes, mcol: u16, mrow: u16, body_hit: ?Mouse.BodyHit) void {
const v = p.view();
switch (v.drag) {
- .border_v => |*d| {
- const c = d.left_col;
- d.cur_x = if (c + 1 < v.ncol)
- clampBorderCol(v.col_x[c], v.col_w[c], v.col_w[c + 1], mcol)
- else
- mcol;
- if (d.corner) |k| if (k.idx + 1 < v.cols[k.col].n) {
- const a = v.rects[v.cols[k.col].panes[k.idx]];
- const b = v.rects[v.cols[k.col].panes[k.idx + 1]];
- d.cur_y = clampBorderRow(a.y, a.h, b.h, mrow);
- } else {
- d.cur_y = mrow;
- };
- },
.border_h => |*d| {
const cc = d.col;
const k = d.top_idx;
@@ -1239,18 +1172,6 @@ fn dragRelease(p: *Pardes, button: Mouse.Button) void {
defer v.drag = .none;
defer v.chord_hold = false;
switch (v.drag) {
- .border_v => |d| {
- const c = d.left_col;
- const old_seam = v.col_x[c] + v.col_w[c] -| 1;
- // the handle is the left pane's LAST column (inclusive), so
- // the new width includes it — a no-drag click changes nothing
- if (c + 1 < v.ncol and d.cur_x != old_seam)
- layout.setColumnPairWidth(p, c, (d.cur_x + 1) -| v.col_x[c]);
- if (d.corner) |k| {
- if (d.cur_y != seamRowOf(p, k.col, k.idx))
- layout.applyRowSplit(p, k.col, k.idx, d.cur_y);
- }
- },
.border_h => |d| if (d.cur_y != seamRowOf(p, d.col, d.top_idx))
layout.applyRowSplit(p, d.col, d.top_idx, d.cur_y),
.column_move => |d| if (layout.columnBySerial(p, d.serial)) |column| switch (layout.columnDrop(p, column, d.cur_x, d.grab)) {
@@ -1391,7 +1312,7 @@ fn dragRelease(p: *Pardes, button: Mouse.Button) void {
const test_metrics: pardes.RowMetrics = .{ .body_w = 10, .body_h = 20, .tagline_w = 6, .tagline_h = 12 };
-fn cornerFixture(gpa: std.mem.Allocator) !*Pardes {
+fn twoColumns(gpa: std.mem.Allocator) !*Pardes {
const p = try Pardes.init(gpa, .{ .cols = 100, .rows = 30, .shells = 3 });
p.update(.{ .resize = .{ .cols = 100, .rows = 30 } });
p.view().active = p.view().cols[1].panes[0];
@@ -1463,7 +1384,7 @@ fn layerCenter(layer: *const Layer, col: u16, comptime tag: bool) [2]f32 {
}
test "a pane's last row of text is no resize handle; the rule over the next pane is" {
- const p = try cornerFixture(std.testing.allocator);
+ const p = try twoColumns(std.testing.allocator);
defer p.deinit();
const seam = seamRowOf(p, 1, 0);
const inside = p.view().col_x[1] + p.view().col_w[1] / 2;
@@ -1473,8 +1394,22 @@ test "a pane's last row of text is no resize handle; the rule over the next pane
try std.testing.expect(nudgeRightSeam(p, 2) == seam + 2);
}
+test "the line between two columns is no resize handle: a press there is a sweep in the pane" {
+ const p = try twoColumns(std.testing.allocator);
+ defer p.deinit();
+ const line = p.view().col_x[0] + p.view().col_w[0] - 1;
+ const row = p.view().rects[p.view().cols[0].panes[0]].y + BOX_H + 1;
+ const weight = p.view().cols[0].weight;
+ p.update(.{ .mouse = .{ .button = .left, .kind = .press, .col = line, .row = row } });
+ try std.testing.expect(p.view().drag == .select);
+ p.update(.{ .mouse = .{ .button = .left, .kind = .drag, .col = line + 8, .row = row } });
+ p.update(.{ .mouse = .{ .button = .left, .kind = .release, .col = line + 8, .row = row } });
+ p.sync();
+ try std.testing.expectEqual(weight, p.view().cols[0].weight);
+}
+
test "a pane's grip dragged up or down its own column moves its top, down to the floor of the pane above" {
- const p = try cornerFixture(std.testing.allocator);
+ const p = try twoColumns(std.testing.allocator);
defer p.deinit();
const upper = p.view().cols[1].panes[0];
const lower = p.view().cols[1].panes[1];
@@ -1499,26 +1434,6 @@ test "a pane's grip dragged up or down its own column moves its top, down to the
try std.testing.expectEqual(to, p.view().rects[lower].y);
}
-test "a press near chrome takes it: the tag rows, a column's handle or a seam on its cell or a cell away, a pane's tag; nothing in a body" {
- const p = try cornerFixture(std.testing.allocator);
- defer p.deinit();
- // Column 0's two panes share its rows evenly; column 1's lower one is
- // tall, its middle a body row.
- const handle = p.view().col_x[0] + p.view().col_w[0] - 1;
- const seam = seamRowOf(p, 0, 0);
- const mid = p.view().col_x[0] + p.view().col_w[0] / 2;
- const top = p.view().rects[p.view().cols[0].panes[0]].y;
- const low = p.view().rects[p.view().cols[1].panes[1]];
- const body = low.y + low.h / 2;
- try std.testing.expectEqual(ChromeTarget{ .col = 5, .row = 0 }, chromeTarget(p, 5, 0).?);
- try std.testing.expectEqual(ChromeTarget{ .col = handle, .row = body }, chromeTarget(p, handle, body).?);
- try std.testing.expectEqual(ChromeTarget{ .col = handle, .row = body }, chromeTarget(p, handle + 1, body).?);
- try std.testing.expectEqual(ChromeTarget{ .col = mid, .row = seam }, chromeTarget(p, mid, seam).?);
- try std.testing.expectEqual(ChromeTarget{ .col = mid, .row = seam }, chromeTarget(p, mid, seam - 1).?);
- try std.testing.expectEqual(ChromeTarget{ .col = mid, .row = top }, chromeTarget(p, mid, top).?);
- try std.testing.expect(chromeTarget(p, mid, seam - 3) == null);
-}
-
test "plain left click clears explicit modal selection" {
const gpa = std.testing.allocator;
// Wide enough for the tag on one row: the body starts under it.
@@ -1558,144 +1473,6 @@ test "a selection drag and its release leave the selection done" {
try std.testing.expectEqual(.done, pane.sel[sel_slot].state);
}
-test "a corner drag's two axes clamp independently" {
- // a 100-wide window split 50/50, and a 30-row column split 15/14 under the
- // topbar: the shape windowops.snap drives
- const lx: u16 = 0;
- const lw: u16 = 50;
- const rw: u16 = 50;
- const ay: u16 = TOPBAR_H;
- const ah: u16 = 15;
- const bh: u16 = 14;
- const row_lo: u16 = ay + BOX_H - 1;
- const row_hi: u16 = ay + ah + bh - (BOX_H + 1);
-
- // each axis alone, at both walls
- try std.testing.expectEqual(@as(u16, config.MINW), clampBorderCol(lx, lw, rw, 0));
- try std.testing.expectEqual(@as(u16, 100 - config.MINW), clampBorderCol(lx, lw, rw, 999));
- try std.testing.expectEqual(row_lo, clampBorderRow(ay, ah, bh, 0));
- try std.testing.expectEqual(row_hi, clampBorderRow(ay, ah, bh, 999));
-
- // THE corner property: drag off the right edge while staying mid-height —
- // x sits at its wall, y still tracks the mouse row exactly
- try std.testing.expectEqual(@as(u16, 100 - config.MINW), clampBorderCol(lx, lw, rw, 999));
- try std.testing.expectEqual(@as(u16, 12), clampBorderRow(ay, ah, bh, 12));
- // and the mirror: pinned at the bottom, x still free
- try std.testing.expectEqual(row_hi, clampBorderRow(ay, ah, bh, 999));
- try std.testing.expectEqual(@as(u16, 40), clampBorderCol(lx, lw, rw, 40));
- // both pinned at once is just both walls, not a stuck gesture
- try std.testing.expectEqual(@as(u16, config.MINW), clampBorderCol(lx, lw, rw, 0));
- try std.testing.expectEqual(row_hi, clampBorderRow(ay, ah, bh, 999));
-
- // degenerate pairs pass through untouched, each on its own terms: a pane
- // pair with no room stays draggable even when the column pair has room
- try std.testing.expectEqual(@as(u16, 7), clampBorderCol(0, 5, 5, 7));
- try std.testing.expectEqual(@as(u16, 40), clampBorderCol(lx, lw, rw, 40));
- try std.testing.expectEqual(@as(u16, 9), clampBorderRow(TOPBAR_H, 1, 0, 9));
-}
-
-test "a v-handle press at the RIGHT column's seam drags both boundaries" {
- const p = try cornerFixture(std.testing.allocator);
- defer p.deinit();
- try std.testing.expectEqual(@as(usize, 2), p.view().cols[1].n);
-
- const handle = p.view().col_x[0] + p.view().col_w[0] - 1;
- const right_seam = nudgeRightSeam(p, 3);
- try std.testing.expect(right_seam != seamRowOf(p, 0, 0));
-
- const w0 = p.view().cols[0].weight;
- const v_left = p.panes[p.view().cols[0].panes[0]].?.vweight;
- const v_right = p.panes[p.view().cols[1].panes[0]].?.vweight;
-
- p.update(.{ .mouse = .{ .button = .left, .kind = .press, .col = handle, .row = right_seam } });
- try std.testing.expect(p.view().drag == .border_v);
- const corner = p.view().drag.border_v.corner orelse return error.NoCorner;
- try std.testing.expectEqual(@as(usize, 1), corner.col);
- try std.testing.expectEqual(@as(usize, 0), corner.idx);
-
- p.update(.{ .mouse = .{ .button = .left, .kind = .drag, .col = handle + 8, .row = right_seam - 4 } });
- p.update(.{ .mouse = .{ .button = .left, .kind = .release, .col = handle + 8, .row = right_seam - 4 } });
- p.sync();
-
- // both halves committed: the column pair widened, and the RIGHT column's
- // pane pair reweighted — while the left column's panes stayed put
- try std.testing.expect(p.view().cols[0].weight > w0);
- try std.testing.expect(p.panes[p.view().cols[1].panes[0]].?.vweight != v_right);
- try std.testing.expectEqual(v_left, p.panes[p.view().cols[0].panes[0]].?.vweight);
-}
-
-test "a tie row still moves the LEFT column's pane pair only" {
- const p = try cornerFixture(std.testing.allocator);
- defer p.deinit();
-
- // put column 1's seam exactly on column 0's, the row the eye reads as one
- // line across the whole window
- const left_seam = seamRowOf(p, 0, 0);
- _ = nudgeRightSeam(p, @as(i32, left_seam) - @as(i32, seamRowOf(p, 1, 0)));
- try std.testing.expectEqual(left_seam, seamRowOf(p, 1, 0));
-
- const handle = p.view().col_x[0] + p.view().col_w[0] - 1;
- const v_left = p.panes[p.view().cols[0].panes[0]].?.vweight;
- const v_right = p.panes[p.view().cols[1].panes[0]].?.vweight;
-
- p.update(.{ .mouse = .{ .button = .left, .kind = .press, .col = handle, .row = left_seam } });
- const corner = p.view().drag.border_v.corner orelse return error.NoCorner;
- try std.testing.expectEqual(@as(usize, 0), corner.col);
-
- p.update(.{ .mouse = .{ .button = .left, .kind = .drag, .col = handle, .row = left_seam - 4 } });
- p.update(.{ .mouse = .{ .button = .left, .kind = .release, .col = handle, .row = left_seam - 4 } });
- p.sync();
- try std.testing.expect(p.panes[p.view().cols[0].panes[0]].?.vweight != v_left);
- try std.testing.expectEqual(v_right, p.panes[p.view().cols[1].panes[0]].?.vweight);
-}
-
-test "a v-handle press at nobody's seam is still a plain edge drag" {
- const p = try cornerFixture(std.testing.allocator);
- defer p.deinit();
- const right_seam = nudgeRightSeam(p, 3);
- const left_seam = seamRowOf(p, 0, 0);
-
- const handle = p.view().col_x[0] + p.view().col_w[0] - 1;
- var row: u16 = TOPBAR_H + 1;
- while (row == left_seam or row == right_seam) row += 1;
-
- const w0 = p.view().cols[0].weight;
- const v_left = p.panes[p.view().cols[0].panes[0]].?.vweight;
- const v_right = p.panes[p.view().cols[1].panes[0]].?.vweight;
- p.update(.{ .mouse = .{ .button = .left, .kind = .press, .col = handle, .row = row } });
- try std.testing.expect(p.view().drag == .border_v);
- try std.testing.expect(p.view().drag.border_v.corner == null);
- p.update(.{ .mouse = .{ .button = .left, .kind = .drag, .col = handle + 8, .row = row + 5 } });
- p.update(.{ .mouse = .{ .button = .left, .kind = .release, .col = handle + 8, .row = row + 5 } });
- p.sync();
- // exactly ONE boundary moved
- try std.testing.expect(p.view().cols[0].weight > w0);
- try std.testing.expectEqual(v_left, p.panes[p.view().cols[0].panes[0]].?.vweight);
- try std.testing.expectEqual(v_right, p.panes[p.view().cols[1].panes[0]].?.vweight);
-}
-
-test "a RIGHT-column corner's two axes clamp independently" {
- const p = try cornerFixture(std.testing.allocator);
- defer p.deinit();
- const right_seam = nudgeRightSeam(p, 3);
- const handle = p.view().col_x[0] + p.view().col_w[0] - 1;
- p.update(.{ .mouse = .{ .button = .left, .kind = .press, .col = handle, .row = right_seam } });
- try std.testing.expectEqual(@as(usize, 1), (p.view().drag.border_v.corner orelse return error.NoCorner).col);
-
- // off the right edge at mid-height: x parks at its MINW wall, y is the mouse
- p.update(.{ .mouse = .{ .button = .left, .kind = .drag, .col = 999, .row = right_seam } });
- try std.testing.expectEqual(@as(u16, 100 - config.MINW), p.view().drag.border_v.cur_x);
- try std.testing.expectEqual(right_seam, p.view().drag.border_v.cur_y);
-
- // and the mirror: below the bottom at mid-width. y parks, x tracks again
- p.update(.{ .mouse = .{ .button = .left, .kind = .drag, .col = handle, .row = 999 } });
- try std.testing.expectEqual(handle, p.view().drag.border_v.cur_x);
- const a = p.view().rects[p.view().cols[1].panes[0]];
- const b = p.view().rects[p.view().cols[1].panes[1]];
- try std.testing.expectEqual(clampBorderRow(a.y, a.h, b.h, 999), p.view().drag.border_v.cur_y);
- p.update(.{ .mouse = .{ .button = .left, .kind = .release, .col = handle, .row = 999 } });
-}
-
test "mouse thumb buttons navigate once and clear selection gestures" {
const p = try Pardes.init(std.testing.allocator, .{ .cols = 60, .rows = 12 });
defer p.deinit();