diff options
| author | Gabriel Schneider <[email protected]> | 2026-11-05 12:35:31 -0300 |
|---|---|---|
| committer | Gabriel Schneider <[email protected]> | 2026-11-05 15:18:26 -0300 |
| commit | e65ada6bfab3e3851281be253b5e8187b652b66b (patch) | |
| tree | 8eda0b933dd1c1c0e1310963b1be0000d01281e7 | |
| parent | ba3c654472ee0dd9fb5d39dd24063c07a44c6752 (diff) | |
| download | pardes-e65ada6bfab3e3851281be253b5e8187b652b66b.tar.gz pardes-e65ada6bfab3e3851281be253b5e8187b652b66b.zip | |
the Pet back, the window's alone: src/gui/pet.zig and the window's pet overlay return as they were (the workspace tag's blank end, the tag's colours, now read from the Surface's chrome, its walk and hop on the window's own clock, SDL_GetTicks), and Pet is a plain setting now, a choice of off, cat or frog the window reads (config.Runtime.pet, a byte with no state behind it, dumped and replicated as any setting, in /ctl and DumpConfig as `Pet <name>`, and as `# Pet unsupported` where no window draws it, so an init file shared with a terminal loads there clean); its behaviour test and the appearance gallery's pets return
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge
| -rw-r--r-- | docs/typ/builtins-gui.json | 1 | ||||
| -rw-r--r-- | docs/typ/reference.typ | 1 | ||||
| -rw-r--r-- | src/config.zig | 9 | ||||
| -rw-r--r-- | src/gui/gui.zig | 101 | ||||
| -rw-r--r-- | src/gui/pet.zig | 215 | ||||
| -rw-r--r-- | test/appearance_gallery.py | 31 | ||||
| -rw-r--r-- | test/behaviour/settings.zig | 25 |
7 files changed, 376 insertions, 7 deletions
diff --git a/docs/typ/builtins-gui.json b/docs/typ/builtins-gui.json index aedbb3a6..fbfcfd3c 100644 --- a/docs/typ/builtins-gui.json +++ b/docs/typ/builtins-gui.json @@ -81,6 +81,7 @@ {"name": "PdfFit", "leader": "SPC t z", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Fit the PDF page to the pane by width or by height, flipping between them (or to the one named, `width|height`)."}, {"name": "PdfSections", "leader": "SPC t s", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "List the PDF's sections in a pane, each a place to go."}, {"name": "PdfTint", "leader": "SPC t i", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Tint the PDF page to the theme, or show it as printed, stepping through them (or to the one named, `disabled|filtered|full`)."}, + {"name": "Pet", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "off, cat, frog", "doc": "The window's companion in the workspace tag's blank space: off, cat or frog."}, {"name": "Petscii", "leader": "SPC t p", "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "glyph art over the host's pixels: an image pane's picture, or the kitty graphics a terminal's program placed (yazi's previews)"}, {"name": "ProgramEsc", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": "on, off", "doc": "In a raw terminal, Esc goes to the program and Shift-Esc backs out, on; off (the default) swaps them."}, {"name": "Putall", "leader": null, "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "acme's Putall: every pane holding unsaved edits to a file is saved, each as its own Save; one that is refused (changed on disk since, a write that fails) says so and the rest are saved all the same."}, diff --git a/docs/typ/reference.typ b/docs/typ/reference.typ index dc8e1f36..90bea27a 100644 --- a/docs/typ/reference.typ +++ b/docs/typ/reference.typ @@ -447,6 +447,7 @@ word clicked in a tag does. The same lines go in the startup file [#word("TaglineSize") `<1-100>`], [82: tagline face, percent; SDL and macOS], [#word("WindowOpacity") `<0-100>`], [100; SDL only: everything but text and the cursor], [#word("Ligatures")], [on; SDL only, macOS draws CoreText's own], + [#word("Pet") `off|cat|frog`], [off; SDL only: a sprite in the workspace tag's blank space], ) #word("LocationsConfig") with no argument prints the current settings as a line diff --git a/src/config.zig b/src/config.zig index 3024fc5a..a7520b38 100644 --- a/src/config.zig +++ b/src/config.zig @@ -170,6 +170,7 @@ pub const leader_path = paths: { table.set(.ProgramEsc, null); table.set(.Motion, null); if (builtins.capabilities.lift) table.set(.GripWidth, null); + if (builtins.capabilities.lift) table.set(.Pet, null); if (builtins.TreeContext.enabled) table.set(.TreeContext, null); table.set(.ThemeFile, null); table.set(.DumpThemes, null); @@ -740,6 +741,9 @@ pub const Runtime = struct { window_opacity: u8 = 100, window_blur: u8 = 0, window_opacity_pending: bool = true, + /// The window's companion in the workspace tag's blank space + /// (gui/pet.zig), or none: a setting alone, the window moves it. + pet: Pet = .off, // Effective values change only after a host acknowledges the request. shell: struct { @@ -794,7 +798,8 @@ pub const Runtime = struct { pub const SearchPlace = enum { attached, column }; pub const SearchPane = enum { reuse, new }; /// A setting that is one of a few words, each an enum field of Runtime. - pub const Choice = enum { pager, term_images, jump_scope, search_place, search_pane }; + pub const Choice = enum { pager, term_images, jump_scope, search_place, search_pane, pet }; + pub const Pet = enum { off, cat, frog }; pub const tagline_percent_min: u8 = 1; pub const tagline_percent_max: u8 = 100; @@ -916,6 +921,7 @@ pub const Runtime = struct { .cursor_blink => .lift, else => null, }, + .choice => |which| if (which == .pet) .lift else null, else => null, }; } @@ -936,6 +942,7 @@ pub const Runtime = struct { .{ .word = "ProgramEsc", .action = .{ .toggle = .program_esc }, .doc = "In a raw terminal, Esc goes to the program and Shift-Esc backs out, on; off (the default) swaps them." }, .{ .word = "Motion", .action = .motion, .doc = "How animations move: off, crisp, smooth, bouncy or playful." }, .{ .word = "GripWidth", .action = .grip_width, .doc = "The grip and scrollbar width, as a percent of the theme's rail." }, + .{ .word = "Pet", .action = .{ .choice = .pet }, .doc = "The window's companion in the workspace tag's blank space: off, cat or frog." }, .{ .word = "MessageLinger", .action = .{ .message_ms = .linger }, .doc = "How long, in milliseconds, a message stays after what dismisses it." }, .{ .word = "MessageFall", .action = .{ .message_ms = .fall }, .doc = "How long, in milliseconds, a message takes to fall into its row." }, .{ .word = "MessageDissolve", .action = .{ .message_ms = .dissolve }, .doc = "How long, in milliseconds, a message takes to dissolve." }, diff --git a/src/gui/gui.zig b/src/gui/gui.zig index 4f82d246..e5ca645d 100644 --- a/src/gui/gui.zig +++ b/src/gui/gui.zig @@ -13,6 +13,7 @@ const look = @import("../look.zig"); const message = pardes.Messages.Message; const file_watch = @import("../file_watch.zig"); const deck = @import("deck.zig"); +const pet = @import("pet.zig"); const fonts = @import("../fonts.zig"); // the fallback faces const selection_pipe = @import("../selection_pipe.zig"); const c_heap = @import("c_heap"); @@ -239,9 +240,9 @@ const LoadedFallback = struct { const max_touch_points: usize = 16; const touch_scroll_tick: f32 = 0.02; -// The triangle overlay holds only the cursor's glide quad: the chrome is -// decor. -const max_overlay_vertices: usize = 6; +// The triangle overlay holds only the pet and the cursor's glide quad: the +// chrome is decor. +const max_overlay_vertices: usize = pet.max_vertices + 6; const font_px_step: f32 = 2.0; const font_px_min: f32 = 8.0; @@ -991,6 +992,8 @@ const Gui = struct { words: Words = .{}, touch: Touch = .{}, + /// The workspace tag's pet (Pet), on the window's own clock. + pet_state: pet.State = .{}, live_ctrl: bool = false, live_alt: bool = false, @@ -5418,7 +5421,7 @@ fn renderFrame( if (!pdf_focus) core.frames.scroll = g.glide.follow.offset; core.frames.caret = caretRow(g, surface) orelse 0; const cursors_shown = !quad_mode; - var overlay_count = buildOverlay(g, surface, sw, sh); + var overlay_count = buildOverlay(g, core.settings.pet, surface, sw, sh); if (overlay_count != 0 and !uploadOverlayGpu(g, cmd, overlay_count)) overlay_count = 0; if (!prepareNativeImages(g, gpa, cmd, surface, &groups, sw, sh)) { @@ -8056,16 +8059,96 @@ fn cursorDecor(g: *Gui, gpa: std.mem.Allocator, surface: *const pardes.Surface, /// The triangle overlay: the cursor's glide, over everything. fn buildOverlay( g: *Gui, + which: pardes.config.Runtime.Pet, surface: *const pardes.Surface, sw: u32, sh: u32, ) u32 { if (g.overlay_vertices.len == 0 or sw == 0 or sh == 0) return 0; var builder = OverlayBuilder{ .vertices = g.overlay_vertices, .win_w = @floatFromInt(sw), .win_h = @floatFromInt(sh) }; + appendWorkspacePet(g, which, surface, &builder); appendCursorGlide(g, surface, &builder); return @intCast(builder.len); } +/// The workspace tag's pet (the Pet setting, gui/pet.zig): in the blank +/// end of the grid's first row, past the tag's text, in the tag's colours, +/// on the window's own clock. Nothing of it reaches the core. +fn appendWorkspacePet(g: *Gui, which: pardes.config.Runtime.Pet, surface: *const pardes.Surface, builder: *OverlayBuilder) void { + const kind: pet.Kind = @fromBackingInt(@backingInt(which)); + if (kind == .off or surface.rows == 0 or surface.cols == 0) { + g.pet_state = .{}; + return; + } + var occupied: usize = 0; + for (surface.cells[0..surface.cols], 0..) |*cell, i| { + if (cellCodepoint(cell) != ' ') occupied = i + 1; + } + const band_top: f32 = @floatFromInt(taglineBandOffset(0, builder.win_h, g.cell_h, g.tagline_height)); + const region = if (occupied >= surface.cols) null else pet.lane( + occupied, + @floatFromInt(g.tagline_width), + builder.win_w, + band_top, + @floatFromInt(g.tagline_height), + ); + // ponytail: it moves when the window draws; a wake of its own for an + // idle window if a still pet ever matters. + const pose = g.pet_state.sample(kind, c.SDL_GetTicks(), region) orelse return; + const ink = overlayRgb(surface.chrome.tag_fg); + const eye = overlayRgb(surface.chrome.tag_bg); + // Behind the cursor: the overlay is over the cells, so the pixels a + // cursor covers are left out. + var boxes: [max_cursors]CursorBox = undefined; + const cursors = boxes[0..cursorBoxes(g, surface, fixedCellLayout(g), builder.win_h, &boxes)]; + for (0..pet.height) |y| for (0..pet.width) |x| { + const color = pet.pixel(kind, pose, x, y); + if (color == 0) continue; + const x0 = pose.x + @as(f32, @floatFromInt(x)) * pose.scale; + const y0 = pose.y + @as(f32, @floatFromInt(y)) * pose.scale; + const covered = for (cursors) |box| { + if (x0 < box.x1 and x0 + pose.scale > box.x0 and y0 < box.y1 and y0 + pose.scale > box.y0) break true; + } else false; + if (covered) continue; + builder.addRect(x0, y0, x0 + pose.scale, y0 + pose.scale, if (color == 2) eye else ink); + }; +} + +test "a pet stays past the workspace tag's text, and off it is gone" { + std.testing.refAllDecls(pet); + var cells: [80]pardes.Cell = @splat(.{}); + const surface: pardes.Surface = .{ .cols = 80, .rows = 1, .cells = &cells }; + for ("Workspace Commands", 0..) |ch, i| { + cells[i].text[0] = ch; + cells[i].len = 1; + cells[i].default = false; + } + var g = testGui(10, 20, 8, 16); + var vertices: [pet.max_vertices]OverlayVertex = undefined; + var builder: OverlayBuilder = .{ .vertices = &vertices, .win_w = 800, .win_h = 480 }; + appendWorkspacePet(&g, .cat, &surface, &builder); + try std.testing.expect(builder.len > 0); + for (vertices[0..builder.len]) |v| { + const x = (v.x + 1) * 400; + const y = (1 - v.y) * 240; + try std.testing.expect(x >= 20 * 8 - 0.01); + try std.testing.expect(y >= 0 and y < 20); + } + builder.len = 0; + appendWorkspacePet(&g, .off, &surface, &builder); + try std.testing.expectEqual(@as(usize, 0), builder.len); + try std.testing.expectEqual(@as(?u64, null), g.pet_state.tick); +} + +fn overlayRgb(rgb: [3]u8) OverlayColor { + return .{ + .r = @as(f32, @floatFromInt(rgb[0])) / 255.0, + .g = @as(f32, @floatFromInt(rgb[1])) / 255.0, + .b = @as(f32, @floatFromInt(rgb[2])) / 255.0, + .a = 1, + }; +} + /// G3: the focused cursor while it glides or blinks, its quad from the core /// (Chrome.cursor_quad, grid cells) in its cursor colour; a little less than /// solid, so the glyphs it passes over stay legible. @@ -8171,6 +8254,16 @@ const OverlayBuilder = struct { b.addVertex(x2, y2, color); } + fn addRect(b: *OverlayBuilder, x0_in: f32, y0_in: f32, x1_in: f32, y1_in: f32, color: OverlayColor) void { + if (b.len + 6 > b.vertices.len) return; + const x0 = std.math.clamp(@min(x0_in, x1_in), 0.0, b.win_w); + const x1 = std.math.clamp(@max(x0_in, x1_in), 0.0, b.win_w); + const y0 = std.math.clamp(@min(y0_in, y1_in), 0.0, b.win_h); + const y1 = std.math.clamp(@max(y0_in, y1_in), 0.0, b.win_h); + if (x1 <= x0 or y1 <= y0) return; + b.addTri(x0, y0, x1, y0, x1, y1, color); + b.addTri(x0, y0, x1, y1, x0, y1, color); + } }; fn envU16(env: *std.process.Environ.Map, name: []const u8) ?u16 { diff --git a/src/gui/pet.zig b/src/gui/pet.zig new file mode 100644 index 00000000..7a13ca91 --- /dev/null +++ b/src/gui/pet.zig @@ -0,0 +1,215 @@ +//! Original code-native pixel companions. Pure, bounded geometry and a 10 Hz +//! animation clock: no textures, allocation, input handling or editor state. +const std = @import("std"); + +pub const Kind = enum { off, cat, frog }; +pub const width = 12; +pub const height = 9; +pub const max_vertices = width * height * 6; +pub const Lane = struct { left: f32, right: f32, top: f32, scale: f32 }; +pub const Pose = struct { x: f32, y: f32, scale: f32, left: bool, walking: bool, frame: u8 }; +/// The frog's hop: sits two ticks, takes off, peaks for two, comes down, lands. +const hop_ticks = 8; + +/// Only the trailing blank part of the global tag is eligible. The caller +/// supplies its last occupied cell, including any wide-grapheme continuation. +pub fn lane(occupied: usize, cell_w: f32, screen_w: f32, top: f32, band_h: f32) ?Lane { + if (cell_w <= 0 or band_h < height + 2) return null; + const scale = @min(3, @floor((band_h - 2) / height)); + const left = @as(f32, @floatFromInt(occupied + 2)) * cell_w; + const right = screen_w - 2 * cell_w - width * scale; + if (right - left < 4 * scale) return null; + return .{ .left = left, .right = right, .top = top + band_h - height * scale - 1, .scale = scale }; +} + +pub const State = struct { + kind: Kind = .off, + tick: ?u64 = null, + x: f32 = 0, + target: f32 = 0, + left: bool = false, + idle: u8 = 12, + frame: u8 = 0, + rng: std.Random.DefaultPrng = undefined, + + /// No lane (the tag's text has filled it) hides the pet but keeps + /// where it was and what it was doing. + pub fn sample(s: *State, kind: Kind, now_ms: u64, area: ?Lane) ?Pose { + const region = area orelse return null; + if (kind == .off) { + s.* = .{}; + return null; + } + const tick = now_ms / 100; + if (s.kind != kind or s.tick == null) { + s.* = .{ .kind = kind, .tick = tick, .x = region.left, .target = region.left, .rng = .init(now_ms) }; + } + s.x = std.math.clamp(s.x, region.left, region.right); + s.target = std.math.clamp(s.target, region.left, region.right); + // Coming back from suspension never launches the pet across the tag. + const steps = @min(tick -| s.tick.?, 2); + s.tick = tick; + for (0..steps) |_| { + s.frame +%= 1; + if (s.idle > 0) { + s.idle -= 1; + if (s.idle == 0) { + // Wander to a random spot of the lane; one too close + // would be a shuffle in place, so take the far end. + s.target = region.left + s.rng.random().float(f32) * (region.right - region.left); + if (@abs(s.target - s.x) < 8 * region.scale) + s.target = if (s.x - region.left > region.right - s.x) region.left else region.right; + s.left = s.target < s.x; + s.frame = 255; // the walk starts at frame 0 + } + continue; + } + // The cat walks steadily; the frog travels only while airborne. + const phase = s.frame % hop_ticks; + if (kind == .cat or (phase >= 2 and phase < 6)) { + const step = (if (kind == .cat) @as(f32, 1.8) else 2.6) * region.scale; + s.x = if (s.left) @max(s.target, s.x - step) else @min(s.target, s.x + step); + } + if (s.x == s.target and (kind == .cat or phase == hop_ticks - 1)) + s.idle = s.rng.random().intRangeAtMost(u8, 20, 60); + } + return .{ .x = @floor(s.x), .y = region.top, .scale = region.scale, .left = s.left, .walking = s.idle == 0, .frame = s.frame }; + } +}; + +const cat = [_][]const u8{ + " # # ", + " #####", + " ##o##", + " # ######", + " # ######## ", + " ######### ", + " ######## ", + " ## ## ", + " # # ", +}; +const frog = [_][]const u8{ + " ", + " ", + " ", + " ## ", + " #o## ", + " #########", + " ######### ", + " ##### ## ", + "###### ### ", +}; +const frog_leap = [_][]const u8{ + " ## ", + " #o## ", + " #######", + " ######## ", + " ####### ", + " ### ## ", + "## # ", + "# ", + " ", +}; + +/// 0 transparent, 1 theme ink, 2 eye cutout. Walk legs and idle blinks are +/// generated in this fixed 12x9 tile; neither can spill into an adjacent row. +pub fn pixel(kind: Kind, pose: Pose, x_in: usize, y: usize) u2 { + if (x_in >= width or y >= height or kind == .off) return 0; + const x = if (pose.left) width - 1 - x_in else x_in; + const alternate = (pose.frame / 2) % 2 == 1; + // An idle companion still looks alive during its first pause: a slow + // two-pixel tail-tip flick, or the frog's throat gently inflating. These + // remain inside the tile and mirror with the rest of the animal. + const breathing = (pose.frame / 4) % 2 == 1; + if (!pose.walking and breathing) { + if (kind == .cat and y == 3 and x <= 1) + return @intFromBool(x == 0); + if (kind == .frog and ((y == 6 and x == 11) or (y == 7 and x == 10))) return 1; + } + if (kind == .cat and pose.walking and alternate and y >= 7) + return @intFromBool((y == 7 and (x == 3 or x == 7)) or (y == 8 and (x == 2 or x == 8))); + // A hopping frog leaps two rows low at take-off and one on the way down. + const phase = pose.frame % hop_ticks; + const leaping = kind == .frog and pose.walking and phase >= 2 and phase < 6; + const sink: usize = if (!leaping) 0 else if (phase == 2) 2 else if (phase == 5) 1 else 0; + if (y < sink) return 0; + const ch = (if (kind == .cat) cat else if (leaping) frog_leap else frog)[y - sink][x]; + return switch (ch) { + '#' => 1, + 'o' => if (!pose.walking and pose.frame % 30 >= 27) 1 else 2, + else => 0, + }; +} + +test "pet stays in trailing workspace blanks, and a lost lane hides it without a reset" { + try std.testing.expect(lane(20, 8, 200, 0, 16) == null); + try std.testing.expect(lane(3, 8, 200, 0, 10) == null); + const region = lane(3, 8, 200, 2, 20).?; + try std.testing.expect(region.left >= 5 * 8); + var state: State = .{}; + var moved = false; + var reversed = false; + for (0..2000) |i| { + const pose = state.sample(.cat, i * 100, region).?; + try std.testing.expect(pose.x >= region.left and pose.x + width * pose.scale <= 200 - 16); + try std.testing.expect(pose.y >= 2 and pose.y + height * pose.scale < 22); + moved = moved or pose.walking; + reversed = reversed or pose.left; + } + try std.testing.expect(moved and reversed); + const kept = state; + try std.testing.expect(state.sample(.cat, 300000, null) == null); + try std.testing.expectEqual(kept.x, state.x); + try std.testing.expectEqual(kept.tick, state.tick); + try std.testing.expect(state.sample(.off, 300100, region) == null); +} + +test "pet clock is fixed rate and sprites bounded in both directions" { + const region = lane(1, 8, 400, 0, 16).?; + var state: State = .{}; + const start = state.sample(.frog, 1000, region).?; + try std.testing.expectEqualDeep(start, state.sample(.frog, 1099, region).?); + for ([_]Kind{ .cat, .frog }) |kind| for ([_]bool{ false, true }) |left| { + const pose: Pose = .{ .x = 0, .y = 0, .scale = 1, .left = left, .walking = true, .frame = 3 }; + var count: usize = 0; + for (0..height) |y| for (0..width) |x| { + count += @intFromBool(pixel(kind, pose, x, y) != 0); + }; + try std.testing.expect(count > 20 and count <= width * height); + try std.testing.expectEqual(@as(u2, 0), pixel(kind, pose, width, height)); + }; +} + +test "pet rests at random spots and the frog travels only in the air" { + const region = lane(1, 8, 800, 0, 16).?; + var state: State = .{}; + var last = state.sample(.frog, 0, region).?; + var rested_midway = false; + for (1..3000) |i| { + const pose = state.sample(.frog, i * 100, region).?; + const phase = pose.frame % hop_ticks; + if (pose.x != last.x) try std.testing.expect(pose.walking and phase >= 2 and phase < 6); + rested_midway = rested_midway or (last.walking and !pose.walking and pose.x > region.left and pose.x < @floor(region.right)); + last = pose; + } + try std.testing.expect(rested_midway); +} + +test "pet initial idle visibly animates without walking or leaving its tile" { + const region = lane(1, 8, 400, 0, 16).?; + for ([_]Kind{ .cat, .frog }) |kind| { + var state: State = .{}; + const initial = state.sample(kind, 0, region).?; + var later = initial; + for (1..5) |tick| later = state.sample(kind, tick * 100, region).?; + try std.testing.expect(!initial.walking and !later.walking); + try std.testing.expectEqual(initial.x, later.x); + try std.testing.expectEqual(initial.y, later.y); + var changes: usize = 0; + for (0..height) |y| for (0..width) |x| { + changes += @intFromBool(pixel(kind, initial, x, y) != pixel(kind, later, x, y)); + }; + try std.testing.expectEqual(@as(usize, 2), changes); + try std.testing.expectEqual(@as(u2, 0), pixel(kind, later, width, height)); + } +} diff --git a/test/appearance_gallery.py b/test/appearance_gallery.py index 0d3ab1fa..636c0f69 100644 --- a/test/appearance_gallery.py +++ b/test/appearance_gallery.py @@ -1,10 +1,12 @@ #!/usr/bin/env python3 -"""Review native palettes, compact tags and sized fonts in an owned SDL session.""" +"""Review native palettes, compact tags, sized fonts and pets in an owned SDL session.""" import argparse +import hashlib import json import os from pathlib import Path import subprocess +import time from fs import session from ui_review import capture, command, panes, require, wait_for @@ -27,6 +29,9 @@ Native palettes spectrum vivid syntax harvest warm earth clay soft rose and pine + +Pet cat / Pet frog / Pet off +Companions stay in unused workspace-tag space. ''' PREFERENCE_NOTES = b'''Pardes / contrast studies @@ -68,7 +73,7 @@ def run(args): if args.live_window: inherited = {'SDL_VIDEODRIVER': 'x11'} handles = {} - report = {'themes': [], 'os_windows': []} + report = {'themes': [], 'pets': [], 'os_windows': []} with session('/bin/sh', root, name, socket_name=name, tty=True, launch=launch, inherited=inherited, terminal=handles) as (client, _): source = next(serial for serial, tag in panes(client).items() if str(source_path) in tag) @@ -168,6 +173,27 @@ def run(args): report['native_themes_first'] = True client.write(f'/pane/{selector}/exec', b'Del\n') command(client, terminal, 'Collapse') + for pet in (() if args.skip_pets else ('cat', 'frog', 'off')): + command(client, right, 'Pet ' + pet) + settings = config_report() + require('\nPet ' + pet + '\n' in settings, 'pet setting not applied') + # Returning focus to the source closes all transient report state. + client.write(f'/pane/{source}/look', f'{source_path}:1\n'.encode()) + take_frame('pet-' + pet) + if pet != 'off': + frame = client.screen() + original_tag = frame['cells'][:frame['cols']] + time.sleep(1) + take_frame('pet-' + pet + '-later') + frame = client.screen() + require(original_tag == frame['cells'][:frame['cols']], 'pet animation changed tag text or styles') + def band_digest(label): + pixels = subprocess.check_output(['magick', str(root / (label + '.png')), + '-crop', '1500x20+0+0', '-depth', '8', 'RGB:-']) + return hashlib.sha256(pixels).hexdigest() + require(band_digest('pet-' + pet) != band_digest('pet-' + pet + '-later'), + 'pet did not animate in workspace tag') + report['pets'].append(pet) require(client.read(f'/pane/{source}/body') == original == source_path.read_bytes(), 'Agave source changed') report['source_unchanged'] = True client.write(f'/pane/{terminal}/pty/data', b'exit\r') @@ -182,5 +208,6 @@ if __name__ == '__main__': parser.add_argument('--project', required=True, type=Path) parser.add_argument('--live-window', action='store_true', help='capture the owned OS window without offscreen test mode') parser.add_argument('--themes', nargs='+', default=THEMES, help='themes to compare in order') + parser.add_argument('--skip-pets', action='store_true', help='review palettes without repeating pet animation tests') parser.add_argument('--theme-selector', action='store_true', help='capture native-first picker and focused source gutter') run(parser.parse_args()) diff --git a/test/behaviour/settings.zig b/test/behaviour/settings.zig index 3a9d42df..d87e8191 100644 --- a/test/behaviour/settings.zig +++ b/test/behaviour/settings.zig @@ -43,6 +43,31 @@ test "settings: Shell refuses a path that is no executable, and bare it goes bac try std.testing.expectEqualStrings(default, try setting(&s, "Shell")); } +test "settings: Pet is the window's: a terminal's view refuses it; a window takes only its pets, and /ctl reads it back" { + var s = try Session.initFile(std.testing.allocator, "x\n"); + defer s.deinit(); + // Which build, from its options, not from the answer: a terminal's view + // taking Pet must fail here, not pass as a window. + if (comptime @import("pardes_config").platform == .gui) { + try std.testing.expectEqualStrings("Pet off", try setting(&s, "Pet")); + try s.write("/ctl", "Pet cat\n"); + try std.testing.expectEqualStrings("Pet cat", try setting(&s, "Pet")); + // A window's: dog is no pet of its. + _ = try s.refused("/ctl", "Pet dog\n"); + try std.testing.expectEqualStrings("Pet cat", try setting(&s, "Pet")); + try s.write("/ctl", "Pet frog\n"); + try std.testing.expectEqualStrings("Pet frog", try setting(&s, "Pet")); + try s.write("/ctl", "Pet off\n"); + try std.testing.expectEqualStrings("Pet off", try setting(&s, "Pet")); + return; + } + _ = try s.refused("/ctl", "Pet cat\n"); + try std.testing.expectEqualStrings("Pet is GUI-only, invalid here \"Pet\"", s.said); + try std.testing.expectEqual(@as(u16, 22), try s.refused(s.at("/pane/{d}/exec", .{try s.focused()}), "Pet cat\n")); + try std.testing.expectEqualStrings("Pet is GUI-only, invalid here", s.said); + try std.testing.expect(has(try s.read("/ctl"), "\n# Pet unsupported\n")); +} + fn expectHas(text: []const u8, part: []const u8) !void { if (std.mem.indexOf(u8, text, part) == null) { std.debug.print("not in it: {s}\n", .{part}); |
