stevee

commit 12d1b3d6ee59e2a5e7f09d1b6ef517b1b786333d
parent 865b8cd7ffc58b9eda210c072751446ae0543b33
Author: Andrea Feletto <andrea@andreafeletto.com>
Date:   Sat, 17 Dec 2022 16:34:52 +0100

update to zig 0.10.0

Diffstat:
M
.build.yml
 | 
7
+++++--
M
build.zig
 | 
8
++++----
M
src/Buffer.zig
 | 
4
+++-
M
src/main.zig
 | 
4
++--
M
src/render.zig
 | 
3
+++

5 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/.build.yml b/.build.yml
@@ -1,7 +1,6 @@
 image: archlinux
 packages:
   - hut
-  - zig
   - wayland
   - wayland-protocols
   - fcft
@@ -12,6 +11,10 @@ sources:
 secrets:
   - 8a791f75-2c57-4cd6-8cae-710da7d992cc
 tasks:
+  - zig: |
+      curl -O https://ziglang.org/download/0.10.0/zig-linux-x86_64-0.10.0.tar.xz
+      tar xf zig-linux-x86_64-0.10.0.tar.xz
+      mv zig-linux-x86_64-0.10.0 zig
   - submodules: |
       cd levee
       git submodule update --init
@@ -21,4 +24,4 @@ tasks:
       hut git artifact upload *.tar.gz
   - build: |
       cd levee
-      zig build
+      ~/zig/zig build
diff --git a/build.zig b/build.zig
@@ -33,20 +33,20 @@ pub fn build(b: *std.build.Builder) void {
 
     const wayland = Pkg{
         .name = "wayland",
-        .path = .{ .generated = &scanner.result },
+        .source = .{ .generated = &scanner.result },
     };
     const pixman = Pkg{
         .name = "pixman",
-        .path = .{ .path = "deps/zig-pixman/pixman.zig" },
+        .source = .{ .path = "deps/zig-pixman/pixman.zig" },
     };
     const fcft = Pkg{
         .name = "fcft",
-        .path = .{ .path = "deps/zig-fcft/fcft.zig" },
+        .source = .{ .path = "deps/zig-fcft/fcft.zig" },
         .dependencies = &[_]Pkg{pixman},
     };
     const udev = Pkg{
         .name = "udev",
-        .path = .{ .path = "deps/zig-udev/udev.zig" },
+        .source = .{ .path = "deps/zig-udev/udev.zig" },
     };
 
     exe.addPackage(fcft);
diff --git a/src/Buffer.zig b/src/Buffer.zig
@@ -18,11 +18,13 @@ height: u31 = 0,
 size: u31 = 0,
 
 pub fn resize(self: *Buffer, shm: *wl.Shm, width: u31, height: u31) !void {
+    if (width == 0 or height == 0) return;
+
     self.busy = true;
     self.width = width;
     self.height = height;
 
-    const fd = try os.memfd_create("levee-shm", os.linux.MFD_CLOEXEC);
+    const fd = try os.memfd_create("levee-shm", os.linux.MFD.CLOEXEC);
     defer os.close(fd);
 
     const stride = width * 4;
diff --git a/src/main.zig b/src/main.zig
@@ -39,9 +39,9 @@ pub fn main() anyerror!void {
 
     // modules
     var args = process.args();
-    const program_name = args.nextPosix() orelse unreachable;
+    const program_name = args.next() orelse unreachable;
 
-    while (args.nextPosix()) |arg| {
+    while (args.next()) |arg| {
         if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {
             help(program_name);
             return;
diff --git a/src/render.zig b/src/render.zig
@@ -29,6 +29,7 @@ pub fn renderTags(bar: *Bar) !void {
         width,
         bar.height,
     );
+    if (buffer.buffer == null) return;
     buffer.busy = true;
 
     for (tags) |*tag, i| {
@@ -72,6 +73,7 @@ pub fn renderClock(bar: *Bar) !void {
 
     const buffers = &bar.clock.buffers;
     const buffer = try Buffer.nextBuffer(buffers, shm, width, bar.height);
+    if (buffer.buffer == null) return;
     buffer.busy = true;
 
     const bg_area = [_]pixman.Rectangle16{
@@ -139,6 +141,7 @@ pub fn renderModules(bar: *Bar) !void {
 
     const buffers = &bar.modules.buffers;
     const buffer = try Buffer.nextBuffer(buffers, shm, width, bar.height);
+    if (buffer.buffer == null) return;
     buffer.busy = true;
 
     const bg_area = [_]pixman.Rectangle16{