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

Merge pull request #2794 from gpanders/push-lsmkzutmutol

Browse Source 
termio: track whether fg/bg color is explicitly set
This commit is contained in:
Mitchell Hashimoto
2024-11-23 19:05:19 -08:00
committed by GitHub
parent f14e8d989c 4042041b61
commit c24ca3d9fb
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/termio/Termio.zig
View File

@ -200,9 +200,9 @@ pub fn init(self: *Termio, alloc: Allocator, opts: termio.Options) !void {
.default_cursor_style = opts.config.cursor_style, .default_cursor_style = opts.config.cursor_style,
.default_cursor_blink = opts.config.cursor_blink, .default_cursor_blink = opts.config.cursor_blink,
.default_cursor_color = default_cursor_color, .default_cursor_color = default_cursor_color,
.cursor_color = default_cursor_color, .cursor_color = null,
.foreground_color = opts.config.foreground.toTerminalRGB(), .foreground_color = null,
.background_color = opts.config.background.toTerminalRGB(), .background_color = null,
}; };
}; };

56
src/termio/stream_handler.zig
View File

@ -52,20 +52,20 @@ pub const StreamHandler = struct {
default_cursor_blink: ?bool, default_cursor_blink: ?bool,
default_cursor_color: ?terminal.color.RGB, default_cursor_color: ?terminal.color.RGB,
/// Actual cursor color. This can be changed with OSC 12. /// Actual cursor color. This can be changed with OSC 12. If unset, falls
/// back to the default cursor color.
cursor_color: ?terminal.color.RGB, cursor_color: ?terminal.color.RGB,
/// The default foreground and background color are those set by the user's /// The default foreground and background color are those set by the user's
/// config file. These can be overridden by terminal applications using OSC /// config file.
/// 10 and OSC 11, respectively.
default_foreground_color: terminal.color.RGB, default_foreground_color: terminal.color.RGB,
default_background_color: terminal.color.RGB, default_background_color: terminal.color.RGB,
/// The actual foreground and background color. Normally this will be the /// The foreground and background color as set by an OSC 10 or OSC 11
/// same as the default foreground and background color, unless changed by a /// sequence. If unset then the respective color falls back to the default
/// terminal application. /// value.
foreground_color: terminal.color.RGB, foreground_color: ?terminal.color.RGB,
background_color: terminal.color.RGB, background_color: ?terminal.color.RGB,
/// The response to use for ENQ requests. The memory is owned by /// The response to use for ENQ requests. The memory is owned by
/// whoever owns StreamHandler. /// whoever owns StreamHandler.
@ -1197,9 +1197,12 @@ pub const StreamHandler = struct {
const color = switch (kind) { const color = switch (kind) {
.palette => |i| self.terminal.color_palette.colors[i], .palette => |i| self.terminal.color_palette.colors[i],
.foreground => self.foreground_color, .foreground => self.foreground_color orelse self.default_foreground_color,
.background => self.background_color, .background => self.background_color orelse self.default_background_color,
.cursor => self.cursor_color orelse self.foreground_color, .cursor => self.cursor_color orelse
self.default_cursor_color orelse
self.foreground_color orelse
self.default_foreground_color,
}; };
var msg: termio.Message = .{ .write_small = .{} }; var msg: termio.Message = .{ .write_small = .{} };
@ -1342,34 +1345,35 @@ pub const StreamHandler = struct {
} }
}, },
.foreground => { .foreground => {
self.foreground_color = self.default_foreground_color; self.foreground_color = null;
_ = self.renderer_mailbox.push(.{ _ = self.renderer_mailbox.push(.{
.foreground_color = self.foreground_color, .foreground_color = self.default_foreground_color,
}, .{ .forever = {} }); }, .{ .forever = {} });
self.surfaceMessageWriter(.{ .color_change = .{ self.surfaceMessageWriter(.{ .color_change = .{
.kind = .foreground, .kind = .foreground,
.color = self.foreground_color, .color = self.default_foreground_color,
} }); } });
}, },
.background => { .background => {
self.background_color = self.default_background_color; self.background_color = null;
_ = self.renderer_mailbox.push(.{ _ = self.renderer_mailbox.push(.{
.background_color = self.background_color, .background_color = self.default_background_color,
}, .{ .forever = {} }); }, .{ .forever = {} });
self.surfaceMessageWriter(.{ .color_change = .{ self.surfaceMessageWriter(.{ .color_change = .{
.kind = .background, .kind = .background,
.color = self.background_color, .color = self.default_background_color,
} }); } });
}, },
.cursor => { .cursor => {
self.cursor_color = self.default_cursor_color; self.cursor_color = null;
_ = self.renderer_mailbox.push(.{ _ = self.renderer_mailbox.push(.{
.cursor_color = self.cursor_color, .cursor_color = self.default_cursor_color,
}, .{ .forever = {} }); }, .{ .forever = {} });
if (self.cursor_color) |color| { if (self.default_cursor_color) |color| {
self.surfaceMessageWriter(.{ .color_change = .{ self.surfaceMessageWriter(.{ .color_change = .{
.kind = .cursor, .kind = .cursor,
.color = color, .color = color,
@ -1422,9 +1426,9 @@ pub const StreamHandler = struct {
const color: terminal.color.RGB = switch (key) { const color: terminal.color.RGB = switch (key) {
.palette => |palette| self.terminal.color_palette.colors[palette], .palette => |palette| self.terminal.color_palette.colors[palette],
.special => |special| switch (special) { .special => |special| switch (special) {
.foreground => self.foreground_color, .foreground => self.foreground_color orelse self.default_foreground_color,
.background => self.background_color, .background => self.background_color orelse self.default_background_color,
.cursor => self.cursor_color, .cursor => self.cursor_color orelse self.default_cursor_color,
else => { else => {
log.warn("ignoring unsupported kitty color protocol key: {}", .{key}); log.warn("ignoring unsupported kitty color protocol key: {}", .{key});
continue; continue;
@ -1485,15 +1489,15 @@ pub const StreamHandler = struct {
.special => |special| { .special => |special| {
const msg: renderer.Message = switch (special) { const msg: renderer.Message = switch (special) {
.foreground => msg: { .foreground => msg: {
self.foreground_color = self.default_foreground_color; self.foreground_color = null;
break :msg .{ .foreground_color = self.default_foreground_color }; break :msg .{ .foreground_color = self.default_foreground_color };
}, },
.background => msg: { .background => msg: {
self.background_color = self.default_background_color; self.background_color = null;
break :msg .{ .background_color = self.default_background_color }; break :msg .{ .background_color = self.default_background_color };
}, },
.cursor => msg: { .cursor => msg: {
self.cursor_color = self.default_cursor_color; self.cursor_color = null;
break :msg .{ .cursor_color = self.default_cursor_color }; break :msg .{ .cursor_color = self.default_cursor_color };
}, },
else => { else => {