diff options
| author | Gabriel Schneider <[email protected]> | 2026-11-05 22:21:45 -0300 |
|---|---|---|
| committer | Gabriel Schneider <[email protected]> | 2026-11-05 23:08:36 -0300 |
| commit | 71e5a0f4a8685b385fac762995d45575b638179f (patch) | |
| tree | bf643875b0567b45cf659c1b3ad4b872f311a774 /test/pdf.zig | |
| parent | d8e5fc18f5923c4213de1cb4105a677e725200af (diff) | |
| download | pardes-71e5a0f4a8685b385fac762995d45575b638179f.tar.gz pardes-71e5a0f4a8685b385fac762995d45575b638179f.zip | |
kinds #1, the paint contract: a picture over the cells is one Placement (raster: ptr, w, h, stride; src in pixels; dst in the frame's cells; at, where in them in pixels, or none for the frontend to fit; key, the pixels' identity by pane serial, page and revision; a terminal program's kitty z; dirty, the rows changed since an older key; art, the pane's Petscii, Palette and Ascii), where ImagePlace carried native.{revision, page, fit, pan_x, pan_y, geometry, pixel_offset_y, paper_bg, exact}, cell rects and an ImageCacheKey of three shapes by build; a PDF strip's scroll is its body region's scroll_px, whose fraction the window draws as pixel_offset_y was; glyph art leaves the core for src/Art.zig, the frontends' (the matcher, both palettes and a cache by key, ex image.zig's GlyphArt and TerminalImages' glyph cache): the core always hands an image pane, a PDF's pages and a terminal's kitty images as placements, whatever the frontend shows, and the tty draws them as glyph art without kitty graphics or when the pane asks, the window when the pane asks; the four words set the same pane bytes as before and the frontend reads them off the placement, so config.zig, builtins.zig and exec.zig are untouched; /screen lists a frame's placements as images (only a frame with pictures has the field); no golden changes: the snapshot goldens are the tty's, which draws the same art (images.snap and tagbottomimage.snap pass unchanged, and the tty's bytes for an image, its Palette and its Ascii are byte-identical to the base's), no /screen golden holds a picture, and the window's goldens hash the same; tests: kitty.zig's glyph-art case becomes its core half (a placement over the 8x4 cells, the cells the pane's) with the art in tui.zig's own test, terminal.zig's glyph-art case the same, surface.zig's two ImageCacheKey cases one keyOf case, the GlyphArt cases move to Art.zig with a frame case; gates: core-test 959/959, behaviour-test 244/244, unit-test 1486/1487 tui and 1530/1531 gui, pane-test 171/172, snap all ok, process-test 0 of 37 failed on both, hxdiff 19 and hxparity 6 mismatches by the base's names, replicas, gui-golden, monkey-gui, kitty-test 44/44, kitty-harness and image-harness on both, daemon.py main and window-clients
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge
Diffstat (limited to 'test/pdf.zig')
| -rw-r--r-- | test/pdf.zig | 279 |
1 files changed, 171 insertions, 108 deletions
diff --git a/test/pdf.zig b/test/pdf.zig index b66db1df..1b2f2829 100644 --- a/test/pdf.zig +++ b/test/pdf.zig @@ -16,7 +16,69 @@ const Key = pardes.Key; const Event = pardes.Event; const Mode = panes.Text.Mode; const Surface = pardes.Surface; -const ImagePlace = pardes.ImagePlace; +const Placement = pardes.Placement; + +/// A placement as these cases read it: its page and revision (its key +/// among its pane's pages), where it goes and its pixels. +const Shown = struct { + page: u32, + revision: u32, + fit: image.NativeFit, + geometry: image.NativeGeometry, + pixel_offset_y: f32, + rgba: []const u8, + iw: usize, + ih: usize, +}; + +/// A frame of `p`, and its placements read so. +fn renderShown(p: *Pardes, arena: std.mem.Allocator) ![]Shown { + _ = try p.render(arena); + return shownAll(p, arena); +} + +/// `p`'s frame's placements, read so. +fn shownAll(p: *Pardes, arena: std.mem.Allocator) ![]Shown { + const s = &p.surface; + const out = try arena.alloc(Shown, s.placements.items.len); + for (s.placements.items, out) |place, *o| { + const pane = p.panes[place.pane].?; + const pv = pane.pdf.?; + var page: u32 = 0; + var revision: u32 = 0; + found: { + for (pv.rasters[0..pv.rasters_len]) |r| if (r.valid and Placement.keyOf(pane.serial, @intCast(r.page), r.revision) == place.key) { + page = @intCast(r.page); + revision = r.revision; + break :found; + }; + for (0..pv.page_count) |pg| if (Placement.keyOf(pane.serial, @intCast(pg), 0) == place.key) { + page = @intCast(pg); + break :found; + }; + return error.UnknownPlacement; + } + var scroll: f64 = 0; + for (s.regionList()) |r| if (r.kind == .body and r.owner == place.pane) { + scroll = r.scroll_px; + break; + }; + o.* = .{ + .page = page, + .revision = revision, + .fit = switch (pv.fit) { + .width => .width, + .height => .height, + }, + .geometry = .{ .src = place.src, .dst = place.at orelse return error.MissingPdfGeometry }, + .pixel_offset_y = -@as(f32, @floatCast(scroll - @floor(scroll))), + .rgba = place.raster.bytes(), + .iw = place.raster.w, + .ih = place.raster.h, + }; + } + return out; +} const PdfFitMode = panes.Pdf.FitMode; const PdfTintMode = panes.Pdf.TintMode; const pdf_enabled = panes.Pdf.enabled; @@ -159,14 +221,14 @@ const PdfLinkTests = struct { const pane = p.panes[0].?; var frame = std.heap.ArenaAllocator.init(p.gpa); defer frame.deinit(); - const plain = try p.render(frame.allocator()); - const plain_revision = plain.images.items[0].native.revision; + _ = try p.render(frame.allocator()); + const plain_revision = (try shownAll(p, frame.allocator()))[0].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.items[0].native.revision != plain_revision); + try std.testing.expect((try shownAll(p, frame.allocator()))[0].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); @@ -563,10 +625,10 @@ 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.images.items.len); - const first_place = first.images.items[0]; + try std.testing.expectEqual(@as(usize, 1), first.placements.items.len); + const first_place = (try shownAll(p, frame.allocator()))[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); + try std.testing.expectEqual(image.NativeFit.width, first_place.fit); const request = panes.Pdf.renderRequest( panes.Pdf.paneViewport(p, pane) orelse return error.MissingPdfViewport, pdf_raster_policy, @@ -597,9 +659,9 @@ test "MuPDF pane renders, navigates, searches, and round-trips its page" { p.update(.{ .pdf_scroll = .{ .pane = 0, .delta_pixels = 0.25, .glide = false } }); 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.items[0].native.revision); - try std.testing.expectEqual(@as(f32, -0.25), fractional.images.items[0].native.pixel_offset_y); + _ = try p.render(frame.allocator()); + try std.testing.expectEqual(first_place.revision, (try shownAll(p, frame.allocator()))[0].revision); + try std.testing.expectEqual(@as(f32, -0.25), (try shownAll(p, frame.allocator()))[0].pixel_offset_y); pane.pdf.?.document_scroll_y = 0; // The default reading view moves one exact display-cell distance without @@ -608,13 +670,13 @@ test "MuPDF pane renders, navigates, searches, and round-trips its page" { try std.testing.expectEqual(@as(usize, 0), pane.pdf.?.page); try std.testing.expectEqual(@as(f64, p.cell_pixels.h), pane.pdf.?.document_scroll_y); try std.testing.expectEqual( - first_place.native.revision, + first_place.revision, panes.Pdf.rasterForPage(pane.pdf.?, pane.pdf.?.page).?.revision, ); _ = frame.reset(.retain_capacity); - const panned = try p.render(frame.allocator()); - 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); + _ = try p.render(frame.allocator()); + try std.testing.expectEqual(first_place.revision, (try shownAll(p, frame.allocator()))[0].revision); + try std.testing.expect((try shownAll(p, frame.allocator()))[0].geometry.src.y > first_place.geometry.src.y); const row_scroll = pane.pdf.?.document_scroll_y; pane.pdf.?.document_scroll_y = 0; @@ -668,7 +730,7 @@ test "MuPDF pane renders, navigates, searches, and round-trips its page" { p.update(.{ .key = .{ .cp = 'b', .ctrl = true } }); try std.testing.expectEqual(@max(@as(f64, 0), counted_full - @as(f64, @floatFromInt(key_viewport.pixel_h * 2))), pane.pdf.?.document_scroll_y); try std.testing.expectEqual( - first_place.native.revision, + first_place.revision, panes.Pdf.rasterForPage(pane.pdf.?, pane.pdf.?.page).?.revision, ); @@ -687,22 +749,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.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); + try std.testing.expectEqual(@as(usize, 2), boundary.placements.items.len); + try std.testing.expectEqual(@as(u32, 0), (try shownAll(p, frame.allocator()))[0].page); + try std.testing.expectEqual(@as(u32, 1), (try shownAll(p, frame.allocator()))[1].page); const first_bottom = @as(f32, @floatFromInt( - boundary.images.items[0].native.geometry.?.dst.y + - boundary.images.items[0].native.geometry.?.dst.h, - )) + boundary.images.items[0].native.pixel_offset_y; + (try shownAll(p, frame.allocator()))[0].geometry.dst.y + + (try shownAll(p, frame.allocator()))[0].geometry.dst.h, + )) + (try shownAll(p, frame.allocator()))[0].pixel_offset_y; const second_top = @as(f32, @floatFromInt( - boundary.images.items[1].native.geometry.?.dst.y, - )) + boundary.images.items[1].native.pixel_offset_y; + (try shownAll(p, frame.allocator()))[1].geometry.dst.y, + )) + (try shownAll(p, frame.allocator()))[1].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.items[0].native.revision; - const page1_revision = boundary.images.items[1].native.revision; + const page0_revision = (try shownAll(p, frame.allocator()))[0].revision; + const page1_revision = (try shownAll(p, frame.allocator()))[1].revision; // A scroll can activate the already-cached neighbor before the shell's // next draw. Every consumer resolves the active page's resident raster, @@ -725,9 +787,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.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); + try std.testing.expectEqual(@as(usize, 2), second.placements.items.len); + try std.testing.expectEqual(page0_revision, (try shownAll(p, frame.allocator()))[0].revision); + try std.testing.expectEqual(page1_revision, (try shownAll(p, frame.allocator()))[1].revision); p.update(.{ .key = .{ .cp = 'k' } }); try std.testing.expectEqual(before_boundary_scroll, pane.pdf.?.document_scroll_y); @@ -740,18 +802,18 @@ test "MuPDF pane renders, navigates, searches, and round-trips its page" { panes.Pdf.activatePage(p, pane, 1, true); _ = frame.reset(.retain_capacity); const away = try p.render(frame.allocator()); - 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(away.placements.items.len > 0); + for (try shownAll(p, frame.allocator())) |place| + try std.testing.expect(place.page != 0); try std.testing.expect(panes.Pdf.rasterForPage(pane.pdf.?, 0) == null); try std.testing.expectEqual(@as(usize, 1), pane.pdf.?.spare_len); const retired = pane.pdf.?.spare[0]; panes.Pdf.activatePage(p, pane, 0, true); _ = frame.reset(.retain_capacity); - const returned = try p.render(frame.allocator()); - 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); + _ = try p.render(frame.allocator()); + try std.testing.expectEqual(@as(u32, 0), (try shownAll(p, frame.allocator()))[0].page); + try std.testing.expectEqual(retired.ptr, (try shownAll(p, frame.allocator()))[0].rgba.ptr); + try std.testing.expect((try shownAll(p, frame.allocator()))[0].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 @@ -917,16 +979,16 @@ 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.images.items.len >= 2); + try std.testing.expect(flung.placements.items.len >= 2); var banded = false; - for (flung.images.items) |place| { - const geometry = place.native.geometry orelse return error.MissingPdfGeometry; - const raster = panes.Pdf.rasterForPage(pv, place.native.page) orelse + for (try shownAll(p, frame.allocator())) |place| { + const geometry = place.geometry; + const raster = panes.Pdf.rasterForPage(pv, place.page) orelse return error.MissingPdfRaster; if (raster.band_h < raster.ih) banded = true; try std.testing.expectEqual(place.iw * raster.band_h * 4, place.rgba.len); shots[shots_len] = .{ - .page = place.native.page, + .page = place.page, .dst = geometry.dst, .pixels = try copySourceRect(gpa, place, geometry.src), }; @@ -940,13 +1002,13 @@ 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.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 + try std.testing.expectEqual(shots_len, rested.placements.items.len); + for (try shownAll(p, frame.allocator()), shots[0..shots_len]) |place, shot| { + const geometry = place.geometry; + const raster = panes.Pdf.rasterForPage(pv, place.page) orelse return error.MissingPdfRaster; try std.testing.expectEqual(raster.ih, raster.band_h); // promoted at rest - try std.testing.expectEqual(shot.page, place.native.page); + try std.testing.expectEqual(shot.page, place.page); try std.testing.expectEqual(shot.dst.x, geometry.dst.x); try std.testing.expectEqual(shot.dst.y, geometry.dst.y); try std.testing.expectEqual(shot.dst.w, geometry.dst.w); @@ -1035,9 +1097,9 @@ 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.images.items.len); - const place = surface.images.items[0]; - const geometry = place.native.geometry orelse return error.MissingPdfGeometry; + try std.testing.expectEqual(@as(usize, 1), surface.placements.items.len); + const place = (try shownAll(p, frame.allocator()))[0]; + const geometry = place.geometry; const raster = panes.Pdf.rasterForPage(pv, 0) orelse return error.MissingPdfRaster; // Bounded: a band, never the page, and within one buffer's budget. try std.testing.expectEqual(shape.width, place.iw); @@ -1064,7 +1126,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.items[0]; + const again = (try renderShown(p, frame.allocator()))[0]; const again_y = panes.Pdf.rasterForPage(pv, 0).?.band_y; const stride = shape.stride; const common_top = @max(middle_y, again_y); @@ -1078,7 +1140,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.items[0].rgba); + const foot = try gpa.dupe(u8, (try renderShown(p, frame.allocator()))[0].rgba); defer gpa.free(foot); // At the foot of the page, a search hit: its highlight lands on exactly @@ -1086,8 +1148,8 @@ test "a tall page is drawn at the display's resolution, in bands that are the wh // word finds the word. try pv.setSearchQuery(gpa, "bottommost"); _ = frame.reset(.retain_capacity); - const lit = try p.render(frame.allocator()); - const place = lit.images.items[0]; + _ = try p.render(frame.allocator()); + const place = (try shownAll(p, frame.allocator()))[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); @@ -1127,7 +1189,7 @@ test "a tall page is drawn at the display's resolution, in bands that are the wh /// that makes "same picture" mean something when the textures differ in shape. fn copySourceRect( gpa: std.mem.Allocator, - place: ImagePlace, + place: Shown, src: image.PixelRect, ) ![]u8 { const stride = place.iw * 4; @@ -1270,11 +1332,11 @@ 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.images.items.len); + try std.testing.expectEqual(pv.page_count, surface.placements.items.len); try std.testing.expectEqual(pv.page_count, pv.rasters_len); - 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); + for (try shownAll(p, frame.allocator()), 0..) |place, page| { + try std.testing.expectEqual(@as(u32, @intCast(page)), place.page); + try std.testing.expectEqual(@as(u32, 1), place.geometry.dst.h); } } @@ -1320,7 +1382,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.images.items.len); + try std.testing.expectEqual(@as(usize, 2), default_surface.placements.items.len); try std.testing.expectEqual(@as(usize, 2), pv.rasters_len); const Snapshot = struct { @@ -1333,16 +1395,17 @@ test "PDF tint and tinted theme changes rebuild every visible raster only" { checksum: u64, }; const Capture = struct { - fn get(surface: *const Surface) ![2]Snapshot { - if (surface.images.items.len != 2) return error.UnexpectedVisiblePdfCount; + fn get(core: *Pardes, arena: std.mem.Allocator) ![2]Snapshot { + if (core.surface.placements.items.len != 2) return error.UnexpectedVisiblePdfCount; var out: [2]Snapshot = undefined; + const shown = try shownAll(core, arena); for (&out, 0..) |*snapshot, i| { - const place = surface.images.items[i]; + const place = shown[i]; snapshot.* = .{ - .page = place.native.page, - .revision = place.native.revision, - .geometry = place.native.geometry orelse return error.MissingPdfGeometry, - .pixel_offset_y = place.native.pixel_offset_y, + .page = place.page, + .revision = place.revision, + .geometry = place.geometry, + .pixel_offset_y = place.pixel_offset_y, .iw = place.iw, .ih = place.ih, .checksum = std.hash.Wyhash.hash(0x5044_4654_494e_5421, place.rgba), @@ -1361,7 +1424,7 @@ test "PDF tint and tinted theme changes rebuild every visible raster only" { } } }; - const default_filtered = try Capture.get(default_surface); + const default_filtered = try Capture.get(p, frame.allocator()); for (pv.rasters[0..pv.rasters_len]) |raster| try std.testing.expectEqual(PdfTintMode.filtered, raster.tint_key.?.mode); @@ -1371,8 +1434,8 @@ test "PDF tint and tinted theme changes rebuild every visible raster only" { pardes.colors.setThemeIndex(p, dark_index); for (pv.rasters[0..pv.rasters_len]) |raster| try std.testing.expect(!raster.tried); _ = frame.reset(.retain_capacity); - const themed_surface = try p.render(frame.allocator()); - const themed = try Capture.get(themed_surface); + _ = try p.render(frame.allocator()); + const themed = try Capture.get(p, frame.allocator()); try Capture.expectGeometry(default_filtered, themed); for (default_filtered, themed) |old, new| { try std.testing.expect(new.revision > old.revision); @@ -1382,8 +1445,8 @@ test "PDF tint and tinted theme changes rebuild every visible raster only" { panes.Pdf.toggleTint(pane); try std.testing.expectEqual(PdfTintMode.full, pv.tint); _ = frame.reset(.retain_capacity); - const full_surface = try p.render(frame.allocator()); - const full = try Capture.get(full_surface); + _ = try p.render(frame.allocator()); + const full = try Capture.get(p, frame.allocator()); try Capture.expectGeometry(themed, full); for (themed, full) |old, new| { try std.testing.expect(new.revision > old.revision); @@ -1394,8 +1457,8 @@ test "PDF tint and tinted theme changes rebuild every visible raster only" { panes.Pdf.toggleTint(pane); try std.testing.expectEqual(PdfTintMode.disabled, pv.tint); _ = frame.reset(.retain_capacity); - const disabled_surface = try p.render(frame.allocator()); - const disabled = try Capture.get(disabled_surface); + _ = try p.render(frame.allocator()); + const disabled = try Capture.get(p, frame.allocator()); try Capture.expectGeometry(full, disabled); for (full, disabled) |old, source| { try std.testing.expect(source.revision > old.revision); @@ -1411,8 +1474,8 @@ test "PDF tint and tinted theme changes rebuild every visible raster only" { // the per-raster key comparison asks MuPDF for replacement pixels. for (pv.rasters[0..pv.rasters_len]) |raster| try std.testing.expect(raster.tried); _ = frame.reset(.retain_capacity); - const unchanged_surface = try p.render(frame.allocator()); - const unchanged = try Capture.get(unchanged_surface); + _ = try p.render(frame.allocator()); + const unchanged = try Capture.get(p, frame.allocator()); try Capture.expectGeometry(disabled, unchanged); for (disabled, unchanged) |old, new| { try std.testing.expectEqual(old.revision, new.revision); @@ -1581,8 +1644,8 @@ test "PDF n/N addresses and reveals distinct MuPDF hits on one page" { try std.testing.expect(pardes.look.searchStep(p, 0, 1)); 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.items[0].native.revision; + _ = try p.render(frame.allocator()); + const revision = (try shownAll(p, frame.allocator()))[0].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; @@ -1601,15 +1664,15 @@ test "PDF n/N addresses and reveals distinct MuPDF hits on one page" { try std.testing.expectEqual(@as(usize, 1), pv.search_hit); 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.items[0].native.revision); + _ = try p.render(frame.allocator()); + try std.testing.expectEqual(revision, (try shownAll(p, frame.allocator()))[0].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.items[0].native.revision); + _ = try p.render(frame.allocator()); + try std.testing.expectEqual(revision, (try shownAll(p, frame.allocator()))[0].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| { @@ -1641,7 +1704,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.images.items.len); + try std.testing.expectEqual(@as(usize, 0), fallback.placements.items.len); p.update(.{ .key = .{ .cp = 'j' } }); try std.testing.expectEqual(@as(usize, 1), pane.pdf.?.page); p.update(.{ .key = .{ .cp = 'k' } }); @@ -1658,8 +1721,8 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { p.frontend.native_images = true; _ = frame.reset(.retain_capacity); - const plain = try p.render(frame.allocator()); - const plain_revision = plain.images.items[0].native.revision; + _ = try p.render(frame.allocator()); + const plain_revision = (try shownAll(p, frame.allocator()))[0].revision; var found = try pane.pdf.?.document.search(gpa, 0, "Pardes"); defer found.deinit(gpa); @@ -1726,8 +1789,8 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { ) != null); _ = frame.reset(.retain_capacity); - const selected_frame = try p.render(frame.allocator()); - const selected_revision = selected_frame.images.items[0].native.revision; + _ = try p.render(frame.allocator()); + const selected_revision = (try shownAll(p, frame.allocator()))[0].revision; try std.testing.expect(selected_revision != plain_revision); // Repeating an identical drag endpoint is a no-op: Kitty/SDL keep the @@ -1735,8 +1798,8 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { try std.testing.expect(panes.Pdf.beginDrag(p, pane, word_col, selected_row, true)); 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.items[0].native.revision); + _ = try p.render(frame.allocator()); + try std.testing.expectEqual(selected_revision, (try shownAll(p, frame.allocator()))[0].revision); // Delayed native hover retains independent quads/text and changes only // presentation state. In particular it must not borrow the click path, @@ -1789,15 +1852,15 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { try std.testing.expectEqual(pdf_impl.HighlightKind.custom, page_highlights[0].kind); 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.items[0].native.revision; + _ = try p.render(frame.allocator()); + const hovered_revision = (try shownAll(p, frame.allocator()))[0].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.items[0].native.revision != hovered_revision); + _ = try p.render(frame.allocator()); + try std.testing.expect((try shownAll(p, frame.allocator()))[0].revision != hovered_revision); try std.testing.expectEqual(active_before, p.active); try std.testing.expectEqual(page_before, pv.page); @@ -1850,14 +1913,14 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { try std.testing.expectEqual(max_document_scroll, pv.document_scroll_y); pv.document_scroll_y = revealed_scroll; _ = frame.reset(.retain_capacity); - const searched = try p.render(frame.allocator()); - try std.testing.expect(searched.images.items[0].native.revision != selected_revision); + _ = try p.render(frame.allocator()); + try std.testing.expect((try shownAll(p, frame.allocator()))[0].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.items[0].native.revision; + const revision_before_geometry_change = (try shownAll(p, frame.allocator()))[0].revision; pv.search_reveal_pending = false; panes.Pdf.toggleFit(pane); try std.testing.expect(pv.search_reveal_pending); @@ -1882,14 +1945,14 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { } }); try std.testing.expect(pv.search_reveal_pending); _ = frame.reset(.retain_capacity); - const geometry_changed = try p.render(frame.allocator()); + _ = try p.render(frame.allocator()); if (pdf_raster_policy.match_viewport) - try std.testing.expect(geometry_changed.images.items[0].native.revision != + try std.testing.expect((try shownAll(p, frame.allocator()))[0].revision != revision_before_geometry_change) else try std.testing.expectEqual( revision_before_geometry_change, - geometry_changed.images.items[0].native.revision, + (try shownAll(p, frame.allocator()))[0].revision, ); p.update(.{ .resize = .{ .cols = p.screen_w, @@ -1914,8 +1977,8 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { // Native drag events update MuPDF quads and copied text immediately, but // 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.items[0].native.revision; + _ = try p.render(frame.allocator()); + const before_drag_revision = (try shownAll(p, frame.allocator()))[0].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 = .{ @@ -1931,10 +1994,10 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { .row = @min(drag_row, selected_row +| 2), } }); _ = frame.reset(.retain_capacity); - const during_first_drag = try p.render(frame.allocator()); + _ = try p.render(frame.allocator()); try std.testing.expectEqual( before_drag_revision, - during_first_drag.images.items[0].native.revision, + (try shownAll(p, frame.allocator()))[0].revision, ); p.update(.{ .mouse = .{ .button = config.select_button, @@ -1944,10 +2007,10 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { } }); try std.testing.expect(p.drag.select.pdf.selection_changed); _ = frame.reset(.retain_capacity); - const during_second_drag = try p.render(frame.allocator()); + _ = try p.render(frame.allocator()); try std.testing.expectEqual( before_drag_revision, - during_second_drag.images.items[0].native.revision, + (try shownAll(p, frame.allocator()))[0].revision, ); p.update(.{ .mouse = .{ .button = config.select_button, @@ -1957,16 +2020,16 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { } }); try std.testing.expect(!raster.tried); _ = frame.reset(.retain_capacity); - const committed_drag = try p.render(frame.allocator()); + _ = try p.render(frame.allocator()); try std.testing.expectEqual( before_drag_revision + 1, - committed_drag.images.items[0].native.revision, + (try shownAll(p, frame.allocator()))[0].revision, ); _ = frame.reset(.retain_capacity); - const stable_drag = try p.render(frame.allocator()); + _ = try p.render(frame.allocator()); try std.testing.expectEqual( - committed_drag.images.items[0].native.revision, - stable_drag.images.items[0].native.revision, + (try shownAll(p, frame.allocator()))[0].revision, + (try shownAll(p, frame.allocator()))[0].revision, ); const saved_query = try gpa.dupe(u8, pv.search_query); |
