mirror of
https://github.com/ghostty-org/ghostty.git
synced 2026-08-28 01:51:43 +00:00
Update to Zig 0.16.0
This commit represents the majority of the work necessary to upgrade Ghostty to use Zig 0.16.0. Key parts: * In addition to its previous responsibilities, the global state now houses state for global I/O implementations and the process environment. It is now also utilized in the main application along with the C library. Where necessary, global state is isolated from key parts of the implementation (e.g., in libghostty subsystems), and it's expected that this list will grow. * We currently manage our own C translation layer where necessary. In these cases, cImport has been removed in favor of the new external translate-c package. Due to fixes that have needed be made to properly translate the dependencies that were swapped out, as mentioned, we have had to backport fixes from the current translate-c package (and the upstream Arocc dependency). We will host this ourselves until Zig 0.17.0 is released with these fixes. * Where necessary (only a small number of cases), some stdlib code from 0.15.2 (and even from 0.17.0) has been taken, adopted, and vendored in lib/compat. Co-authored-by: Leah Amelia Chen <hi@pluie.me>
This commit is contained in:
@@ -7,8 +7,12 @@ const args = @import("args.zig");
|
||||
const diagnostics = @import("diagnostics.zig");
|
||||
const lib = @import("../lib/main.zig");
|
||||
const homedir = @import("../os/homedir.zig");
|
||||
const global = @import("../global.zig");
|
||||
|
||||
pub const Options = struct {
|
||||
/// We store an I/O implementation to make maintenance easier.
|
||||
_io: std.Io,
|
||||
|
||||
/// This is set by the CLI parser for deinit.
|
||||
_arena: ?ArenaAllocator = null,
|
||||
|
||||
@@ -26,8 +30,18 @@ pub const Options = struct {
|
||||
/// there is a "normal" config setting on the cli.
|
||||
_diagnostics: diagnostics.DiagnosticList = .{},
|
||||
|
||||
pub const ParseManuallyHookError = error{InvalidValue} ||
|
||||
homedir.ExpandError ||
|
||||
std.Io.Dir.RealPathFileAllocError ||
|
||||
Allocator.Error;
|
||||
|
||||
/// Manual parse hook, collect all of the arguments after `+new-window`.
|
||||
pub fn parseManuallyHook(self: *Options, alloc: Allocator, arg: []const u8, iter: anytype) (error{InvalidValue} || homedir.ExpandError || std.fs.Dir.RealPathAllocError || Allocator.Error)!bool {
|
||||
pub fn parseManuallyHook(
|
||||
self: *Options,
|
||||
alloc: Allocator,
|
||||
arg: []const u8,
|
||||
iter: anytype,
|
||||
) ParseManuallyHookError!bool {
|
||||
var e_seen: bool = std.mem.eql(u8, arg, "-e");
|
||||
|
||||
// Include the argument that triggered the manual parse hook.
|
||||
@@ -50,7 +64,12 @@ pub const Options = struct {
|
||||
return false;
|
||||
}
|
||||
|
||||
fn checkArg(self: *Options, alloc: Allocator, arg: []const u8) (error{InvalidValue} || homedir.ExpandError || std.fs.Dir.RealPathAllocError || Allocator.Error)!?[:0]const u8 {
|
||||
const CheckArgError = error{InvalidValue} ||
|
||||
homedir.ExpandError ||
|
||||
std.Io.Dir.RealPathFileAllocError ||
|
||||
Allocator.Error;
|
||||
|
||||
fn checkArg(self: *Options, alloc: Allocator, arg: []const u8) CheckArgError!?[:0]const u8 {
|
||||
if (lib.cutPrefix(u8, arg, "--class=")) |rest| {
|
||||
self.class = try alloc.dupeZ(u8, std.mem.trim(u8, rest, &std.ascii.whitespace));
|
||||
return null;
|
||||
@@ -60,11 +79,15 @@ pub const Options = struct {
|
||||
const stripped = std.mem.trim(u8, rest, &std.ascii.whitespace);
|
||||
if (std.mem.eql(u8, stripped, "home")) return try alloc.dupeZ(u8, arg);
|
||||
if (std.mem.eql(u8, stripped, "inherit")) return try alloc.dupeZ(u8, arg);
|
||||
const cwd: std.fs.Dir = std.fs.cwd();
|
||||
const cwd: std.Io.Dir = .cwd();
|
||||
var expandhome_buf: [std.fs.max_path_bytes]u8 = undefined;
|
||||
const expanded = try homedir.expandHome(stripped, &expandhome_buf);
|
||||
const expanded = expanded: {
|
||||
var environ_map = try global.environMap();
|
||||
defer environ_map.deinit();
|
||||
break :expanded try homedir.expandHome(&environ_map, stripped, &expandhome_buf);
|
||||
};
|
||||
var realpath_buf: [std.fs.max_path_bytes]u8 = undefined;
|
||||
const realpath = try cwd.realpath(expanded, &realpath_buf);
|
||||
const realpath = realpath_buf[0..try cwd.realPathFile(self._io, expanded, &realpath_buf)];
|
||||
self._working_directory_seen = true;
|
||||
return try std.fmt.allocPrintSentinel(alloc, "--working-directory={s}", .{realpath}, 0);
|
||||
}
|
||||
@@ -147,11 +170,11 @@ pub const Options = struct {
|
||||
///
|
||||
/// Available since: 1.2.0
|
||||
pub fn run(alloc: Allocator) !u8 {
|
||||
var iter = try args.argsIterator(alloc);
|
||||
var iter = try args.argsIterator(alloc, global.args());
|
||||
defer iter.deinit();
|
||||
|
||||
var buffer: [1024]u8 = undefined;
|
||||
var stderr_writer = std.fs.File.stderr().writer(&buffer);
|
||||
var stderr_writer = std.Io.File.stderr().writer(global.io(), &buffer);
|
||||
const stderr = &stderr_writer.interface;
|
||||
|
||||
const result = runArgs(alloc, &iter, stderr);
|
||||
@@ -164,7 +187,7 @@ fn runArgs(
|
||||
argsIter: anytype,
|
||||
stderr: *std.Io.Writer,
|
||||
) !u8 {
|
||||
var opts: Options = .{};
|
||||
var opts: Options = .{ ._io = global.io() };
|
||||
defer opts.deinit();
|
||||
|
||||
args.parse(Options, alloc_gpa, &opts, argsIter) catch |err| switch (err) {
|
||||
@@ -195,11 +218,16 @@ fn runArgs(
|
||||
|
||||
if (!opts._working_directory_seen) {
|
||||
const alloc = opts._arena.?.allocator();
|
||||
const cwd: std.fs.Dir = std.fs.cwd();
|
||||
const cwd: std.Io.Dir = .cwd();
|
||||
var buf: [std.fs.max_path_bytes]u8 = undefined;
|
||||
const wd = try cwd.realpath(".", &buf);
|
||||
const wd = buf[0..try cwd.realPathFile(global.io(), ".", &buf)];
|
||||
// This should be inserted at the beginning of the list, just in case `-e` was used.
|
||||
try opts._arguments.insert(alloc, 0, try std.fmt.allocPrintSentinel(alloc, "--working-directory={s}", .{wd}, 0));
|
||||
try opts._arguments.insert(alloc, 0, try std.fmt.allocPrintSentinel(
|
||||
alloc,
|
||||
"--working-directory={s}",
|
||||
.{wd},
|
||||
0,
|
||||
));
|
||||
}
|
||||
|
||||
var arena = ArenaAllocator.init(alloc_gpa);
|
||||
|
||||
Reference in New Issue
Block a user