mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-04-21 14:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Zig (#164)

Browse Source 
* update zig

* pkg/fontconfig: clean up @as

* pkg/freetype,harfbuzz: clean up @as

* pkg/imgui: clean up @as

* pkg/macos: clean up @as

* pkg/pixman,utf8proc: clean up @as

* clean up @as

* lots more @as cleanup

* undo flatpak changes

* clean up @as
This commit is contained in:
Mitchell Hashimoto
2023-06-30 12:15:31 -07:00
committed by GitHub
parent 0c632e7345
commit 314f9287b1
110 changed files with 892 additions and 1022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/macos/foundation/string.zig
View File

@@ -10,13 +10,13 @@ pub const String = opaque {
encoding: StringEncoding,
external: bool,
) Allocator.Error!*String {
return @ptrFromInt(?*String, @intFromPtr(c.CFStringCreateWithBytes(
return @as(?*String, @ptrFromInt(@intFromPtr(c.CFStringCreateWithBytes(
null,
bs.ptr,
@intCast(c_long, bs.len),
@intCast(bs.len),
@intFromEnum(encoding),
@intFromBool(external),
))) orelse Allocator.Error.OutOfMemory;
)))) orelse Allocator.Error.OutOfMemory;
}
pub fn release(self: *String) void {
@@ -24,13 +24,13 @@ pub const String = opaque {
}
pub fn getLength(self: *String) usize {
return @intCast(usize, c.CFStringGetLength(@ptrCast(c.CFStringRef, self)));
return @intCast(c.CFStringGetLength(@ptrCast(self)));
}
pub fn hasPrefix(self: *String, prefix: *String) bool {
return c.CFStringHasPrefix(
@ptrCast(c.CFStringRef, self),
@ptrCast(c.CFStringRef, prefix),
@ptrCast(self),
@ptrCast(prefix),
) == 1;
}
@@ -39,21 +39,18 @@ pub const String = opaque {
other: *String,
options: StringComparison,
) foundation.ComparisonResult {
return @enumFromInt(
foundation.ComparisonResult,
c.CFStringCompare(
@ptrCast(c.CFStringRef, self),
@ptrCast(c.CFStringRef, other),
@intCast(c_ulong, @bitCast(c_int, options)),
),
);
return @enumFromInt(c.CFStringCompare(
@ptrCast(self),
@ptrCast(other),
@intCast(@as(c_int, @bitCast(options))),
));
}
pub fn cstring(self: *String, buf: []u8, encoding: StringEncoding) ?[]const u8 {
if (c.CFStringGetCString(
@ptrCast(c.CFStringRef, self),
@ptrCast(self),
buf.ptr,
@intCast(c_long, buf.len),
@intCast(buf.len),
@intFromEnum(encoding),
) == 0) return null;
return std.mem.sliceTo(buf, 0);
@@ -61,7 +58,7 @@ pub const String = opaque {
pub fn cstringPtr(self: *String, encoding: StringEncoding) ?[:0]const u8 {
const ptr = c.CFStringGetCStringPtr(
@ptrCast(c.CFStringRef, self),
@ptrCast(self),
@intFromEnum(encoding),
);
if (ptr == null) return null;