From bf6e4f49b8a29f90d47ae5d272c9d0a29c626b64 Mon Sep 17 00:00:00 2001 From: CJ van den Berg Date: Thu, 7 Nov 2024 10:54:43 +0100 Subject: [PATCH] feat: set terminal cursor color to match theme --- build.zig.zon | 4 ++-- src/renderer/vaxis/renderer.zig | 5 +++++ src/tui/tui.zig | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build.zig.zon b/build.zig.zon index bb101c3..70dd6ab 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -30,8 +30,8 @@ .hash = "122019f077d09686b1ec47928ca2b4bf264422f3a27afc5b49dafb0129a4ceca0d01", }, .vaxis = .{ - .url = "https://github.com/neurocyte/libvaxis/archive/e1e3c61cdfa35a68e747685d1a245aa1d81d88f4.tar.gz", - .hash = "12206bacf76425efb2bda37c77b05e2ce13a18aa152d3b2264d2bcadb0941ba93ffc", + .url = "https://github.com/neurocyte/libvaxis/archive/ad953bc553f064c18e801745233cbebd6ca9d00c.tar.gz", + .hash = "122008a492174c4e5057df3cddc5b05c3864883952bf7cbb6f5c3902e3bf79549f3c", }, .zeit = .{ .url = "https://github.com/rockorager/zeit/archive/9cca8ec620a54c3b07cd249f25e5bcb3153d03d7.tar.gz", diff --git a/src/renderer/vaxis/renderer.zig b/src/renderer/vaxis/renderer.zig index f60d53e..769258e 100644 --- a/src/renderer/vaxis/renderer.zig +++ b/src/renderer/vaxis/renderer.zig @@ -2,6 +2,7 @@ const std = @import("std"); const cbor = @import("cbor"); const log = @import("log"); const Style = @import("theme").Style; +const Color = @import("theme").Color; const vaxis = @import("vaxis"); const builtin = @import("builtin"); @@ -334,6 +335,10 @@ pub fn set_terminal_style(self: *Self, style_: Style) void { self.vx.setTerminalBackgroundColor(self.tty.anyWriter(), vaxis.Cell.Color.rgbFromUint(@intCast(color.color)).rgb) catch {}; } +pub fn set_terminal_cursor_color(self: *Self, color: Color) void { + self.vx.setTerminalCursorColor(self.tty.anyWriter(), vaxis.Cell.Color.rgbFromUint(@intCast(color.color)).rgb) catch {}; +} + pub fn set_terminal_working_directory(self: *Self, absolute_path: []const u8) void { self.vx.setTerminalWorkingDirectory(self.tty.anyWriter(), absolute_path) catch {}; } diff --git a/src/tui/tui.zig b/src/tui/tui.zig index c4ff059..b4f1b19 100644 --- a/src/tui/tui.zig +++ b/src/tui/tui.zig @@ -931,6 +931,8 @@ pub const fallbacks: []const FallBack = &[_]FallBack{ }; fn set_terminal_style(self: *Self) void { - if (self.config.enable_terminal_color_scheme) + if (self.config.enable_terminal_color_scheme) { self.rdr.set_terminal_style(self.theme.editor); + self.rdr.set_terminal_cursor_color(self.theme.editor_cursor.bg.?); + } }