From 998d7668e9d1ec1859f493af17c3d346f918d091 Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Thu, 9 Nov 2023 19:06:58 -0600
Subject: [PATCH] core: update active palette on config reload

When the config is changed, update the active palette in addition to the
default palette, but only those colors which have not been changed with
OSC 4.
---
 src/termio/Exec.zig | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/termio/Exec.zig b/src/termio/Exec.zig
index 03891364f..50654b8fd 100644
--- a/src/termio/Exec.zig
+++ b/src/termio/Exec.zig
@@ -346,10 +346,18 @@ pub fn changeConfig(self: *Exec, config: *DerivedConfig) !void {
     //   - command, working-directory: we never restart the underlying
     //   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.
     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
     self.default_cursor_style = config.cursor_style;
     self.default_cursor_blink = config.cursor_blink;
@@ -2293,7 +2301,6 @@ const StreamHandler = struct {
                     // reset those indices to the default palette
                     var it = mask.iterator(.{});
                     while (it.next()) |i| {
-                        log.warn("Resetting palette color {}", .{i});
                         self.terminal.color_palette.colors[i] = self.terminal.default_palette[i];
                         mask.unset(i);
                     }
@@ -2302,7 +2309,6 @@ const StreamHandler = struct {
                     while (it.next()) |param| {
                         // Skip invalid parameters
                         const i = std.fmt.parseUnsigned(u8, param, 10) catch continue;
-                        log.warn("Resetting palette color {}", .{i});
                         if (mask.isSet(i)) {
                             self.terminal.color_palette.colors[i] = self.terminal.default_palette[i];
                             mask.unset(i);