diff --git a/.gitignore b/.gitignore index c335a5b..feda423 100644 --- a/.gitignore +++ b/.gitignore @@ -16,5 +16,3 @@ zig-out/ /build/ /build-*/ /docgen_tmp/ - -result diff --git a/build.zig b/build.zig index 421a8f8..fe5c7dc 100644 --- a/build.zig +++ b/build.zig @@ -1,70 +1,34 @@ const std = @import("std"); -// Although this function looks imperative, note that its job is to -// declaratively construct a build graph that will be executed by an external -// runner. pub fn build(b: *std.Build) void { - // Standard target options allows the person running `zig build` to choose - // what target to build for. Here we do not override the defaults, which - // means any target is allowed, and the default is native. Other options - // for restricting supported target set are available. const target = b.standardTargetOptions(.{}); - - // Standard optimization options allow the person running `zig build` to select - // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not - // set a preferred release mode, allowing the user to decide how to optimize. const optimize = b.standardOptimizeOption(.{}); const exe = b.addExecutable(.{ .name = "statusbar", - // In this case the main source file is merely a path, however, in more - // complicated build scripts, this could be a generated file. .root_source_file = .{ .path = "src/main.zig" }, .target = target, .optimize = optimize, }); - - // This declares intent for the executable to be installed into the - // standard location when the user invokes the "install" step (the default - // step when running `zig build`). b.installArtifact(exe); - // This *creates* a Run step in the build graph, to be executed when another - // step is evaluated that depends on it. The next line below will establish - // such a dependency. const run_cmd = b.addRunArtifact(exe); - - // By making the run step depend on the install step, it will be run from the - // installation directory rather than directly from within the cache directory. - // This is not necessary, however, if the application depends on other installed - // files, this ensures they will be present and in the expected location. run_cmd.step.dependOn(b.getInstallStep()); - - // This allows the user to pass arguments to the application in the build - // command itself, like this: `zig build run -- arg1 arg2 etc` if (b.args) |args| { run_cmd.addArgs(args); } - // This creates a build step. It will be visible in the `zig build --help` menu, - // and can be selected like this: `zig build run` - // This will evaluate the `run` step rather than the default, which is "install". const run_step = b.step("run", "Run the app"); run_step.dependOn(&run_cmd.step); - // Creates a step for unit testing. This only builds the test executable - // but does not run it. - const unit_tests = b.addTest(.{ + const exe_unit_tests = b.addTest(.{ .root_source_file = .{ .path = "src/main.zig" }, .target = target, .optimize = optimize, }); - const run_unit_tests = b.addRunArtifact(unit_tests); + const run_exe_unit_tests = b.addRunArtifact(exe_unit_tests); - // Similar to creating the run step earlier, this exposes a `test` step to - // the `zig build --help` menu, providing a way for the user to request - // running the unit tests. const test_step = b.step("test", "Run unit tests"); - test_step.dependOn(&run_unit_tests.step); + test_step.dependOn(&run_exe_unit_tests.step); } diff --git a/build.zig.zon b/build.zig.zon new file mode 100644 index 0000000..cbe30d4 --- /dev/null +++ b/build.zig.zon @@ -0,0 +1,22 @@ +.{ + .name = "statusbar", + .version = "0.0.0", + + //.minimum_zig_version = "0.11.0", + + .dependencies = .{}, + + .paths = .{ + // This makes *all* files, recursively, included in this package. It is generally + // better to explicitly list the files and directories instead, to insure that + // fetching from tarballs, file system paths, and version control all result + // in the same contents hash. + "", + // For example... + //"build.zig", + //"build.zig.zon", + //"src", + //"LICENSE", + //"README.md", + }, +} diff --git a/flake.lock b/flake.lock index c5e0267..9c8f7b6 100644 --- a/flake.lock +++ b/flake.lock @@ -59,11 +59,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1710206277, - "narHash": "sha256-LHQaQsSaH6IZ1YPF25gMWxFK7DWOn1wMkdH5WQNvEvU=", + "lastModified": 1712453141, + "narHash": "sha256-U8VBcSik4uNsMw/Re2h9chy287uHMxl2Ztk9H1l5xLM=", "owner": "Cloudef", "repo": "zig2nix", - "rev": "a9b2a0546e6dc330042aa5d19269ab9c1cb6fb5f", + "rev": "5ea593c7de91dff07d6eb368b8c504fb1b137998", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ca96e41..fe8bf52 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "Statusbar written in Zig"; + description = "Zig project flake"; inputs = { zig2nix.url = "github:Cloudef/zig2nix"; @@ -11,7 +11,7 @@ # Zig flake helper # Check the flake.nix in zig2nix project for more options: # - env = zig2nix.outputs.zig-env.${system} {}; + env = zig2nix.outputs.zig-env.${system} { zig = zig2nix.outputs.packages.${system}.zig.master.bin; }; system-triple = env.lib.zigTripleFromString system; in with builtins; with env.lib; with env.pkgs.lib; rec { # nix build .#target.{zig-target} diff --git a/src/main.zig b/src/main.zig index ce12f02..6a4b5f5 100644 --- a/src/main.zig +++ b/src/main.zig @@ -2,6 +2,7 @@ const std = @import("std"); const io = std.io; const heap = std.heap; const json = std.json; +const posix = std.posix; const battery = @import("modules/battery.zig"); const calendar = @import("modules/calendar.zig"); @@ -26,7 +27,7 @@ pub fn main() !void { try stdout.print("{{\"version\":1}}\n[\n", .{}); try bw.flush(); - var modules = [_]Module{ + const modules = [_]Module{ uptime.init(arena.allocator()).module, loadavg.init(arena.allocator()).module, memory.init(arena.allocator()).module, @@ -36,6 +37,13 @@ pub fn main() !void { calendar.init(arena.allocator()).module, }; + var act = posix.Sigaction{ + .handler = .{ .handler = sigHandler }, + .mask = posix.empty_sigset, + .flags = 0, + }; + try posix.sigaction(posix.SIG.USR1, &act, null); + while (true) { // const start_time = std.time.milliTimestamp(); @@ -83,19 +91,27 @@ pub fn main() !void { // const end_time = std.time.milliTimestamp(); // std.debug.print("\nFinished in {d}ms", .{end_time - start_time}); - std.time.sleep(1000_000_000); + var i: usize = 0; + while (!refresh and i < 100) : (i += 1) std.time.sleep(10_000_000); + refresh = false; } } +var refresh = false; + +fn sigHandler(_: i32) callconv(.C) void { + refresh = true; +} + pub const Color = struct { r: f32, g: f32, b: f32, pub fn init(string: []const u8) !Color { - var r = try std.fmt.parseInt(u8, string[1..2], 16); - var g = try std.fmt.parseInt(u8, string[3..4], 16); - var b = try std.fmt.parseInt(u8, string[5..6], 16); + const r = try std.fmt.parseInt(u8, string[1..2], 16); + const g = try std.fmt.parseInt(u8, string[3..4], 16); + const b = try std.fmt.parseInt(u8, string[5..6], 16); return .{ .r = @as(f32, @floatFromInt(r)) / 255, .g = @as(f32, @floatFromInt(g)) / 255, diff --git a/src/module.zig b/src/module.zig index 46ad834..45e9c0b 100644 --- a/src/module.zig +++ b/src/module.zig @@ -28,3 +28,12 @@ getJsonFn: *const fn (*const Self) anyerror!JSON, pub fn getJson(self: *const Self) anyerror!JSON { return self.getJsonFn(self); } + +pub const Block = struct { + full_text: []const u8, + short_text: ?[]const u8, + /// from 0.0 to 1.0, affects foreground color + /// from 1.0 to 2.0, affects background and foreground colors + urgency: f32, +}; + diff --git a/src/modules/battery.zig b/src/modules/battery.zig index 76b0c1b..7aff63f 100644 --- a/src/modules/battery.zig +++ b/src/modules/battery.zig @@ -14,7 +14,7 @@ pub fn init(allocator: std.mem.Allocator) Self { } pub fn getJson(module: *const Module) !Module.JSON { - const self = @fieldParentPtr(Self, "module", module); + const self: *const Self = @fieldParentPtr("module", module); var energy_full_file = try std.fs.openFileAbsolute("/sys/class/power_supply/BAT0/energy_full", .{}); defer energy_full_file.close(); diff --git a/src/modules/calendar.zig b/src/modules/calendar.zig index 389741a..19bbd62 100644 --- a/src/modules/calendar.zig +++ b/src/modules/calendar.zig @@ -14,7 +14,7 @@ pub fn init(allocator: std.mem.Allocator) Self { } pub fn getJson(module: *const Module) !Module.JSON { - const self = @fieldParentPtr(Self, "module", module); + const self: *const Self = @fieldParentPtr("module", module); var tz_file = try std.fs.openFileAbsolute("/etc/localtime", .{}); defer tz_file.close(); var tz = try std.tz.Tz.parse(self.module.allocator, tz_file.reader()); diff --git a/src/modules/display.zig b/src/modules/display.zig index 34fba25..8663c66 100644 --- a/src/modules/display.zig +++ b/src/modules/display.zig @@ -14,7 +14,7 @@ pub fn init(allocator: std.mem.Allocator) Self { } pub fn getJson(module: *const Module) !Module.JSON { - const self = @fieldParentPtr(Self, "module", module); + const self: *const Self = @fieldParentPtr("module", module); var brightness_full_file = try std.fs.openFileAbsolute("/sys/class/backlight/acpi_video0/max_brightness", .{}); defer brightness_full_file.close(); diff --git a/src/modules/loadavg.zig b/src/modules/loadavg.zig index 1cd5da0..888b3b4 100644 --- a/src/modules/loadavg.zig +++ b/src/modules/loadavg.zig @@ -14,14 +14,14 @@ pub fn init(allocator: std.mem.Allocator) Self { } pub fn getJson(module: *const Module) !Module.JSON { - const self = @fieldParentPtr(Self, "module", module); + const self: *const Self = @fieldParentPtr("module", module); var loadavg_file = try std.fs.openFileAbsolute("/proc/loadavg", .{}); defer loadavg_file.close(); const loadavg_string = try loadavg_file.reader().readAllAlloc(self.module.allocator, 64); var loadavg_split = std.mem.splitScalar(u8, loadavg_string[0 .. loadavg_string.len - 1], ' '); - var loadavg = try std.fmt.parseFloat(f32, loadavg_split.first()); + const loadavg = try std.fmt.parseFloat(f32, loadavg_split.first()); return .{ .full_text = try std.fmt.allocPrint(self.module.allocator, "{d:0>1.2}", .{loadavg}), diff --git a/src/modules/memory.zig b/src/modules/memory.zig index 18c40e7..73cbe46 100644 --- a/src/modules/memory.zig +++ b/src/modules/memory.zig @@ -14,7 +14,7 @@ pub fn init(allocator: std.mem.Allocator) Self { } pub fn getJson(module: *const Module) !Module.JSON { - const self = @fieldParentPtr(Self, "module", module); + const self: *const Self = @fieldParentPtr("module", module); var meminfo_file = try std.fs.openFileAbsolute("/proc/meminfo", .{}); defer meminfo_file.close(); diff --git a/src/modules/uptime.zig b/src/modules/uptime.zig index 351cfef..769c79e 100644 --- a/src/modules/uptime.zig +++ b/src/modules/uptime.zig @@ -14,7 +14,7 @@ pub fn init(allocator: std.mem.Allocator) Self { } pub fn getJson(module: *const Module) !Module.JSON { - const self = @fieldParentPtr(Self, "module", module); + const self: *const Self = @fieldParentPtr("module", module); var uptime_file = try std.fs.openFileAbsolute("/proc/uptime", .{}); defer uptime_file.close(); diff --git a/src/modules/volume.zig b/src/modules/volume.zig index 168161c..783f66c 100644 --- a/src/modules/volume.zig +++ b/src/modules/volume.zig @@ -14,9 +14,9 @@ pub fn init(allocator: std.mem.Allocator) Self { } pub fn getJson(module: *const Module) !Module.JSON { - const self = @fieldParentPtr(Self, "module", module); + const self: *const Self = @fieldParentPtr("module", module); - const child = try std.ChildProcess.exec(.{ + const child = try std.ChildProcess.run(.{ .argv = &[_][]const u8{ "amixer", "sget", "Master" }, .allocator = self.module.allocator, });