mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-10-09 11:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

gtk: use std.Io.Writer to generate runtime CSS

Browse Source
This commit is contained in:
Jeffrey C. Ollie
2025-10-06 09:39:50 -05:00
parent 86421c9e09
commit d2ee80bc49
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/apprt/gtk/class/application.zig
View File

@@ -806,19 +806,19 @@ pub const Application = extern struct {
} }
} }
fn loadRuntimeCss(self: *Self) Allocator.Error!void { fn loadRuntimeCss(self: *Self) (Allocator.Error || std.Io.Writer.Error)!void {
const alloc = self.allocator(); const alloc = self.allocator();
const config = self.private().config.get(); const config = self.private().config.get();
var buf: std.ArrayListUnmanaged(u8) = try .initCapacity(alloc, 2048); var buf: std.Io.Writer.Allocating = try .initCapacity(alloc, 2048);
defer buf.deinit(alloc); defer buf.deinit();
const writer = buf.writer(alloc); const writer = &buf.writer;
// Load standard css first as it can override some of the user configured styling. // Load standard css first as it can override some of the user configured styling.
try loadRuntimeCss414(config, &writer); try loadRuntimeCss414(config, writer);
try loadRuntimeCss416(config, &writer); try loadRuntimeCss416(config, writer);
const unfocused_fill: CoreConfig.Color = config.@"unfocused-split-fill" orelse config.background; const unfocused_fill: CoreConfig.Color = config.@"unfocused-split-fill" orelse config.background;
@@ -861,7 +861,8 @@ pub const Application = extern struct {
// ensure that we have a sentinel // ensure that we have a sentinel
try writer.writeByte(0); try writer.writeByte(0);
const data = buf.items[0 .. buf.items.len - 1 :0]; const data_ = buf.written();
const data = data_[0 .. data_.len - 1 :0];
log.debug("runtime CSS is {d} bytes", .{data.len + 1}); log.debug("runtime CSS is {d} bytes", .{data.len + 1});
@@ -875,8 +876,8 @@ pub const Application = extern struct {
/// Load runtime CSS for older than GTK 4.16 /// Load runtime CSS for older than GTK 4.16
fn loadRuntimeCss414( fn loadRuntimeCss414(
config: *const CoreConfig, config: *const CoreConfig,
writer: *const std.ArrayListUnmanaged(u8).Writer, writer: *std.Io.Writer,
) Allocator.Error!void { ) std.Io.Writer.Error!void {
if (gtk_version.runtimeAtLeast(4, 16, 0)) return; if (gtk_version.runtimeAtLeast(4, 16, 0)) return;
const window_theme = config.@"window-theme"; const window_theme = config.@"window-theme";
@@ -911,8 +912,8 @@ pub const Application = extern struct {
/// Load runtime for GTK 4.16 and newer /// Load runtime for GTK 4.16 and newer
fn loadRuntimeCss416( fn loadRuntimeCss416(
config: *const CoreConfig, config: *const CoreConfig,
writer: *const std.ArrayListUnmanaged(u8).Writer, writer: *std.Io.Writer,
) Allocator.Error!void { ) std.Io.Writer.Error!void {
if (gtk_version.runtimeUntil(4, 16, 0)) return; if (gtk_version.runtimeUntil(4, 16, 0)) return;
const window_theme = config.@"window-theme"; const window_theme = config.@"window-theme";
@@ -1044,9 +1045,7 @@ pub const Application = extern struct {
defer file.close(); defer file.close();
log.info("loading gtk-custom-css path={s}", .{path}); log.info("loading gtk-custom-css path={s}", .{path});
var buf: [4096]u8 = undefined; const contents = try file.readToEndAlloc(
var reader = file.reader(&buf);
const contents = try reader.interface.readAlloc(
alloc, alloc,
5 * 1024 * 1024, // 5MB, 5 * 1024 * 1024, // 5MB,
); );
@@ -1164,7 +1163,7 @@ pub const Application = extern struct {
// just stuck with the old CSS but we don't want to fail the entire // just stuck with the old CSS but we don't want to fail the entire
// config change operation. // config change operation.
self.loadRuntimeCss() catch |err| switch (err) { self.loadRuntimeCss() catch |err| switch (err) {
error.OutOfMemory => log.warn( error.WriteFailed, error.OutOfMemory => log.warn(
"out of memory loading runtime CSS, no runtime CSS applied", "out of memory loading runtime CSS, no runtime CSS applied",
.{}, .{},
), ),