mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-08-25 00:21:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

terminal: color reset should set override to null, not default (#13650)

Browse Source 
#12755

Reset previously copied the active default into the override. This is
wrong, a reset should unset the override and defer back to the default.

Reset foreground, background, and cursor colors now resolve through the
current default while explicit OSC overrides remain unchanged across
configuration updates.

Set a configured background in the OSC 11 regression, assert OSC 111
clears its override, then change the default to verify the reset color
follows it.
This commit is contained in:
Mitchell Hashimoto
2026-08-05 14:48:40 -07:00
committed by GitHub
parent 78dec345b2 7cd2f65f5c
commit 1aeca6705e
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/terminal/color.zig
View File

@@ -350,7 +350,7 @@ pub const DynamicRGB = struct {
}
pub fn reset(self: *DynamicRGB) void {
self.override = self.default;
self.override = null;
}
};

11
src/terminal/stream_terminal.zig
View File

@@ -1673,6 +1673,9 @@ test "OSC 11 set and reset background color" {
var s: Stream = .init(.{ .allocator = testing.allocator, .handler = .init(&t) });
defer s.deinit();
const default: color.RGB = .{ .r = 0x10, .g = 0x20, .b = 0x30 };
t.colors.background.default = default;
// Set background to green
s.nextSlice("\x1b]11;rgb:00/ff/00\x1b\\");
const bg = t.colors.background.get().?;
@@ -1682,7 +1685,13 @@ test "OSC 11 set and reset background color" {
// Reset background
s.nextSlice("\x1b]111\x1b\\");
try testing.expect(t.colors.background.get() == null);
try testing.expectEqual(default, t.colors.background.get().?);
try testing.expectEqual(null, t.colors.background.override);
// A reset color continues to follow later configuration changes.
const updated: color.RGB = .{ .r = 0x40, .g = 0x50, .b = 0x60 };
t.colors.background.default = updated;
try testing.expectEqual(updated, t.colors.background.get().?);
}
test "OSC 12 set and reset cursor color" {