From f8fb785c9572855943713181d738b72ea494b7d5 Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Wed, 28 Oct 2026 17:56:30 -0300 Subject: caret: a wheel's scroll moves the caret with its line, the text's own glide, no spring of its own chasing it (the dance): its springs land on its cell (CursorGlide.How .rigid gone) and the pixel shell draws it at its cell less the glide's offset while its line rides (caretRide, Glide.caret_rides), clipped as the text is; a page that keeps its row leaves it still as before; tests: the springs land, the caret rides exactly with its line Co-Authored-By: Claude Opus 5.5 --- src/draw.zig | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) (limited to 'src/draw.zig') diff --git a/src/draw.zig b/src/draw.zig index e3ab9f2a..f4c43631 100644 --- a/src/draw.zig +++ b/src/draw.zig @@ -239,7 +239,7 @@ fn glideCursor(p: *Pardes, s: *Surface) void { }; const motion = animation.Motion.of(p.settings.motion); // The thin insert-mode caret glides as the block does (a jump smears - // and bows, a step eases); a scroll moves it rigidly, below. + // and bows, a step eases); a scroll lands it, below. var how: animation.CursorGlide.How = .ease; var frame: PaneFrame = .{}; // In a column's or the workspace's tag the cursor is not the pane's, @@ -259,14 +259,13 @@ fn glideCursor(p: *Pardes, s: *Surface) void { // The pane moved in the layout: the springs move with it (its // own cursor's; one in a column's tag stays). if (inside) p.cursor_glide.shift(origin[0] - view.origin[0], origin[1] - view.origin[1]); - // Scrolled (a file's view, a terminal's output): the caret is its - // own body, drawn from its own springs only, never from the text's - // glide. Its mark is where it will be once the view settles (its - // cell now: the core's view is that one), so a page that keeps its - // row leaves it still, and a scroll that carries its line moves - // it there whole, at the view's pace, not as a jump's smear. A - // terminal's output scrolls it with no glide: it lands with it. - if (inside and line != view.line) how = if (pane.isTerminal()) .land else .rigid; + // Scrolled (a file's view, a terminal's output): the caret did not + // move, the text did. Its springs land on its cell (the core's + // view is the settled one), so a page that keeps its row leaves + // it still, and a scroll that carries its line has the shell draw + // it with the text's own glide (Glide.caret_rides), one picture, + // never a second spring chasing the first. + if (inside and line != view.line) how = .land; } else if (view.serial != 0 and p.cursor_glide.placed) { // Focus moved (to another pane, or between a pane and a // column's or the workspace's tag): the glide starts where the @@ -1971,7 +1970,7 @@ test "each Motion flavour reaches the lift as its own trajectory" { try std.testing.expect(peaks[2] <= 1.001 and peaks[3] > 1.25 and peaks[4] > peaks[3]); } -test "the caret is its own body: a page leaves it still under the moving text, a wheel scroll moves it whole to its line's new row" { +test "the caret is its own body: a page leaves it still under the moving text, a wheel scroll lands its springs on its line's new row" { if (!builtins.capabilities.lift) return error.SkipZigTest; const p = try Pardes.init(std.testing.allocator, .{ .cols = 80, .rows = 30 }); defer p.deinit(); @@ -2003,23 +2002,16 @@ test "the caret is its own body: a page leaves it still under the moving text, a try std.testing.expectEqual(row_before, s.cursor.?.y); try std.testing.expectEqual(@as(u8, 0), s.chrome.cursor_glide & 1); try std.testing.expectEqual(@as(f32, @floatFromInt(row_before)), s.chrome.cursor_quad[1]); - // The view scrolled with the caret on its line: it heads for the - // line's new row whole (every corner the same way), and lands on it. + // The view scrolled with the caret on its line: its springs land on + // the line's new row at once, no second glide; the shell carries it + // there with the text's own (Glide.caret_rides). pane.scrollBy(-3); now += 16 * std.time.ns_per_ms; p.advance(now); _ = arena.reset(.retain_capacity); s = try p.render(arena.allocator()); - const mark: f32 = @floatFromInt(s.cursor.?.y); - try std.testing.expect(s.chrome.cursor_glide & 1 != 0 and s.chrome.cursor_quad[1] < mark); - try std.testing.expectApproxEqAbs(s.chrome.cursor_quad[3] - s.chrome.cursor_quad[1], s.chrome.cursor_quad[5] - s.chrome.cursor_quad[7], 1e-4); - while (p.continuous()) { - now += 7 * std.time.ns_per_ms; - p.advance(now); - _ = arena.reset(.retain_capacity); - s = try p.render(arena.allocator()); - } - try std.testing.expectEqual(mark, s.chrome.cursor_quad[1]); + try std.testing.expectEqual(@as(u8, 0), s.chrome.cursor_glide & 1); + try std.testing.expectEqual(@as(f32, @floatFromInt(s.cursor.?.y)), s.chrome.cursor_quad[1]); } test "the focused cursor glides a jump, eases a step, the thin caret too, and is exact at rest" { -- cgit v1.3