From f7e1d0b83b9067c6dd3d482134b8305c6e39752c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Sat, 23 Nov 2024 10:21:38 -0800
Subject: [PATCH] apprt/embedded: update our cached config on config_change
 action

Fixes #2784
---
 src/apprt/embedded.zig | 41 +++++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/apprt/embedded.zig b/src/apprt/embedded.zig
index ccafb9aa6..6a4411a85 100644
--- a/src/apprt/embedded.zig
+++ b/src/apprt/embedded.zig
@@ -85,26 +85,38 @@ pub const App = struct {
     };
 
     core_app: *CoreApp,
-    config: *const Config,
     opts: Options,
     keymap: input.Keymap,
 
+    /// The configuration for the app. This is owned by this structure.
+    config: Config,
+
     /// The keymap state is used for global keybinds only. Each surface
     /// also has its own keymap state for focused keybinds.
     keymap_state: input.Keymap.State,
 
-    pub fn init(core_app: *CoreApp, config: *const Config, opts: Options) !App {
+    pub fn init(
+        core_app: *CoreApp,
+        config: *const Config,
+        opts: Options,
+    ) !App {
+        // We have to clone the config.
+        const alloc = core_app.alloc;
+        var config_clone = try config.clone(alloc);
+        errdefer config_clone.deinit();
+
         return .{
             .core_app = core_app,
-            .config = config,
+            .config = config_clone,
             .opts = opts,
             .keymap = try input.Keymap.init(),
             .keymap_state = .{},
         };
     }
 
-    pub fn terminate(self: App) void {
+    pub fn terminate(self: *App) void {
         self.keymap.deinit();
+        self.config.deinit();
     }
 
     /// Returns true if there are any global keybinds in the configuration.
@@ -370,11 +382,11 @@ pub const App = struct {
         }
     }
 
-    pub fn wakeup(self: App) void {
+    pub fn wakeup(self: *const App) void {
         self.opts.wakeup(self.opts.userdata);
     }
 
-    pub fn wait(self: App) !void {
+    pub fn wait(self: *const App) !void {
         _ = self;
     }
 
@@ -450,6 +462,19 @@ pub const App = struct {
                 },
             },
 
+            .config_change => switch (target) {
+                .surface => {},
+
+                // For app updates, we update our core config. We need to
+                // clone it because the caller owns the param.
+                .app => if (value.config.clone(self.core_app.alloc)) |config| {
+                    self.config.deinit();
+                    self.config = config;
+                } else |err| {
+                    log.err("error updating app config err={}", .{err});
+                },
+            },
+
             else => {},
         }
     }
@@ -573,7 +598,7 @@ pub const Surface = struct {
         errdefer app.core_app.deleteSurface(self);
 
         // Shallow copy the config so that we can modify it.
-        var config = try apprt.surface.newConfig(app.core_app, app.config);
+        var config = try apprt.surface.newConfig(app.core_app, &app.config);
         defer config.deinit();
 
         // If we have a working directory from the options then we set it.
@@ -1831,7 +1856,7 @@ pub const CAPI = struct {
         // This is only supported on macOS
         if (comptime builtin.target.os.tag != .macos) return;
 
-        const config = app.config;
+        const config = &app.config;
 
         // Do nothing if we don't have background transparency enabled
         if (config.@"background-opacity" >= 1.0) return;