diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGELOG.md | 3 | ||||
| -rw-r--r-- | src/TerminalImages.zig | 7 | ||||
| -rw-r--r-- | src/gui/gui.zig | 4 | ||||
| -rw-r--r-- | src/host_io.zig | 4 | ||||
| -rw-r--r-- | src/macos.zig | 2 | ||||
| -rw-r--r-- | src/main.zig | 2 | ||||
| -rw-r--r-- | src/tape.zig | 4 | ||||
| -rw-r--r-- | src/tui/tui.zig | 4 |
8 files changed, 17 insertions, 13 deletions
diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md index 750b3744..633687e8 100644 --- a/src/CHANGELOG.md +++ b/src/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- zstbi is upstream's again (zig-gamedev/zstbi, its main): the fork pinned + for Zig 0.17 was deleted, and a fresh checkout could not fetch it. + - pardes's syntax is a library: a Zig package that depends on pardes is given the `pardes-syntax` module (`src/lib_syntax.zig`), with the grammars, highlighting, declarations, syntax tree and themes as the diff --git a/src/TerminalImages.zig b/src/TerminalImages.zig index c352c2a4..f8fed78e 100644 --- a/src/TerminalImages.zig +++ b/src/TerminalImages.zig @@ -123,8 +123,9 @@ const max_dim: u32 = 1280; var started = false; /// Once at startup and exit, with what the resize allocates from. -pub fn start(io: std.Io, gpa: std.mem.Allocator) void { - zstbi.init(io, gpa); +pub fn start(gpa: std.mem.Allocator) void { + // Refused only when started twice with a resize still alive: PNGs then stay refused. + zstbi.init(gpa) catch return; started = true; } pub fn stop() void { @@ -149,7 +150,7 @@ fn decodePng(gpa: std.mem.Allocator, bytes: []const u8) ghostty_vt.sys.DecodeErr if (longest <= max_dim) return .{ .width = got.width, .height = got.height, .data = got.data }; defer gpa.free(got.data); const img: zstbi.Image = .{ .data = got.data, .width = got.width, .height = got.height, .num_components = 4, .bytes_per_component = 1, .bytes_per_row = got.width * 4, .is_hdr = false }; - var scaled = img.resize(@intCast(@max(1, @as(u64, got.width) * max_dim / longest)), @intCast(@max(1, @as(u64, got.height) * max_dim / longest))); + var scaled = img.resize(@intCast(@max(1, @as(u64, got.width) * max_dim / longest)), @intCast(@max(1, @as(u64, got.height) * max_dim / longest))) catch return error.InvalidData; defer scaled.deinit(); return .{ .width = scaled.width, .height = scaled.height, .data = gpa.dupe(u8, scaled.data) catch return error.InvalidData }; } diff --git a/src/gui/gui.zig b/src/gui/gui.zig index e16d0576..537271f1 100644 --- a/src/gui/gui.zig +++ b/src/gui/gui.zig @@ -1310,7 +1310,7 @@ fn localSession( const gpa = init.gpa; const allocs = pardes.memory.init(gpa); defer pardes.memory.deinit(); - host_io.startWorkers(io, allocs); + host_io.startWorkers(allocs); defer host_io.stopWorkers(); var opts = opts_in; opts.addons = pardes.Addon.scan(); @@ -1649,7 +1649,7 @@ fn remoteSession(init: std.process.Init, g: *Gui, opts_in: pardes.Options, test_ const have: ?*replica.Have = if (far) &have_store else null; const allocs = pardes.memory.init(gpa); defer pardes.memory.deinit(); - pardes.TerminalImages.start(io, allocs.image); + pardes.TerminalImages.start(allocs.image); pardes.Kind.heap = allocs.addon; pardes.syntax.start(allocs.tree_sitter); defer { diff --git a/src/host_io.zig b/src/host_io.zig index be741020..3141ff64 100644 --- a/src/host_io.zig +++ b/src/host_io.zig @@ -172,8 +172,8 @@ pub fn testClock() ?u64 { /// on `allocs` (pardes.memory.init), and what kinds keep past a call (their /// heap, `pa_api.heap`: the pdf addon's documents and pages). `stopWorkers` /// is its defer. -pub fn startWorkers(io: std.Io, allocs: pardes.memory.Allocators) void { - pardes.TerminalImages.start(io, allocs.image); +pub fn startWorkers(allocs: pardes.memory.Allocators) void { + pardes.TerminalImages.start(allocs.image); pardes.Kind.heap = allocs.addon; pardes.syntax.start(allocs.tree_sitter); } diff --git a/src/macos.zig b/src/macos.zig index c0d1c69c..254cf2a7 100644 --- a/src/macos.zig +++ b/src/macos.zig @@ -340,7 +340,7 @@ fn initCore(runtime: ?*const Runtime, cols_arg: u16, rows_arg: u16) !void { if (found.dir) |d| crash.setDir(d); } - pardes.TerminalImages.start(io, allocs.image); + pardes.TerminalImages.start(allocs.image); pardes.Kind.heap = allocs.addon; // Its addons are compiled in (no loader runs here): image and PDF panes. opts.addons = pardes.Addon.scan(); diff --git a/src/main.zig b/src/main.zig index 03bed908..ed20dceb 100644 --- a/src/main.zig +++ b/src/main.zig @@ -363,7 +363,7 @@ fn nativeMain(std_init: std.process.Init) !void { var init = std_init; if (builtin.mode != .debug) init.gpa = pardes.memory.host(std.heap.c_allocator); // A recorded session's tape replayed, no session of its own (src/tape.zig). - if (init.environ_map.get("PARDES_REPLAY")) |tape| std.process.exit(pardes.tape.replayMain(init.io, tape)); + if (init.environ_map.get("PARDES_REPLAY")) |tape| std.process.exit(pardes.tape.replayMain(tape)); var stderr_probe: [64]u8 = undefined; _ = std.debug.lockStderr(&stderr_probe); std.debug.unlockStderr(); diff --git a/src/tape.zig b/src/tape.zig index 4db78b86..c617f2a2 100644 --- a/src/tape.zig +++ b/src/tape.zig @@ -1244,10 +1244,10 @@ pub fn startFromEnv() void { /// `PARDES_REPLAY=<tape>`: the tape replayed into three replicas, each /// digest checked; 0 when none diverged. -pub fn replayMain(io: std.Io, path: []const u8) u8 { +pub fn replayMain(path: []const u8) u8 { const gpa = std.heap.c_allocator; // What a shell starts before its core (tui.zig's localSession). - pardes.TerminalImages.start(io, gpa); + pardes.TerminalImages.start(gpa); pardes.syntax.start(gpa); const bytes = std.Io.Dir.cwd().readFileAlloc(std.Io.Threaded.global_single_threaded.io(), path, gpa, .unlimited) catch |err| { std.debug.print("replay: cannot read {s}: {t}\n", .{ path, err }); diff --git a/src/tui/tui.zig b/src/tui/tui.zig index 73103046..0daac14b 100644 --- a/src/tui/tui.zig +++ b/src/tui/tui.zig @@ -685,7 +685,7 @@ pub fn remote(init: std.process.Init, opts: pardes.Options, path: []const u8, se const have: ?*replica.Have = if (far) &have_store else null; const allocs = pardes.memory.init(gpa); defer pardes.memory.deinit(); - pardes.TerminalImages.start(io, allocs.image); + pardes.TerminalImages.start(allocs.image); pardes.Kind.heap = allocs.addon; pardes.syntax.start(allocs.tree_sitter); defer { @@ -978,7 +978,7 @@ fn localSession( options.tree_sitter_allocator = allocs.tree_sitter; options.frame_allocator = allocs.frame; - host_io.startWorkers(io, allocs); + host_io.startWorkers(allocs); defer host_io.stopWorkers(); options.addons = pardes.Addon.scan(); |
