src -> wayland

build.zig

@@ -7,7 +7,7 @@ pub fn build(b: *std.Build) void {
     const libxev = b.dependency("libxev", .{}).module("xev");
 
     const wayland = b.addModule("wayland", .{
-        .root_source_file = b.path("./src/lib.zig"),
+        .root_source_file = b.path("./wayland/lib.zig"),
         .imports = &.{
             .{ .name = "xev", .module = libxev },
         },
@@ -25,7 +25,7 @@ pub fn build(b: *std.Build) void {
     inline for (.{ "globals", "seats", "hello", "kb_grab" }) |example| {
         const exe = b.addExecutable(.{
             .name = example,
-            .root_source_file = b.path("examples/" ++ example ++ ".zig"),
+            .root_source_file = b.path("wayland/examples/" ++ example ++ ".zig"),
             .target = target,
             .optimize = optimize,
         });

build.zig.zon

@@ -1,6 +1,6 @@
 // vi: ft=zig
 .{
-    .name = "zoinx",
+    .name = "way-z",
     .version = "0.0.0",
     .paths = .{""},
     .dependencies = .{

readme.md

@@ -5,9 +5,10 @@ Native Zig Wayland client library and widget toolkit
 ## Description
 
 This project has a few different parts:
-    - Wayland client library (in `src/`): This can be used to crate a statically linked binary capable of displaying CPU rendered graphics.
-    - Widget toolkit (in `toolkit/`): This builds over the wayland client and povides a Data Oriented library for creating GUI apps
-    - Apps (in `apps/`): Demo apps built using the widget toolkit
+
+- Wayland client library (in `wayland/`): This can be used to crate a statically linked binary capable of displaying CPU rendered graphics.
+- Widget toolkit (in `toolkit/`): This builds over the wayland client and povides a Data Oriented library for creating GUI apps
+- Apps (in `apps/`): Demo apps built using the widget toolkit
 
 ## Getting Started
 

examples/hello.zig → wayland/examples/hello.zig

@@ -14,8 +14,8 @@ const SurfaceCtx = struct {
     wl_surface: wl.Surface,
     xdg_surface: xdg.Surface,
     xdg_toplevel: xdg.Toplevel,
-    width: u32,
-    height: u32,
+    width: u31,
+    height: u31,
     offset: f32,
     last_frame: u32,
 };

examples/kb_grab.zig → wayland/examples/kb_grab.zig

@@ -19,8 +19,8 @@ const SurfaceCtx = struct {
     wl_surface: wl.Surface,
     layer_surface: wayland.zwlr.LayerSurfaceV1,
     shortcut_inhibitor: zwp.KeyboardShortcutsInhibitorV1,
-    width: u32,
-    height: u32,
+    width: u31,
+    height: u31,
     offset: f32,
     last_frame: u32,
 };

src/generated/wp.zig → wayland/generated/wp.zig

@@ -63,8 +63,7 @@ pub const CursorShapeManagerV1 = enum(u32) {
     };
 };
 
-/// This interface advertises the list of supported cursor shapes for a
-/// device, and allows clients to set the cursor shape.
+/// This interface allows clients to set the cursor shape.
 pub const CursorShapeDeviceV1 = enum(u32) {
     _,
     pub const interface = Interface{

src/generated/xdg.zig → wayland/generated/xdg.zig

@@ -270,7 +270,7 @@ pub const Positioner = enum(u32) {
         ///
         /// The default adjustment is none.
         set_constraint_adjustment: struct {
-            constraint_adjustment: u32, // bit mask of constraint adjustments
+            constraint_adjustment: ConstraintAdjustment, // bit mask of constraint adjustments
         },
         /// Specify the surface position offset relative to the position of the
         /// anchor on the anchor rectangle and the anchor on the surface. For

scanner.py → wayland/scanner.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # pyright: strict
 # TODO: Use ZigEtc everywhere
 
@@ -781,13 +782,14 @@ def emit(self, fd: TextIO):
             const {g} = @import("{g}.zig");"""
             )
 
+script_dir = Path(__file__).parent
 
 def main():
     global protocols
     xml_protocols = [
         "/usr/share/wayland/wayland.xml",
         "/usr/share/wayland-protocols/stable/xdg-shell/xdg-shell.xml",
-        "./protocols/wlr-layer-shell-unstable-v1.xml",
+        script_dir / "./protocols/wlr-layer-shell-unstable-v1.xml",
         "/usr/share/wayland-protocols/unstable/tablet/tablet-unstable-v2.xml",
         "/usr/share/wayland-protocols/staging/cursor-shape/cursor-shape-v1.xml",
         "/usr/share/wayland-protocols/unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml",
@@ -799,7 +801,7 @@ def main():
         Namespace.get(p.prefix).protocols.append(p)
 
     for ns in Namespace.instances.values():
-        out = Path(__file__).parent / f"src/generated/{ns.name}.zig"
+        out =  script_dir / f"generated/{ns.name}.zig"
         out.parent.mkdir(exist_ok=True)
         with out.open("w") as f:
             ns.emit(f)