steven/beansprout-custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move Bar.inits() env into Context

Browse source 
Since each bar has its own, it's easier to just share it. This does
create a consistent slight overhead, but may be useful anyways if we
care about the Env more further down the line.
This commit is contained in:
Ben Buhse 2026-02-15 17:19:06 -06:00
commit bcc0e9705e
No known key found for this signature in database
GPG key ID: 7916ACFCD38FD0B4
2 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Bar.zig
View file

@ -27,17 +27,15 @@ layer_surface: ?*zwlr.LayerSurfaceV1 = null,
configured: bool = false,
pub fn init(context: *Context, output: *Output) !Bar {
// Get the local environment
// Needed for the timezone
// XXX: It might be better to store this in Context?
var env = try process.getEnvMap(utils.gpa);
defer env.deinit();
const timezone = try zeit.local(utils.gpa, &context.env);
errdefer timezone.deinit();
const timezone = try zeit.local(utils.gpa, &env);
const fonts = try getFcftFonts("monospace:size=14", 1);
errdefer fonts.destroy();
return .{
.context = context,
.fonts = try getFcftFonts("monospace:size=14", 1),
.fonts = fonts,
.timezone = timezone,
.output = output,
};
@ -82,6 +80,7 @@ pub fn initSurface(bar: *Bar) !void {
pub fn deinit(bar: *Bar) void {
bar.configured = false;
bar.timezone.deinit();
bar.fonts.destroy();
if (bar.wl_surface) |wl_surface| {
wl_surface.destroy();
}