diff options
| -rw-r--r-- | docs/next-terminal.md | 5 | ||||
| -rw-r--r-- | src/Term.zig | 8 | ||||
| -rw-r--r-- | src/ansi.zig | 36 | ||||
| -rw-r--r-- | src/plain/term.zig | 2 | ||||
| -rw-r--r-- | src/term/terminal.zig | 13 | ||||
| -rw-r--r-- | test/perf-baseline-gui-debug.json | 2 | ||||
| -rw-r--r-- | test/perf-baseline-tui-debug.json | 2 | ||||
| -rw-r--r-- | test/perf-baseline-tui-fast.json | 2 |
8 files changed, 48 insertions, 22 deletions
diff --git a/docs/next-terminal.md b/docs/next-terminal.md index 1229df6f..2a8b61c3 100644 --- a/docs/next-terminal.md +++ b/docs/next-terminal.md @@ -209,7 +209,10 @@ What differs from the plan above, and why: replica's presentation, and reads the emulator through five entries (`grid`, `modes`, `prompt`, `echoCell`, `markRead`). - **The draw group is plain data** (Phase 0 left it typed in the core's - types): `Term.paint` fills a cell buffer in the theme's colours, the + types): `Term.paint` fills a cell buffer in the theme's colours with + the view's rows the body shows (painting the whole view cost a frame + of the perf harness's `render` 82 -> 127 µs: a 3-row pane over a + terminal still 37 rows tall, until the next update resized it), the core lays it over the body (src/ansi.zig), and `Term.images` gives placements. The colour filter stays the terminal's, as it wraps ghostty's `generate256Color`. A finished command pane's diff colours diff --git a/src/Term.zig b/src/Term.zig index cf94c6d5..441280ee 100644 --- a/src/Term.zig +++ b/src/Term.zig @@ -342,10 +342,10 @@ pub fn spanColor(f: *Filter, color: plain.Color, is_bg: bool) plain.Color { // images as placements; which of the body's rows they stand under is the // core's (src/ansi.zig). -/// Its view's rows as cells in the theme's colours, through the theme's -/// filter when the pane has it on. -pub fn paint(s: *State, ink: *const Ink, palette: *FilterPalette, filtered: bool, cols: u16, cells: []Painted, rows: []PaintedRow) void { - the().paint(s.impl, ink, palette, filtered, cols, cells, rows); +/// Its view's rows from `first`, `rows.len` of them, as cells in the +/// theme's colours, through the theme's filter when the pane has it on. +pub fn paint(s: *State, ink: *const Ink, palette: *FilterPalette, filtered: bool, first: u16, cols: u16, cells: []Painted, rows: []PaintedRow) void { + the().paint(s.impl, ink, palette, filtered, first, cols, cells, rows); } /// Its kitty graphics over the body's rows, as placements. diff --git a/src/ansi.zig b/src/ansi.zig index ad74dabb..224a5e69 100644 --- a/src/ansi.zig +++ b/src/ansi.zig @@ -56,17 +56,39 @@ pub fn recolor(p: *Pardes, s: *Surface, pane: *Pane, r: pardes.Rect, tx: u16, tw const body_y = p.bodyTop(pane, r); const g = Term.grid(state); const cols = g.cols; + const vp_rows: i32 = @intCast(g.len); + // The view's rows the body shows, an edit copy's among them: only they + // are painted (a pane shorter than its terminal, as one is until the + // terminal is resized to it, shows few of its rows). + var lo: i32 = vp_rows; + var hi: i32 = 0; + { + var shown: BodyWalk = .init(pane); + var n: u16 = 0; + while (shown.next()) |row| : (n += 1) { + if (n >= body_h) break; + // A copy's line stands over one of the rows the copy covers. + const from: i32, const to: i32 = switch (row) { + .grid => |v| .{ v, v + 1 }, + .edit => .{ pane.ovl.?.row - shown.goff, pane.ovl.?.row + pane.ovl.?.rows - shown.goff }, + }; + lo = @min(lo, from); + hi = @max(hi, to); + } + } + lo = @max(lo, 0); + hi = @min(hi, vp_rows); + if (lo >= hi) return; const arena = p.scratch.allocator(); - const cells = arena.alloc(Term.Painted, g.len * @as(usize, cols)) catch return; - const rows = arena.alloc(Term.PaintedRow, g.len) catch return; + const cells = arena.alloc(Term.Painted, @as(usize, @intCast(hi - lo)) * cols) catch return; + const rows = arena.alloc(Term.PaintedRow, @intCast(hi - lo)) catch return; { const tz_paint = tracy.zone(@src(), "termPaint"); defer tz_paint.end(); const ink = inkOf(p.theme()); - Term.paint(state, &ink, &p.tty_filter_palette, pane.tty_filter, cols, cells, rows); + Term.paint(state, &ink, &p.tty_filter_palette, pane.tty_filter, @intCast(lo), cols, cells, rows); } const filtered = pane.tty_filter; - const vp_rows: i32 = @intCast(g.len); // Which buffer lines the user has not actually changed, so a row swallowed // by a growing buffer keeps the colour it still stands over. var anchors: ?EditAnchors = null; @@ -87,9 +109,9 @@ pub fn recolor(p: *Pardes, s: *Surface, pane: *Pane, r: pardes.Rect, tx: u16, tw .grid => |v| .{ .row = v }, }; const vi = anchor.row; - if (vi < 0 or vi >= vp_rows) continue; - const prow = rows[@intCast(vi)]; - const grid_row = cells[@as(usize, @intCast(vi)) * cols ..][0..prow.len]; + if (vi < lo or vi >= hi) continue; + const prow = rows[@intCast(vi - lo)]; + const grid_row = cells[@as(usize, @intCast(vi - lo)) * cols ..][0..prow.len]; const cut: u16 = if (pane.body.mode == .tty) 0 else cut: { const prompt = prow.prompt orelse break :cut 0; break :cut switch (prompt) { diff --git a/src/plain/term.zig b/src/plain/term.zig index dbc4fc87..de969796 100644 --- a/src/plain/term.zig +++ b/src/plain/term.zig @@ -398,7 +398,7 @@ pub const Ops = struct { /// Its view's rows, `rows.len` of them, `cols` cells each, into /// `cells`: each cell's style in the theme's colours (through the /// filter when `filtered`), its bytes and width. - paint: *const fn (s: *State, ink: *const Ink, palette: *FilterPalette, filtered: bool, cols: u16, cells: []Painted, rows: []PaintedRow) void, + paint: *const fn (s: *State, ink: *const Ink, palette: *FilterPalette, filtered: bool, first: u16, cols: u16, cells: []Painted, rows: []PaintedRow) void, /// Its kitty images over the body's rows, appended to `out`, and their /// placeholder cells blanked in `frame` (`frame_cols` wide). images: *const fn (s: *State, gpa: std.mem.Allocator, at: ImagesAt, out: *std.ArrayList(plain.Placement), frame: []plain.Cell, frame_cols: u16) void, diff --git a/src/term/terminal.zig b/src/term/terminal.zig index 71a2f3de..0178a848 100644 --- a/src/term/terminal.zig +++ b/src/term/terminal.zig @@ -1191,11 +1191,12 @@ pub fn viewport(state: *State, arena: std.mem.Allocator, cut: bool) ![]const []c } /// Its view's rows as cells, for the core's paint (Term.paint, the core's -/// src/ansi.zig): `rows.len` rows of `cols` cells into `cells`, each its -/// style in the theme's colours (through the filter when `filtered`), the -/// bytes it spells in the view's text and its width; each row whether a -/// prompt starts it, and how much of it that is. -pub fn paint(state: *State, ink: *const Ink, palette: *FilterPalette, filtered: bool, cols: u16, cells: []Painted, rows: []PaintedRow) void { +/// src/ansi.zig): `rows.len` rows from the view's row `first`, `cols` +/// cells each into `cells`, each its style in the theme's colours (through +/// the filter when `filtered`), the bytes it spells in the view's text and +/// its width; each row whether a prompt starts it, and how much of it that +/// is. +pub fn paint(state: *State, ink: *const Ink, palette: *FilterPalette, filtered: bool, first: u16, cols: u16, cells: []Painted, rows: []PaintedRow) void { var filter_storage: Filter = undefined; const filter: ?*Filter = if (filtered) blk: { filter_storage = filterOf(ink, palette, &state.vt); @@ -1207,7 +1208,7 @@ pub fn paint(state: *State, ink: *const Ink, palette: *FilterPalette, filtered: const pages = &state.vt.screens.active.pages; for (rows, 0..) |*row, vi| { row.* = .{ .prompt = null, .placeholder = false, .len = 0 }; - const row_pin = pages.pin(.{ .viewport = .{ .y = @intCast(vi) } }) orelse continue; + const row_pin = pages.pin(.{ .viewport = .{ .y = @intCast(first + vi) } }) orelse continue; const flags = row_pin.rowAndCell().row; if (flags.semantic_prompt != .none) row.prompt = promptCut(row_pin); row.placeholder = flags.kitty_virtual_placeholder; diff --git a/test/perf-baseline-gui-debug.json b/test/perf-baseline-gui-debug.json index c6d6bf09..a1396fb2 100644 --- a/test/perf-baseline-gui-debug.json +++ b/test/perf-baseline-gui-debug.json @@ -1 +1 @@ -{"harness":"97c56874da9cffa8","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"gui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400}],"cells":[{"op":"open","fixture":"medium","min_us":1711,"med_us":1784,"p90_us":1997,"max_us":2062},{"op":"render","fixture":"medium","min_us":81,"med_us":82,"p90_us":95,"max_us":95},{"op":"key-down","fixture":"medium","min_us":88,"med_us":89,"p90_us":92,"max_us":92},{"op":"key-right","fixture":"medium","min_us":88,"med_us":90,"p90_us":104,"max_us":108},{"op":"page-down","fixture":"medium","min_us":88,"med_us":91,"p90_us":101,"max_us":110},{"op":"wheel","fixture":"medium","min_us":86,"med_us":87,"p90_us":89,"max_us":96},{"op":"edit-char","fixture":"medium","min_us":333,"med_us":387,"p90_us":402,"max_us":410},{"op":"edit-twin","fixture":"medium","min_us":350,"med_us":403,"p90_us":436,"max_us":441},{"op":"body-2m","fixture":"medium","min_us":881,"med_us":1574,"p90_us":1791,"max_us":1816},{"op":"body-appends","fixture":"medium","min_us":1181,"med_us":1323,"p90_us":1574,"max_us":1613},{"op":"deep-sel","fixture":"medium","min_us":73,"med_us":106,"p90_us":118,"max_us":121},{"op":"image-frame","fixture":"medium","min_us":113,"med_us":116,"p90_us":118,"max_us":118}]} +{"harness":"aed36aceb98afadd","build":{"compiler":"0.17.1","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"gui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400}],"cells":[{"op":"open","fixture":"medium","min_us":1713,"med_us":1939,"p90_us":2099,"max_us":2119},{"op":"render","fixture":"medium","min_us":82,"med_us":83,"p90_us":86,"max_us":92},{"op":"key-down","fixture":"medium","min_us":89,"med_us":93,"p90_us":101,"max_us":106},{"op":"key-right","fixture":"medium","min_us":88,"med_us":90,"p90_us":95,"max_us":98},{"op":"page-down","fixture":"medium","min_us":88,"med_us":90,"p90_us":95,"max_us":104},{"op":"wheel","fixture":"medium","min_us":86,"med_us":88,"p90_us":93,"max_us":95},{"op":"edit-char","fixture":"medium","min_us":331,"med_us":391,"p90_us":398,"max_us":429},{"op":"edit-twin","fixture":"medium","min_us":354,"med_us":412,"p90_us":433,"max_us":455},{"op":"body-2m","fixture":"medium","min_us":1006,"med_us":1549,"p90_us":1694,"max_us":1777},{"op":"body-appends","fixture":"medium","min_us":1125,"med_us":1324,"p90_us":1392,"max_us":1416},{"op":"deep-sel","fixture":"medium","min_us":76,"med_us":78,"p90_us":83,"max_us":136},{"op":"image-frame","fixture":"medium","min_us":114,"med_us":121,"p90_us":130,"max_us":142}]} diff --git a/test/perf-baseline-tui-debug.json b/test/perf-baseline-tui-debug.json index 60bbde55..799aa003 100644 --- a/test/perf-baseline-tui-debug.json +++ b/test/perf-baseline-tui-debug.json @@ -1 +1 @@ -{"harness":"97c56874da9cffa8","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"tui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400}],"cells":[{"op":"open","fixture":"medium","min_us":1738,"med_us":2035,"p90_us":2220,"max_us":2221},{"op":"render","fixture":"medium","min_us":81,"med_us":83,"p90_us":85,"max_us":113},{"op":"key-down","fixture":"medium","min_us":89,"med_us":91,"p90_us":95,"max_us":97},{"op":"key-right","fixture":"medium","min_us":88,"med_us":89,"p90_us":90,"max_us":96},{"op":"page-down","fixture":"medium","min_us":88,"med_us":93,"p90_us":96,"max_us":118},{"op":"wheel","fixture":"medium","min_us":86,"med_us":87,"p90_us":88,"max_us":89},{"op":"edit-char","fixture":"medium","min_us":334,"med_us":384,"p90_us":536,"max_us":538},{"op":"edit-twin","fixture":"medium","min_us":371,"med_us":452,"p90_us":477,"max_us":480},{"op":"body-2m","fixture":"medium","min_us":839,"med_us":1372,"p90_us":1627,"max_us":1666},{"op":"body-appends","fixture":"medium","min_us":1152,"med_us":1329,"p90_us":1438,"max_us":1542},{"op":"deep-sel","fixture":"medium","min_us":75,"med_us":77,"p90_us":84,"max_us":102},{"op":"image-frame","fixture":"medium","min_us":112,"med_us":122,"p90_us":128,"max_us":136}]} +{"harness":"aed36aceb98afadd","build":{"compiler":"0.17.1","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"tui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400}],"cells":[{"op":"open","fixture":"medium","min_us":1745,"med_us":2061,"p90_us":2178,"max_us":2218},{"op":"render","fixture":"medium","min_us":81,"med_us":86,"p90_us":93,"max_us":97},{"op":"key-down","fixture":"medium","min_us":89,"med_us":96,"p90_us":110,"max_us":124},{"op":"key-right","fixture":"medium","min_us":87,"med_us":88,"p90_us":98,"max_us":109},{"op":"page-down","fixture":"medium","min_us":88,"med_us":88,"p90_us":91,"max_us":91},{"op":"wheel","fixture":"medium","min_us":85,"med_us":86,"p90_us":89,"max_us":94},{"op":"edit-char","fixture":"medium","min_us":328,"med_us":395,"p90_us":431,"max_us":433},{"op":"edit-twin","fixture":"medium","min_us":353,"med_us":405,"p90_us":439,"max_us":440},{"op":"body-2m","fixture":"medium","min_us":927,"med_us":1554,"p90_us":1651,"max_us":1974},{"op":"body-appends","fixture":"medium","min_us":1193,"med_us":1314,"p90_us":1493,"max_us":1511},{"op":"deep-sel","fixture":"medium","min_us":75,"med_us":78,"p90_us":83,"max_us":83},{"op":"image-frame","fixture":"medium","min_us":111,"med_us":119,"p90_us":132,"max_us":134}]} diff --git a/test/perf-baseline-tui-fast.json b/test/perf-baseline-tui-fast.json index 697cd91c..b6d052ab 100644 --- a/test/perf-baseline-tui-fast.json +++ b/test/perf-baseline-tui-fast.json @@ -1 +1 @@ -{"harness":"97c56874da9cffa8","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"fast","c_optimize":"fast","terminal_optimize":"fast","platform":"tui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400}],"cells":[{"op":"open","fixture":"medium","min_us":1692,"med_us":1929,"p90_us":2047,"max_us":2100},{"op":"render","fixture":"medium","min_us":73,"med_us":75,"p90_us":79,"max_us":84},{"op":"key-down","fixture":"medium","min_us":79,"med_us":80,"p90_us":83,"max_us":83},{"op":"key-right","fixture":"medium","min_us":77,"med_us":78,"p90_us":79,"max_us":86},{"op":"page-down","fixture":"medium","min_us":78,"med_us":81,"p90_us":97,"max_us":107},{"op":"wheel","fixture":"medium","min_us":76,"med_us":80,"p90_us":82,"max_us":86},{"op":"edit-char","fixture":"medium","min_us":329,"med_us":366,"p90_us":389,"max_us":402},{"op":"edit-twin","fixture":"medium","min_us":336,"med_us":379,"p90_us":420,"max_us":429},{"op":"body-2m","fixture":"medium","min_us":841,"med_us":1404,"p90_us":1572,"max_us":1598},{"op":"body-appends","fixture":"medium","min_us":970,"med_us":1141,"p90_us":1251,"max_us":1263},{"op":"deep-sel","fixture":"medium","min_us":66,"med_us":71,"p90_us":77,"max_us":84},{"op":"image-frame","fixture":"medium","min_us":42,"med_us":46,"p90_us":55,"max_us":56}]} +{"harness":"aed36aceb98afadd","build":{"compiler":"0.17.1","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"fast","c_optimize":"fast","terminal_optimize":"fast","platform":"tui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400}],"cells":[{"op":"open","fixture":"medium","min_us":1722,"med_us":2008,"p90_us":2211,"max_us":2219},{"op":"render","fixture":"medium","min_us":74,"med_us":78,"p90_us":80,"max_us":92},{"op":"key-down","fixture":"medium","min_us":79,"med_us":81,"p90_us":83,"max_us":84},{"op":"key-right","fixture":"medium","min_us":79,"med_us":80,"p90_us":81,"max_us":83},{"op":"page-down","fixture":"medium","min_us":79,"med_us":79,"p90_us":81,"max_us":82},{"op":"wheel","fixture":"medium","min_us":76,"med_us":77,"p90_us":80,"max_us":88},{"op":"edit-char","fixture":"medium","min_us":314,"med_us":366,"p90_us":385,"max_us":404},{"op":"edit-twin","fixture":"medium","min_us":347,"med_us":405,"p90_us":469,"max_us":471},{"op":"body-2m","fixture":"medium","min_us":848,"med_us":1376,"p90_us":1575,"max_us":1692},{"op":"body-appends","fixture":"medium","min_us":931,"med_us":1171,"p90_us":1215,"max_us":1246},{"op":"deep-sel","fixture":"medium","min_us":64,"med_us":66,"p90_us":67,"max_us":70},{"op":"image-frame","fixture":"medium","min_us":43,"med_us":45,"p90_us":46,"max_us":49}]} |
