From 54eb30468a995da502287d1d8e55fb4b7b0fb4ca Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Wed, 23 Jul 2025 12:00:22 +0200 Subject: [PATCH 1/2] build: update libvaxis --- build.zig.zon | 4 ++-- src/renderer/vaxis/renderer.zig | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.zig.zon b/build.zig.zon index 7d9b927..e9b4e2c 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -27,8 +27,8 @@ .hash = "fuzzig-0.1.1-AAAAALNIAQBmbHr-MPalGuR393Vem2pTQXI7_LXeNJgX", }, .vaxis = .{ - .url = "https://github.com/neurocyte/libvaxis/archive/6137cb4c44a7350996f0946a069739e5075d1f23.tar.gz", - .hash = "vaxis-0.1.0-BWNV_HwOCQCw5wTV63hQGSc1QJzsNcytH6sGf1GBc0hP", + .url = "git+https://github.com/neurocyte/libvaxis?ref=main#846ddb8bf483e8a7eb25628d6c34ba7e781155b6", + .hash = "vaxis-0.5.1-BWNV_AsQCQDvfb-li1CZEOBG_YsteinP9qI-PpV47-jf", }, .zeit = .{ .url = "https://github.com/rockorager/zeit/archive/8fd203f85f597f16e0a525c1f1ca1e0bffded809.tar.gz", diff --git a/src/renderer/vaxis/renderer.zig b/src/renderer/vaxis/renderer.zig index 2ac6f8c..1c01745 100644 --- a/src/renderer/vaxis/renderer.zig +++ b/src/renderer/vaxis/renderer.zig @@ -180,7 +180,7 @@ fn handleSegfaultPosixNoAbort(sig: i32, info: *const std.posix.siginfo_t, ctx_pt pub fn run(self: *Self) Error!void { self.vx.sgr = .legacy; - self.vx.conpty_hacks = true; + self.vx.enable_workarounds = true; panic_cleanup = .{ .allocator = self.allocator, .tty = &self.tty, .vx = &self.vx }; if (!self.no_alternate) self.vx.enterAltScreen(self.tty.anyWriter()) catch return error.TtyWriteError; @@ -639,7 +639,7 @@ const Loop = struct { switch (builtin.os.tag) { .windows => { var parser: vaxis.Parser = .{ - .graphemes = &self.vaxis.unicode.graphemes, + .grapheme_data = &self.vaxis.unicode.width_data.graphemes, }; const a = self.vaxis.opts.system_clipboard_allocator orelse @panic("no tty allocator"); while (!self.should_quit) { @@ -648,7 +648,7 @@ const Loop = struct { }, else => { var parser: vaxis.Parser = .{ - .graphemes = &self.vaxis.unicode.graphemes, + .grapheme_data = &self.vaxis.unicode.width_data.graphemes, }; const a = self.vaxis.opts.system_clipboard_allocator orelse @panic("no tty allocator"); From 0ce522828d825e1dde5c3e5d7fbc471665201a1a Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Wed, 23 Jul 2025 12:19:10 +0200 Subject: [PATCH 2/2] build: update thespian for new cbor --- build.zig.zon | 4 ++-- src/Project.zig | 2 ++ src/renderer/vaxis/renderer.zig | 2 ++ src/renderer/win32/renderer.zig | 2 ++ src/shell.zig | 2 ++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build.zig.zon b/build.zig.zon index e9b4e2c..0a34e23 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -15,8 +15,8 @@ .hash = "dizzy-1.0.0-AAAAAM1wAAAiDbx_6RwcVEOBk8p2XOu8t9WPNc3K7kBK", }, .thespian = .{ - .url = "https://github.com/neurocyte/thespian/archive/ccdcbbff09f945eec063ebf889581db3e1312107.tar.gz", - .hash = "thespian-0.0.1-owFOjlgaBgCqc3FCnB4Xyg8-9jyIDWgHSJMGx_nt5Kcc", + .url = "git+https://github.com/neurocyte/thespian#f2980d3a747abdf0d18a01596dd8b953dd3e6243", + .hash = "thespian-0.0.1-owFOjk0aBgC8w9ibeiVdhftyEIaVIHCnubsJWfkktE8v", }, .themes = .{ .url = "https://github.com/neurocyte/flow-themes/releases/download/master-952f9f630ea9544088fd30293666ee0650b7a690/flow-themes.tar.gz", diff --git a/src/Project.zig b/src/Project.zig index f9da66c..8e97119 100644 --- a/src/Project.zig +++ b/src/Project.zig @@ -231,6 +231,8 @@ pub fn restore_state_v0(self: *Self, data: []const u8) error{ JsonIncompatibleType, NotAnObject, BadArrayAllocExtract, + InvalidMapType, + InvalidUnion, }!void { tp.trace(tp.channel.debug, .{"restore_state_v0"}); defer self.sort_files_by_mtime(); diff --git a/src/renderer/vaxis/renderer.zig b/src/renderer/vaxis/renderer.zig index 1c01745..3141e34 100644 --- a/src/renderer/vaxis/renderer.zig +++ b/src/renderer/vaxis/renderer.zig @@ -58,6 +58,8 @@ pub const Error = error{ JsonIncompatibleType, NotAnObject, BadArrayAllocExtract, + InvalidMapType, + InvalidUnion, } || std.Thread.SpawnError; pub fn init(allocator: std.mem.Allocator, handler_ctx: *anyopaque, no_alternate: bool, _: *const fn (ctx: *anyopaque) void) Error!Self { diff --git a/src/renderer/win32/renderer.zig b/src/renderer/win32/renderer.zig index a56adb7..a4d8ed8 100644 --- a/src/renderer/win32/renderer.zig +++ b/src/renderer/win32/renderer.zig @@ -36,6 +36,8 @@ pub const Error = error{ JsonIncompatibleType, NotAnObject, BadArrayAllocExtract, + InvalidMapType, + InvalidUnion, } || std.Thread.SpawnError; pub const panic = messageBoxThenPanic(.{ .title = "Flow Panic" }); diff --git a/src/shell.zig b/src/shell.zig index 5869a3d..3e316ab 100644 --- a/src/shell.zig +++ b/src/shell.zig @@ -27,6 +27,8 @@ pub const Error = error{ JsonIncompatibleType, NotAnObject, BadArrayAllocExtract, + InvalidMapType, + InvalidUnion, }; pub const OutputHandler = fn (context: usize, parent: tp.pid_ref, arg0: []const u8, output: []const u8) void;