Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

macos: reload config MUST go through Zig core

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-09-11 15:20:31 -07:00
parent 42bbcbfb9b
commit 2f0905b60c
3 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/ghostty.h
View File

@ -315,6 +315,7 @@ void ghostty_app_free(ghostty_app_t);
bool ghostty_app_tick(ghostty_app_t);
void *ghostty_app_userdata(ghostty_app_t);
void ghostty_app_keyboard_changed(ghostty_app_t);
void ghostty_app_reload_config(ghostty_app_t);
ghostty_surface_config_s ghostty_surface_config_new();

36
macos/Sources/Ghostty/AppState.swift
View File

@ -52,7 +52,7 @@ extension Ghostty {
}
// Initialize the global configuration.
guard let cfg = Self.reloadConfig() else {
guard let cfg = Self.loadConfig() else {
readiness = .error
return
}
@ -109,7 +109,7 @@ extension Ghostty {
}
/// Initializes a new configuration and loads all the values.
static func reloadConfig() -> ghostty_config_t? {
static func loadConfig() -> ghostty_config_t? {
// Initialize the global configuration.
guard let cfg = ghostty_config_new() else {
AppDelegate.logger.critical("ghostty_config_new failed")
@ -172,19 +172,8 @@ extension Ghostty {
}
func reloadConfig() {
guard let newConfig = Self.reloadConfig() else {
AppDelegate.logger.warning("failed to reload configuration")
return
}
// Assign the new config. This will automatically free the old config.
// It is safe to free the old config from within this function call.
config = newConfig
// If we have a delegate, notify.
if let delegate = delegate {
delegate.configDidReload(self)
}
guard let app = self.app else { return }
ghostty_app_reload_config(app)
}
/// Request that the given surface is closed. This will trigger the full normal surface close event
@ -302,9 +291,22 @@ extension Ghostty {
}
static func reloadConfig(_ userdata: UnsafeMutableRawPointer?) -> ghostty_config_t? {
guard let newConfig = Self.loadConfig() else {
AppDelegate.logger.warning("failed to reload configuration")
return nil
}
// Assign the new config. This will automatically free the old config.
// It is safe to free the old config from within this function call.
let state = Unmanaged<AppState>.fromOpaque(userdata!).takeUnretainedValue()
state.reloadConfig()
return state.config
state.config = newConfig
// If we have a delegate, notify.
if let delegate = state.delegate {
delegate.configDidReload(state)
}
return newConfig
}
static func wakeup(_ userdata: UnsafeMutableRawPointer?) {

8
src/apprt/embedded.zig
View File

@ -779,6 +779,14 @@ pub const CAPI = struct {
};
}
/// Reload the configuration.
export fn ghostty_app_reload_config(v: *App) void {
_ = v.reloadConfig() catch |err| {
log.err("error reloading config err={}", .{err});
return;
};
}
/// Returns initial surface options.
export fn ghostty_surface_config_new() apprt.Surface.Options {
return .{};