mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-05-22 04:44:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

config: support loading from "Application Support" directory on macOS

Browse Source
This commit is contained in:
Kyaw
2024-11-24 17:08:07 +07:00
parent c24ca3d9fb
commit 10e37a3dee
5 changed files with 86 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/config/Config.zig
View File

@@ -1809,10 +1809,15 @@ pub fn deinit(self: *Config) void {
/// Load the configuration according to the default rules:
///
/// 1. Defaults
/// 2. XDG Config File
/// 2. Configuration Files
/// 3. CLI flags
/// 4. Recursively defined configuration files
///
/// Configuration files are loaded in the follow order:
///
/// 1. XDG Config File
/// 2. "Application Support" Config File on macOS
///
pub fn load(alloc_gpa: Allocator) !Config {
var result = try default(alloc_gpa);
errdefer result.deinit();
@@ -2394,25 +2399,37 @@ pub fn loadFile(self: *Config, alloc: Allocator, path: []const u8) !void {
try self.expandPaths(std.fs.path.dirname(path).?);
}
/// Load the configuration from the default configuration file. The default
/// configuration file is at `$XDG_CONFIG_HOME/ghostty/config`.
pub fn loadDefaultFiles(self: *Config, alloc: Allocator) !void {
const config_path = try internal_os.xdg.config(alloc, .{ .subdir = "ghostty/config" });
defer alloc.free(config_path);
self.loadFile(alloc, config_path) catch |err| switch (err) {
/// Load optional configuration file from `path`. All errors are ignored.
pub fn loadOptionalFile(self: *Config, alloc: Allocator, path: []const u8) void {
self.loadFile(alloc, path) catch |err| switch (err) {
error.FileNotFound => std.log.info(
"homedir config not found, not loading path={s}",
.{config_path},
"optional config file not found, not loading path={s}",
.{path},
),
else => std.log.warn(
"error reading config file, not loading err={} path={s}",
.{ err, config_path },
"error reading optional config file, not loading err={} path={s}",
.{ err, path },
),
};
}
/// Load configurations from the default configuration files. The default
/// configuration file is at `$XDG_CONFIG_HOME/ghostty/config`.
///
/// On macOS, `$HOME/Library/Application Support/$CFBundleIdentifier/config`
/// is also loaded.
pub fn loadDefaultFiles(self: *Config, alloc: Allocator) !void {
const xdg_path = try internal_os.xdg.config(alloc, .{ .subdir = "ghostty/config" });
defer alloc.free(xdg_path);
self.loadOptionalFile(alloc, xdg_path);
if (builtin.os.tag == .macos) {
const app_support_path = try internal_os.macos.getAppSupportDir(alloc, "config");
defer alloc.free(app_support_path);
self.loadOptionalFile(alloc, app_support_path);
}
}
/// Load and parse the CLI args.
pub fn loadCliArgs(self: *Config, alloc_gpa: Allocator) !void {
switch (builtin.os.tag) {