summaryrefslogtreecommitdiff
path: root/src/terminal.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/terminal.zig')
-rw-r--r--src/terminal.zig42
1 files changed, 29 insertions, 13 deletions
diff --git a/src/terminal.zig b/src/terminal.zig
index 3bb1fbda..3190c6e3 100644
--- a/src/terminal.zig
+++ b/src/terminal.zig
@@ -2041,7 +2041,7 @@ pub fn recolorAnsi(p: *Pardes, s: *Surface, pane: *Pane, r: pardes.Rect, tx: u16
const filtered: ?*FilteredColors = if (pane.tty_filter) blk: {
const tz_filter = tracy.zone(@src(), "filterInit");
defer tz_filter.end();
- filtered_storage = FilteredColors.init(p, pane);
+ filtered_storage = FilteredColors.init(p, &pane.terminal.?.vt);
break :blk &filtered_storage;
} else null;
// DECSCNM, read once: the filtered palette folds it in itself, the raw
@@ -2192,7 +2192,9 @@ fn cellStyle(p: *Pardes, ci: ghostty_vt.PageList.Cell, filtered: ?*FilteredColor
return cs;
}
-const FilteredColors = struct {
+/// A program's colours mapped to the theme (Filter): a terminal's cells, or
+/// a +Pager's spans (`vt` null, the program's palette xterm's own).
+pub const FilteredColors = if (enabled) struct {
source: GColor.Palette,
target: *const GColor.Palette,
theme_bg: GColor.RGB,
@@ -2212,16 +2214,18 @@ const FilteredColors = struct {
cache_key: [256]u8 = undefined,
cache_valid: [256]bool = @splat(false),
- fn init(p: *Pardes, pane: *const Pane) FilteredColors {
+ pub fn init(p: *Pardes, vt: ?*const ghostty_vt.Terminal) FilteredColors {
var source = GColor.default;
- for (&source, 0..) |*rgb, i|
- rgb.* = pane.terminal.?.vt.colorForXterm(.{ .palette = @intCast(i) }) orelse rgb.*;
+ if (vt) |t| {
+ for (&source, 0..) |*rgb, i|
+ rgb.* = t.colorForXterm(.{ .palette = @intCast(i) }) orelse rgb.*;
+ }
const theme = p.theme();
var theme_bg = asGhostRgb(theme.bg orelse theme.tag_bg);
var theme_fg = asGhostRgb(theme.fg orelse theme.tag_fg);
- var dynamic_bg = pane.terminal.?.vt.colorForXterm(.{ .dynamic = .background });
- var dynamic_fg = pane.terminal.?.vt.colorForXterm(.{ .dynamic = .foreground });
- if (pane.terminal.?.vt.modes.get(.reverse_colors)) {
+ var dynamic_bg = if (vt) |t| t.colorForXterm(.{ .dynamic = .background }) else null;
+ var dynamic_fg = if (vt) |t| t.colorForXterm(.{ .dynamic = .foreground }) else null;
+ if (vt != null and vt.?.modes.get(.reverse_colors)) {
std.mem.swap(GColor.RGB, &theme_bg, &theme_fg);
std.mem.swap(?GColor.RGB, &dynamic_bg, &dynamic_fg);
}
@@ -2280,6 +2284,18 @@ const FilteredColors = struct {
return asPardesColor(self.keyedRgb(style.bg(cell, &self.source).?));
}
+ /// A +Pager span's colour (pager.zig), as `fg` and `bg` map a cell's.
+ pub fn spanColor(self: *FilteredColors, color: pardes.Color, is_bg: bool) pardes.Color {
+ return switch (color) {
+ .default => color,
+ .index => |idx| if (is_bg) self.bg_for_palette[idx] else self.fg_for_palette[idx],
+ .rgb => |rgb| blk: {
+ const keyed = self.keyedRgb(asGhostRgb(rgb));
+ break :blk asPardesColor(if (is_bg) keyed else self.legible(keyed));
+ },
+ };
+ }
+
fn legible(self: *const FilteredColors, rgb: GColor.RGB) GColor.RGB {
if (contrastOf(luminanceOf(rgb), self.default_bg_luminance) >=
config.tty_filter_min_contrast) return rgb;
@@ -2317,7 +2333,7 @@ const FilteredColors = struct {
self.cache_valid[slot] = true;
return best;
}
-};
+} else struct {};
const channel_luminance: [256]f64 = blk: {
@setEvalBranchQuota(20000);
@@ -2570,7 +2586,7 @@ test "terminal Filter maps the default roles before it maps anything else" {
// the null-page fallback that only the legacy dark theme exercises.
for (0..9) |t| {
p.settings.theme = @intCast(t);
- const stage_one = FilteredColors.init(p, pane);
+ const stage_one = FilteredColors.init(p, &pane.terminal.?.vt);
// `dark` declares no background of its own, which is exactly why the
// resolver reads the tag colours as the fallback rather than `.?`.
const theme = p.theme();
@@ -2584,7 +2600,7 @@ test "terminal Filter maps the default roles before it maps anything else" {
p.settings.theme = 0;
p.update(.{ .output = .{ .pane = 0, .bytes = "\x1b]11;#5f5f5f\x1b\\" } });
- var moved = FilteredColors.init(p, pane);
+ var moved = FilteredColors.init(p, &pane.terminal.?.vt);
try testing.expect(!moved.default_bg.eql(moved.theme_bg));
try testing.expect(moved.default_bg.eql(moved.keyedRgb(.{ .r = 0x5f, .g = 0x5f, .b = 0x5f })));
}
@@ -2609,7 +2625,7 @@ test "terminal Filter refuses a foreground that would collapse onto the page" {
for (0..9) |t| {
p.settings.theme = @intCast(t);
- var fc = FilteredColors.init(p, pane);
+ var fc = FilteredColors.init(p, &pane.terminal.?.vt);
const page = asPardesColor(fc.default_bg);
const rescued = asPardesColor(fc.fallback_fg);
_ = frame.reset(.retain_capacity);
@@ -2661,7 +2677,7 @@ test "terminal Filter holds every projected foreground off the page" {
for (0..9) |t| {
p.settings.theme = @intCast(t);
- var fc = FilteredColors.init(p, pane);
+ var fc = FilteredColors.init(p, &pane.terminal.?.vt);
var refused: usize = 0;
for (fc.target, 0..) |projected, key| {
const ink = fc.legible(projected);