diff options
| author | Gabriel Schneider <[email protected]> | 2026-11-04 23:27:59 -0300 |
|---|---|---|
| committer | Gabriel Schneider <[email protected]> | 2026-11-04 23:35:18 -0300 |
| commit | 383256a741117596931c4e3817491041fde5229d (patch) | |
| tree | af2ae2e868c8b514a12598c4ac7b5cd0fe2fc6f7 | |
| parent | 3b790a525c964f5b1dd4c1296c8291b7ecc3da22 (diff) | |
| download | pardes-383256a741117596931c4e3817491041fde5229d.tar.gz pardes-383256a741117596931c4e3817491041fde5229d.zip | |
config: look_preview_delay_frames is a u16, as its ?u16 was never null: every orelse return after it, look.zig's discarded delay, and the report's never-written Look hover delay: off line go, the tests passing the constant (pardes.zig, ninep/tree.zig and ctl.zig's test take one line each)
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge
| -rw-r--r-- | src/builtins.zig | 2 | ||||
| -rw-r--r-- | src/config.zig | 11 | ||||
| -rw-r--r-- | src/look.zig | 8 | ||||
| -rw-r--r-- | src/ninep/ctl.zig | 2 | ||||
| -rw-r--r-- | src/ninep/tree.zig | 2 | ||||
| -rw-r--r-- | src/pardes.zig | 2 | ||||
| -rw-r--r-- | test/panes.zig | 2 | ||||
| -rw-r--r-- | test/pdf.zig | 5 |
8 files changed, 13 insertions, 21 deletions
diff --git a/src/builtins.zig b/src/builtins.zig index a6a2f95b..5d752353 100644 --- a/src/builtins.zig +++ b/src/builtins.zig @@ -510,7 +510,7 @@ test "Ligatures is a setting only in the shell that shapes text" { .platform = @tagName(pardes.platform), .theme_name = p.theme().name, .compiled_default_shell = config.defaultShell(), - .hover_delay_frames = null, + .hover_delay_frames = config.look_preview_delay_frames, .native_images = false, .capabilities = viewCapabilities(p), .state = &p.settings, diff --git a/src/config.zig b/src/config.zig index f1da742a..eb5fe361 100644 --- a/src/config.zig +++ b/src/config.zig @@ -406,7 +406,7 @@ pub const del_below: []const Chord = &.{ .{ .cp = 'j' }, .{ .cp = Key.down } }; pub const wheel_rows: i32 = 1; pub const wheel_cols: i32 = 4; -pub const look_preview_delay_frames: ?u16 = 2; +pub const look_preview_delay_frames: u16 = 2; /// The longest any message timing (MessageLinger, MessageFall, /// MessageDissolve) may be set to, in milliseconds. @@ -1446,7 +1446,7 @@ pub const Runtime = struct { /// of the theme's name. theme_file: ?[]const u8 = null, compiled_default_shell: []const u8, - hover_delay_frames: ?u16, + hover_delay_frames: u16, /// Where dumps go when `DumpDir` is unset; empty without a host /// filesystem. default_dump_dir: []const u8 = "", @@ -1562,10 +1562,7 @@ pub const Runtime = struct { "# Default shell ($SHELL, else /bin/sh): {s}\n", .{ context.platform, context.compiled_default_shell }, ); - if (context.hover_delay_frames) |frames| - try out.print("# Look hover delay: {d} frames\n", .{frames}) - else - try out.writeAll("# Look hover delay: off\n"); + try out.print("# Look hover delay: {d} frames\n", .{context.hover_delay_frames}); try out.print("# Native images: {s}\n", .{onOff(context.native_images)}); if (std.mem.eql(u8, context.platform, "gui")) try out.print("# Pet: {s}\n", .{@tagName(state.pet)}); @@ -1948,7 +1945,6 @@ pub const Runtime = struct { var defaults_context = context; defaults_context.startup_config_path = null; defaults_context.platform = "tui"; - defaults_context.hover_delay_frames = null; defaults_context.native_images = false; defaults_context.capabilities = .{ .font_picker = false, @@ -1974,7 +1970,6 @@ pub const Runtime = struct { try std.testing.expect(std.mem.indexOf(u8, defaults_report, "PanelSlide off\n") != null); try std.testing.expect(std.mem.indexOf(u8, defaults_report, "Crt unsupported\n") != null); try std.testing.expect(std.mem.indexOf(u8, defaults_report, "TaglineSize unsupported\n") != null); - try std.testing.expect(std.mem.indexOf(u8, defaults_report, "# Look hover delay: off\n") != null); try std.testing.expect(std.mem.indexOf(u8, defaults_report, "# Native images: off\n") != null); // A setting this shell does not have reads so, as a comment. try std.testing.expect(std.mem.indexOf(u8, defaults_report, "# Ligatures unsupported\n") != null); diff --git a/src/look.zig b/src/look.zig index 18fca334..f8c1e24b 100644 --- a/src/look.zig +++ b/src/look.zig @@ -919,8 +919,6 @@ pub fn lookHoverPane(p: *const Pardes) ?usize { } fn noteLookHover(p: *Pardes, col: u16, row: u16, body_hit: ?Mouse.BodyHit, tag_hit: ?TagHit) void { - const delay = config.look_preview_delay_frames orelse return; - _ = delay; const id = mouse.paneAt(p, col, row) orelse return cancelLookHover(p); const pane = p.panes[id] orelse return cancelLookHover(p); _ = edit.pointerTextSelection(p, id, col, row, body_hit, tag_hit) orelse return cancelLookHover(p); @@ -956,7 +954,7 @@ pub fn refreshLookHoverFromRaw(p: *Pardes) void { } pub fn advanceLookHover(p: *Pardes) void { - const delay = config.look_preview_delay_frames orelse return; + const delay = config.look_preview_delay_frames; const waiting = if (p.look_hover_wait) |*w| w else return; waiting.frames +|= 1; if (waiting.frames < delay) return; @@ -1929,8 +1927,7 @@ pub fn lookAt(p: *Pardes, id: usize, operand_raw: []const u8) void { } test "Look hover waits without mutating the pane and input cancels it" { - const delay = config.look_preview_delay_frames orelse return; - try std.testing.expect(delay > 0); + const delay = config.look_preview_delay_frames; const gpa = std.testing.allocator; const p = try Pardes.init(gpa, .{ .cols = 60, .rows = 12, .tty_only = true }); @@ -2064,7 +2061,6 @@ test "cwd changes cancel only the affected pane's Look hover" { } test "stationary Look hover follows only acknowledged panel samples" { - _ = config.look_preview_delay_frames orelse return; const p = try Pardes.init(std.testing.allocator, .{ .cols = 120, .rows = 20, .tty_only = true }); defer p.deinit(); const pane = p.panes[0].?; diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig index 4749fc94..05e13edc 100644 --- a/src/ninep/ctl.zig +++ b/src/ninep/ctl.zig @@ -1864,7 +1864,7 @@ test "after a ThemeFile the root ctl and DumpConfig say ThemeFile and its path, .theme_name = p.theme().name, .theme_file = pardes.colors.loadedThemeFile(p), .compiled_default_shell = config.defaultShell(), - .hover_delay_frames = null, + .hover_delay_frames = config.look_preview_delay_frames, .native_images = false, .capabilities = builtins.capabilities, .state = &p.settings, diff --git a/src/ninep/tree.zig b/src/ninep/tree.zig index bd53b6a9..6bd4e007 100644 --- a/src/ninep/tree.zig +++ b/src/ninep/tree.zig @@ -1442,7 +1442,7 @@ test "a listing read in chunks is what it was at the open, however the panes cha } test "filesystem inspection preserves pending and displayed Look hover" { - const delay = config.look_preview_delay_frames orelse return; + const delay = config.look_preview_delay_frames; const gpa = testing.allocator; const p = try withFile(gpa, "alpha beta gamma\n"); defer p.deinit(); diff --git a/src/pardes.zig b/src/pardes.zig index eb27c70c..ba373726 100644 --- a/src/pardes.zig +++ b/src/pardes.zig @@ -7617,7 +7617,7 @@ pub const Pardes = struct { var frames: ?u64 = null; if (streaming) |due| frames = @max(1, (due -| p.stepped_ns + animation.frame_ns - 1) / animation.frame_ns); if (p.look_hover_wait) |waiting| { - const delay = config.look_preview_delay_frames orelse return next; + const delay = config.look_preview_delay_frames; frames = @max(1, delay -| waiting.frames); } for (p.panes) |slot| if (slot) |pane| { diff --git a/test/panes.zig b/test/panes.zig index 6b2af760..f083a88e 100644 --- a/test/panes.zig +++ b/test/panes.zig @@ -769,7 +769,7 @@ const ClickCursorTests = struct { try std.testing.expect(std.mem.endsWith(u8, unselected, " gamma\n")); } - const delay = config.look_preview_delay_frames orelse return; + const delay = config.look_preview_delay_frames; p.update(.{ .mouse = .{ .button = .none, .kind = .motion, .col = x + 2, .row = y + 2 } }); for (0..delay) |_| p.update(.tick); const selected_preview = p.look_hover_preview orelse return error.MissingSelectionHover; diff --git a/test/pdf.zig b/test/pdf.zig index 16522af6..ef05f789 100644 --- a/test/pdf.zig +++ b/test/pdf.zig @@ -148,7 +148,7 @@ const PdfLinkTests = struct { fn hover(p: *Pardes, cell: Cell) void { p.update(.{ .mouse = .{ .button = .none, .kind = .motion, .col = cell.col, .row = cell.row } }); - for (0..(config.look_preview_delay_frames orelse 0)) |_| p.update(.tick); + for (0..config.look_preview_delay_frames) |_| p.update(.tick); } test "PDF links hover clears on leave page and reload while right drag chooses Look text" { @@ -1764,7 +1764,8 @@ test "PDF native mouse selection, Look, and highlights share page geometry" { // presentation state. In particular it must not borrow the click path, // whose page activation and persistent selection are intentional effects // of a gesture rather than observation. - if (config.look_preview_delay_frames) |delay| { + { + const delay = config.look_preview_delay_frames; const active_before = p.active; const page_before = pv.page; const scroll_before = pv.document_scroll_y; |
