diff options
| author | Gabriel Schneider <[email protected]> | 2026-11-05 00:22:27 -0300 |
|---|---|---|
| committer | Gabriel Schneider <[email protected]> | 2026-11-05 01:00:59 -0300 |
| commit | 1b12f7aadaf0e0a4570a5985900f61d0fb897f79 (patch) | |
| tree | 2563f00aa47d3ef39ef1647482ba5d19bc1373a1 | |
| parent | b283824eed0703ae9b89f2af520354046146b855 (diff) | |
| download | pardes-1b12f7aadaf0e0a4570a5985900f61d0fb897f79.tar.gz pardes-1b12f7aadaf0e0a4570a5985900f61d0fb897f79.zip | |
surface: a frame's images are a std.ArrayList(ImagePlace), where they were a slice of optionals grown by hand (appendImagePlace's doubling realloc, nimages beside it) whose slots were never null: every reader's `orelse continue` and `.?` go (gui, tui, terminal, TerminalImages, ninep/screen, test/pdf.zig, kitty and the two PDF benches); macos.zig's loop the same, passing ast-check but not built here
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge
| -rw-r--r-- | src/TerminalImages.zig | 8 | ||||
| -rw-r--r-- | src/draw.zig | 2 | ||||
| -rw-r--r-- | src/gui/gui.zig | 14 | ||||
| -rw-r--r-- | src/macos.zig | 11 | ||||
| -rw-r--r-- | src/ninep/screen.zig | 4 | ||||
| -rw-r--r-- | src/pardes.zig | 16 | ||||
| -rw-r--r-- | src/surface.zig | 3 | ||||
| -rw-r--r-- | src/terminal.zig | 14 | ||||
| -rw-r--r-- | src/tui/tui.zig | 10 | ||||
| -rw-r--r-- | test/kitty.zig | 14 | ||||
| -rw-r--r-- | test/pdf.zig | 121 | ||||
| -rw-r--r-- | test/pdf_pointer_bench.zig | 3 | ||||
| -rw-r--r-- | test/pdf_scroll_bench.zig | 10 |
13 files changed, 101 insertions, 129 deletions
diff --git a/src/TerminalImages.zig b/src/TerminalImages.zig index f26b5852..ab8ee099 100644 --- a/src/TerminalImages.zig +++ b/src/TerminalImages.zig @@ -164,10 +164,10 @@ pub fn draw( const ctx: Ctx = .{ .ti = ti, .p = p, .s = s, .pane = pane_id, .serial = serial, .tx = tx, .body_y = body_y, .cols = cols, .rows_of = rows_of, .cw = cw, .ch = ch, .pixels = pixels }; // Handed on lowest z first (the storage's order is a hash map's), the // order a shell draws them in; equal z keeps the order they came in. - const first = s.nimages; - defer std.sort.insertion(?pardes.ImagePlace, s.images[first..s.nimages], {}, struct { - fn lessThan(_: void, a: ?pardes.ImagePlace, b: ?pardes.ImagePlace) bool { - return (if (a) |x| x.z else 0) < (if (b) |y| y.z else 0); + const first = s.images.items.len; + defer std.sort.insertion(pardes.ImagePlace, s.images.items[first..], {}, struct { + fn lessThan(_: void, a: pardes.ImagePlace, b: pardes.ImagePlace) bool { + return a.z < b.z; } }.lessThan); diff --git a/src/draw.zig b/src/draw.zig index 4f238942..1e17df3d 100644 --- a/src/draw.zig +++ b/src/draw.zig @@ -551,7 +551,7 @@ pub fn render(p: *Pardes, arena: std.mem.Allocator) !*Surface { if (p.drag == .move or p.drag == .column_move) s.pointer_shape = .box; for (&s.body_layers) |*layer| layer.rows = 0; for (&s.tag_layers) |*layer| layer.rows = 0; - s.nimages = 0; + s.images.clearRetainingCapacity(); s.npanel_tracks = 0; s.previous_cells = &.{}; s.previous_body_layers = &.{}; diff --git a/src/gui/gui.zig b/src/gui/gui.zig index ac32ced4..00491aeb 100644 --- a/src/gui/gui.zig +++ b/src/gui/gui.zig @@ -6457,8 +6457,7 @@ fn clearNativeImages(g: *Gui) void { } fn surfaceHasNativeKey(surface: *const pardes.Surface, key: pardes.ImageCacheKey) bool { - for (surface.images[0..surface.nimages]) |maybe| { - const place = maybe orelse continue; + for (surface.images.items) |place| { if (validImageBytes(place) != null and place.cacheKey().eql(key)) return true; } return false; @@ -6474,9 +6473,8 @@ fn rememberPresentedImages(g: *Gui, gpa: std.mem.Allocator, surface: *const pard var next: std.ArrayListUnmanaged(SavedImagePlace) = .empty; var adopted = false; defer if (!adopted) next.deinit(gpa); - next.ensureTotalCapacity(gpa, surface.nimages) catch return; - for (surface.images[0..surface.nimages]) |maybe| { - const place = maybe orelse continue; + next.ensureTotalCapacity(gpa, surface.images.items.len) catch return; + for (surface.images.items) |place| { if (validImageBytes(place) == null or !g.native_images.contains(place.cacheKey())) continue; next.appendAssumeCapacity(SavedImagePlace.from(place)); } @@ -6753,8 +6751,7 @@ fn prepareNativeImages( sw: u32, sh: u32, ) bool { - for (surface.images[0..surface.nimages]) |maybe| { - const place = maybe orelse continue; + for (surface.images.items) |place| { if (validImageBytes(place) == null) continue; uploadNativeTexture(g, gpa, cmd, place) catch continue; } @@ -6794,8 +6791,7 @@ fn prepareNativeImages( } if (track == null or track.?.phase != .closing) { - for (surface.images[0..surface.nimages]) |maybe| { - const current = maybe orelse continue; + for (surface.images.items) |current| { if (validImageBytes(current) == null or groupOf(groups, current.serial) != group_index) continue; const saved = SavedImagePlace.from(current); diff --git a/src/macos.zig b/src/macos.zig index bc906dea..e69a2fbe 100644 --- a/src/macos.zig +++ b/src/macos.zig @@ -1756,16 +1756,15 @@ fn encodeChanged(diff: pardes.PanelCellDiff) u8 { fn collectImages(st: *State, surface: *const pardes.Surface) void { if (comptime !pardes.pdf_enabled) return; - if (surface.nimages == 0) return; - if (st.images.len < surface.nimages) { + if (surface.images.items.len == 0) return; + if (st.images.len < surface.images.items.len) { const resized = if (st.images.len == 0) - st.gpa.alloc(Image, surface.nimages) + st.gpa.alloc(Image, surface.images.items.len) else - st.gpa.realloc(st.images, surface.nimages); + st.gpa.realloc(st.images, surface.images.items.len); st.images = resized catch return; } - for (surface.images[0..surface.nimages]) |maybe| { - const place = maybe orelse continue; + for (surface.images.items) |place| { if (place.iw == 0 or place.ih == 0 or place.rgba.len == 0) continue; const geometry = place.native.geometry orelse image.NativeGeometry{ .src = .{ .x = 0, .y = 0, .w = @intCast(place.iw), .h = @intCast(place.ih) }, diff --git a/src/ninep/screen.zig b/src/ninep/screen.zig index c0251d80..95fe50a7 100644 --- a/src/ninep/screen.zig +++ b/src/ninep/screen.zig @@ -293,8 +293,8 @@ test "screen inspection preserves acknowledged presentation and the next real fr try testing.expectEqualDeep(expected.cell_diffs, actual.cell_diffs); try testing.expectEqual(expected.previous_cells.len, actual.previous_cells.len); try testing.expectEqual(expected.cells.len, actual.cells.len); - try testing.expectEqual(@as(usize, 0), expected.nimages); - try testing.expectEqual(@as(usize, 0), actual.nimages); + try testing.expectEqual(@as(usize, 0), expected.images.items.len); + try testing.expectEqual(@as(usize, 0), actual.images.items.len); for (expected.cells, actual.cells) |*left, *right| try testing.expect(left.visuallyEqual(right)); for (expected.previous_cells, actual.previous_cells) |*left, *right| try testing.expect(left.visuallyEqual(right)); if (phase == 1 and transition != .off) try testing.expect(expected.panelTracks().len > 0); diff --git a/src/pardes.zig b/src/pardes.zig index 11cb762a..fb26840b 100644 --- a/src/pardes.zig +++ b/src/pardes.zig @@ -4478,7 +4478,7 @@ pub const Pardes = struct { for (&p.surface.body_layers) |*layer| gpa.free(layer.cells); for (&p.surface.tag_layers) |*layer| gpa.free(layer.cells); p.presentation.deinit(gpa); - if (p.surface.images.len > 0) gpa.free(p.surface.images); + p.surface.images.deinit(gpa); gpa.destroy(p); } @@ -7573,19 +7573,7 @@ pub const Pardes = struct { pub const render = draw.render; pub fn appendImagePlace(p: *Pardes, place: ImagePlace) bool { - const s = &p.surface; - if (s.nimages == s.images.len) { - const old_len = s.images.len; - const new_len = @max(@as(usize, 4), std.math.mul(usize, @max(old_len, 1), 2) catch return false); - const grown = if (old_len == 0) - p.gpa.alloc(?ImagePlace, new_len) catch return false - else - p.gpa.realloc(s.images, new_len) catch return false; - @memset(grown[old_len..], null); - s.images = grown; - } - s.images[s.nimages] = place; - s.nimages += 1; + p.surface.images.append(p.gpa, place) catch return false; return true; } }; diff --git a/src/surface.zig b/src/surface.zig index f5afdd98..3b99f517 100644 --- a/src/surface.zig +++ b/src/surface.zig @@ -499,8 +499,7 @@ pub const Surface = struct { cells: []Cell = &.{}, /// bar: draw an insert-style thin cursor instead of the block cursor: ?struct { x: u16, y: u16, bar: bool = false } = null, - images: []?ImagePlace = &.{}, - nimages: usize = 0, + images: std.ArrayList(ImagePlace) = .empty, panel_tracks: [MAX_PANES * 2]animation.Track = undefined, npanel_tracks: usize = 0, previous_cells: []const Cell = &.{}, diff --git a/src/terminal.zig b/src/terminal.zig index 2bd41030..04e4f233 100644 --- a/src/terminal.zig +++ b/src/terminal.zig @@ -3316,8 +3316,8 @@ inline fn kittyTransmit(comptime extra: []const u8) []const u8 { }; } -fn imagePlaces(s: *const Surface) []const ?pardes.ImagePlace { - return s.images[0..s.nimages]; +fn imagePlaces(s: *const Surface) []const pardes.ImagePlace { + return s.images.items; } test "a terminal's kitty graphics image is drawn where its program placed it, and a delete takes it away" { @@ -3336,7 +3336,7 @@ test "a terminal's kitty graphics image is drawn where its program placed it, an var s = try p.render(frame.allocator()); const places = imagePlaces(s); try std.testing.expectEqual(@as(usize, 1), places.len); - const place = places[0].?; + const place = places[0]; const r = p.rects[0]; try std.testing.expect(place.native.exact); try std.testing.expectEqual(@as(u32, 7), place.native.page); @@ -3356,7 +3356,7 @@ test "a terminal's kitty graphics image is drawn where its program placed it, an p.update(.{ .output = .{ .pane = 0, .bytes = "\x1b[24;1H\n\n" } }); _ = frame.reset(.retain_capacity); s = try p.render(frame.allocator()); - try std.testing.expectEqual(p.bodyTop(pane, r), imagePlaces(s)[0].?.y); + try std.testing.expectEqual(p.bodyTop(pane, r), imagePlaces(s)[0].y); p.update(.{ .output = .{ .pane = 0, .bytes = "\n" } }); _ = frame.reset(.retain_capacity); s = try p.render(frame.allocator()); @@ -3472,9 +3472,9 @@ test "a virtual kitty placement shows through its placeholder cells, which draw const r = p.rects[0]; const tx = r.x + config.GUTTER; const y = p.bodyTop(pane, r) + 1; - try std.testing.expectEqual(tx + 2, places[0].?.x); - try std.testing.expectEqual(y, places[0].?.y); - try std.testing.expectEqual(@as(u16, 2), places[0].?.w); + try std.testing.expectEqual(tx + 2, places[0].x); + try std.testing.expectEqual(y, places[0].y); + try std.testing.expectEqual(@as(u16, 2), places[0].w); try std.testing.expectEqualStrings(" ", s.at(tx + 2, y).grapheme()); try std.testing.expectEqualStrings(" ", s.at(tx + 3, y).grapheme()); try std.testing.expectEqualStrings("X", s.at(tx + 4, y).grapheme()); diff --git a/src/tui/tui.zig b/src/tui/tui.zig index e7fde434..0230e7a9 100644 --- a/src/tui/tui.zig +++ b/src/tui/tui.zig @@ -1191,8 +1191,8 @@ test "host watch closes initial race and reloads rename-over PDF while idle" { var frame = std.heap.ArenaAllocator.init(gpa); defer frame.deinit(); const surface = try core.render(frame.allocator()); - try std.testing.expect(surface.nimages > 0); - try std.testing.expectEqual(@as(u32, 0), surface.images[0].?.native.page); + try std.testing.expect(surface.images.items.len > 0); + try std.testing.expectEqual(@as(u32, 0), surface.images.items[0].native.page); } fn kittyImageRepresentable(place: pardes.ImagePlace) bool { @@ -1201,8 +1201,7 @@ fn kittyImageRepresentable(place: pardes.ImagePlace) bool { } fn surfaceHasKittyKey(surface: *const pardes.Surface, key: pardes.ImageCacheKey) bool { - for (surface.images[0..surface.nimages]) |maybe| { - const place = maybe orelse continue; + for (surface.images.items) |place| { if (comptime pardes.pdf_enabled) if (!kittyImageRepresentable(place)) continue; if (place.cacheKey().eql(key)) return true; } @@ -2838,8 +2837,7 @@ const Shell = struct { paintCells(win, trailed.cells, trailed.cols, trailed.rows); if (s.remote) |c| if (c.link.notice_len > 0) noticeLine(win, c.link.notice(), trailed.cols, trailed.rows); tz_cells.end(); - for (surface.images[0..surface.nimages]) |maybe| { - const place = maybe orelse continue; + for (surface.images.items) |place| { if (panel_compositor.hidesAttachment(surface.panelTracks(), place.serial)) continue; if (comptime pardes.pdf_enabled) { if (!kittyImageRepresentable(place)) continue; diff --git a/test/kitty.zig b/test/kitty.zig index f5de44e7..737e8fbf 100644 --- a/test/kitty.zig +++ b/test/kitty.zig @@ -125,10 +125,10 @@ const Rig = struct { return &r.vt(id).screens.active.kitty_images; } - fn places(r: *Rig) ![]const ?pardes.ImagePlace { + fn places(r: *Rig) ![]const pardes.ImagePlace { _ = r.frame.reset(.retain_capacity); const s = try r.p.render(r.frame.allocator()); - return s.images[0..s.nimages]; + return s.images.items; } /// The top-left cell of pane `id`'s body, in screen cells. @@ -140,7 +140,7 @@ const Rig = struct { /// The places drawn for the image a program called `image_id`. fn placesOf(r: *Rig, image_id: u32) ![]const pardes.ImagePlace { var out: std.ArrayList(pardes.ImagePlace) = .empty; - for (try r.places()) |maybe| if (maybe) |place| if (place.native.page == image_id) + for (try r.places()) |place| if (place.native.page == image_id) try out.append(r.frame.allocator(), place); return out.items; } @@ -440,8 +440,8 @@ test "kitty: z-index travels with the image, and images are handed on lowest z f var zs: [4]i32 = undefined; var ids: [4]u32 = undefined; for (drawn, 0..) |place, i| { - zs[i] = place.?.z; - ids[i] = place.?.native.page; + zs[i] = place.z; + ids[i] = place.native.page; } try std.testing.expectEqualSlices(i32, &.{ -7, 0, 3, 5 }, &zs); try std.testing.expectEqualSlices(u32, &.{ 9, 10, 11, 8 }, &ids); @@ -1293,9 +1293,9 @@ test "kitty: recorded kitten icat and chafa traffic replays: answers whole, imag }; const o = r.origin(0); var top: ?pardes.ImagePlace = null; - for (drawn) |maybe| if (maybe) |place| { + for (drawn) |place| { if (top == null or place.y < top.?.y or (place.y == top.?.y and place.x < top.?.x)) top = place; - }; + } const first = top orelse { std.debug.print("{s}: nothing drawn\n", .{rec.name}); return error.NothingDrawn; diff --git a/test/pdf.zig b/test/pdf.zig index ef05f789..21e84880 100644 --- a/test/pdf.zig +++ b/test/pdf.zig @@ -161,13 +161,13 @@ const PdfLinkTests = struct { var frame = std.heap.ArenaAllocator.init(p.gpa); defer frame.deinit(); const plain = try p.render(frame.allocator()); - const plain_revision = plain.images[0].?.native.revision; + const plain_revision = plain.images.items[0].native.revision; while (p.nextEffect()) |_| {} const blank = try cellAt(p, 0.3, 0.38); hover(p, blank); const hovered = try p.render(frame.allocator()); try std.testing.expectEqual(Surface.PointerShape.link, hovered.pointer_shape); - try std.testing.expect(hovered.images[0].?.native.revision != plain_revision); + try std.testing.expect(hovered.images.items[0].native.revision != plain_revision); const highlights = panes.Pdf.highlightInput(p, 0, pane); try std.testing.expect(!std.meta.eql(highlights.hover_color, highlights.selection_color)); try std.testing.expect(pane.pdf.?.selection == null); @@ -565,8 +565,8 @@ test "MuPDF pane renders, navigates, searches, and round-trips its page" { var frame = std.heap.ArenaAllocator.init(gpa); defer frame.deinit(); const first = try p.render(frame.allocator()); - try std.testing.expectEqual(@as(usize, 1), first.nimages); - const first_place = first.images[0].?; + try std.testing.expectEqual(@as(usize, 1), first.images.items.len); + const first_place = first.images.items[0]; try std.testing.expect(first_place.rgba.len == first_place.iw * first_place.ih * 4); try std.testing.expectEqual(image.NativeFit.width, first_place.native.fit); const request = panes.Pdf.renderRequest( @@ -600,8 +600,8 @@ test "MuPDF pane renders, navigates, searches, and round-trips its page" { try std.testing.expectEqual(@as(f64, 0.25), pane.pdf.?.document_scroll_y); _ = frame.reset(.retain_capacity); const fractional = try p.render(frame.allocator()); - try std.testing.expectEqual(first_place.native.revision, fractional.images[0].?.native.revision); - try std.testing.expectEqual(@as(f32, -0.25), fractional.images[0].?.native.pixel_offset_y); + try std.testing.expectEqual(first_place.native.revision, fractional.images.items[0].native.revision); + try std.testing.expectEqual(@as(f32, -0.25), fractional.images.items[0].native.pixel_offset_y); pane.pdf.?.document_scroll_y = 0; // The default reading view moves one exact display-cell distance without @@ -615,8 +615,8 @@ test "MuPDF pane renders, navigates, searches, and round-trips its page" { ); _ = frame.reset(.retain_capacity); const panned = try p.render(frame.allocator()); - try std.testing.expectEqual(first_place.native.revision, panned.images[0].?.native.revision); - try std.testing.expect(panned.images[0].?.native.geometry.?.src.y > first_place.native.geometry.?.src.y); + try std.testing.expectEqual(first_place.native.revision, panned.images.items[0].native.revision); + try std.testing.expect(panned.images.items[0].native.geometry.?.src.y > first_place.native.geometry.?.src.y); const row_scroll = pane.pdf.?.document_scroll_y; pane.pdf.?.document_scroll_y = 0; @@ -689,22 +689,22 @@ test "MuPDF pane renders, navigates, searches, and round-trips its page" { ); _ = frame.reset(.retain_capacity); const boundary = try p.render(frame.allocator()); - try std.testing.expectEqual(@as(usize, 2), boundary.nimages); - try std.testing.expectEqual(@as(u32, 0), boundary.images[0].?.native.page); - try std.testing.expectEqual(@as(u32, 1), boundary.images[1].?.native.page); + try std.testing.expectEqual(@as(usize, 2), boundary.images.items.len); + try std.testing.expectEqual(@as(u32, 0), boundary.images.items[0].native.page); + try std.testing.expectEqual(@as(u32, 1), boundary.images.items[1].native.page); const first_bottom = @as(f32, @floatFromInt( - boundary.images[0].?.native.geometry.?.dst.y + - boundary.images[0].?.native.geometry.?.dst.h, - )) + boundary.images[0].?.native.pixel_offset_y; + boundary.images.items[0].native.geometry.?.dst.y + + boundary.images.items[0].native.geometry.?.dst.h, + )) + boundary.images.items[0].native.pixel_offset_y; const second_top = @as(f32, @floatFromInt( - boundary.images[1].?.native.geometry.?.dst.y, - )) + boundary.images[1].?.native.pixel_offset_y; + boundary.images.items[1].native.geometry.?.dst.y, + )) + boundary.images.items[1].native.pixel_offset_y; const visible_gap = second_top - first_bottom; try std.testing.expect(visible_gap >= @as(f32, PDF_PAGE_GAP_PX)); try std.testing.expect(visible_gap <= @as(f32, PDF_PAGE_GAP_PX + 1)); const before_boundary_scroll = pane.pdf.?.document_scroll_y; - const page0_revision = boundary.images[0].?.native.revision; - const page1_revision = boundary.images[1].?.native.revision; + const page0_revision = boundary.images.items[0].native.revision; + const page1_revision = boundary.images.items[1].native.revision; // A scroll can activate the already-cached neighbor before the shell's // next draw. Every consumer resolves the active page's resident raster, @@ -727,9 +727,9 @@ test "MuPDF pane renders, navigates, searches, and round-trips its page" { try std.testing.expectEqual(before_boundary_scroll + p.cell_pixels.h, pane.pdf.?.document_scroll_y); _ = frame.reset(.retain_capacity); const second = try p.render(frame.allocator()); - try std.testing.expectEqual(@as(usize, 2), second.nimages); - try std.testing.expectEqual(page0_revision, second.images[0].?.native.revision); - try std.testing.expectEqual(page1_revision, second.images[1].?.native.revision); + try std.testing.expectEqual(@as(usize, 2), second.images.items.len); + try std.testing.expectEqual(page0_revision, second.images.items[0].native.revision); + try std.testing.expectEqual(page1_revision, second.images.items[1].native.revision); p.update(.{ .key = .{ .cp = 'k' } }); try std.testing.expectEqual(before_boundary_scroll, pane.pdf.?.document_scroll_y); @@ -742,8 +742,8 @@ test "MuPDF pane renders, navigates, searches, and round-trips its page" { panes.Pdf.setPage(p, pane, 1); _ = frame.reset(.retain_capacity); const away = try p.render(frame.allocator()); - try std.testing.expect(away.nimages > 0); - for (away.images[0..away.nimages]) |maybe| if (maybe) |place| + try std.testing.expect(away.images.items.len > 0); + for (away.images.items) |place| try std.testing.expect(place.native.page != 0); try std.testing.expect(panes.Pdf.rasterForPage(&pane.pdf.?, 0) == null); try std.testing.expectEqual(@as(usize, 1), pane.pdf.?.spare_len); @@ -751,9 +751,9 @@ test "MuPDF pane renders, navigates, searches, and round-trips its page" { panes.Pdf.setPage(p, pane, 0); _ = frame.reset(.retain_capacity); const returned = try p.render(frame.allocator()); - try std.testing.expectEqual(@as(u32, 0), returned.images[0].?.native.page); - try std.testing.expectEqual(retired.ptr, returned.images[0].?.rgba.ptr); - try std.testing.expect(returned.images[0].?.native.revision != page0_revision); + try std.testing.expectEqual(@as(u32, 0), returned.images.items[0].native.page); + try std.testing.expectEqual(retired.ptr, returned.images.items[0].rgba.ptr); + try std.testing.expect(returned.images.items[0].native.revision != page0_revision); // PdfFit exists as a real builtin in this build. It resets placement but // preserves the current page pixels; fit-height j/k remains continuous in @@ -919,10 +919,9 @@ test "a fling's banded pages show the reader exactly what whole pages would" { try std.testing.expect(panes.Pdf.scrollPane(p, pane, landing, false)); _ = frame.reset(.retain_capacity); const flung = try p.render(frame.allocator()); - try std.testing.expect(flung.nimages >= 2); + try std.testing.expect(flung.images.items.len >= 2); var banded = false; - for (flung.images[0..flung.nimages]) |maybe| { - const place = maybe orelse continue; + for (flung.images.items) |place| { const geometry = place.native.geometry orelse return error.MissingPdfGeometry; const raster = panes.Pdf.rasterForPage(pv, place.native.page) orelse return error.MissingPdfRaster; @@ -943,9 +942,8 @@ test "a fling's banded pages show the reader exactly what whole pages would" { // has to have matched. _ = frame.reset(.retain_capacity); const rested = try p.render(frame.allocator()); - try std.testing.expectEqual(shots_len, rested.nimages); - for (rested.images[0..rested.nimages], shots[0..shots_len]) |maybe, shot| { - const place = maybe orelse return error.MissingPdfPlacement; + try std.testing.expectEqual(shots_len, rested.images.items.len); + for (rested.images.items, shots[0..shots_len]) |place, shot| { const geometry = place.native.geometry orelse return error.MissingPdfGeometry; const raster = panes.Pdf.rasterForPage(pv, place.native.page) orelse return error.MissingPdfRaster; @@ -1039,8 +1037,8 @@ test "a tall page is drawn at the display's resolution, in bands that are the wh pv.scroll_travel = 0; // read, not flung _ = frame.reset(.retain_capacity); const surface = try p.render(frame.allocator()); - try std.testing.expectEqual(@as(usize, 1), surface.nimages); - const place = surface.images[0].?; + try std.testing.expectEqual(@as(usize, 1), surface.images.items.len); + const place = surface.images.items[0]; const geometry = place.native.geometry orelse return error.MissingPdfGeometry; const raster = panes.Pdf.rasterForPage(pv, 0) orelse return error.MissingPdfRaster; // Bounded: a band, never the page, and within one buffer's budget. @@ -1068,7 +1066,7 @@ test "a tall page is drawn at the display's resolution, in bands that are the wh _ = panes.Pdf.scrollPane(p, pane, @round(max_scroll / 2) - pv.document_scroll_y, false); pv.scroll_travel = 0; _ = frame.reset(.retain_capacity); - const again = (try p.render(frame.allocator())).images[0].?; + const again = (try p.render(frame.allocator())).images.items[0]; const again_y = panes.Pdf.rasterForPage(pv, 0).?.band_y; const stride = shape.stride; const common_top = @max(middle_y, again_y); @@ -1082,7 +1080,7 @@ test "a tall page is drawn at the display's resolution, in bands that are the wh _ = panes.Pdf.scrollPane(p, pane, max_scroll - pv.document_scroll_y, false); pv.scroll_travel = 0; _ = frame.reset(.retain_capacity); - const foot = try gpa.dupe(u8, (try p.render(frame.allocator())).images[0].?.rgba); + const foot = try gpa.dupe(u8, (try p.render(frame.allocator())).images.items[0].rgba); defer gpa.free(foot); // At the foot of the page, a search hit: its highlight lands on exactly @@ -1091,7 +1089,7 @@ test "a tall page is drawn at the display's resolution, in bands that are the wh try pv.setSearchQuery(gpa, "bottommost"); _ = frame.reset(.retain_capacity); const lit = try p.render(frame.allocator()); - const place = lit.images[0].?; + const place = lit.images.items[0]; const raster = panes.Pdf.rasterForPage(pv, 0) orelse return error.MissingPdfRaster; const highlights = try panes.Pdf.buildHighlights(pv, frame.allocator(), panes.Pdf.highlightInput(p, 0, pane)); const marks = highlights.forPage(0); @@ -1274,10 +1272,9 @@ test "PDF continuous strip renders every intersecting short page" { var frame = std.heap.ArenaAllocator.init(gpa); defer frame.deinit(); const surface = try p.render(frame.allocator()); - try std.testing.expectEqual(pv.page_count, surface.nimages); + try std.testing.expectEqual(pv.page_count, surface.images.items.len); try std.testing.expectEqual(pv.page_count, pv.rasters_len); - for (surface.images[0..surface.nimages], 0..) |maybe, page| { - const place = maybe orelse return error.MissingShortPdfPage; + for (surface.images.items, 0..) |place, page| { try std.testing.expectEqual(@as(u32, @intCast(page)), place.native.page); try std.testing.expectEqual(@as(u32, 1), place.native.geometry.?.dst.h); } @@ -1326,7 +1323,7 @@ test "PDF tint and tinted theme changes rebuild every visible raster only" { _ = frame.reset(.retain_capacity); const default_surface = try p.render(frame.allocator()); try std.testing.expectEqual(PdfTintMode.filtered, pv.tint); - try std.testing.expectEqual(@as(usize, 2), default_surface.nimages); + try std.testing.expectEqual(@as(usize, 2), default_surface.images.items.len); try std.testing.expectEqual(@as(usize, 2), pv.rasters_len); const Snapshot = struct { @@ -1340,10 +1337,10 @@ test "PDF tint and tinted theme changes rebuild every visible raster only" { }; const Capture = struct { fn get(surface: *const Surface) ![2]Snapshot { - if (surface.nimages != 2) return error.UnexpectedVisiblePdfCount; + if (surface.images.items.len != 2) return error.UnexpectedVisiblePdfCount; var out: [2]Snapshot = undefined; for (&out, 0..) |*snapshot, i| { - const place = surface.images[i] orelse return error.MissingVisiblePdf; + const place = surface.images.items[i]; snapshot.* = .{ .page = place.native.page, .revision = place.native.revision, @@ -1604,7 +1601,7 @@ test "PDF n/N addresses and reveals distinct MuPDF hits on one page" { try std.testing.expectEqual(@as(usize, 0), pv.search_hit); try std.testing.expectEqual(@as(usize, 0), pane.search_row.?); const first = try p.render(frame.allocator()); - const revision = first.images[0].?.native.revision; + const revision = first.images.items[0].native.revision; const raster = panes.Pdf.rasterForPage(pv, pv.page).?; const first_scroll = pv.document_scroll_y; const first_results = pv.search_results orelse return error.MissingPdfPageSearch; @@ -1624,14 +1621,14 @@ test "PDF n/N addresses and reveals distinct MuPDF hits on one page" { try std.testing.expectEqual(@as(usize, 2), pane.search_row.?); _ = frame.reset(.retain_capacity); const second = try p.render(frame.allocator()); - try std.testing.expectEqual(revision, second.images[0].?.native.revision); + try std.testing.expectEqual(revision, second.images.items[0].native.revision); try std.testing.expect(pardes.look.searchStep(p, 0, 1)); try std.testing.expectEqual(@as(usize, 2), pv.search_hit); try std.testing.expectEqual(@as(usize, 4), pane.search_row.?); _ = frame.reset(.retain_capacity); const third = try p.render(frame.allocator()); - try std.testing.expectEqual(revision, third.images[0].?.native.revision); + try std.testing.expectEqual(revision, third.images.items[0].native.revision); try std.testing.expect(pv.document_scroll_y != first_scroll); const third_results = pv.search_results orelse return error.MissingPdfPageSearch; const third_quad = for (third_results.quads) |item| { @@ -1663,7 +1660,7 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { // A host without Kitty/native pixels keeps the projected-text contract: // j/k can still change pages and a body drag remains a generic selection. const fallback = try p.render(frame.allocator()); - try std.testing.expectEqual(@as(usize, 0), fallback.nimages); + try std.testing.expectEqual(@as(usize, 0), fallback.images.items.len); p.update(.{ .key = .{ .cp = 'j' } }); try std.testing.expectEqual(@as(usize, 1), pane.pdf.?.page); p.update(.{ .key = .{ .cp = 'k' } }); @@ -1681,7 +1678,7 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { p.native_images = true; _ = frame.reset(.retain_capacity); const plain = try p.render(frame.allocator()); - const plain_revision = plain.images[0].?.native.revision; + const plain_revision = plain.images.items[0].native.revision; var found = try pane.pdf.?.document.search(gpa, 0, "Pardes"); defer found.deinit(gpa); @@ -1749,7 +1746,7 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { _ = frame.reset(.retain_capacity); const selected_frame = try p.render(frame.allocator()); - const selected_revision = selected_frame.images[0].?.native.revision; + const selected_revision = selected_frame.images.items[0].native.revision; try std.testing.expect(selected_revision != plain_revision); // Repeating an identical drag endpoint is a no-op: Kitty/SDL keep the @@ -1758,7 +1755,7 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { try std.testing.expect(raster.tried); _ = frame.reset(.retain_capacity); const duplicate = try p.render(frame.allocator()); - try std.testing.expectEqual(selected_revision, duplicate.images[0].?.native.revision); + try std.testing.expectEqual(selected_revision, duplicate.images.items[0].native.revision); // Delayed native hover retains independent quads/text and changes only // presentation state. In particular it must not borrow the click path, @@ -1812,14 +1809,14 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { try std.testing.expectEqual(pdf_impl.HighlightKind.selection, page_highlights[page_highlights.len - 1].kind); _ = frame.reset(.retain_capacity); const hovered_frame = try p.render(frame.allocator()); - const hovered_revision = hovered_frame.images[0].?.native.revision; + const hovered_revision = hovered_frame.images.items[0].native.revision; try std.testing.expect(hovered_revision != selected_revision); p.update(.pointer_leave); try std.testing.expect(p.pdf_hover_preview == null); _ = frame.reset(.retain_capacity); const unhovered_frame = try p.render(frame.allocator()); - try std.testing.expect(unhovered_frame.images[0].?.native.revision != hovered_revision); + try std.testing.expect(unhovered_frame.images.items[0].native.revision != hovered_revision); try std.testing.expectEqual(active_before, p.active); try std.testing.expectEqual(page_before, pv.page); @@ -1873,13 +1870,13 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { pv.document_scroll_y = revealed_scroll; _ = frame.reset(.retain_capacity); const searched = try p.render(frame.allocator()); - try std.testing.expect(searched.images[0].?.native.revision != selected_revision); + try std.testing.expect(searched.images.items[0].native.revision != selected_revision); // Fit and viewport changes can crop a hit which was already revealed. // Fit remains placement-only. SDL's physical-viewport quality request // changes with a resize and therefore replaces pixels; Kitty's fixed, // bandwidth-conscious request retains them. - const revision_before_geometry_change = searched.images[0].?.native.revision; + const revision_before_geometry_change = searched.images.items[0].native.revision; pv.search_reveal_pending = false; panes.Pdf.toggleFit(pane); try std.testing.expect(pv.search_reveal_pending); @@ -1906,12 +1903,12 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { _ = frame.reset(.retain_capacity); const geometry_changed = try p.render(frame.allocator()); if (pdf_raster_policy.match_viewport) - try std.testing.expect(geometry_changed.images[0].?.native.revision != + try std.testing.expect(geometry_changed.images.items[0].native.revision != revision_before_geometry_change) else try std.testing.expectEqual( revision_before_geometry_change, - geometry_changed.images[0].?.native.revision, + geometry_changed.images.items[0].native.revision, ); p.update(.{ .resize = .{ .cols = p.screen_w, @@ -1937,7 +1934,7 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { // keep the already transmitted page generation stable until release. _ = frame.reset(.retain_capacity); const before_drag = try p.render(frame.allocator()); - const before_drag_revision = before_drag.images[0].?.native.revision; + const before_drag_revision = before_drag.images.items[0].native.revision; const drag_col = @min(r.x + r.w - 1, word_col +| 12); const drag_row = @min(r.y + r.h - 1, selected_row +| 4); p.update(.{ .mouse = .{ @@ -1956,7 +1953,7 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { const during_first_drag = try p.render(frame.allocator()); try std.testing.expectEqual( before_drag_revision, - during_first_drag.images[0].?.native.revision, + during_first_drag.images.items[0].native.revision, ); p.update(.{ .mouse = .{ .button = config.select_button, @@ -1969,7 +1966,7 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { const during_second_drag = try p.render(frame.allocator()); try std.testing.expectEqual( before_drag_revision, - during_second_drag.images[0].?.native.revision, + during_second_drag.images.items[0].native.revision, ); p.update(.{ .mouse = .{ .button = config.select_button, @@ -1982,13 +1979,13 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { const committed_drag = try p.render(frame.allocator()); try std.testing.expectEqual( before_drag_revision + 1, - committed_drag.images[0].?.native.revision, + committed_drag.images.items[0].native.revision, ); _ = frame.reset(.retain_capacity); const stable_drag = try p.render(frame.allocator()); try std.testing.expectEqual( - committed_drag.images[0].?.native.revision, - stable_drag.images[0].?.native.revision, + committed_drag.images.items[0].native.revision, + stable_drag.images.items[0].native.revision, ); const saved_query = try gpa.dupe(u8, pv.search_query); diff --git a/test/pdf_pointer_bench.zig b/test/pdf_pointer_bench.zig index ae2de2f5..a6560263 100644 --- a/test/pdf_pointer_bench.zig +++ b/test/pdf_pointer_bench.zig @@ -111,8 +111,7 @@ const Run = struct { } fn observe(run: *Run, surface: *const pardes.Surface) void { - for (surface.images[0..surface.nimages]) |maybe| { - const place = maybe orelse continue; + for (surface.images.items) |place| { run.visual = mix(run.visual, [_]u64{ place.pane, place.x, place.y, place.w, place.h, place.native.page, place.iw, place.ih }); if (place.native.geometry) |g| run.visual = mix(run.visual, [_]u64{ g.src.x, g.src.y, g.src.w, g.src.h, g.dst.x, g.dst.y, g.dst.w, g.dst.h }); run.visual = std.hash.Wyhash.hash(run.visual, place.rgba); diff --git a/test/pdf_scroll_bench.zig b/test/pdf_scroll_bench.zig index f3d47b1e..391a98e6 100644 --- a/test/pdf_scroll_bench.zig +++ b/test/pdf_scroll_bench.zig @@ -460,14 +460,10 @@ const Recorder = struct { /// which pixels arrive. fn observe(self: *Recorder, frame: usize, surface: *const pardes.Surface) void { self.frames += 1; - self.visual = mix(self.visual, surface.nimages); - self.transport = mix(self.transport, surface.nimages); + self.visual = mix(self.visual, surface.images.items.len); + self.transport = mix(self.transport, surface.images.items.len); const full = frame % full_rgba_stride == 0; - for (surface.images[0..surface.nimages]) |maybe| { - const place = maybe orelse { - self.visual = mix(self.visual, std.math.maxInt(u64)); - continue; - }; + for (surface.images.items) |place| { self.images += 1; self.visual = mix(self.visual, place.pane); self.visual = mix(self.visual, place.x); |
