Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

gtk: move builder to separate file/struct

Browse Source
This commit is contained in:
Jeffrey C. Ollie
2025-01-27 10:24:14 -06:00
parent 6a01cd443e
commit b916e1aca6
2 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/apprt/gtk/Builder.zig Normal file
View File

@ -0,0 +1,37 @@
/// Wrapper around GTK's builder APIs that perform some comptime checks.
const Builder = @This();
const std = @import("std");
const c = @import("c.zig").c;
builder: *c.GtkBuilder,
pub fn init(comptime name: []const u8) Builder {
comptime {
// Use @embedFile to make sure that the file exists at compile
// time. Zig _should_ discard the data so that it doesn't end up
// in the final executable. At runtime we will load the data from
// a GResource.
_ = @embedFile("ui/" ++ name ++ ".ui");
// Check to make sure that our file is listed as a `ui_file` in
// `gresource.zig`. If it isn't Ghostty could crash at runtime
// when we try and load a nonexistent GResource.
const gresource = @import("gresource.zig");
for (gresource.ui_files) |ui_file| {
if (std.mem.eql(u8, ui_file, name)) break;
} else @compileError("missing '" ++ name ++ "' in gresource.zig");
}
return .{
.builder = c.gtk_builder_new_from_resource("/com/mitchellh/ghostty/ui/" ++ name ++ ".ui") orelse unreachable,
};
}
pub fn getObject(self: *const Builder, comptime T: type, name: [:0]const u8) *T {
return @ptrCast(@alignCast(c.gtk_builder_get_object(self.builder, name.ptr)));
}
pub fn deinit(self: *const Builder) void {
c.g_object_unref(self.builder);
}

25
src/apprt/gtk/menu.zig
View File

@ -5,6 +5,7 @@ const apprt = @import("../../apprt.zig");
const App = @import("App.zig");
const Window = @import("Window.zig");
const Surface = @import("Surface.zig");
const Builder = @import("Builder.zig");
const log = std.log.scoped(.gtk_menu);
@ -31,28 +32,10 @@ pub fn Menu(
};
const parent: *T = @alignCast(@fieldParentPtr(variant, self));
const path = "ui/menu-" ++ name ++ "-" ++ variant ++ ".ui";
const builder = Builder.init("menu-" ++ name ++ "-" ++ variant);
defer builder.deinit();
comptime {
// Use @embedFile to make sure that the file exists at compile
// time. Zig _should_ discard the data so that it doesn't end up
// in the final executable. At runtime we will load the data from
// a GResource.
_ = @embedFile(path);
// Check to make sure that our file is listed as a `ui_file` in
// `gresource.zig`. If it isn't Ghostty could crash at runtime
// when we try and load a nonexistent GResource.
const gresource = @import("gresource.zig");
for (gresource.ui_files) |ui_file| {
if (std.mem.eql(u8, ui_file, "menu-" ++ name ++ "-" ++ variant)) break;
} else @compileError("missing 'menu-" ++ name ++ "-" ++ variant ++ "' in gresource.zig");
}
const builder = c.gtk_builder_new_from_resource("/com/mitchellh/ghostty/" ++ path);
defer c.g_object_unref(@ptrCast(builder));
const menu_model: *c.GMenuModel = @ptrCast(@alignCast(c.gtk_builder_get_object(builder, "menu")));
const menu_model = builder.getObject(c.GMenuModel, "menu");
const menu_widget: *MenuWidget = switch (style) {
.popover_menu => brk: {