summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-11-04 23:27:41 -0300
committerGabriel Schneider <[email protected]>2026-11-05 01:01:28 -0300
commit55b842a1be818562a0d70bad3477405a5dc57afa (patch)
treee988b15a4723855dbbfc572869e9b9ea466365c4
parentc62ddeed7b3b176f9a777e3670017542da898f17 (diff)
downloadpardes-55b842a1be818562a0d70bad3477405a5dc57afa.tar.gz
pardes-55b842a1be818562a0d70bad3477405a5dc57afa.zip
pdf_view: the pane layer's one-caller wrappers are their callers (pageAtViewportY in pageAtGridRow, nativeReady in paneNativeReady, pointAtPage in panePointAtPage, stepPanePage in verticalWheel, panPane in horizontalWheel, reloadPane in reloadWatched, pointAt's two callers ask panePointAtPage for the page they stand on), setPage and beginSelection go (only test/pdf.zig called them: it calls activatePage and beginDrag with true), and a pane's rect and id are Pardes.paneIdOf's where four loops searched for them; three copies of the whole PDF state taken to read a field go with them
Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge
-rw-r--r--src/pdf_view.zig164
-rw-r--r--test/pdf.zig28
2 files changed, 55 insertions, 137 deletions
diff --git a/src/pdf_view.zig b/src/pdf_view.zig
index 0745a6fc..ddc9c896 100644
--- a/src/pdf_view.zig
+++ b/src/pdf_view.zig
@@ -1472,55 +1472,11 @@ pub fn activeGeometry(state: *const State, viewport: Viewport) ?image.NativeGeom
return placed.geometry;
}
-pub fn pageAtViewportY(state: *const State, local_y: f64) ?usize {
- if (comptime !enabled) return null;
- if (!state.layout_valid or !std.math.isFinite(local_y) or local_y < 0) return null;
- const document_y = state.document_scroll_y + local_y;
- const page = pageAtOffset(state, document_y);
- const start: f64 = @floatFromInt(state.page_starts[page]);
- if (document_y < start or
- document_y >= start + @as(f64, @floatFromInt(state.page_heights[page]))) return null;
- return page;
-}
-
pub fn pageReady(state: *const State, viewport: Viewport, page: usize) bool {
if (comptime !enabled) return false;
return placedRaster(state, viewport, page) != null;
}
-pub fn nativeReady(state: *const State, viewport: Viewport) bool {
- if (comptime !enabled) return false;
- for (state.rasters[0..state.rasters_len]) |*raster| {
- if (raster.valid and raster.rgba.len > 0 and
- placedGeometry(state, raster, viewport, raster.page) != null) return true;
- }
- return false;
-}
-
-pub fn pointAtPage(
- state: *const State,
- viewport: Viewport,
- page: usize,
- px: i64,
- py: i64,
- clamp_to_page: bool,
-) ?Point {
- if (comptime !enabled) return null;
- const raster = rasterForPageConst(state, page) orelse return null;
- if (raster.rgba.len == 0) return null;
- const placed = placedGeometry(state, raster, viewport, page) orelse return null;
- return pointAtGeometry(
- placed.geometry,
- placed.pixel_offset_y,
- raster.iw,
- raster.ih,
- raster.band_y,
- px,
- py,
- clamp_to_page,
- );
-}
-
fn slotShape(slot: *const Raster) pdf.Raster {
const stride = slot.iw * 4;
return .{ .width = slot.iw, .height = slot.ih, .stride = stride, .len = stride * slot.ih };
@@ -2842,9 +2798,7 @@ pub fn sameBytes(core: *pardes.Pardes, pane: *const pardes.Pane) bool {
/// can retire the corresponding directory watch before that id is reused.
pub fn deinitPane(core: *pardes.Pardes, pane: *pardes.Pane, state: *State) void {
if (comptime !enabled) return;
- for (core.panes, 0..) |slot, id| {
- if (slot == pane) core.emit(.{ .watch = .{ .pane = @intCast(id), .on = false } });
- }
+ if (core.paneIdOf(pane)) |id| core.emit(.{ .watch = .{ .pane = @intCast(id), .on = false } });
state.deinit(core.pdf_gpa);
}
@@ -2862,16 +2816,6 @@ pub fn reopen(core: *pardes.Pardes, pane: *pardes.Pane) !void {
}
}
-pub fn reloadPane(
- core: *pardes.Pardes,
- pane: *pardes.Pane,
-) !void {
- if (comptime !enabled) return error.PdfDisabled;
- const state = &(pane.pdf orelse return error.MissingPdfState);
- try state.reload(core.pdf_gpa);
- resetPageChrome(pane);
-}
-
pub fn isSectionsOutput(pane: *const pardes.Pane) bool {
if (comptime !enabled) return false;
const file = pane.file orelse return false;
@@ -2921,8 +2865,11 @@ pub fn reloadWatched(
core: *pardes.Pardes,
pane: *pardes.Pane,
) !void {
- try reloadPane(core, pane);
- refreshCleanSections(core, &pane.pdf.?);
+ if (comptime !enabled) return error.PdfDisabled;
+ const state = &(pane.pdf orelse return error.MissingPdfState);
+ try state.reload(core.pdf_gpa);
+ resetPageChrome(pane);
+ refreshCleanSections(core, state);
}
fn rearmCleanSections(
@@ -3146,10 +3093,6 @@ pub fn landAt(core: *pardes.Pardes, pane: *pardes.Pane, at: Place) void {
}
}
-pub fn setPage(core: *pardes.Pardes, pane: *pardes.Pane, page: usize) void {
- activatePage(core, pane, page, true);
-}
-
pub fn toggleFit(pane: *pardes.Pane) void {
if (comptime !enabled) return;
const state = &(pane.pdf orelse return);
@@ -3162,17 +3105,9 @@ pub fn toggleTint(pane: *pardes.Pane) void {
state.toggleTint();
}
-pub fn stepPanePage(core: *pardes.Pardes, pane: *pardes.Pane, delta: i64) void {
- if (comptime !enabled) return;
- const state = &(pane.pdf orelse return);
- if (stepPage(state, core.pdf_gpa, delta)) resetPageChrome(pane);
-}
-
pub fn paneViewport(core: *const pardes.Pardes, pane: *const pardes.Pane) ?Viewport {
if (comptime !enabled) return null;
- const rect = for (core.panes, 0..) |slot, id| {
- if (slot == pane) break core.rects[id];
- } else return null;
+ const rect = core.rects[core.paneIdOf(pane) orelse return null];
const cols = rect.w -| config.GUTTER;
const rows = rect.h -| pane.tag_rows;
if (cols == 0 or rows == 0) return null;
@@ -3206,26 +3141,34 @@ pub fn paneGeometry(core: *const pardes.Pardes, pane: *const pardes.Pane) ?image
return activeGeometry(state, view);
}
+/// The page under grid row `row`, from the middle of its cell.
pub fn pageAtGridRow(core: *const pardes.Pardes, pane: *const pardes.Pane, row: u16) ?usize {
if (comptime !enabled) return null;
- const state = pane.pdf orelse return null;
- const rect = for (core.panes, 0..) |slot, id| {
- if (slot == pane) break core.rects[id];
- } else return null;
+ const state = &(pane.pdf orelse return null);
+ const rect = core.rects[core.paneIdOf(pane) orelse return null];
const body_y = core.bodyTop(pane, rect);
- if (row < body_y or row >= body_y + (rect.h -| pane.tag_rows)) return null;
- const local_y = @as(f64, @floatFromInt(
+ if (!state.layout_valid or row < body_y or row >= body_y + (rect.h -| pane.tag_rows)) return null;
+ const document_y = state.document_scroll_y + @as(f64, @floatFromInt(
@as(u32, row - body_y) * core.cell_pixels.h + core.cell_pixels.h / 2,
));
- return pageAtViewportY(&state, local_y);
+ const page = pageAtOffset(state, document_y);
+ const start: f64 = @floatFromInt(state.page_starts[page]);
+ if (document_y < start or
+ document_y >= start + @as(f64, @floatFromInt(state.page_heights[page]))) return null;
+ return page;
}
+/// Some page of the pane is placed where it is drawn.
pub fn paneNativeReady(core: *const pardes.Pardes, pane: *const pardes.Pane) bool {
if (comptime !enabled) return false;
if (!core.native_images) return false;
const state = if (pane.pdf) |*view| view else return false;
const view = paneViewport(core, pane) orelse return false;
- return nativeReady(state, view);
+ for (state.rasters[0..state.rasters_len]) |*raster| {
+ if (raster.valid and raster.rgba.len > 0 and
+ placedGeometry(state, raster, view, raster.page) != null) return true;
+ }
+ return false;
}
pub fn nativePageAtGridRow(
@@ -3242,18 +3185,8 @@ pub fn nativePageAtGridRow(
return page;
}
-pub fn pointAt(
- core: *const pardes.Pardes,
- pane: *const pardes.Pane,
- col: u16,
- row: u16,
- clamp_to_page: bool,
-) ?Point {
- if (comptime !enabled) return null;
- const state = pane.pdf orelse return null;
- return panePointAtPage(core, pane, state.page, col, row, clamp_to_page);
-}
-
+/// The point of `page` under the middle of grid cell `col`,`row`, where
+/// that page is placed; `clamp_to_page` holds a point past it on its edge.
pub fn panePointAtPage(
core: *const pardes.Pardes,
pane: *const pardes.Pane,
@@ -3265,14 +3198,15 @@ pub fn panePointAtPage(
if (comptime !enabled) return null;
const state = if (pane.pdf) |*view| view else return null;
const view = paneViewport(core, pane) orelse return null;
- const rect = for (core.panes, 0..) |slot, id| {
- if (slot == pane) break core.rects[id];
- } else return null;
+ const raster = rasterForPageConst(state, page) orelse return null;
+ if (raster.rgba.len == 0) return null;
+ const placed = placedGeometry(state, raster, view, page) orelse return null;
+ const rect = core.rects[core.paneIdOf(pane) orelse return null];
const body_x = @as(i64, rect.x + config.GUTTER);
const body_y = @as(i64, core.bodyTop(pane, rect));
const px = (@as(i64, col) - body_x) * core.cell_pixels.w + core.cell_pixels.w / 2;
const py = (@as(i64, row) - body_y) * core.cell_pixels.h + core.cell_pixels.h / 2;
- return pointAtPage(state, view, page, px, py, clamp_to_page);
+ return pointAtGeometry(placed.geometry, placed.pixel_offset_y, raster.iw, raster.ih, raster.band_y, px, py, clamp_to_page);
}
pub fn probeAt(
@@ -3317,7 +3251,7 @@ pub fn beginDrag(
if (hit_page != pane.pdf.?.page) activatePage(core, pane, hit_page, false);
const state = &pane.pdf.?;
state.clearDrag();
- const point = pointAt(core, pane, col, row, false) orelse return false;
+ const point = panePointAtPage(core, pane, state.page, col, row, false) orelse return false;
state.drag_anchor = point;
state.drag_head = point;
if (!snap_word) return true;
@@ -3331,15 +3265,6 @@ pub fn beginDrag(
return true;
}
-pub fn beginSelection(
- core: *pardes.Pardes,
- pane: *pardes.Pane,
- col: u16,
- row: u16,
-) bool {
- return beginDrag(core, pane, col, row, true);
-}
-
pub fn updateSelection(
core: *pardes.Pardes,
pane: *pardes.Pane,
@@ -3350,7 +3275,7 @@ pub fn updateSelection(
if (comptime !enabled) return .failed;
const state = &(pane.pdf orelse return .failed);
const anchor = state.drag_anchor orelse return .failed;
- const point = pointAt(core, pane, col, row, true) orelse return .failed;
+ const point = panePointAtPage(core, pane, state.page, col, row, true) orelse return .failed;
if (state.drag_head) |head| if (head.x == point.x and head.y == point.y) return .stationary;
const result = state.setSelection(core.pdf_gpa, anchor, point, invalidate_raster);
if (result != .failed) state.drag_head = point;
@@ -3504,19 +3429,6 @@ pub fn highlightInput(
};
}
-pub fn panPane(
- core: *pardes.Pardes,
- pane: *pardes.Pane,
- axis: PanAxis,
- direction: i8,
- display_pixels: u32,
-) PanResult {
- if (comptime !enabled) return .unavailable;
- const placed = paneGeometry(core, pane) orelse return .unavailable;
- const state = &(pane.pdf orelse return .unavailable);
- return panPixels(state, placed, axis, direction, display_pixels);
-}
-
/// `glide`: a notch, which the strip glides; else a touchpad's fraction,
/// which it follows as it comes.
pub fn scrollPane(core: *pardes.Pardes, pane: *pardes.Pane, delta_pixels: f64, glide: bool) bool {
@@ -3563,7 +3475,12 @@ pub fn moving(core: *const pardes.Pardes) bool {
pub fn verticalWheel(core: *pardes.Pardes, pane: *pardes.Pane, direction: i8) void {
if (comptime !enabled) return;
- if (!core.native_images) return stepPanePage(core, pane, direction);
+ if (!core.native_images) {
+ // The text layer: a page a notch.
+ const state = &(pane.pdf orelse return);
+ if (stepPage(state, core.pdf_gpa, direction)) resetPageChrome(pane);
+ return;
+ }
const rows: u32 = @intCast(@max(1, config.wheel_rows));
const pixels = scaledStep(core.cell_pixels.h, rows);
_ = scrollPane(core, pane, @as(f64, @floatFromInt(pixels)) * direction, true);
@@ -3571,10 +3488,11 @@ pub fn verticalWheel(core: *pardes.Pardes, pane: *pardes.Pane, direction: i8) vo
pub fn horizontalWheel(core: *pardes.Pardes, pane: *pardes.Pane, direction: i8) void {
if (comptime !enabled) return;
- const state = pane.pdf orelse return;
+ const state = &(pane.pdf orelse return);
if (!core.native_images or state.fit != .height) return;
+ const placed = paneGeometry(core, pane) orelse return;
const cols: u32 = @intCast(@max(1, config.wheel_cols));
- _ = panPane(core, pane, .horizontal, direction, scaledStep(core.cell_pixels.w, cols));
+ _ = panPixels(state, placed, .horizontal, direction, scaledStep(core.cell_pixels.w, cols));
}
pub fn draw(
diff --git a/test/pdf.zig b/test/pdf.zig
index 21e84880..1bbfa59c 100644
--- a/test/pdf.zig
+++ b/test/pdf.zig
@@ -122,7 +122,7 @@ const PdfLinkTests = struct {
_ = try p.render(frame.allocator());
while (p.nextEffect()) |_| {}
const target_cell = try textCell(p, "target.txt");
- try std.testing.expect(panes.Pdf.beginSelection(p, p.panes[0].?, target_cell.col, target_cell.row));
+ try std.testing.expect(panes.Pdf.beginDrag(p, p.panes[0].?, target_cell.col, target_cell.row, true));
try std.testing.expect(p.panes[0].?.pdf.?.selection != null);
click(p, target_cell);
try expectOpened(p, null);
@@ -175,9 +175,9 @@ const PdfLinkTests = struct {
p.update(.pointer_leave);
try std.testing.expectEqual(Surface.PointerShape.arrow, (try p.render(frame.allocator())).pointer_shape);
hover(p, blank);
- panes.Pdf.setPage(p, pane, 1);
+ panes.Pdf.activatePage(p, pane, 1, true);
try std.testing.expectEqual(Surface.PointerShape.arrow, (try p.render(frame.allocator())).pointer_shape);
- panes.Pdf.setPage(p, pane, 0);
+ panes.Pdf.activatePage(p, pane, 0, true);
_ = try p.render(frame.allocator());
hover(p, try cellAt(p, 0.3, 0.38));
try std.testing.expect(p.reloadWatchedFile(0, &.{}));
@@ -382,7 +382,7 @@ test "watched PDF reload replaces MuPDF state and preserves the reading view" {
state.pan_x = 1234;
state.pan_y = 4321;
try state.setSearchQuery(p.pdf_gpa, "needle");
- panes.Pdf.setPage(p, pane, 2);
+ panes.Pdf.activatePage(p, pane, 2, true);
var frame = std.heap.ArenaAllocator.init(gpa);
defer frame.deinit();
_ = try p.render(frame.allocator());
@@ -739,7 +739,7 @@ test "MuPDF pane renders, navigates, searches, and round-trips its page" {
// the relay and the arriving page of the same size takes them, so a fling
// never asks the allocator (or the kernel's fault handler) for megabytes it
// just gave up.
- panes.Pdf.setPage(p, pane, 1);
+ 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);
@@ -748,7 +748,7 @@ test "MuPDF pane renders, navigates, searches, and round-trips its page" {
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.setPage(p, pane, 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);
@@ -854,7 +854,7 @@ test "MuPDF pane renders, navigates, searches, and round-trips its page" {
try pane.pdf.?.setSearchQuery(p.pdf_gpa, long_query);
try std.testing.expectEqualStrings(long_query, pane.pdf.?.search_query);
const next_page = if (pane.pdf.?.page == 0) @as(usize, 1) else 0;
- panes.Pdf.setPage(p, pane, next_page);
+ panes.Pdf.activatePage(p, pane, next_page, true);
try std.testing.expectEqualStrings(long_query, pane.pdf.?.search_query);
// PDF dumps keep the image-compatible schema: page/path, the exact
@@ -1456,7 +1456,7 @@ test "PDF resize preserves page-relative document position" {
var frame = std.heap.ArenaAllocator.init(gpa);
defer frame.deinit();
- panes.Pdf.setPage(p, pane, 1);
+ panes.Pdf.activatePage(p, pane, 1, true);
_ = try p.render(frame.allocator());
const fraction: f64 = 0.375;
pv.document_scroll_y = @as(f64, @floatFromInt(pv.page_starts[1])) +
@@ -1507,7 +1507,7 @@ test "PDF pane geometry change preserves its page-relative position" {
var frame = std.heap.ArenaAllocator.init(gpa);
defer frame.deinit();
- panes.Pdf.setPage(p, pane, 1);
+ panes.Pdf.activatePage(p, pane, 1, true);
_ = try p.render(frame.allocator());
const fraction: f64 = 0.625;
pv.document_scroll_y = @as(f64, @floatFromInt(pv.page_starts[1])) +
@@ -1731,7 +1731,7 @@ test "PDF native mouse selection, Look, and highlights share page geometry" {
@as(i32, r.y + BOX_H),
@as(i32, r.y + r.h - 1),
));
- if (!panes.Pdf.beginSelection(p, pane, col, row)) continue;
+ if (!panes.Pdf.beginDrag(p, pane, col, row, true)) continue;
if (std.ascii.findIgnoreCase(pv.selection_text, "Pardes") != null) {
selected_col = col;
selected_row = row;
@@ -1751,7 +1751,7 @@ test "PDF native mouse selection, Look, and highlights share page geometry" {
// Repeating an identical drag endpoint is a no-op: Kitty/SDL keep the
// same texture generation instead of retransmitting identical pixels.
- try std.testing.expect(panes.Pdf.beginSelection(p, pane, word_col, selected_row));
+ 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());
@@ -1921,14 +1921,14 @@ test "PDF native mouse selection, Look, and highlights share page geometry" {
// Unsupported text-selection actions are consumed by the PDF adapter:
// they neither invent a range over placeholder cells nor disturb the
// native MuPDF selection. The select-button's no-drag click still clears.
- try std.testing.expect(panes.Pdf.beginSelection(p, pane, word_col, selected_row));
+ try std.testing.expect(panes.Pdf.beginDrag(p, pane, word_col, selected_row, true));
p.update(.{ .key = .{ .cp = 'v' } });
try std.testing.expect(pv.selection != null);
try std.testing.expect(!pane.body.vsel.active);
p.update(.{ .mouse = .{ .button = config.select_button, .kind = .press, .col = word_col, .row = selected_row } });
p.update(.{ .mouse = .{ .button = config.select_button, .kind = .release, .col = word_col, .row = selected_row } });
try std.testing.expect(pv.selection == null);
- try std.testing.expect(panes.Pdf.beginSelection(p, pane, word_col, selected_row));
+ try std.testing.expect(panes.Pdf.beginDrag(p, pane, word_col, selected_row, true));
// Native drag events update MuPDF quads and copied text immediately, but
// keep the already transmitted page generation stable until release.
@@ -1993,7 +1993,7 @@ test "PDF native mouse selection, Look, and highlights share page geometry" {
const saved_selection = try gpa.dupe(u8, pv.selection_text);
defer gpa.free(saved_selection);
const selected_page = pv.selection_page;
- panes.Pdf.setPage(p, pane, 1);
+ panes.Pdf.activatePage(p, pane, 1, true);
try std.testing.expect(pv.selection != null);
try std.testing.expectEqual(selected_page, pv.selection_page);
try std.testing.expectEqualStrings(saved_selection, pv.selection_text);