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 #852 from gpanders/palette-reset

Browse Source 
core: update active palette on config reload
This commit is contained in:
Mitchell Hashimoto
2023-11-09 17:18:58 -08:00
committed by GitHub
parent db868df50c 998d7668e9
commit 5514d0a0c2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/termio/Exec.zig
View File

@ -346,10 +346,18 @@ pub fn changeConfig(self: *Exec, config: *DerivedConfig) !void {
// - command, working-directory: we never restart the underlying // - command, working-directory: we never restart the underlying
// process so we don't care or need to know about these. // process so we don't care or need to know about these.
// Update the palette. Note this will only apply to new colors drawn // Update the default palette. Note this will only apply to new colors drawn
// since we decode all palette colors to RGB on usage. // since we decode all palette colors to RGB on usage.
self.terminal.default_palette = config.palette; self.terminal.default_palette = config.palette;
// Update the active palette, except for any colors that were modified with
// OSC 4
for (0..config.palette.len) |i| {
if (!self.terminal.color_palette.mask.isSet(i)) {
self.terminal.color_palette.colors[i] = config.palette[i];
}
}
// Update our default cursor style // Update our default cursor style
self.default_cursor_style = config.cursor_style; self.default_cursor_style = config.cursor_style;
self.default_cursor_blink = config.cursor_blink; self.default_cursor_blink = config.cursor_blink;
@ -2293,7 +2301,6 @@ const StreamHandler = struct {
// reset those indices to the default palette // reset those indices to the default palette
var it = mask.iterator(.{}); var it = mask.iterator(.{});
while (it.next()) |i| { while (it.next()) |i| {
log.warn("Resetting palette color {}", .{i});
self.terminal.color_palette.colors[i] = self.terminal.default_palette[i]; self.terminal.color_palette.colors[i] = self.terminal.default_palette[i];
mask.unset(i); mask.unset(i);
} }
@ -2302,7 +2309,6 @@ const StreamHandler = struct {
while (it.next()) |param| { while (it.next()) |param| {
// Skip invalid parameters // Skip invalid parameters
const i = std.fmt.parseUnsigned(u8, param, 10) catch continue; const i = std.fmt.parseUnsigned(u8, param, 10) catch continue;
log.warn("Resetting palette color {}", .{i});
if (mask.isSet(i)) { if (mask.isSet(i)) {
self.terminal.color_palette.colors[i] = self.terminal.default_palette[i]; self.terminal.color_palette.colors[i] = self.terminal.default_palette[i];
mask.unset(i); mask.unset(i);