Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-25 13:16:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix breaking changes with latest zig

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-04-12 15:04:49 -07:00
parent 910c8cb04a
commit 8dbedeb76c
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/input/keycodes.zig
View File

@ -25,7 +25,9 @@ pub const entries: []const Entry = entries: {
.native = raw[native_idx], .native = raw[native_idx],
}; };
} }
break :entries &result;
const final = result;
break :entries &final;
}; };
/// Entry contains the USB code, native keycode, and W3C dom code for /// Entry contains the USB code, native keycode, and W3C dom code for

34
src/termio/Exec.zig
View File

@ -2646,9 +2646,15 @@ const StreamHandler = struct {
// any host (such an SSH session). The best practice terminals follow // any host (such an SSH session). The best practice terminals follow
// is to valid the hostname to be local. // is to valid the hostname to be local.
const host_valid = host_valid: { const host_valid = host_valid: {
const host = uri.host orelse break :host_valid false; const host_component = uri.host orelse break :host_valid false;
// Empty or localhost is always good // Get the raw string of the URI. Its unclear to me if the various
// tags of this enum guarantee no percent-encoding so we just
// check all of it. This isn't a performance critical path.
const host = switch (host_component) {
.raw => |v| v,
.percent_encoded => |v| v,
};
if (host.len == 0 or std.mem.eql(u8, "localhost", host)) { if (host.len == 0 or std.mem.eql(u8, "localhost", host)) {
break :host_valid true; break :host_valid true;
} }
@ -2671,24 +2677,32 @@ const StreamHandler = struct {
// the stack and fall back to heap allocation if we have to. // the stack and fall back to heap allocation if we have to.
var pathBuf: [1024]u8 = undefined; var pathBuf: [1024]u8 = undefined;
const path, const heap = path: { const path, const heap = path: {
// Get the raw string of the URI. Its unclear to me if the various
// tags of this enum guarantee no percent-encoding so we just
// check all of it. This isn't a performance critical path.
const path = switch (uri.path) {
.raw => |v| v,
.percent_encoded => |v| v,
};
// If the path doesn't have any escapes, we can use it directly. // If the path doesn't have any escapes, we can use it directly.
if (std.mem.indexOfScalar(u8, uri.path, '%') == null) if (std.mem.indexOfScalar(u8, path, '%') == null)
break :path .{ uri.path, false }; break :path .{ path, false };
// First try to stack-allocate // First try to stack-allocate
var fba = std.heap.FixedBufferAllocator.init(&pathBuf); var fba = std.heap.FixedBufferAllocator.init(&pathBuf);
if (std.Uri.unescapeString(fba.allocator(), uri.path)) |path| if (std.fmt.allocPrint(fba.allocator(), "{raw}", .{uri.path})) |v|
break :path .{ path, false } break :path .{ v, false }
else |_| {} else |_| {}
// Fall back to heap // Fall back to heap
if (std.Uri.unescapeString(self.alloc, uri.path)) |path| if (std.fmt.allocPrint(self.alloc, "{raw}", .{uri.path})) |v|
break :path .{ path, true } break :path .{ v, true }
else |_| {} else |_| {}
// Fall back to using it directly... // Fall back to using it directly...
log.warn("failed to unescape OSC 7 path, using it directly path={s}", .{uri.path}); log.warn("failed to unescape OSC 7 path, using it directly path={s}", .{path});
break :path .{ uri.path, false }; break :path .{ path, false };
}; };
defer if (heap) self.alloc.free(path); defer if (heap) self.alloc.free(path);