Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-14 15:56:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2137 from ghostty-org/extend-color

Browse Source 
renderer: do not extend padding color if any cell has default bg color
This commit is contained in:
Mitchell Hashimoto
2024-08-22 22:49:40 -04:00
committed by GitHub
parent 0b87eb7147 cff907940f
commit 80f20712e3
3 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/renderer/Metal.zig
View File

@ -2224,9 +2224,15 @@ fn rebuildCells(
// Apply heuristics for padding extension.
.extend => if (y == 0) {
self.uniforms.padding_extend.up = !row.neverExtendBg();
self.uniforms.padding_extend.up = !row.neverExtendBg(
color_palette,
self.background_color,
);
} else if (y == self.cells.size.rows - 1) {
self.uniforms.padding_extend.down = !row.neverExtendBg();
self.uniforms.padding_extend.down = !row.neverExtendBg(
color_palette,
self.background_color,
);
},
}

10
src/renderer/OpenGL.zig
View File

@ -1296,9 +1296,15 @@ pub fn rebuildCells(
// Apply heuristics for padding extension.
.extend => if (y == 0) {
self.padding_extend_top = !row.neverExtendBg();
self.padding_extend_top = !row.neverExtendBg(
color_palette,
self.background_color,
);
} else if (y == self.grid_size.rows - 1) {
self.padding_extend_bottom = !row.neverExtendBg();
self.padding_extend_bottom = !row.neverExtendBg(
color_palette,
self.background_color,
);
},
}

22
src/terminal/PageList.zig
View File

@ -6,6 +6,7 @@ const PageList = @This();
const std = @import("std");
const Allocator = std.mem.Allocator;
const assert = std.debug.assert;
const color = @import("color.zig");
const fastmem = @import("../fastmem.zig");
const kitty = @import("kitty.zig");
const point = @import("point.zig");
@ -3238,7 +3239,11 @@ pub const Pin = struct {
/// Returns true if the row of this pin should never have its background
/// color extended for filling padding space in the renderer. This is
/// a set of heuristics that help making our padding look better.
pub fn neverExtendBg(self: Pin) bool {
pub fn neverExtendBg(
self: Pin,
palette: *const color.Palette,
default_background: color.RGB,
) bool {
// Any semantic prompts should not have their background extended
// because prompts often contain special formatting (such as
// powerline) that looks bad when extended.
@ -3253,8 +3258,12 @@ pub const Pin = struct {
// extend because the default background color probably looks
// good enough as an extension.
switch (cell.content_tag) {
// We assume bg color cells are setting non-default colors.
.bg_color_palette, .bg_color_rgb => {},
// If it is a background color cell, we check the color.
.bg_color_palette, .bg_color_rgb => {
const s = self.style(cell);
const bg = s.bg(cell, palette) orelse return true;
if (bg.eql(default_background)) return true;
},
// If its a codepoint cell we can check the style.
.codepoint, .codepoint_grapheme => {
@ -3272,8 +3281,13 @@ pub const Pin = struct {
else => {},
}
// Never extend cell that has a default background.
// A default background is if there is no background
// on the style OR the explicitly set background
// matches our default background.
const s = self.style(cell);
if (s.bg_color == .none) return true;
const bg = s.bg(cell, palette) orelse return true;
if (bg.eql(default_background)) return true;
},
}
}