pkg/macos: yeet more usingns

This commit is contained in:
Mitchell Hashimoto
2024-08-16 16:50:41 -07:00
parent 17d844e7bf
commit 318dc85c02
15 changed files with 63 additions and 40 deletions

View File

@@ -2,11 +2,11 @@ const std = @import("std");
const assert = std.debug.assert;
const Allocator = std.mem.Allocator;
const graphics = @import("../graphics.zig");
const context = @import("context.zig");
const Context = @import("context.zig").Context;
const c = @import("c.zig").c;
pub const BitmapContext = opaque {
pub usingnamespace context.Context(BitmapContext);
pub const context = Context(BitmapContext);
pub fn create(
data: ?[]u8,

View File

@@ -8,6 +8,8 @@ const c = @import("c.zig").c;
/// given type.
pub fn Context(comptime T: type) type {
return struct {
value: *T,
pub fn release(self: *T) void {
c.CGContextRelease(@ptrCast(self));
}

View File

@@ -1,14 +1,34 @@
pub const c = @import("text/c.zig");
pub usingnamespace @import("text/font.zig");
pub usingnamespace @import("text/font_collection.zig");
pub usingnamespace @import("text/font_descriptor.zig");
pub usingnamespace @import("text/font_manager.zig");
pub usingnamespace @import("text/frame.zig");
pub usingnamespace @import("text/framesetter.zig");
pub usingnamespace @import("text/line.zig");
pub usingnamespace @import("text/paragraph_style.zig");
pub usingnamespace @import("text/run.zig");
pub usingnamespace @import("text/stylized_strings.zig");
const font = @import("text/font.zig");
const font_collection = @import("text/font_collection.zig");
const font_descriptor = @import("text/font_descriptor.zig");
const font_manager = @import("text/font_manager.zig");
const frame = @import("text/frame.zig");
const framesetter = @import("text/framesetter.zig");
const line = @import("text/line.zig");
const paragraph_style = @import("text/paragraph_style.zig");
const run = @import("text/run.zig");
const stylized_strings = @import("text/stylized_strings.zig");
pub const c = @import("text/c.zig").c;
pub const Font = font.Font;
pub const FontTableTag = font.FontTableTag;
pub const FontCollection = font_collection.FontCollection;
pub const FontDescriptor = font_descriptor.FontDescriptor;
pub const FontAttribute = font_descriptor.FontAttribute;
pub const FontTraitKey = font_descriptor.FontTraitKey;
pub const FontVariationAxisKey = font_descriptor.FontVariationAxisKey;
pub const FontSymbolicTraits = font_descriptor.FontSymbolicTraits;
pub const createFontDescriptorsFromURL = font_manager.createFontDescriptorsFromURL;
pub const createFontDescriptorsFromData = font_manager.createFontDescriptorsFromData;
pub const Frame = frame.Frame;
pub const Framesetter = framesetter.Framesetter;
pub const Line = line.Line;
pub const ParagraphStyle = paragraph_style.ParagraphStyle;
pub const ParagraphStyleSetting = paragraph_style.ParagraphStyleSetting;
pub const ParagraphStyleSpecifier = paragraph_style.ParagraphStyleSpecifier;
pub const WritingDirection = paragraph_style.WritingDirection;
pub const Run = run.Run;
pub const StringAttribute = stylized_strings.StringAttribute;
test {
@import("std").testing.refAllDecls(@This());

View File

@@ -1,3 +1,3 @@
pub usingnamespace @cImport({
pub const c = @cImport({
@cInclude("CoreText/CoreText.h");
});

View File

@@ -4,7 +4,7 @@ const Allocator = std.mem.Allocator;
const foundation = @import("../foundation.zig");
const graphics = @import("../graphics.zig");
const text = @import("../text.zig");
const c = @import("c.zig");
const c = @import("c.zig").c;
pub const Font = opaque {
pub fn createWithFontDescriptor(desc: *const text.FontDescriptor, size: f32) Allocator.Error!*Font {

View File

@@ -2,7 +2,7 @@ const std = @import("std");
const Allocator = std.mem.Allocator;
const foundation = @import("../foundation.zig");
const text = @import("../text.zig");
const c = @import("c.zig");
const c = @import("c.zig").c;
pub const FontCollection = opaque {
pub fn createFromAvailableFonts() Allocator.Error!*FontCollection {

View File

@@ -1,7 +1,7 @@
const std = @import("std");
const Allocator = std.mem.Allocator;
const foundation = @import("../foundation.zig");
const c = @import("c.zig");
const c = @import("c.zig").c;
pub const FontDescriptor = opaque {
pub fn createWithNameAndSize(name: *foundation.String, size: f64) Allocator.Error!*FontDescriptor {

View File

@@ -1,7 +1,7 @@
const std = @import("std");
const Allocator = std.mem.Allocator;
const foundation = @import("../foundation.zig");
const c = @import("c.zig");
const c = @import("c.zig").c;
pub fn createFontDescriptorsFromURL(url: *foundation.URL) ?*foundation.Array {
return @ptrFromInt(@intFromPtr(c.CTFontManagerCreateFontDescriptorsFromURL(

View File

@@ -4,7 +4,7 @@ const Allocator = std.mem.Allocator;
const foundation = @import("../foundation.zig");
const graphics = @import("../graphics.zig");
const text = @import("../text.zig");
const c = @import("c.zig");
const c = @import("c.zig").c;
pub const Frame = opaque {
pub fn release(self: *Frame) void {

View File

@@ -4,7 +4,7 @@ const Allocator = std.mem.Allocator;
const foundation = @import("../foundation.zig");
const graphics = @import("../graphics.zig");
const text = @import("../text.zig");
const c = @import("c.zig");
const c = @import("c.zig").c;
pub const Framesetter = opaque {
pub fn createWithAttributedString(str: *foundation.AttributedString) Allocator.Error!*Framesetter {

View File

@@ -4,7 +4,7 @@ const Allocator = std.mem.Allocator;
const foundation = @import("../foundation.zig");
const graphics = @import("../graphics.zig");
const text = @import("../text.zig");
const c = @import("c.zig");
const c = @import("c.zig").c;
pub const Line = opaque {
pub fn createWithAttributedString(str: *foundation.AttributedString) Allocator.Error!*Line {

View File

@@ -4,7 +4,7 @@ const Allocator = std.mem.Allocator;
const foundation = @import("../foundation.zig");
const graphics = @import("../graphics.zig");
const text = @import("../text.zig");
const c = @import("c.zig");
const c = @import("c.zig").c;
// https://developer.apple.com/documentation/coretext/ctparagraphstyle?language=objc
pub const ParagraphStyle = opaque {

View File

@@ -4,7 +4,7 @@ const Allocator = std.mem.Allocator;
const foundation = @import("../foundation.zig");
const graphics = @import("../graphics.zig");
const text = @import("../text.zig");
const c = @import("c.zig");
const c = @import("c.zig").c;
pub const Run = opaque {
pub fn release(self: *Run) void {

View File

@@ -1,5 +1,5 @@
const foundation = @import("../foundation.zig");
const c = @import("c.zig");
const c = @import("c.zig").c;
pub const StringAttribute = enum {
font,