Merge branch 'master' of https://codeberg.org/river/river

.builds/alpine.yml

@@ -40,11 +40,10 @@ tasks:
       sudo ninja -C build/ install
       cd ..
 
-      wget -nv https://ziglang.org/download/0.11.0/zig-linux-x86_64-0.11.0.tar.xz
+      wget -nv https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz
-      # Remove a lot of useless lines from tar output.
+      tar xf zig-linux-x86_64-0.13.0.tar.xz
-      tar -xvf zig-linux-x86_64-0.11.0.tar.xz 1>/dev/null
+      sudo mv zig-linux-x86_64-0.13.0/zig /usr/bin/
-      sudo mv zig-linux-x86_64-0.11.0/zig /usr/bin/
+      sudo mv zig-linux-x86_64-0.13.0/lib /usr/lib/zig
-      sudo mv zig-linux-x86_64-0.11.0/lib /usr/lib/zig
   - build: |
       cd river
       zig build
@@ -57,3 +56,4 @@ tasks:
       zig fmt --check riverctl/
       zig fmt --check rivertile/
       zig fmt --check build.zig
+      zig fmt --check build.zig.zon

.builds/archlinux.yml

@@ -38,11 +38,10 @@ tasks:
       sudo ninja -C build/ install
       cd ..
 
-      wget -nv https://ziglang.org/download/0.11.0/zig-linux-x86_64-0.11.0.tar.xz
+      wget -nv https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz
-      # Remove a lot of useless lines from tar output.
+      tar xf zig-linux-x86_64-0.13.0.tar.xz
-      tar -xvf zig-linux-x86_64-0.11.0.tar.xz 1>/dev/null
+      sudo mv zig-linux-x86_64-0.13.0/zig /usr/bin/
-      sudo mv zig-linux-x86_64-0.11.0/zig /usr/bin/
+      sudo mv zig-linux-x86_64-0.13.0/lib /usr/lib/zig
-      sudo mv zig-linux-x86_64-0.11.0/lib /usr/lib/zig
   - build: |
       cd river
       zig build
@@ -55,3 +54,4 @@ tasks:
       zig fmt --check riverctl/
       zig fmt --check rivertile/
       zig fmt --check build.zig
+      zig fmt --check build.zig.zon

.builds/freebsd.yml

@@ -1,61 +0,0 @@
-image: freebsd/latest
-packages:
-  - devel/evdev-proto
-  - devel/libevdev
-  - devel/libepoll-shim
-  - devel/libudev-devd
-  - devel/meson
-  - devel/pkgconf
-  - graphics/mesa-libs
-  - graphics/wayland-protocols
-  - misc/hwdata
-  - x11/libX11
-  - x11/libinput
-  - x11/libxcb
-  - x11/libxkbcommon
-  - x11/pixman
-  - x11/xcb-util-errors
-  - x11/xcb-util-renderutil
-  - x11/xcb-util-wm
-  - x11-servers/xwayland
-  - sysutils/seatd
-  - sysutils/libdisplay-info
-  - gmake
-  - scdoc
-  - wget
-sources:
-  - https://codeberg.org/river/river
-  - https://gitlab.freedesktop.org/wayland/wayland.git
-  - https://gitlab.freedesktop.org/wlroots/wlroots.git
-tasks:
-  - install_deps: |
-      cd wayland
-      git checkout 1.22.0
-      meson setup build -Ddocumentation=false -Dtests=false --prefix /usr
-      sudo ninja -C build install
-      cd ..
-
-      cd wlroots
-      git checkout 0.17.2
-      meson setup build --auto-features=enabled -Drenderers=gles2 -Dexamples=false \
-            -Dwerror=false -Db_ndebug=false --prefix /usr
-      sudo ninja -C build/ install
-      cd ..
-
-      wget -nv https://ziglang.org/download/0.11.0/zig-freebsd-x86_64-0.11.0.tar.xz
-      # Remove a lot of useless lines from tar output.
-      tar -xvf zig-freebsd-x86_64-0.11.0.tar.xz 1>/dev/null
-      sudo mv zig-freebsd-x86_64-0.11.0/zig /usr/bin/
-      sudo mv zig-freebsd-x86_64-0.11.0/lib /usr/lib/zig
-  - build: |
-      cd river
-      zig build
-  - build_xwayland: |
-      cd river
-      zig build -Dxwayland
-  - fmt: |
-      cd river
-      zig fmt --check river/
-      zig fmt --check riverctl/
-      zig fmt --check rivertile/
-      zig fmt --check build.zig

.gitignore

@@ -1,2 +1,2 @@
-zig-cache/
+.zig-cache/
 zig-out/

.gitmodules

@@ -1,12 +0,0 @@
-[submodule "deps/zig-wayland"]
-	path = deps/zig-wayland
-	url = https://codeberg.org/ifreund/zig-wayland
-[submodule "deps/zig-pixman"]
-	path = deps/zig-pixman
-	url = https://codeberg.org/ifreund/zig-pixman
-[submodule "deps/zig-xkbcommon"]
-	path = deps/zig-xkbcommon
-	url = https://codeberg.org/ifreund/zig-xkbcommon
-[submodule "deps/zig-wlroots"]
-	path = deps/zig-wlroots
-	url = https://codeberg.org/ifreund/zig-wlroots

PACKAGING.md

@@ -26,6 +26,45 @@ and is only compatible with that release and any patch releases. At the time
 of writing for example river is compatible with Zig 0.9.0 and 0.9.1 but
 not Zig 0.8.0 or 0.10.0.
 
+## Zig Package Manager
+
+River uses the built-in Zig package manager for its (few) Zig dependencies.
+By default, running `zig build` will fetch river's Zig dependencies from the
+internet and store them in the global zig cache before building river. Since
+accessing the internet is forbidden or at least frowned upon by most distro
+packaging infrastructure, there are ways to fetch the Zig dependencies in a
+separate step before building river:
+
+1. Fetch step with internet access:
+
+   For each package in the `build.zig.zon` manifest file run the following command
+   with the tarball URL in the `build.zig.zon`:
+
+   ```
+   zig fetch --global-cache-dir /tmp/foobar $URL
+   ```
+
+   This command will download and unpack the tarball, hash the contents of the
+   tarball, and store the contents in the `/tmp/foobar/p/$HASH` directory. This
+   hash should match the corresponding hash field in the `build.zig.zon`.
+
+2. Build step with no internet access:
+
+   The `--system` flag for `zig build` takes a path to an arbitrary directory in
+   which zig packages stored in subdirectories matching their hash can be found.
+
+   ```
+   zig build --system /tmp/foobar/p/ ...
+   ```
+
+   This flag will disable all internet access and error if a package is not found
+   in the provided directory.
+
+It is also possible for distros to distribute Zig package manager packages as
+distro packages, although there are still some rough edges as the support for
+this is not yet mature. See this patchset for Chimera Linux for an example of
+how this can work: https://github.com/chimera-linux/cports/pull/1395
+
 ## Build options
 
 River is built using the Zig build system. To see all available build

README.md

@@ -51,18 +51,13 @@ commands to set up the user's configuration.
 
 ## Building
 
-On cloning the repository, you must init and update the submodules as well
+Note: If you are packaging river for distribution, see [PACKAGING.md](PACKAGING.md).
-with e.g.
-
-```
-git submodule update --init
-```
 
 To compile river first ensure that you have the following dependencies
 installed. The "development" versions are required if applicable to your
 distribution.
 
-- [zig](https://ziglang.org/download/) 0.11
+- [zig](https://ziglang.org/download/) 0.13
 - wayland
 - wayland-protocols
 - [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots) 0.17.2
@@ -76,10 +71,7 @@ Then run, for example:
 ```
 zig build -Doptimize=ReleaseSafe --prefix ~/.local install
 ```
-To enable experimental Xwayland support pass the `-Dxwayland` option as well.
+To enable Xwayland support pass the `-Dxwayland` option as well.
-
-If you are packaging river for distribution, see also
-[PACKAGING.md](PACKAGING.md).
 
 ## Usage
 

build.zig

@@ -4,7 +4,7 @@ const Build = std.Build;
 const fs = std.fs;
 const mem = std.mem;
 
-const Scanner = @import("deps/zig-wayland/build.zig").Scanner;
+const Scanner = @import("zig-wayland").Scanner;
 
 /// While a river release is in development, this string should contain the version in development
 /// with the "-dev" suffix.
@@ -18,6 +18,7 @@ pub fn build(b: *Build) !void {
 
     const strip = b.option(bool, "strip", "Omit debug information") orelse false;
     const pie = b.option(bool, "pie", "Build a Position Independent Executable") orelse false;
+    const llvm = !(b.option(bool, "no-llvm", "(expirimental) Use non-LLVM x86 Zig backend") orelse false);
 
     const omit_frame_pointer = switch (optimize) {
         .Debug, .ReleaseSafe => false,
@@ -64,7 +65,7 @@ pub fn build(b: *Build) !void {
         if (mem.endsWith(u8, version, "-dev")) {
             var ret: u8 = undefined;
 
-            const git_describe_long = b.execAllowFail(
+            const git_describe_long = b.runAllowFail(
                 &.{ "git", "-C", b.build_root.path orelse ".", "describe", "--long" },
                 &ret,
                 .Inherit,
@@ -91,12 +92,12 @@ pub fn build(b: *Build) !void {
     const scanner = Scanner.create(b, .{});
 
     scanner.addSystemProtocol("stable/xdg-shell/xdg-shell.xml");
-    scanner.addSystemProtocol("staging/ext-session-lock/ext-session-lock-v1.xml");
-    scanner.addSystemProtocol("unstable/pointer-gestures/pointer-gestures-unstable-v1.xml");
-    scanner.addSystemProtocol("unstable/pointer-constraints/pointer-constraints-unstable-v1.xml");
-    scanner.addSystemProtocol("unstable/xdg-decoration/xdg-decoration-unstable-v1.xml");
-    scanner.addSystemProtocol("unstable/tablet/tablet-unstable-v2.xml");
     scanner.addSystemProtocol("staging/cursor-shape/cursor-shape-v1.xml");
+    scanner.addSystemProtocol("staging/ext-session-lock/ext-session-lock-v1.xml");
+    scanner.addSystemProtocol("unstable/pointer-constraints/pointer-constraints-unstable-v1.xml");
+    scanner.addSystemProtocol("unstable/pointer-gestures/pointer-gestures-unstable-v1.xml");
+    scanner.addSystemProtocol("unstable/tablet/tablet-unstable-v2.xml");
+    scanner.addSystemProtocol("unstable/xdg-decoration/xdg-decoration-unstable-v1.xml");
 
     scanner.addCustomProtocol("protocol/river-control-unstable-v1.xml");
     scanner.addCustomProtocol("protocol/river-status-unstable-v1.xml");
@@ -131,63 +132,62 @@ pub fn build(b: *Build) !void {
     scanner.generate("zwlr_layer_shell_v1", 4);
     scanner.generate("zwlr_output_power_manager_v1", 1);
 
-    const wayland = b.createModule(.{ .source_file = scanner.result });
+    const wayland = b.createModule(.{ .root_source_file = scanner.result });
-    const xkbcommon = b.createModule(.{
-        .source_file = .{ .path = "deps/zig-xkbcommon/src/xkbcommon.zig" },
-    });
-    const pixman = b.createModule(.{
-        .source_file = .{ .path = "deps/zig-pixman/pixman.zig" },
-    });
-    const wlroots = b.createModule(.{
-        .source_file = .{ .path = "deps/zig-wlroots/src/wlroots.zig" },
-        .dependencies = &.{
-            .{ .name = "wayland", .module = wayland },
-            .{ .name = "xkbcommon", .module = xkbcommon },
-            .{ .name = "pixman", .module = pixman },
-        },
-    });
 
-    const flags = b.createModule(.{ .source_file = .{ .path = "common/flags.zig" } });
+    const xkbcommon = b.dependency("zig-xkbcommon", .{}).module("xkbcommon");
-    const globber = b.createModule(.{ .source_file = .{ .path = "common/globber.zig" } });
+    const pixman = b.dependency("zig-pixman", .{}).module("pixman");
+
+    const wlroots = b.dependency("zig-wlroots", .{}).module("wlroots");
+    wlroots.addImport("wayland", wayland);
+    wlroots.addImport("xkbcommon", xkbcommon);
+    wlroots.addImport("pixman", pixman);
+
+    // We need to ensure the wlroots include path obtained from pkg-config is
+    // exposed to the wlroots module for @cImport() to work. This seems to be
+    // the best way to do so with the current std.Build API.
+    wlroots.resolved_target = target;
+    wlroots.linkSystemLibrary("wlroots", .{});
+
+    const flags = b.createModule(.{ .root_source_file = b.path("common/flags.zig") });
+    const globber = b.createModule(.{ .root_source_file = b.path("common/globber.zig") });
 
     {
         const river = b.addExecutable(.{
             .name = "river",
-            .root_source_file = .{ .path = "river/main.zig" },
+            .root_source_file = b.path("river/main.zig"),
             .target = target,
             .optimize = optimize,
+            .strip = strip,
+            .use_llvm = llvm,
+            .use_lld = llvm,
         });
-        river.addOptions("build_options", options);
+        river.root_module.addOptions("build_options", options);
 
         river.linkLibC();
         river.linkSystemLibrary("libevdev");
         river.linkSystemLibrary("libinput");
-
-        river.addModule("wayland", wayland);
         river.linkSystemLibrary("wayland-server");
-
+        river.linkSystemLibrary("wlroots");
-        river.addModule("xkbcommon", xkbcommon);
         river.linkSystemLibrary("xkbcommon");
-
-        river.addModule("pixman", pixman);
         river.linkSystemLibrary("pixman-1");
 
-        river.addModule("wlroots", wlroots);
+        river.root_module.addImport("wayland", wayland);
-        river.linkSystemLibrary("wlroots");
+        river.root_module.addImport("xkbcommon", xkbcommon);
+        river.root_module.addImport("pixman", pixman);
+        river.root_module.addImport("wlroots", wlroots);
+        river.root_module.addImport("flags", flags);
+        river.root_module.addImport("globber", globber);
 
-        river.addModule("flags", flags);
-        river.addModule("globber", globber);
         river.addCSourceFile(.{
-            .file = .{ .path = "river/wlroots_log_wrapper.c" },
+            .file = b.path("river/wlroots_log_wrapper.c"),
             .flags = &.{ "-std=c99", "-O2" },
         });
 
         // TODO: remove when zig issue #131 is implemented
         scanner.addCSource(river);
 
-        river.strip = strip;
         river.pie = pie;
-        river.omit_frame_pointer = omit_frame_pointer;
+        river.root_module.omit_frame_pointer = omit_frame_pointer;
 
         b.installArtifact(river);
     }
@@ -195,22 +195,24 @@ pub fn build(b: *Build) !void {
     {
         const riverctl = b.addExecutable(.{
             .name = "riverctl",
-            .root_source_file = .{ .path = "riverctl/main.zig" },
+            .root_source_file = b.path("riverctl/main.zig"),
             .target = target,
             .optimize = optimize,
+            .strip = strip,
+            .use_llvm = llvm,
+            .use_lld = llvm,
         });
-        riverctl.addOptions("build_options", options);
+        riverctl.root_module.addOptions("build_options", options);
 
-        riverctl.addModule("flags", flags);
+        riverctl.root_module.addImport("flags", flags);
-        riverctl.addModule("wayland", wayland);
+        riverctl.root_module.addImport("wayland", wayland);
         riverctl.linkLibC();
         riverctl.linkSystemLibrary("wayland-client");
 
         scanner.addCSource(riverctl);
 
-        riverctl.strip = strip;
         riverctl.pie = pie;
-        riverctl.omit_frame_pointer = omit_frame_pointer;
+        riverctl.root_module.omit_frame_pointer = omit_frame_pointer;
 
         b.installArtifact(riverctl);
     }
@@ -218,22 +220,24 @@ pub fn build(b: *Build) !void {
     {
         const rivertile = b.addExecutable(.{
             .name = "rivertile",
-            .root_source_file = .{ .path = "rivertile/main.zig" },
+            .root_source_file = b.path("rivertile/main.zig"),
             .target = target,
             .optimize = optimize,
+            .strip = strip,
+            .use_llvm = llvm,
+            .use_lld = llvm,
         });
-        rivertile.addOptions("build_options", options);
+        rivertile.root_module.addOptions("build_options", options);
 
-        rivertile.addModule("flags", flags);
+        rivertile.root_module.addImport("flags", flags);
-        rivertile.addModule("wayland", wayland);
+        rivertile.root_module.addImport("wayland", wayland);
         rivertile.linkLibC();
         rivertile.linkSystemLibrary("wayland-client");
 
         scanner.addCSource(rivertile);
 
-        rivertile.strip = strip;
         rivertile.pie = pie;
-        rivertile.omit_frame_pointer = omit_frame_pointer;
+        rivertile.root_module.omit_frame_pointer = omit_frame_pointer;
 
         b.installArtifact(rivertile);
     }
@@ -261,7 +265,7 @@ pub fn build(b: *Build) !void {
             // Even passing a buffer to std.Build.Step.Run appears to be racy and occasionally deadlocks.
             const scdoc = b.addSystemCommand(&.{ "/bin/sh", "-c", "scdoc < doc/" ++ page ++ ".1.scd" });
             // This makes the caching work for the Workaround, and the extra argument is ignored by /bin/sh.
-            scdoc.addFileArg(.{ .path = "doc/" ++ page ++ ".1.scd" });
+            scdoc.addFileArg(b.path("doc/" ++ page ++ ".1.scd"));
 
             const stdout = scdoc.captureStdOut();
             b.getInstallStep().dependOn(&b.addInstallFile(stdout, "share/man/man1/" ++ page ++ ".1").step);
@@ -282,7 +286,7 @@ pub fn build(b: *Build) !void {
 
     {
         const globber_test = b.addTest(.{
-            .root_source_file = .{ .path = "common/globber.zig" },
+            .root_source_file = b.path("common/globber.zig"),
             .target = target,
             .optimize = optimize,
         });

build.zig.zon

@@ -0,0 +1,23 @@
+.{
+    .name = "river",
+    .version = "0.4.0-dev",
+    .paths = .{""},
+    .dependencies = .{
+        .@"zig-pixman" = .{
+            .url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz",
+            .hash = "12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56",
+        },
+        .@"zig-wayland" = .{
+            .url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz",
+            .hash = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242",
+        },
+        .@"zig-wlroots" = .{
+            .url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.17.1.tar.gz",
+            .hash = "1220c65ab884c236cc950b564c70f6cd04046d86485ee76e0cde886cef7438021b4f",
+        },
+        .@"zig-xkbcommon" = .{
+            .url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz",
+            .hash = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f",
+        },
+    },
+}

common/flags.zig

@@ -18,7 +18,7 @@ const std = @import("std");
 const mem = std.mem;
 
 pub const Flag = struct {
-    name: []const u8,
+    name: [:0]const u8,
     kind: enum { boolean, arg },
 };
 
@@ -37,7 +37,7 @@ pub fn parser(comptime Arg: type, comptime flags: []const Flag) type {
 
             pub const Flags = flags_type: {
                 var fields: []const std.builtin.Type.StructField = &.{};
-                inline for (flags) |flag| {
+                for (flags) |flag| {
                     const field: std.builtin.Type.StructField = switch (flag.kind) {
                         .boolean => .{
                             .name = flag.name,
@@ -57,7 +57,7 @@ pub fn parser(comptime Arg: type, comptime flags: []const Flag) type {
                     fields = fields ++ [_]std.builtin.Type.StructField{field};
                 }
                 break :flags_type @Type(.{ .Struct = .{
-                    .layout = .Auto,
+                    .layout = .auto,
                     .fields = fields,
                     .decls = &.{},
                     .is_tuple = false,

deps/zig-pixman

@@ -1 +0,0 @@
-Subproject commit 70bff91beec4ad4c026dfc4465613e360dc85527

deps/zig-wayland

@@ -1 +0,0 @@
-Subproject commit 73fed093301b2e5f58998aa4797ce952bd148676

deps/zig-wlroots

@@ -1 +0,0 @@
-Subproject commit a579f9f7dae72c960e8804737109815c78e471f4

deps/zig-xkbcommon

@@ -1 +0,0 @@
-Subproject commit 7e09b389373b060148c0ca050e0b525e118d91e7

river/Control.zig

@@ -48,7 +48,7 @@ pub fn init(control: *Control) !void {
 }
 
 fn handleServerDestroy(listener: *wl.Listener(*wl.Server), _: *wl.Server) void {
-    const control = @fieldParentPtr(Control, "server_destroy", listener);
+    const control: *Control = @fieldParentPtr("server_destroy", listener);
     control.global.destroy();
     control.args_map.deinit();
 }

river/Cursor.zig

@@ -19,7 +19,7 @@ const Cursor = @This();
 const build_options = @import("build_options");
 const std = @import("std");
 const assert = std.debug.assert;
-const os = std.os;
+const posix = std.posix;
 const math = std.math;
 const wlr = @import("wlroots");
 const wayland = @import("wayland");
@@ -303,7 +303,7 @@ fn clearFocus(cursor: *Cursor) void {
 
 /// Axis event is a scroll wheel or similiar
 fn handleAxis(listener: *wl.Listener(*wlr.Pointer.event.Axis), event: *wlr.Pointer.event.Axis) void {
-    const cursor = @fieldParentPtr(Cursor, "axis", listener);
+    const cursor: *Cursor = @fieldParentPtr("axis", listener);
     const device: *InputDevice = @ptrFromInt(event.device.data);
 
     cursor.seat.handleActivity();
@@ -328,7 +328,7 @@ fn handleAxis(listener: *wl.Listener(*wlr.Pointer.event.Axis), event: *wlr.Point
 }
 
 fn handleButton(listener: *wl.Listener(*wlr.Pointer.event.Button), event: *wlr.Pointer.event.Button) void {
-    const cursor = @fieldParentPtr(Cursor, "button", listener);
+    const cursor: *Cursor = @fieldParentPtr("button", listener);
 
     cursor.seat.handleActivity();
     cursor.unhide();
@@ -432,7 +432,7 @@ fn handlePinchBegin(
     listener: *wl.Listener(*wlr.Pointer.event.PinchBegin),
     event: *wlr.Pointer.event.PinchBegin,
 ) void {
-    const cursor = @fieldParentPtr(Cursor, "pinch_begin", listener);
+    const cursor: *Cursor = @fieldParentPtr("pinch_begin", listener);
     server.input_manager.pointer_gestures.sendPinchBegin(
         cursor.seat.wlr_seat,
         event.time_msec,
@@ -444,7 +444,7 @@ fn handlePinchUpdate(
     listener: *wl.Listener(*wlr.Pointer.event.PinchUpdate),
     event: *wlr.Pointer.event.PinchUpdate,
 ) void {
-    const cursor = @fieldParentPtr(Cursor, "pinch_update", listener);
+    const cursor: *Cursor = @fieldParentPtr("pinch_update", listener);
     server.input_manager.pointer_gestures.sendPinchUpdate(
         cursor.seat.wlr_seat,
         event.time_msec,
@@ -459,7 +459,7 @@ fn handlePinchEnd(
     listener: *wl.Listener(*wlr.Pointer.event.PinchEnd),
     event: *wlr.Pointer.event.PinchEnd,
 ) void {
-    const cursor = @fieldParentPtr(Cursor, "pinch_end", listener);
+    const cursor: *Cursor = @fieldParentPtr("pinch_end", listener);
     server.input_manager.pointer_gestures.sendPinchEnd(
         cursor.seat.wlr_seat,
         event.time_msec,
@@ -471,7 +471,7 @@ fn handleSwipeBegin(
     listener: *wl.Listener(*wlr.Pointer.event.SwipeBegin),
     event: *wlr.Pointer.event.SwipeBegin,
 ) void {
-    const cursor = @fieldParentPtr(Cursor, "swipe_begin", listener);
+    const cursor: *Cursor = @fieldParentPtr("swipe_begin", listener);
     server.input_manager.pointer_gestures.sendSwipeBegin(
         cursor.seat.wlr_seat,
         event.time_msec,
@@ -483,7 +483,7 @@ fn handleSwipeUpdate(
     listener: *wl.Listener(*wlr.Pointer.event.SwipeUpdate),
     event: *wlr.Pointer.event.SwipeUpdate,
 ) void {
-    const cursor = @fieldParentPtr(Cursor, "swipe_update", listener);
+    const cursor: *Cursor = @fieldParentPtr("swipe_update", listener);
     server.input_manager.pointer_gestures.sendSwipeUpdate(
         cursor.seat.wlr_seat,
         event.time_msec,
@@ -496,7 +496,7 @@ fn handleSwipeEnd(
     listener: *wl.Listener(*wlr.Pointer.event.SwipeEnd),
     event: *wlr.Pointer.event.SwipeEnd,
 ) void {
-    const cursor = @fieldParentPtr(Cursor, "swipe_end", listener);
+    const cursor: *Cursor = @fieldParentPtr("swipe_end", listener);
     server.input_manager.pointer_gestures.sendSwipeEnd(
         cursor.seat.wlr_seat,
         event.time_msec,
@@ -508,7 +508,7 @@ fn handleTouchDown(
     listener: *wl.Listener(*wlr.Touch.event.Down),
     event: *wlr.Touch.event.Down,
 ) void {
-    const cursor = @fieldParentPtr(Cursor, "touch_down", listener);
+    const cursor: *Cursor = @fieldParentPtr("touch_down", listener);
 
     cursor.seat.handleActivity();
 
@@ -544,7 +544,7 @@ fn handleTouchMotion(
     listener: *wl.Listener(*wlr.Touch.event.Motion),
     event: *wlr.Touch.event.Motion,
 ) void {
-    const cursor = @fieldParentPtr(Cursor, "touch_motion", listener);
+    const cursor: *Cursor = @fieldParentPtr("touch_motion", listener);
 
     cursor.seat.handleActivity();
 
@@ -563,7 +563,7 @@ fn handleTouchUp(
     listener: *wl.Listener(*wlr.Touch.event.Up),
     event: *wlr.Touch.event.Up,
 ) void {
-    const cursor = @fieldParentPtr(Cursor, "touch_up", listener);
+    const cursor: *Cursor = @fieldParentPtr("touch_up", listener);
 
     cursor.seat.handleActivity();
 
@@ -576,7 +576,7 @@ fn handleTouchCancel(
     listener: *wl.Listener(*wlr.Touch.event.Cancel),
     _: *wlr.Touch.event.Cancel,
 ) void {
-    const cursor = @fieldParentPtr(Cursor, "touch_cancel", listener);
+    const cursor: *Cursor = @fieldParentPtr("touch_cancel", listener);
 
     cursor.seat.handleActivity();
 
@@ -612,7 +612,7 @@ fn handleTouchCancel(
 }
 
 fn handleTouchFrame(listener: *wl.Listener(void)) void {
-    const cursor = @fieldParentPtr(Cursor, "touch_frame", listener);
+    const cursor: *Cursor = @fieldParentPtr("touch_frame", listener);
 
     cursor.seat.handleActivity();
 
@@ -624,7 +624,7 @@ fn handleTabletToolAxis(
     event: *wlr.Tablet.event.Axis,
 ) void {
     const device: *InputDevice = @ptrFromInt(event.device.data);
-    const tablet = @fieldParentPtr(Tablet, "device", device);
+    const tablet: *Tablet = @fieldParentPtr("device", device);
 
     device.seat.handleActivity();
 
@@ -638,7 +638,7 @@ fn handleTabletToolProximity(
     event: *wlr.Tablet.event.Proximity,
 ) void {
     const device: *InputDevice = @ptrFromInt(event.device.data);
-    const tablet = @fieldParentPtr(Tablet, "device", device);
+    const tablet: *Tablet = @fieldParentPtr("device", device);
 
     device.seat.handleActivity();
 
@@ -652,7 +652,7 @@ fn handleTabletToolTip(
     event: *wlr.Tablet.event.Tip,
 ) void {
     const device: *InputDevice = @ptrFromInt(event.device.data);
-    const tablet = @fieldParentPtr(Tablet, "device", device);
+    const tablet: *Tablet = @fieldParentPtr("device", device);
 
     device.seat.handleActivity();
 
@@ -666,7 +666,7 @@ fn handleTabletToolButton(
     event: *wlr.Tablet.event.Button,
 ) void {
     const device: *InputDevice = @ptrFromInt(event.device.data);
-    const tablet = @fieldParentPtr(Tablet, "device", device);
+    const tablet: *Tablet = @fieldParentPtr("device", device);
 
     device.seat.handleActivity();
 
@@ -706,7 +706,7 @@ fn handlePointerMapping(cursor: *Cursor, event: *wlr.Pointer.event.Button, view:
 /// events together. For instance, two axis events may happen at the same
 /// time, in which case a frame event won't be sent in between.
 fn handleFrame(listener: *wl.Listener(*wlr.Cursor), _: *wlr.Cursor) void {
-    const cursor = @fieldParentPtr(Cursor, "frame", listener);
+    const cursor: *Cursor = @fieldParentPtr("frame", listener);
     cursor.seat.wlr_seat.pointerNotifyFrame();
 }
 
@@ -720,7 +720,7 @@ fn handleMotionAbsolute(
     listener: *wl.Listener(*wlr.Pointer.event.MotionAbsolute),
     event: *wlr.Pointer.event.MotionAbsolute,
 ) void {
-    const cursor = @fieldParentPtr(Cursor, "motion_absolute", listener);
+    const cursor: *Cursor = @fieldParentPtr("motion_absolute", listener);
 
     cursor.seat.handleActivity();
 
@@ -739,7 +739,7 @@ fn handleMotion(
     listener: *wl.Listener(*wlr.Pointer.event.Motion),
     event: *wlr.Pointer.event.Motion,
 ) void {
-    const cursor = @fieldParentPtr(Cursor, "motion", listener);
+    const cursor: *Cursor = @fieldParentPtr("motion", listener);
 
     cursor.seat.handleActivity();
 
@@ -751,7 +751,7 @@ fn handleRequestSetCursor(
     event: *wlr.Seat.event.RequestSetCursor,
 ) void {
     // This event is rasied by the seat when a client provides a cursor image
-    const cursor = @fieldParentPtr(Cursor, "request_set_cursor", listener);
+    const cursor: *Cursor = @fieldParentPtr("request_set_cursor", listener);
     const focused_client = cursor.seat.wlr_seat.pointer_state.focused_client;
 
     // This can be sent by any client, so we check to make sure this one is
@@ -1111,8 +1111,8 @@ pub fn updateState(cursor: *Cursor) void {
         .passthrough => {
             cursor.updateFocusFollowsCursorTarget();
             if (!cursor.hidden) {
-                var now: os.timespec = undefined;
+                var now: posix.timespec = undefined;
-                os.clock_gettime(os.CLOCK.MONOTONIC, &now) catch @panic("CLOCK_MONOTONIC not supported");
+                posix.clock_gettime(posix.CLOCK.MONOTONIC, &now) catch @panic("CLOCK_MONOTONIC not supported");
                 const msec: u32 = @intCast(now.tv_sec * std.time.ms_per_s +
                     @divTrunc(now.tv_nsec, std.time.ns_per_ms));
                 cursor.passthrough(msec);

river/DragIcon.zig

@@ -71,7 +71,7 @@ pub fn updatePosition(drag_icon: *DragIcon, cursor: *Cursor) void {
 }
 
 fn handleDestroy(listener: *wl.Listener(*wlr.Drag.Icon), _: *wlr.Drag.Icon) void {
-    const drag_icon = @fieldParentPtr(DragIcon, "destroy", listener);
+    const drag_icon: *DragIcon = @fieldParentPtr("destroy", listener);
 
     drag_icon.destroy.link.remove();
 

river/ForeignToplevelHandle.zig

@@ -36,7 +36,7 @@ foreign_close: wl.Listener(*wlr.ForeignToplevelHandleV1) =
     wl.Listener(*wlr.ForeignToplevelHandleV1).init(handleForeignClose),
 
 pub fn map(handle: *ForeignToplevelHandle) void {
-    const view = @fieldParentPtr(View, "foreign_toplevel_handle", handle);
+    const view: *View = @fieldParentPtr("foreign_toplevel_handle", handle);
 
     assert(handle.wlr_handle == null);
 
@@ -67,7 +67,7 @@ pub fn unmap(handle: *ForeignToplevelHandle) void {
 
 /// Must be called just before the view's inflight state is made current.
 pub fn update(handle: *ForeignToplevelHandle) void {
-    const view = @fieldParentPtr(View, "foreign_toplevel_handle", handle);
+    const view: *View = @fieldParentPtr("foreign_toplevel_handle", handle);
 
     const wlr_handle = handle.wlr_handle orelse return;
 
@@ -87,8 +87,8 @@ fn handleForeignActivate(
     listener: *wl.Listener(*wlr.ForeignToplevelHandleV1.event.Activated),
     event: *wlr.ForeignToplevelHandleV1.event.Activated,
 ) void {
-    const handle = @fieldParentPtr(ForeignToplevelHandle, "foreign_activate", listener);
+    const handle: *ForeignToplevelHandle = @fieldParentPtr("foreign_activate", listener);
-    const view = @fieldParentPtr(View, "foreign_toplevel_handle", handle);
+    const view: *View = @fieldParentPtr("foreign_toplevel_handle", handle);
     const seat: *Seat = @ptrFromInt(event.seat.data);
 
     seat.focus(view);
@@ -99,8 +99,8 @@ fn handleForeignFullscreen(
     listener: *wl.Listener(*wlr.ForeignToplevelHandleV1.event.Fullscreen),
     event: *wlr.ForeignToplevelHandleV1.event.Fullscreen,
 ) void {
-    const handle = @fieldParentPtr(ForeignToplevelHandle, "foreign_fullscreen", listener);
+    const handle: *ForeignToplevelHandle = @fieldParentPtr("foreign_fullscreen", listener);
-    const view = @fieldParentPtr(View, "foreign_toplevel_handle", handle);
+    const view: *View = @fieldParentPtr("foreign_toplevel_handle", handle);
 
     view.pending.fullscreen = event.fullscreen;
     server.root.applyPending();
@@ -110,8 +110,8 @@ fn handleForeignClose(
     listener: *wl.Listener(*wlr.ForeignToplevelHandleV1),
     _: *wlr.ForeignToplevelHandleV1,
 ) void {
-    const handle = @fieldParentPtr(ForeignToplevelHandle, "foreign_close", listener);
+    const handle: *ForeignToplevelHandle = @fieldParentPtr("foreign_close", listener);
-    const view = @fieldParentPtr(View, "foreign_toplevel_handle", handle);
+    const view: *View = @fieldParentPtr("foreign_toplevel_handle", handle);
 
     view.close();
 }

river/IdleInhibitManager.zig

@@ -78,7 +78,7 @@ pub fn checkActive(inhibit_manager: *IdleInhibitManager) void {
 }
 
 fn handleNewIdleInhibitor(listener: *wl.Listener(*wlr.IdleInhibitorV1), inhibitor: *wlr.IdleInhibitorV1) void {
-    const inhibit_manager = @fieldParentPtr(IdleInhibitManager, "new_idle_inhibitor", listener);
+    const inhibit_manager: *IdleInhibitManager = @fieldParentPtr("new_idle_inhibitor", listener);
     const inhibitor_node = util.gpa.create(std.TailQueue(IdleInhibitor).Node) catch return;
     inhibitor_node.data.init(inhibitor, inhibit_manager) catch {
         util.gpa.destroy(inhibitor_node);

river/IdleInhibitor.zig

@@ -45,11 +45,11 @@ pub fn init(
 }
 
 fn handleDestroy(listener: *wl.Listener(*wlr.Surface), _: *wlr.Surface) void {
-    const inhibitor = @fieldParentPtr(IdleInhibitor, "destroy", listener);
+    const inhibitor: *IdleInhibitor = @fieldParentPtr("destroy", listener);
 
     inhibitor.destroy.link.remove();
 
-    const node = @fieldParentPtr(std.TailQueue(IdleInhibitor).Node, "data", inhibitor);
+    const node: *std.TailQueue(IdleInhibitor).Node = @fieldParentPtr("data", inhibitor);
     server.idle_inhibit_manager.inhibitors.remove(node);
 
     inhibitor.inhibit_manager.checkActive();

river/InputConfig.zig

@@ -241,7 +241,7 @@ pub const MapToOutput = struct {
                 device.seat.cursor.wlr_cursor.mapInputToOutput(device.wlr_device, wlr_output);
 
                 if (device.wlr_device.type == .tablet_tool) {
-                    const tablet = @fieldParentPtr(Tablet, "device", device);
+                    const tablet: *Tablet = @fieldParentPtr("device", device);
                     tablet.output_mapping = wlr_output;
                 }
             },

river/InputDevice.zig

@@ -125,13 +125,13 @@ fn isKeyboardGroup(wlr_device: *wlr.InputDevice) bool {
 }
 
 fn handleDestroy(listener: *wl.Listener(*wlr.InputDevice), _: *wlr.InputDevice) void {
-    const device = @fieldParentPtr(InputDevice, "destroy", listener);
+    const device: *InputDevice = @fieldParentPtr("destroy", listener);
 
     log.debug("removed input device: {s}", .{device.identifier});
 
     switch (device.wlr_device.type) {
         .keyboard => {
-            const keyboard = @fieldParentPtr(Keyboard, "device", device);
+            const keyboard: *Keyboard = @fieldParentPtr("device", device);
             keyboard.deinit();
             util.gpa.destroy(keyboard);
         },
@@ -140,11 +140,11 @@ fn handleDestroy(listener: *wl.Listener(*wlr.InputDevice), _: *wlr.InputDevice)
             util.gpa.destroy(device);
         },
         .tablet_tool => {
-            const tablet = @fieldParentPtr(Tablet, "device", device);
+            const tablet: *Tablet = @fieldParentPtr("device", device);
             tablet.destroy();
         },
         .switch_device => {
-            const switch_device = @fieldParentPtr(Switch, "device", device);
+            const switch_device: *Switch = @fieldParentPtr("device", device);
             switch_device.deinit();
             util.gpa.destroy(switch_device);
         },

river/InputManager.zig

@@ -158,7 +158,7 @@ pub fn reconfigureDevices(input_manager: *InputManager) void {
 }
 
 fn handleNewInput(listener: *wl.Listener(*wlr.InputDevice), wlr_device: *wlr.InputDevice) void {
-    const input_manager = @fieldParentPtr(InputManager, "new_input", listener);
+    const input_manager: *InputManager = @fieldParentPtr("new_input", listener);
 
     input_manager.defaultSeat().addDevice(wlr_device);
 }
@@ -167,7 +167,7 @@ fn handleNewVirtualPointer(
     listener: *wl.Listener(*wlr.VirtualPointerManagerV1.event.NewPointer),
     event: *wlr.VirtualPointerManagerV1.event.NewPointer,
 ) void {
-    const input_manager = @fieldParentPtr(InputManager, "new_virtual_pointer", listener);
+    const input_manager: *InputManager = @fieldParentPtr("new_virtual_pointer", listener);
 
     // TODO Support multiple seats and don't ignore
     if (event.suggested_seat != null) {

river/InputPopup.zig

@@ -0,0 +1,188 @@
+// This file is part of river, a dynamic tiling wayland compositor.
+//
+// Copyright 2024 The River Developers
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+const InputPopup = @This();
+
+const std = @import("std");
+const assert = std.debug.assert;
+const wlr = @import("wlroots");
+const wl = @import("wayland").server.wl;
+
+const server = &@import("main.zig").server;
+const util = @import("util.zig");
+
+const InputRelay = @import("InputRelay.zig");
+const SceneNodeData = @import("SceneNodeData.zig");
+
+link: wl.list.Link,
+input_relay: *InputRelay,
+
+wlr_popup: *wlr.InputPopupSurfaceV2,
+surface_tree: *wlr.SceneTree,
+
+destroy: wl.Listener(void) = wl.Listener(void).init(handleDestroy),
+map: wl.Listener(void) = wl.Listener(void).init(handleMap),
+unmap: wl.Listener(void) = wl.Listener(void).init(handleUnmap),
+commit: wl.Listener(*wlr.Surface) = wl.Listener(*wlr.Surface).init(handleCommit),
+
+pub fn create(wlr_popup: *wlr.InputPopupSurfaceV2, input_relay: *InputRelay) !void {
+    const input_popup = try util.gpa.create(InputPopup);
+    errdefer util.gpa.destroy(input_popup);
+
+    input_popup.* = .{
+        .link = undefined,
+        .input_relay = input_relay,
+        .wlr_popup = wlr_popup,
+        .surface_tree = try server.root.hidden.tree.createSceneSubsurfaceTree(wlr_popup.surface),
+    };
+
+    input_relay.input_popups.append(input_popup);
+
+    input_popup.wlr_popup.events.destroy.add(&input_popup.destroy);
+    input_popup.wlr_popup.surface.events.map.add(&input_popup.map);
+    input_popup.wlr_popup.surface.events.unmap.add(&input_popup.unmap);
+    input_popup.wlr_popup.surface.events.commit.add(&input_popup.commit);
+
+    input_popup.update();
+}
+
+fn handleDestroy(listener: *wl.Listener(void)) void {
+    const input_popup: *InputPopup = @fieldParentPtr("destroy", listener);
+
+    input_popup.destroy.link.remove();
+    input_popup.map.link.remove();
+    input_popup.unmap.link.remove();
+    input_popup.commit.link.remove();
+
+    input_popup.link.remove();
+
+    util.gpa.destroy(input_popup);
+}
+
+fn handleMap(listener: *wl.Listener(void)) void {
+    const input_popup: *InputPopup = @fieldParentPtr("map", listener);
+
+    input_popup.update();
+}
+
+fn handleUnmap(listener: *wl.Listener(void)) void {
+    const input_popup: *InputPopup = @fieldParentPtr("unmap", listener);
+
+    input_popup.surface_tree.node.reparent(server.root.hidden.tree);
+}
+
+fn handleCommit(listener: *wl.Listener(*wlr.Surface), _: *wlr.Surface) void {
+    const input_popup: *InputPopup = @fieldParentPtr("commit", listener);
+
+    input_popup.update();
+}
+
+pub fn update(input_popup: *InputPopup) void {
+    const text_input = input_popup.input_relay.text_input orelse {
+        input_popup.surface_tree.node.reparent(server.root.hidden.tree);
+        return;
+    };
+
+    if (!input_popup.wlr_popup.surface.mapped) return;
+
+    // This seems like it could be null if the focused surface is destroyed
+    const focused_surface = text_input.wlr_text_input.focused_surface orelse return;
+
+    // Focus should never be sent to subsurfaces
+    assert(focused_surface.getRootSurface() == focused_surface);
+
+    const focused = SceneNodeData.fromSurface(focused_surface) orelse return;
+
+    const output = switch (focused.data) {
+        .view => |view| view.current.output orelse return,
+        .layer_surface => |layer_surface| layer_surface.output,
+        .lock_surface => |lock_surface| lock_surface.getOutput(),
+        // Xwayland doesn't use the text-input protocol
+        .override_redirect => unreachable,
+    };
+
+    const popup_tree = switch (focused.data) {
+        .view => |view| view.popup_tree,
+        .layer_surface => |layer_surface| layer_surface.popup_tree,
+        .lock_surface => |lock_surface| lock_surface.getOutput().layers.popups,
+        // Xwayland doesn't use the text-input protocol
+        .override_redirect => unreachable,
+    };
+
+    input_popup.surface_tree.node.reparent(popup_tree);
+
+    if (!text_input.wlr_text_input.current.features.cursor_rectangle) {
+        // If the text-input client does not inform us where in the surface
+        // the active text input is there's not much we can do. Placing the
+        // popup at the top left corner of the window is nice and simple
+        // while not looking terrible.
+        input_popup.surface_tree.node.setPosition(0, 0);
+        return;
+    }
+
+    var focused_x: c_int = undefined;
+    var focused_y: c_int = undefined;
+    _ = focused.node.coords(&focused_x, &focused_y);
+
+    var output_box: wlr.Box = undefined;
+    server.root.output_layout.getBox(output.wlr_output, &output_box);
+
+    // Relative to the surface with the active text input
+    var cursor_box = text_input.wlr_text_input.current.cursor_rectangle;
+
+    // Adjust to be relative to the output
+    cursor_box.x += focused_x - output_box.x;
+    cursor_box.y += focused_y - output_box.y;
+
+    // Choose popup x/y relative to the output:
+
+    // Align the left edge of the popup with the left edge of the cursor.
+    // If the popup wouldn't fit on the output instead align the right edge
+    // of the popup with the right edge of the cursor.
+    const popup_x = blk: {
+        const popup_width = input_popup.wlr_popup.surface.current.width;
+        if (output_box.width - cursor_box.x >= popup_width) {
+            break :blk cursor_box.x;
+        } else {
+            break :blk cursor_box.x + cursor_box.width - popup_width;
+        }
+    };
+
+    // Align the top edge of the popup with the bottom edge of the cursor.
+    // If the popup wouldn't fit on the output instead align the bottom edge
+    // of the popup with the top edge of the cursor.
+    const popup_y = blk: {
+        const popup_height = input_popup.wlr_popup.surface.current.height;
+        if (output_box.height - (cursor_box.y + cursor_box.height) >= popup_height) {
+            break :blk cursor_box.y + cursor_box.height;
+        } else {
+            break :blk cursor_box.y - popup_height;
+        }
+    };
+
+    // Scene node position is relative to the parent so adjust popup x/y to
+    // be relative to the focused surface.
+    input_popup.surface_tree.node.setPosition(
+        popup_x - focused_x + output_box.x,
+        popup_y - focused_y + output_box.y,
+    );
+
+    // The text input rectangle sent to the input method is relative to the popup.
+    cursor_box.x -= popup_x;
+    cursor_box.y -= popup_y;
+    input_popup.wlr_popup.sendTextInputRectangle(&cursor_box);
+}

river/InputRelay.zig

@@ -26,6 +26,7 @@ const wl = @import("wayland").server.wl;
 const util = @import("util.zig");
 
 const TextInput = @import("TextInput.zig");
+const InputPopup = @import("InputPopup.zig");
 const Seat = @import("Seat.zig");
 
 const log = std.log.scoped(.input_relay);
@@ -40,6 +41,7 @@ text_inputs: wl.list.Head(TextInput, .link),
 /// already in use new input methods are ignored.
 /// If this is null, no text input enter events will be sent.
 input_method: ?*wlr.InputMethodV2 = null,
+input_popups: wl.list.Head(InputPopup, .link),
 /// The currently enabled text input for the currently focused surface.
 /// Always null if there is no input method.
 text_input: ?*TextInput = null,
@@ -50,18 +52,21 @@ grab_keyboard: wl.Listener(*wlr.InputMethodV2.KeyboardGrab) =
     wl.Listener(*wlr.InputMethodV2.KeyboardGrab).init(handleInputMethodGrabKeyboard),
 input_method_destroy: wl.Listener(*wlr.InputMethodV2) =
     wl.Listener(*wlr.InputMethodV2).init(handleInputMethodDestroy),
+input_method_new_popup: wl.Listener(*wlr.InputPopupSurfaceV2) =
+    wl.Listener(*wlr.InputPopupSurfaceV2).init(handleInputMethodNewPopup),
 
 grab_keyboard_destroy: wl.Listener(*wlr.InputMethodV2.KeyboardGrab) =
     wl.Listener(*wlr.InputMethodV2.KeyboardGrab).init(handleInputMethodGrabKeyboardDestroy),
 
 pub fn init(relay: *InputRelay) void {
-    relay.* = .{ .text_inputs = undefined };
+    relay.* = .{ .text_inputs = undefined, .input_popups = undefined };
 
     relay.text_inputs.init();
+    relay.input_popups.init();
 }
 
 pub fn newInputMethod(relay: *InputRelay, input_method: *wlr.InputMethodV2) void {
-    const seat = @fieldParentPtr(Seat, "relay", relay);
+    const seat: *Seat = @fieldParentPtr("relay", relay);
 
     log.debug("new input method on seat {s}", .{seat.wlr_seat.name});
 
@@ -77,6 +82,7 @@ pub fn newInputMethod(relay: *InputRelay, input_method: *wlr.InputMethodV2) void
     input_method.events.commit.add(&relay.input_method_commit);
     input_method.events.grab_keyboard.add(&relay.grab_keyboard);
     input_method.events.destroy.add(&relay.input_method_destroy);
+    input_method.events.new_popup_surface.add(&relay.input_method_new_popup);
 
     if (seat.focused.surface()) |surface| {
         relay.focus(surface);
@@ -87,7 +93,7 @@ fn handleInputMethodCommit(
     listener: *wl.Listener(*wlr.InputMethodV2),
     input_method: *wlr.InputMethodV2,
 ) void {
-    const relay = @fieldParentPtr(InputRelay, "input_method_commit", listener);
+    const relay: *InputRelay = @fieldParentPtr("input_method_commit", listener);
     assert(input_method == relay.input_method);
 
     if (!input_method.client_active) return;
@@ -121,13 +127,13 @@ fn handleInputMethodDestroy(
     listener: *wl.Listener(*wlr.InputMethodV2),
     input_method: *wlr.InputMethodV2,
 ) void {
-    const relay = @fieldParentPtr(InputRelay, "input_method_destroy", listener);
+    const relay: *InputRelay = @fieldParentPtr("input_method_destroy", listener);
     assert(input_method == relay.input_method);
 
     relay.input_method_commit.link.remove();
     relay.grab_keyboard.link.remove();
     relay.input_method_destroy.link.remove();
-
+    relay.input_method_new_popup.link.remove();
     relay.input_method = null;
 
     relay.focus(null);
@@ -139,8 +145,8 @@ fn handleInputMethodGrabKeyboard(
     listener: *wl.Listener(*wlr.InputMethodV2.KeyboardGrab),
     keyboard_grab: *wlr.InputMethodV2.KeyboardGrab,
 ) void {
-    const relay = @fieldParentPtr(InputRelay, "grab_keyboard", listener);
+    const relay: *InputRelay = @fieldParentPtr("grab_keyboard", listener);
-    const seat = @fieldParentPtr(Seat, "relay", relay);
+    const seat: *Seat = @fieldParentPtr("relay", relay);
 
     const active_keyboard = seat.wlr_seat.getKeyboard();
     keyboard_grab.setKeyboard(active_keyboard);
@@ -148,11 +154,23 @@ fn handleInputMethodGrabKeyboard(
     keyboard_grab.events.destroy.add(&relay.grab_keyboard_destroy);
 }
 
+fn handleInputMethodNewPopup(
+    listener: *wl.Listener(*wlr.InputPopupSurfaceV2),
+    wlr_popup: *wlr.InputPopupSurfaceV2,
+) void {
+    const relay: *InputRelay = @fieldParentPtr("input_method_new_popup", listener);
+
+    InputPopup.create(wlr_popup, relay) catch {
+        log.err("out of memory", .{});
+        return;
+    };
+}
+
 fn handleInputMethodGrabKeyboardDestroy(
     listener: *wl.Listener(*wlr.InputMethodV2.KeyboardGrab),
     keyboard_grab: *wlr.InputMethodV2.KeyboardGrab,
 ) void {
-    const relay = @fieldParentPtr(InputRelay, "grab_keyboard_destroy", listener);
+    const relay: *InputRelay = @fieldParentPtr("grab_keyboard_destroy", listener);
     relay.grab_keyboard_destroy.link.remove();
 
     if (keyboard_grab.keyboard) |keyboard| {
@@ -162,13 +180,16 @@ fn handleInputMethodGrabKeyboardDestroy(
 
 pub fn disableTextInput(relay: *InputRelay) void {
     assert(relay.text_input != null);
+    relay.text_input = null;
 
     if (relay.input_method) |input_method| {
+        {
+            var it = relay.input_popups.iterator(.forward);
+            while (it.next()) |popup| popup.update();
+        }
         input_method.sendDeactivate();
         input_method.sendDone();
     }
-
-    relay.text_input = null;
 }
 
 pub fn sendInputMethodState(relay: *InputRelay) void {
@@ -197,6 +218,11 @@ pub fn sendInputMethodState(relay: *InputRelay) void {
         );
     }
 
+    {
+        var it = relay.input_popups.iterator(.forward);
+        while (it.next()) |popup| popup.update();
+    }
+
     input_method.sendDone();
 }
 

river/Keyboard.zig

@@ -146,7 +146,7 @@ pub fn deinit(keyboard: *Keyboard) void {
 
 fn handleKey(listener: *wl.Listener(*wlr.Keyboard.event.Key), event: *wlr.Keyboard.event.Key) void {
     // This event is raised when a key is pressed or released.
-    const keyboard = @fieldParentPtr(Keyboard, "key", listener);
+    const keyboard: *Keyboard = @fieldParentPtr("key", listener);
     const wlr_keyboard = keyboard.device.wlr_device.toKeyboard();
 
     // If the keyboard is in a group, this event will be handled by the group's Keyboard instance.
@@ -247,7 +247,7 @@ fn isModifier(keysym: xkb.Keysym) bool {
 }
 
 fn handleModifiers(listener: *wl.Listener(*wlr.Keyboard), _: *wlr.Keyboard) void {
-    const keyboard = @fieldParentPtr(Keyboard, "modifiers", listener);
+    const keyboard: *Keyboard = @fieldParentPtr("modifiers", listener);
     const wlr_keyboard = keyboard.device.wlr_device.toKeyboard();
 
     // If the keyboard is in a group, this event will be handled by the group's Keyboard instance.

river/KeyboardGroup.zig

@@ -72,7 +72,7 @@ pub fn destroy(group: *KeyboardGroup) void {
 
     group.wlr_group.destroy();
 
-    const node = @fieldParentPtr(std.TailQueue(KeyboardGroup).Node, "data", group);
+    const node: *std.TailQueue(KeyboardGroup).Node = @fieldParentPtr("data", group);
     group.seat.keyboard_groups.remove(node);
     util.gpa.destroy(node);
 }

river/LayerSurface.zig

@@ -80,7 +80,7 @@ pub fn destroyPopups(layer_surface: *LayerSurface) void {
 }
 
 fn handleDestroy(listener: *wl.Listener(*wlr.LayerSurfaceV1), _: *wlr.LayerSurfaceV1) void {
-    const layer_surface = @fieldParentPtr(LayerSurface, "destroy", listener);
+    const layer_surface: *LayerSurface = @fieldParentPtr("destroy", listener);
 
     log.debug("layer surface '{s}' destroyed", .{layer_surface.wlr_layer_surface.namespace});
 
@@ -97,7 +97,7 @@ fn handleDestroy(listener: *wl.Listener(*wlr.LayerSurfaceV1), _: *wlr.LayerSurfa
 }
 
 fn handleMap(listener: *wl.Listener(void)) void {
-    const layer_surface = @fieldParentPtr(LayerSurface, "map", listener);
+    const layer_surface: *LayerSurface = @fieldParentPtr("map", listener);
 
     log.debug("layer surface '{s}' mapped", .{layer_surface.wlr_layer_surface.namespace});
 
@@ -107,7 +107,7 @@ fn handleMap(listener: *wl.Listener(void)) void {
 }
 
 fn handleUnmap(listener: *wl.Listener(void)) void {
-    const layer_surface = @fieldParentPtr(LayerSurface, "unmap", listener);
+    const layer_surface: *LayerSurface = @fieldParentPtr("unmap", listener);
 
     log.debug("layer surface '{s}' unmapped", .{layer_surface.wlr_layer_surface.namespace});
 
@@ -117,7 +117,7 @@ fn handleUnmap(listener: *wl.Listener(void)) void {
 }
 
 fn handleCommit(listener: *wl.Listener(*wlr.Surface), _: *wlr.Surface) void {
-    const layer_surface = @fieldParentPtr(LayerSurface, "commit", listener);
+    const layer_surface: *LayerSurface = @fieldParentPtr("commit", listener);
     const wlr_layer_surface = layer_surface.wlr_layer_surface;
 
     assert(wlr_layer_surface.output != null);
@@ -186,7 +186,7 @@ fn handleKeyboardInteractiveExclusive(output: *Output) void {
 }
 
 fn handleNewPopup(listener: *wl.Listener(*wlr.XdgPopup), wlr_xdg_popup: *wlr.XdgPopup) void {
-    const layer_surface = @fieldParentPtr(LayerSurface, "new_popup", listener);
+    const layer_surface: *LayerSurface = @fieldParentPtr("new_popup", listener);
 
     XdgPopup.create(
         wlr_xdg_popup,

river/Layout.zig

@@ -186,7 +186,7 @@ pub fn destroy(layout: *Layout) void {
     );
 
     // Remove layout from the list
-    const node = @fieldParentPtr(std.TailQueue(Layout).Node, "data", layout);
+    const node: *std.TailQueue(Layout).Node = @fieldParentPtr("data", layout);
     layout.output.layouts.remove(node);
 
     // If we are the currently active layout of an output, clean up.

river/LayoutManager.zig

@@ -44,7 +44,7 @@ pub fn init(layout_manager: *LayoutManager) !void {
 }
 
 fn handleServerDestroy(listener: *wl.Listener(*wl.Server), _: *wl.Server) void {
-    const layout_manager = @fieldParentPtr(LayoutManager, "server_destroy", listener);
+    const layout_manager: *LayoutManager = @fieldParentPtr("server_destroy", listener);
     layout_manager.global.destroy();
 }
 

river/LockManager.zig

@@ -85,7 +85,7 @@ pub fn deinit(manager: *LockManager) void {
 }
 
 fn handleLock(listener: *wl.Listener(*wlr.SessionLockV1), lock: *wlr.SessionLockV1) void {
-    const manager = @fieldParentPtr(LockManager, "new_lock", listener);
+    const manager: *LockManager = @fieldParentPtr("new_lock", listener);
 
     if (manager.lock != null) {
         log.info("denying new session lock client, an active one already exists", .{});
@@ -191,7 +191,7 @@ pub fn maybeLock(manager: *LockManager) void {
 }
 
 fn handleUnlock(listener: *wl.Listener(void)) void {
-    const manager = @fieldParentPtr(LockManager, "unlock", listener);
+    const manager: *LockManager = @fieldParentPtr("unlock", listener);
 
     manager.state = .unlocked;
 
@@ -229,7 +229,7 @@ fn handleUnlock(listener: *wl.Listener(void)) void {
 }
 
 fn handleDestroy(listener: *wl.Listener(void)) void {
-    const manager = @fieldParentPtr(LockManager, "destroy", listener);
+    const manager: *LockManager = @fieldParentPtr("destroy", listener);
 
     log.debug("ext_session_lock_v1 destroyed", .{});
 
@@ -248,7 +248,7 @@ fn handleSurface(
     listener: *wl.Listener(*wlr.SessionLockSurfaceV1),
     wlr_lock_surface: *wlr.SessionLockSurfaceV1,
 ) void {
-    const manager = @fieldParentPtr(LockManager, "new_surface", listener);
+    const manager: *LockManager = @fieldParentPtr("new_surface", listener);
 
     log.debug("new ext_session_lock_surface_v1 created", .{});
 

river/LockSurface.zig

@@ -100,7 +100,7 @@ pub fn configure(lock_surface: *LockSurface) void {
 }
 
 fn handleMap(listener: *wl.Listener(void)) void {
-    const lock_surface = @fieldParentPtr(LockSurface, "map", listener);
+    const lock_surface: *LockSurface = @fieldParentPtr("map", listener);
     const output = lock_surface.getOutput();
 
     output.normal_content.node.setEnabled(false);
@@ -132,7 +132,7 @@ fn updateFocus(lock_surface: *LockSurface) void {
 }
 
 fn handleDestroy(listener: *wl.Listener(void)) void {
-    const lock_surface = @fieldParentPtr(LockSurface, "surface_destroy", listener);
+    const lock_surface: *LockSurface = @fieldParentPtr("surface_destroy", listener);
 
     lock_surface.destroy();
 }

river/Output.zig

@@ -20,6 +20,7 @@ const std = @import("std");
 const assert = std.debug.assert;
 const math = std.math;
 const mem = std.mem;
+const posix = std.posix;
 const fmt = std.fmt;
 const wlr = @import("wlroots");
 const wayland = @import("wayland");
@@ -99,7 +100,7 @@ layers: struct {
     fullscreen: *wlr.SceneTree,
     /// Overlay layer shell layer
     overlay: *wlr.SceneTree,
-    /// xdg-popups of views and layer-shell surfaces
+    /// Popups from xdg-shell and input-method-v2 clients.
     popups: *wlr.SceneTree,
 },
 
@@ -401,7 +402,7 @@ fn sendLayerConfigures(
 }
 
 fn handleDestroy(listener: *wl.Listener(*wlr.Output), _: *wlr.Output) void {
-    const output = @fieldParentPtr(Output, "destroy", listener);
+    const output: *Output = @fieldParentPtr("destroy", listener);
 
     log.debug("output '{s}' destroyed", .{output.wlr_output.name});
 
@@ -436,7 +437,7 @@ fn handleDestroy(listener: *wl.Listener(*wlr.Output), _: *wlr.Output) void {
 }
 
 fn handleRequestState(listener: *wl.Listener(*wlr.Output.event.RequestState), event: *wlr.Output.event.RequestState) void {
-    const output = @fieldParentPtr(Output, "request_state", listener);
+    const output: *Output = @fieldParentPtr("request_state", listener);
 
     output.applyState(event.state) catch {
         log.err("failed to commit requested state", .{});
@@ -514,12 +515,12 @@ pub fn updateBackgroundRect(output: *Output) void {
     output.layers.background_color_rect.setSize(width, height);
 
     var it = output.layers.fullscreen.children.iterator(.forward);
-    const fullscreen_background = @fieldParentPtr(wlr.SceneRect, "node", it.next().?);
+    const fullscreen_background: *wlr.SceneRect = @fieldParentPtr("node", it.next().?);
     fullscreen_background.setSize(width, height);
 }
 
 fn handleFrame(listener: *wl.Listener(*wlr.Output), _: *wlr.Output) void {
-    const output = @fieldParentPtr(Output, "frame", listener);
+    const output: *Output = @fieldParentPtr("frame", listener);
     const scene_output = server.root.scene.getSceneOutput(output.wlr_output).?;
 
     // TODO this should probably be retried on failure
@@ -528,8 +529,8 @@ fn handleFrame(listener: *wl.Listener(*wlr.Output), _: *wlr.Output) void {
         error.CommitFailed => log.err("output commit failed for {s}", .{output.wlr_output.name}),
     };
 
-    var now: std.os.timespec = undefined;
+    var now: posix.timespec = undefined;
-    std.os.clock_gettime(std.os.CLOCK.MONOTONIC, &now) catch @panic("CLOCK_MONOTONIC not supported");
+    posix.clock_gettime(posix.CLOCK.MONOTONIC, &now) catch @panic("CLOCK_MONOTONIC not supported");
     scene_output.sendFrameDone(&now);
 }
 
@@ -591,7 +592,7 @@ fn handlePresent(
     listener: *wl.Listener(*wlr.Output.event.Present),
     event: *wlr.Output.event.Present,
 ) void {
-    const output = @fieldParentPtr(Output, "present", listener);
+    const output: *Output = @fieldParentPtr("present", listener);
 
     if (!event.presented) {
         return;

river/PointerConstraint.zig

@@ -73,7 +73,6 @@ pub fn maybeActivate(constraint: *PointerConstraint) void {
     const seat: *Seat = @ptrFromInt(constraint.wlr_constraint.seat.data);
 
     assert(seat.cursor.constraint == constraint);
-    assert(seat.wlr_seat.keyboard_state.focused_surface == constraint.wlr_constraint.surface);
 
     if (constraint.state == .active) return;
 
@@ -105,8 +104,6 @@ pub fn maybeActivate(constraint: *PointerConstraint) void {
 pub fn updateState(constraint: *PointerConstraint) void {
     const seat: *Seat = @ptrFromInt(constraint.wlr_constraint.seat.data);
 
-    assert(seat.wlr_seat.keyboard_state.focused_surface == constraint.wlr_constraint.surface);
-
     constraint.maybeActivate();
 
     if (constraint.state != .active) return;
@@ -185,14 +182,14 @@ fn warpToHintIfSet(constraint: *PointerConstraint) void {
 }
 
 fn handleNodeDestroy(listener: *wl.Listener(void)) void {
-    const constraint = @fieldParentPtr(PointerConstraint, "node_destroy", listener);
+    const constraint: *PointerConstraint = @fieldParentPtr("node_destroy", listener);
 
     log.info("deactivating pointer constraint, scene node destroyed", .{});
     constraint.deactivate();
 }
 
 fn handleDestroy(listener: *wl.Listener(*wlr.PointerConstraintV1), _: *wlr.PointerConstraintV1) void {
-    const constraint = @fieldParentPtr(PointerConstraint, "destroy", listener);
+    const constraint: *PointerConstraint = @fieldParentPtr("destroy", listener);
     const seat: *Seat = @ptrFromInt(constraint.wlr_constraint.seat.data);
 
     if (constraint.state == .active) {
@@ -214,7 +211,7 @@ fn handleDestroy(listener: *wl.Listener(*wlr.PointerConstraintV1), _: *wlr.Point
 }
 
 fn handleSetRegion(listener: *wl.Listener(void)) void {
-    const constraint = @fieldParentPtr(PointerConstraint, "set_region", listener);
+    const constraint: *PointerConstraint = @fieldParentPtr("set_region", listener);
     const seat: *Seat = @ptrFromInt(constraint.wlr_constraint.seat.data);
 
     switch (constraint.state) {

river/Root.zig

@@ -743,7 +743,7 @@ fn commitTransaction(root: *Root) void {
 // We need this listener to deal with outputs that have their position auto-configured
 // by the wlr_output_layout.
 fn handleLayoutChange(listener: *wl.Listener(*wlr.OutputLayout), _: *wlr.OutputLayout) void {
-    const root = @fieldParentPtr(Root, "layout_change", listener);
+    const root: *Root = @fieldParentPtr("layout_change", listener);
 
     root.handleOutputConfigChange() catch std.log.err("out of memory", .{});
 }
@@ -778,7 +778,7 @@ fn handleManagerApply(
     listener: *wl.Listener(*wlr.OutputConfigurationV1),
     config: *wlr.OutputConfigurationV1,
 ) void {
-    const root = @fieldParentPtr(Root, "manager_apply", listener);
+    const root: *Root = @fieldParentPtr("manager_apply", listener);
     defer config.destroy();
 
     std.log.scoped(.output_manager).info("applying output configuration", .{});
@@ -792,7 +792,7 @@ fn handleManagerTest(
     listener: *wl.Listener(*wlr.OutputConfigurationV1),
     config: *wlr.OutputConfigurationV1,
 ) void {
-    const root = @fieldParentPtr(Root, "manager_test", listener);
+    const root: *Root = @fieldParentPtr("manager_test", listener);
     defer config.destroy();
 
     root.processOutputConfig(config, .test_only);

river/SceneNodeData.zig

@@ -24,6 +24,7 @@ const util = @import("util.zig");
 
 const LayerSurface = @import("LayerSurface.zig");
 const LockSurface = @import("LockSurface.zig");
+const InputPopup = @import("InputPopup.zig");
 const View = @import("View.zig");
 const XwaylandOverrideRedirect = @import("XwaylandOverrideRedirect.zig");
 
@@ -65,16 +66,14 @@ pub fn fromNode(node: *wlr.SceneNode) ?*SceneNodeData {
 }
 
 pub fn fromSurface(surface: *wlr.Surface) ?*SceneNodeData {
-    if (surface.getRootSurface()) |root_surface| {
+    if (@as(?*wlr.SceneNode, @ptrFromInt(surface.getRootSurface().data))) |node| {
-        if (@as(?*wlr.SceneNode, @ptrFromInt(root_surface.data))) |node| {
         return fromNode(node);
     }
-    }
     return null;
 }
 
 fn handleDestroy(listener: *wl.Listener(void)) void {
-    const scene_node_data = @fieldParentPtr(SceneNodeData, "destroy", listener);
+    const scene_node_data: *SceneNodeData = @fieldParentPtr("destroy", listener);
 
     scene_node_data.destroy.link.remove();
     scene_node_data.node.data = 0;

river/Seat.zig

@@ -544,7 +544,7 @@ fn handleRequestSetSelection(
     listener: *wl.Listener(*wlr.Seat.event.RequestSetSelection),
     event: *wlr.Seat.event.RequestSetSelection,
 ) void {
-    const seat = @fieldParentPtr(Seat, "request_set_selection", listener);
+    const seat: *Seat = @fieldParentPtr("request_set_selection", listener);
     seat.wlr_seat.setSelection(event.source, event.serial);
 }
 
@@ -552,7 +552,7 @@ fn handleRequestStartDrag(
     listener: *wl.Listener(*wlr.Seat.event.RequestStartDrag),
     event: *wlr.Seat.event.RequestStartDrag,
 ) void {
-    const seat = @fieldParentPtr(Seat, "request_start_drag", listener);
+    const seat: *Seat = @fieldParentPtr("request_start_drag", listener);
 
     // The start_drag request is ignored by wlroots if a drag is currently in progress.
     assert(seat.drag == .none);
@@ -576,7 +576,7 @@ fn handleRequestStartDrag(
 }
 
 fn handleStartDrag(listener: *wl.Listener(*wlr.Drag), wlr_drag: *wlr.Drag) void {
-    const seat = @fieldParentPtr(Seat, "start_drag", listener);
+    const seat: *Seat = @fieldParentPtr("start_drag", listener);
 
     assert(seat.drag == .none);
     switch (wlr_drag.grab_type) {
@@ -599,7 +599,7 @@ fn handleStartDrag(listener: *wl.Listener(*wlr.Drag), wlr_drag: *wlr.Drag) void
 }
 
 fn handleDragDestroy(listener: *wl.Listener(*wlr.Drag), _: *wlr.Drag) void {
-    const seat = @fieldParentPtr(Seat, "drag_destroy", listener);
+    const seat: *Seat = @fieldParentPtr("drag_destroy", listener);
     seat.drag_destroy.link.remove();
 
     switch (seat.drag) {
@@ -617,6 +617,6 @@ fn handleRequestSetPrimarySelection(
     listener: *wl.Listener(*wlr.Seat.event.RequestSetPrimarySelection),
     event: *wlr.Seat.event.RequestSetPrimarySelection,
 ) void {
-    const seat = @fieldParentPtr(Seat, "request_set_primary_selection", listener);
+    const seat: *Seat = @fieldParentPtr("request_set_primary_selection", listener);
     seat.wlr_seat.setPrimarySelection(event.source, event.serial);
 }

river/SeatStatus.zig

@@ -51,7 +51,7 @@ fn handleRequest(seat_status_v1: *zriver.SeatStatusV1, request: zriver.SeatStatu
 }
 
 fn handleDestroy(_: *zriver.SeatStatusV1, seat_status: *SeatStatus) void {
-    const node = @fieldParentPtr(std.SinglyLinkedList(SeatStatus).Node, "data", seat_status);
+    const node: *std.SinglyLinkedList(SeatStatus).Node = @fieldParentPtr("data", seat_status);
     seat_status.seat.status_trackers.remove(node);
     util.gpa.destroy(node);
 }

river/Server.zig

@@ -19,6 +19,7 @@ const Server = @This();
 const build_options = @import("build_options");
 const std = @import("std");
 const assert = std.debug.assert;
+const posix = std.posix;
 const wlr = @import("wlroots");
 const wl = @import("wayland").server.wl;
 
@@ -122,8 +123,8 @@ pub fn init(server: *Server, runtime_xwayland: bool) !void {
     const loop = wl_server.getEventLoop();
     server.* = .{
         .wl_server = wl_server,
-        .sigint_source = try loop.addSignal(*wl.Server, std.os.SIG.INT, terminate, wl_server),
+        .sigint_source = try loop.addSignal(*wl.Server, posix.SIG.INT, terminate, wl_server),
-        .sigterm_source = try loop.addSignal(*wl.Server, std.os.SIG.TERM, terminate, wl_server),
+        .sigterm_source = try loop.addSignal(*wl.Server, posix.SIG.TERM, terminate, wl_server),
 
         .backend = backend,
         .session = session,
@@ -371,7 +372,7 @@ fn handleNewToplevelDecoration(
 }
 
 fn handleNewLayerSurface(listener: *wl.Listener(*wlr.LayerSurfaceV1), wlr_layer_surface: *wlr.LayerSurfaceV1) void {
-    const server = @fieldParentPtr(Server, "new_layer_surface", listener);
+    const server: *Server = @fieldParentPtr("new_layer_surface", listener);
 
     log.debug(
         "new layer surface: namespace {s}, layer {s}, anchor {b:0>4}, size {},{}, margin {},{},{},{}, exclusive_zone {}",
@@ -431,7 +432,7 @@ fn handleRequestActivate(
     listener: *wl.Listener(*wlr.XdgActivationV1.event.RequestActivate),
     event: *wlr.XdgActivationV1.event.RequestActivate,
 ) void {
-    const server = @fieldParentPtr(Server, "request_activate", listener);
+    const server: *Server = @fieldParentPtr("request_activate", listener);
 
     const node_data = SceneNodeData.fromSurface(event.surface) orelse return;
     switch (node_data.data) {

river/StatusManager.zig

@@ -46,7 +46,7 @@ pub fn init(status_manager: *StatusManager) !void {
 }
 
 fn handleServerDestroy(listener: *wl.Listener(*wl.Server), _: *wl.Server) void {
-    const status_manager = @fieldParentPtr(StatusManager, "server_destroy", listener);
+    const status_manager: *StatusManager = @fieldParentPtr("server_destroy", listener);
     status_manager.global.destroy();
 }
 

river/Switch.zig

@@ -71,7 +71,7 @@ pub fn deinit(switch_device: *Switch) void {
 }
 
 fn handleToggle(listener: *wl.Listener(*wlr.Switch.event.Toggle), event: *wlr.Switch.event.Toggle) void {
-    const switch_device = @fieldParentPtr(Switch, "toggle", listener);
+    const switch_device: *Switch = @fieldParentPtr("toggle", listener);
 
     switch_device.device.seat.handleActivity();
 

river/TabletTool.zig

@@ -90,7 +90,7 @@ fn create(wlr_seat: *wlr.Seat, wlr_tool: *wlr.TabletTool) error{OutOfMemory}!*Ta
 }
 
 fn handleDestroy(listener: *wl.Listener(*wlr.TabletTool), _: *wlr.TabletTool) void {
-    const tool = @fieldParentPtr(TabletTool, "destroy", listener);
+    const tool: *TabletTool = @fieldParentPtr("destroy", listener);
 
     tool.wp_tool.wlr_tool.data = 0;
 
@@ -106,7 +106,7 @@ fn handleSetCursor(
     listener: *wl.Listener(*wlr.TabletV2TabletTool.event.SetCursor),
     event: *wlr.TabletV2TabletTool.event.SetCursor,
 ) void {
-    const tool = @fieldParentPtr(TabletTool, "set_cursor", listener);
+    const tool: *TabletTool = @fieldParentPtr("set_cursor", listener);
 
     if (tool.wp_tool.focused_surface == null or
         tool.wp_tool.focused_surface.?.resource.getClient() != event.seat_client.client)

river/TextInput.zig

@@ -63,9 +63,14 @@ pub fn create(wlr_text_input: *wlr.TextInputV3) !void {
 }
 
 fn handleEnable(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) void {
-    const text_input = @fieldParentPtr(TextInput, "enable", listener);
+    const text_input: *TextInput = @fieldParentPtr("enable", listener);
     const seat: *Seat = @ptrFromInt(text_input.wlr_text_input.seat.data);
 
+    if (text_input.wlr_text_input.focused_surface == null) {
+        log.err("client requested to enable text input without focus, ignoring request", .{});
+        return;
+    }
+
     // The same text_input object may be enabled multiple times consecutively
     // without first disabling it. Enabling a different text input object without
     // first disabling the current one is disallowed by the protocol however.
@@ -85,7 +90,7 @@ fn handleEnable(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) v
 }
 
 fn handleCommit(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) void {
-    const text_input = @fieldParentPtr(TextInput, "commit", listener);
+    const text_input: *TextInput = @fieldParentPtr("commit", listener);
     const seat: *Seat = @ptrFromInt(text_input.wlr_text_input.seat.data);
 
     if (seat.relay.text_input != text_input) {
@@ -99,7 +104,7 @@ fn handleCommit(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) v
 }
 
 fn handleDisable(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) void {
-    const text_input = @fieldParentPtr(TextInput, "disable", listener);
+    const text_input: *TextInput = @fieldParentPtr("disable", listener);
     const seat: *Seat = @ptrFromInt(text_input.wlr_text_input.seat.data);
 
     if (seat.relay.text_input == text_input) {
@@ -108,7 +113,7 @@ fn handleDisable(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3)
 }
 
 fn handleDestroy(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) void {
-    const text_input = @fieldParentPtr(TextInput, "destroy", listener);
+    const text_input: *TextInput = @fieldParentPtr("destroy", listener);
     const seat: *Seat = @ptrFromInt(text_input.wlr_text_input.seat.data);
 
     if (seat.relay.text_input == text_input) {

river/Vector.zig

@@ -44,7 +44,7 @@ pub fn direction(v: Vector) ?wlr.OutputLayout.Direction {
     // A zero length vector has no direction
     if (v.x == 0 and v.y == 0) return null;
 
-    if ((math.absInt(v.y) catch return null) > (math.absInt(v.x) catch return null)) {
+    if (@abs(v.y) > @abs(v.x)) {
         // Careful: We are operating in a Y-inverted coordinate system.
         return if (v.y > 0) .down else .up;
     } else {

river/View.zig

@@ -20,7 +20,7 @@ const build_options = @import("build_options");
 const std = @import("std");
 const assert = std.debug.assert;
 const math = std.math;
-const os = std.os;
+const posix = std.posix;
 const wlr = @import("wlroots");
 const wl = @import("wayland").server.wl;
 
@@ -472,8 +472,9 @@ pub fn rootSurface(view: View) ?*wlr.Surface {
 
 pub fn sendFrameDone(view: View) void {
     assert(view.mapped and !view.destroying);
-    var now: os.timespec = undefined;
+
-    os.clock_gettime(os.CLOCK.MONOTONIC, &now) catch @panic("CLOCK_MONOTONIC not supported");
+    var now: posix.timespec = undefined;
+    posix.clock_gettime(posix.CLOCK.MONOTONIC, &now) catch @panic("CLOCK_MONOTONIC not supported");
     view.rootSurface().?.sendFrameDone(&now);
 }
 

river/XdgDecoration.zig

@@ -66,7 +66,7 @@ fn handleDestroy(
     listener: *wl.Listener(*wlr.XdgToplevelDecorationV1),
     _: *wlr.XdgToplevelDecorationV1,
 ) void {
-    const decoration = @fieldParentPtr(XdgDecoration, "destroy", listener);
+    const decoration: *XdgDecoration = @fieldParentPtr("destroy", listener);
 
     decoration.deinit();
 }
@@ -75,7 +75,7 @@ fn handleRequestMode(
     listener: *wl.Listener(*wlr.XdgToplevelDecorationV1),
     _: *wlr.XdgToplevelDecorationV1,
 ) void {
-    const decoration = @fieldParentPtr(XdgDecoration, "request_mode", listener);
+    const decoration: *XdgDecoration = @fieldParentPtr("request_mode", listener);
 
     const toplevel: *XdgToplevel = @ptrFromInt(decoration.wlr_decoration.toplevel.base.data);
     const view = toplevel.view;

river/XdgPopup.zig

@@ -61,7 +61,7 @@ pub fn create(
 }
 
 fn handleDestroy(listener: *wl.Listener(void)) void {
-    const xdg_popup = @fieldParentPtr(XdgPopup, "destroy", listener);
+    const xdg_popup: *XdgPopup = @fieldParentPtr("destroy", listener);
 
     xdg_popup.destroy.link.remove();
     xdg_popup.new_popup.link.remove();
@@ -71,7 +71,7 @@ fn handleDestroy(listener: *wl.Listener(void)) void {
 }
 
 fn handleNewPopup(listener: *wl.Listener(*wlr.XdgPopup), wlr_xdg_popup: *wlr.XdgPopup) void {
-    const xdg_popup = @fieldParentPtr(XdgPopup, "new_popup", listener);
+    const xdg_popup: *XdgPopup = @fieldParentPtr("new_popup", listener);
 
     XdgPopup.create(
         wlr_xdg_popup,
@@ -84,7 +84,7 @@ fn handleNewPopup(listener: *wl.Listener(*wlr.XdgPopup), wlr_xdg_popup: *wlr.Xdg
 }
 
 fn handleReposition(listener: *wl.Listener(void)) void {
-    const xdg_popup = @fieldParentPtr(XdgPopup, "reposition", listener);
+    const xdg_popup: *XdgPopup = @fieldParentPtr("reposition", listener);
 
     const output = switch (SceneNodeData.fromNode(&xdg_popup.root.node).?.data) {
         .view => |view| view.current.output orelse return,

river/XdgToplevel.zig

@@ -200,7 +200,7 @@ pub fn destroyPopups(toplevel: XdgToplevel) void {
 }
 
 fn handleDestroy(listener: *wl.Listener(void)) void {
-    const toplevel = @fieldParentPtr(XdgToplevel, "destroy", listener);
+    const toplevel: *XdgToplevel = @fieldParentPtr("destroy", listener);
 
     // This can be be non-null here if the client commits a protocol error or
     // if it exits without destroying its wayland objects.
@@ -223,7 +223,7 @@ fn handleDestroy(listener: *wl.Listener(void)) void {
 }
 
 fn handleMap(listener: *wl.Listener(void)) void {
-    const toplevel = @fieldParentPtr(XdgToplevel, "map", listener);
+    const toplevel: *XdgToplevel = @fieldParentPtr("map", listener);
     const view = toplevel.view;
 
     // Add listeners that are only active while mapped
@@ -266,7 +266,7 @@ fn handleMap(listener: *wl.Listener(void)) void {
 
 /// Called when the surface is unmapped and will no longer be displayed.
 fn handleUnmap(listener: *wl.Listener(void)) void {
-    const toplevel = @fieldParentPtr(XdgToplevel, "unmap", listener);
+    const toplevel: *XdgToplevel = @fieldParentPtr("unmap", listener);
 
     // Remove listeners that are only active while mapped
     toplevel.ack_configure.link.remove();
@@ -281,7 +281,7 @@ fn handleUnmap(listener: *wl.Listener(void)) void {
 }
 
 fn handleNewPopup(listener: *wl.Listener(*wlr.XdgPopup), wlr_xdg_popup: *wlr.XdgPopup) void {
-    const toplevel = @fieldParentPtr(XdgToplevel, "new_popup", listener);
+    const toplevel: *XdgToplevel = @fieldParentPtr("new_popup", listener);
 
     XdgPopup.create(wlr_xdg_popup, toplevel.view.popup_tree, toplevel.view.popup_tree) catch {
         wlr_xdg_popup.resource.postNoMemory();
@@ -293,7 +293,7 @@ fn handleAckConfigure(
     listener: *wl.Listener(*wlr.XdgSurface.Configure),
     acked_configure: *wlr.XdgSurface.Configure,
 ) void {
-    const toplevel = @fieldParentPtr(XdgToplevel, "ack_configure", listener);
+    const toplevel: *XdgToplevel = @fieldParentPtr("ack_configure", listener);
     switch (toplevel.configure_state) {
         .inflight => |serial| if (acked_configure.serial == serial) {
             toplevel.configure_state = .acked;
@@ -306,7 +306,7 @@ fn handleAckConfigure(
 }
 
 fn handleCommit(listener: *wl.Listener(*wlr.Surface), _: *wlr.Surface) void {
-    const toplevel = @fieldParentPtr(XdgToplevel, "commit", listener);
+    const toplevel: *XdgToplevel = @fieldParentPtr("commit", listener);
     const view = toplevel.view;
 
     {
@@ -395,7 +395,7 @@ fn handleCommit(listener: *wl.Listener(*wlr.Surface), _: *wlr.Surface) void {
 /// Called when the client asks to be fullscreened. We always honor the request
 /// for now, perhaps it should be denied in some cases in the future.
 fn handleRequestFullscreen(listener: *wl.Listener(void)) void {
-    const toplevel = @fieldParentPtr(XdgToplevel, "request_fullscreen", listener);
+    const toplevel: *XdgToplevel = @fieldParentPtr("request_fullscreen", listener);
     if (toplevel.view.pending.fullscreen != toplevel.wlr_toplevel.requested.fullscreen) {
         toplevel.view.pending.fullscreen = toplevel.wlr_toplevel.requested.fullscreen;
         server.root.applyPending();
@@ -406,7 +406,7 @@ fn handleRequestMove(
     listener: *wl.Listener(*wlr.XdgToplevel.event.Move),
     event: *wlr.XdgToplevel.event.Move,
 ) void {
-    const toplevel = @fieldParentPtr(XdgToplevel, "request_move", listener);
+    const toplevel: *XdgToplevel = @fieldParentPtr("request_move", listener);
     const seat: *Seat = @ptrFromInt(event.seat.seat.data);
     const view = toplevel.view;
 
@@ -429,7 +429,7 @@ fn handleRequestMove(
 }
 
 fn handleRequestResize(listener: *wl.Listener(*wlr.XdgToplevel.event.Resize), event: *wlr.XdgToplevel.event.Resize) void {
-    const toplevel = @fieldParentPtr(XdgToplevel, "request_resize", listener);
+    const toplevel: *XdgToplevel = @fieldParentPtr("request_resize", listener);
     const seat: *Seat = @ptrFromInt(event.seat.seat.data);
     const view = toplevel.view;
 
@@ -453,12 +453,12 @@ fn handleRequestResize(listener: *wl.Listener(*wlr.XdgToplevel.event.Resize), ev
 
 /// Called when the client sets / updates its title
 fn handleSetTitle(listener: *wl.Listener(void)) void {
-    const toplevel = @fieldParentPtr(XdgToplevel, "set_title", listener);
+    const toplevel: *XdgToplevel = @fieldParentPtr("set_title", listener);
     toplevel.view.notifyState();
 }
 
 /// Called when the client sets / updates its app_id
 fn handleSetAppId(listener: *wl.Listener(void)) void {
-    const toplevel = @fieldParentPtr(XdgToplevel, "set_app_id", listener);
+    const toplevel: *XdgToplevel = @fieldParentPtr("set_app_id", listener);
     toplevel.view.notifyAppId();
 }

river/XwaylandOverrideRedirect.zig

@@ -78,7 +78,7 @@ fn handleRequestConfigure(
 }
 
 fn handleDestroy(listener: *wl.Listener(void)) void {
-    const override_redirect = @fieldParentPtr(XwaylandOverrideRedirect, "destroy", listener);
+    const override_redirect: *XwaylandOverrideRedirect = @fieldParentPtr("destroy", listener);
 
     override_redirect.request_configure.link.remove();
     override_redirect.destroy.link.remove();
@@ -90,21 +90,21 @@ fn handleDestroy(listener: *wl.Listener(void)) void {
 }
 
 fn handleAssociate(listener: *wl.Listener(void)) void {
-    const override_redirect = @fieldParentPtr(XwaylandOverrideRedirect, "associate", listener);
+    const override_redirect: *XwaylandOverrideRedirect = @fieldParentPtr("associate", listener);
 
     override_redirect.xwayland_surface.surface.?.events.map.add(&override_redirect.map);
     override_redirect.xwayland_surface.surface.?.events.unmap.add(&override_redirect.unmap);
 }
 
 fn handleDissociate(listener: *wl.Listener(void)) void {
-    const override_redirect = @fieldParentPtr(XwaylandOverrideRedirect, "dissociate", listener);
+    const override_redirect: *XwaylandOverrideRedirect = @fieldParentPtr("dissociate", listener);
 
     override_redirect.map.link.remove();
     override_redirect.unmap.link.remove();
 }
 
 pub fn handleMap(listener: *wl.Listener(void)) void {
-    const override_redirect = @fieldParentPtr(XwaylandOverrideRedirect, "map", listener);
+    const override_redirect: *XwaylandOverrideRedirect = @fieldParentPtr("map", listener);
 
     override_redirect.mapImpl() catch {
         log.err("out of memory", .{});
@@ -155,7 +155,7 @@ pub fn focusIfDesired(override_redirect: *XwaylandOverrideRedirect) void {
 }
 
 fn handleUnmap(listener: *wl.Listener(void)) void {
-    const override_redirect = @fieldParentPtr(XwaylandOverrideRedirect, "unmap", listener);
+    const override_redirect: *XwaylandOverrideRedirect = @fieldParentPtr("unmap", listener);
 
     override_redirect.set_geometry.link.remove();
 
@@ -180,7 +180,7 @@ fn handleUnmap(listener: *wl.Listener(void)) void {
 }
 
 fn handleSetGeometry(listener: *wl.Listener(void)) void {
-    const override_redirect = @fieldParentPtr(XwaylandOverrideRedirect, "set_geometry", listener);
+    const override_redirect: *XwaylandOverrideRedirect = @fieldParentPtr("set_geometry", listener);
 
     override_redirect.surface_tree.?.node.setPosition(
         override_redirect.xwayland_surface.x,
@@ -189,7 +189,7 @@ fn handleSetGeometry(listener: *wl.Listener(void)) void {
 }
 
 fn handleSetOverrideRedirect(listener: *wl.Listener(void)) void {
-    const override_redirect = @fieldParentPtr(XwaylandOverrideRedirect, "set_override_redirect", listener);
+    const override_redirect: *XwaylandOverrideRedirect = @fieldParentPtr("set_override_redirect", listener);
     const xwayland_surface = override_redirect.xwayland_surface;
 
     log.debug("xwayland surface unset override redirect", .{});

river/XwaylandView.zig

@@ -131,7 +131,7 @@ fn setActivated(xwayland_view: XwaylandView, activated: bool) void {
 }
 
 fn handleDestroy(listener: *wl.Listener(void)) void {
-    const xwayland_view = @fieldParentPtr(XwaylandView, "destroy", listener);
+    const xwayland_view: *XwaylandView = @fieldParentPtr("destroy", listener);
 
     // Remove listeners that are active for the entire lifetime of the view
     xwayland_view.destroy.link.remove();
@@ -146,20 +146,20 @@ fn handleDestroy(listener: *wl.Listener(void)) void {
 }
 
 fn handleAssociate(listener: *wl.Listener(void)) void {
-    const xwayland_view = @fieldParentPtr(XwaylandView, "associate", listener);
+    const xwayland_view: *XwaylandView = @fieldParentPtr("associate", listener);
 
     xwayland_view.xwayland_surface.surface.?.events.map.add(&xwayland_view.map);
     xwayland_view.xwayland_surface.surface.?.events.unmap.add(&xwayland_view.unmap);
 }
 
 fn handleDissociate(listener: *wl.Listener(void)) void {
-    const xwayland_view = @fieldParentPtr(XwaylandView, "dissociate", listener);
+    const xwayland_view: *XwaylandView = @fieldParentPtr("dissociate", listener);
     xwayland_view.map.link.remove();
     xwayland_view.unmap.link.remove();
 }
 
 pub fn handleMap(listener: *wl.Listener(void)) void {
-    const xwayland_view = @fieldParentPtr(XwaylandView, "map", listener);
+    const xwayland_view: *XwaylandView = @fieldParentPtr("map", listener);
     const view = xwayland_view.view;
 
     const xwayland_surface = xwayland_view.xwayland_surface;
@@ -213,7 +213,7 @@ pub fn handleMap(listener: *wl.Listener(void)) void {
 }
 
 fn handleUnmap(listener: *wl.Listener(void)) void {
-    const xwayland_view = @fieldParentPtr(XwaylandView, "unmap", listener);
+    const xwayland_view: *XwaylandView = @fieldParentPtr("unmap", listener);
 
     xwayland_view.xwayland_surface.surface.?.data = 0;
 
@@ -235,7 +235,7 @@ fn handleRequestConfigure(
     listener: *wl.Listener(*wlr.XwaylandSurface.event.Configure),
     event: *wlr.XwaylandSurface.event.Configure,
 ) void {
-    const xwayland_view = @fieldParentPtr(XwaylandView, "request_configure", listener);
+    const xwayland_view: *XwaylandView = @fieldParentPtr("request_configure", listener);
 
     // If unmapped, let the client do whatever it wants
     if (xwayland_view.xwayland_surface.surface == null or
@@ -254,7 +254,7 @@ fn handleRequestConfigure(
 }
 
 fn handleSetOverrideRedirect(listener: *wl.Listener(void)) void {
-    const xwayland_view = @fieldParentPtr(XwaylandView, "set_override_redirect", listener);
+    const xwayland_view: *XwaylandView = @fieldParentPtr("set_override_redirect", listener);
     const xwayland_surface = xwayland_view.xwayland_surface;
 
     log.debug("xwayland surface set override redirect", .{});
@@ -276,17 +276,17 @@ fn handleSetOverrideRedirect(listener: *wl.Listener(void)) void {
 }
 
 fn handleSetTitle(listener: *wl.Listener(void)) void {
-    const xwayland_view = @fieldParentPtr(XwaylandView, "set_title", listener);
+    const xwayland_view: *XwaylandView = @fieldParentPtr("set_title", listener);
     xwayland_view.view.notifyState();
 }
 
 fn handleSetClass(listener: *wl.Listener(void)) void {
-    const xwayland_view = @fieldParentPtr(XwaylandView, "set_class", listener);
+    const xwayland_view: *XwaylandView = @fieldParentPtr("set_class", listener);
     xwayland_view.view.notifyAppId();
 }
 
 fn handleSetDecorations(listener: *wl.Listener(void)) void {
-    const xwayland_view = @fieldParentPtr(XwaylandView, "set_decorations", listener);
+    const xwayland_view: *XwaylandView = @fieldParentPtr("set_decorations", listener);
     const view = xwayland_view.view;
 
     const ssd = server.config.rules.ssd.match(view) orelse
@@ -299,7 +299,7 @@ fn handleSetDecorations(listener: *wl.Listener(void)) void {
 }
 
 fn handleRequestFullscreen(listener: *wl.Listener(void)) void {
-    const xwayland_view = @fieldParentPtr(XwaylandView, "request_fullscreen", listener);
+    const xwayland_view: *XwaylandView = @fieldParentPtr("request_fullscreen", listener);
     if (xwayland_view.view.pending.fullscreen != xwayland_view.xwayland_surface.fullscreen) {
         xwayland_view.view.pending.fullscreen = xwayland_view.xwayland_surface.fullscreen;
         server.root.applyPending();
@@ -314,6 +314,6 @@ fn handleRequestMinimize(
     listener: *wl.Listener(*wlr.XwaylandSurface.event.Minimize),
     event: *wlr.XwaylandSurface.event.Minimize,
 ) void {
-    const xwayland_view = @fieldParentPtr(XwaylandView, "request_minimize", listener);
+    const xwayland_view: *XwaylandView = @fieldParentPtr("request_minimize", listener);
     xwayland_view.xwayland_surface.setMinimized(event.minimize);
 }

river/command.zig

@@ -36,10 +36,11 @@ pub const Orientation = enum {
     vertical,
 };
 
-// zig fmt: off
+const command_impls = std.StaticStringMap(
-const command_impls = std.ComptimeStringMap(
     *const fn (*Seat, []const [:0]const u8, *?[]const u8) Error!void,
+).initComptime(
     .{
+        // zig fmt: off
         .{ "attach-mode",               @import("command/attach_mode.zig").defaultAttachMode },
         .{ "background-color",          @import("command/config.zig").backgroundColor },
         .{ "border-color-focused",      @import("command/config.zig").borderColorFocused },
@@ -96,9 +97,9 @@ const command_impls = std.ComptimeStringMap(
         .{ "unmap-switch",              @import("command/map.zig").unmapSwitch },
         .{ "xcursor-theme",             @import("command/xcursor_theme.zig").xcursorTheme },
         .{ "zoom",                      @import("command/zoom.zig").zoom },
+        // zig fmt: on
     },
 );
-// zig fmt: on
 
 pub const Error = error{
     NoCommand,

river/command/output.zig

@@ -109,7 +109,7 @@ fn getOutput(seat: *Seat, str: []const u8) !?*Output {
                 .previous => link.prev.?,
             };
         }
-        return @fieldParentPtr(Output, "active_link", link);
+        return @as(*Output, @fieldParentPtr("active_link", link));
     } else if (std.meta.stringToEnum(wlr.OutputLayout.Direction, str)) |direction| { // Spacial direction
         var focus_box: wlr.Box = undefined;
         server.root.output_layout.getBox(seat.focused_output.?.wlr_output, &focus_box);

river/command/spawn.zig

@@ -15,7 +15,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 const std = @import("std");
-const os = std.os;
+const posix = std.posix;
 
 const c = @import("../c.zig");
 const util = @import("../util.zig");
@@ -35,23 +35,26 @@ pub fn spawn(
 
     const child_args = [_:null]?[*:0]const u8{ "/bin/sh", "-c", args[1], null };
 
-    const pid = os.fork() catch {
+    const pid = posix.fork() catch {
         out.* = try std.fmt.allocPrint(util.gpa, "fork/execve failed", .{});
         return Error.Other;
     };
 
     if (pid == 0) {
         process.cleanupChild();
-        const pid2 = os.fork() catch c._exit(1);
+
-        if (pid2 == 0) os.execveZ("/bin/sh", &child_args, std.c.environ) catch c._exit(1);
+        const pid2 = posix.fork() catch c._exit(1);
+        if (pid2 == 0) {
+            posix.execveZ("/bin/sh", &child_args, std.c.environ) catch c._exit(1);
+        }
 
         c._exit(0);
     }
 
     // Wait the intermediate child.
-    const ret = os.waitpid(pid, 0);
+    const ret = posix.waitpid(pid, 0);
-    if (!os.W.IFEXITED(ret.status) or
+    if (!posix.W.IFEXITED(ret.status) or
-        (os.W.IFEXITED(ret.status) and os.W.EXITSTATUS(ret.status) != 0))
+        (posix.W.IFEXITED(ret.status) and posix.W.EXITSTATUS(ret.status) != 0))
     {
         out.* = try std.fmt.allocPrint(util.gpa, "fork/execve failed", .{});
         return Error.Other;

river/main.zig

@@ -20,7 +20,7 @@ const mem = std.mem;
 const fs = std.fs;
 const io = std.io;
 const log = std.log;
-const os = std.os;
+const posix = std.posix;
 const builtin = @import("builtin");
 const wlr = @import("wlroots");
 const flags = @import("flags");
@@ -57,23 +57,23 @@ pub fn main() anyerror!void {
         .{ .name = "c", .kind = .arg },
         .{ .name = "log-level", .kind = .arg },
         .{ .name = "no-xwayland", .kind = .boolean },
-    }).parse(os.argv[1..]) catch {
+    }).parse(std.os.argv[1..]) catch {
         try io.getStdErr().writeAll(usage);
-        os.exit(1);
+        posix.exit(1);
     };
     if (result.flags.h) {
         try io.getStdOut().writeAll(usage);
-        os.exit(0);
+        posix.exit(0);
     }
     if (result.args.len != 0) {
         log.err("unknown option '{s}'", .{result.args[0]});
         try io.getStdErr().writeAll(usage);
-        os.exit(1);
+        posix.exit(1);
     }
 
     if (result.flags.version) {
         try io.getStdOut().writeAll(build_options.version ++ "\n");
-        os.exit(0);
+        posix.exit(0);
     }
     if (result.flags.@"log-level") |level| {
         if (mem.eql(u8, level, "error")) {
@@ -87,7 +87,7 @@ pub fn main() anyerror!void {
         } else {
             log.err("invalid log level '{s}'", .{level});
             try io.getStdErr().writeAll(usage);
-            os.exit(1);
+            posix.exit(1);
         }
     }
     const enable_xwayland = !result.flags.@"no-xwayland";
@@ -119,16 +119,16 @@ pub fn main() anyerror!void {
     const child_pgid = if (startup_command) |cmd| blk: {
         log.info("running init executable '{s}'", .{cmd});
         const child_args = [_:null]?[*:0]const u8{ "/bin/sh", "-c", cmd, null };
-        const pid = try os.fork();
+        const pid = try posix.fork();
         if (pid == 0) {
             process.cleanupChild();
-            os.execveZ("/bin/sh", &child_args, std.c.environ) catch c._exit(1);
+            posix.execveZ("/bin/sh", &child_args, std.c.environ) catch c._exit(1);
         }
         util.gpa.free(cmd);
         // Since the child has called setsid, the pid is the pgid
         break :blk pid;
     } else null;
-    defer if (child_pgid) |pgid| os.kill(-pgid, os.SIG.TERM) catch |err| {
+    defer if (child_pgid) |pgid| posix.kill(-pgid, posix.SIG.TERM) catch |err| {
         log.err("failed to kill init process group: {s}", .{@errorName(err)});
     };
 
@@ -141,20 +141,20 @@ pub fn main() anyerror!void {
 
 fn defaultInitPath() !?[:0]const u8 {
     const path = blk: {
-        if (os.getenv("XDG_CONFIG_HOME")) |xdg_config_home| {
+        if (posix.getenv("XDG_CONFIG_HOME")) |xdg_config_home| {
             break :blk try fs.path.joinZ(util.gpa, &[_][]const u8{ xdg_config_home, "river/init" });
-        } else if (os.getenv("HOME")) |home| {
+        } else if (posix.getenv("HOME")) |home| {
             break :blk try fs.path.joinZ(util.gpa, &[_][]const u8{ home, ".config/river/init" });
         } else {
             return null;
         }
     };
 
-    os.accessZ(path, os.X_OK) catch |err| {
+    posix.accessZ(path, posix.X_OK) catch |err| {
         if (err == error.PermissionDenied) {
-            if (os.accessZ(path, os.R_OK)) {
+            if (posix.accessZ(path, posix.R_OK)) {
                 log.err("failed to run init executable {s}: the file is not executable", .{path});
-                os.exit(1);
+                posix.exit(1);
             } else |_| {}
         }
         log.err("failed to run init executable {s}: {s}", .{ path, @errorName(err) });
@@ -171,9 +171,11 @@ var runtime_log_level: log.Level = switch (builtin.mode) {
     .ReleaseSafe, .ReleaseFast, .ReleaseSmall => .info,
 };
 
-pub const std_options = struct {
+pub const std_options: std.Options = .{
-    /// Tell std.log to leave all log level filtering to us.
+    // Tell std.log to leave all log level filtering to us.
-    pub const log_level: log.Level = .debug;
+    .log_level = .debug,
+    .logFn = logFn,
+};
 
 pub fn logFn(
     comptime level: log.Level,
@@ -188,7 +190,6 @@ pub const std_options = struct {
     const stderr = io.getStdErr().writer();
     stderr.print(level.asText() ++ scope_prefix ++ format ++ "\n", args) catch {};
 }
-};
 
 /// See wlroots_log_wrapper.c
 extern fn river_init_wlroots_log(importance: wlr.log.Importance) void;

river/process.zig

@@ -15,21 +15,21 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 const std = @import("std");
-const os = std.os;
+const posix = std.posix;
 
 const c = @import("c.zig");
 
-var original_rlimit: ?os.rlimit = null;
+var original_rlimit: ?posix.rlimit = null;
 
 pub fn setup() void {
     // Ignore SIGPIPE so we don't get killed when writing to a socket that
     // has had its read end closed by another process.
-    const sig_ign = os.Sigaction{
+    const sig_ign = posix.Sigaction{
-        .handler = .{ .handler = os.SIG.IGN },
+        .handler = .{ .handler = posix.SIG.IGN },
-        .mask = os.empty_sigset,
+        .mask = posix.empty_sigset,
         .flags = 0,
     };
-    os.sigaction(os.SIG.PIPE, &sig_ign, null) catch unreachable;
+    posix.sigaction(posix.SIG.PIPE, &sig_ign, null) catch unreachable;
 
     // Most unix systems have a default limit of 1024 file descriptors and it
     // seems unlikely for this default to be universally raised due to the
@@ -41,13 +41,13 @@ pub fn setup() void {
     // to catch any fd leaks. Therefore, don't use some crazy high limit that
     // can never be reached before the system runs out of memory. This can be
     // raised further if anyone reaches it in practice.
-    if (os.getrlimit(.NOFILE)) |original| {
+    if (posix.getrlimit(.NOFILE)) |original| {
         original_rlimit = original;
-        const new: os.rlimit = .{
+        const new: posix.rlimit = .{
             .cur = @min(4096, original.max),
             .max = original.max,
         };
-        if (os.setrlimit(.NOFILE, new)) {
+        if (posix.setrlimit(.NOFILE, new)) {
             std.log.info("raised file descriptor limit of the river process to {d}", .{new.cur});
         } else |_| {
             std.log.err("setrlimit failed, using system default file descriptor limit of {d}", .{
@@ -61,17 +61,17 @@ pub fn setup() void {
 
 pub fn cleanupChild() void {
     if (c.setsid() < 0) unreachable;
-    if (os.system.sigprocmask(os.SIG.SETMASK, &os.empty_sigset, null) < 0) unreachable;
+    if (posix.system.sigprocmask(posix.SIG.SETMASK, &posix.empty_sigset, null) < 0) unreachable;
 
-    const sig_dfl = os.Sigaction{
+    const sig_dfl = posix.Sigaction{
-        .handler = .{ .handler = os.SIG.DFL },
+        .handler = .{ .handler = posix.SIG.DFL },
-        .mask = os.empty_sigset,
+        .mask = posix.empty_sigset,
         .flags = 0,
     };
-    os.sigaction(os.SIG.PIPE, &sig_dfl, null) catch unreachable;
+    posix.sigaction(posix.SIG.PIPE, &sig_dfl, null) catch unreachable;
 
     if (original_rlimit) |original| {
-        os.setrlimit(.NOFILE, original) catch {
+        posix.setrlimit(.NOFILE, original) catch {
             std.log.err("failed to restore original file descriptor limit for " ++
                 "child process, setrlimit failed", .{});
         };

riverctl/main.zig

@@ -17,7 +17,7 @@
 const std = @import("std");
 const mem = std.mem;
 const io = std.io;
-const os = std.os;
+const posix = std.posix;
 const assert = std.debug.assert;
 const builtin = @import("builtin");
 
@@ -57,7 +57,7 @@ pub fn main() !void {
             , .{}),
             error.ConnectFailed => {
                 std.log.err("Unable to connect to the Wayland server.", .{});
-                if (os.getenvZ("WAYLAND_DISPLAY") == null) {
+                if (posix.getenvZ("WAYLAND_DISPLAY") == null) {
                     fatal("WAYLAND_DISPLAY is not set.", .{});
                 } else {
                     fatal("Does WAYLAND_DISPLAY contain the socket name of a running server?", .{});
@@ -72,17 +72,17 @@ fn _main() !void {
     const result = flags.parser([*:0]const u8, &.{
         .{ .name = "h", .kind = .boolean },
         .{ .name = "version", .kind = .boolean },
-    }).parse(os.argv[1..]) catch {
+    }).parse(std.os.argv[1..]) catch {
         try io.getStdErr().writeAll(usage);
-        os.exit(1);
+        posix.exit(1);
     };
     if (result.flags.h) {
         try io.getStdOut().writeAll(usage);
-        os.exit(0);
+        posix.exit(0);
     }
     if (result.flags.version) {
         try io.getStdOut().writeAll(@import("build_options").version ++ "\n");
-        os.exit(0);
+        posix.exit(0);
     }
 
     const display = try wl.Display.connect(null);
@@ -128,14 +128,14 @@ fn callbackListener(_: *zriver.CommandCallbackV1, event: zriver.CommandCallbackV
                 const stdout = io.getStdOut().writer();
                 stdout.print("{s}\n", .{success.output}) catch @panic("failed to write to stdout");
             }
-            os.exit(0);
+            posix.exit(0);
         },
         .failure => |failure| {
             // A small hack to provide usage text when river reports an unknown command.
             if (mem.orderZ(u8, failure.failure_message, "unknown command") == .eq) {
                 std.log.err("unknown command", .{});
                 io.getStdErr().writeAll(usage) catch {};
-                os.exit(1);
+                posix.exit(1);
             }
             fatal("{s}", .{failure.failure_message});
         },
@@ -144,5 +144,5 @@ fn callbackListener(_: *zriver.CommandCallbackV1, event: zriver.CommandCallbackV
 
 fn fatal(comptime format: []const u8, args: anytype) noreturn {
     std.log.err(format, args);
-    os.exit(1);
+    posix.exit(1);
 }

rivertile/main.zig

@@ -39,7 +39,7 @@ const std = @import("std");
 const fmt = std.fmt;
 const mem = std.mem;
 const math = std.math;
-const os = std.os;
+const posix = std.posix;
 const assert = std.debug.assert;
 
 const wayland = @import("wayland");
@@ -311,19 +311,19 @@ pub fn main() !void {
         .{ .name = "main-location", .kind = .arg },
         .{ .name = "main-count", .kind = .arg },
         .{ .name = "main-ratio", .kind = .arg },
-    }).parse(os.argv[1..]) catch {
+    }).parse(std.os.argv[1..]) catch {
         try std.io.getStdErr().writeAll(usage);
-        os.exit(1);
+        posix.exit(1);
     };
     if (result.flags.h) {
         try std.io.getStdOut().writeAll(usage);
-        os.exit(0);
+        posix.exit(0);
     }
     if (result.args.len != 0) fatalPrintUsage("unknown option '{s}'", .{result.args[0]});
 
     if (result.flags.version) {
         try std.io.getStdOut().writeAll(@import("build_options").version ++ "\n");
-        os.exit(0);
+        posix.exit(0);
     }
     if (result.flags.@"view-padding") |raw| {
         view_padding = fmt.parseUnsigned(u31, raw, 10) catch
@@ -352,7 +352,7 @@ pub fn main() !void {
 
     const display = wl.Display.connect(null) catch {
         std.debug.print("Unable to connect to Wayland server.\n", .{});
-        os.exit(1);
+        posix.exit(1);
     };
     defer display.disconnect();
 
@@ -405,13 +405,13 @@ fn registryListener(registry: *wl.Registry, event: wl.Registry.Event, context: *
 
 fn fatal(comptime format: []const u8, args: anytype) noreturn {
     std.log.err(format, args);
-    os.exit(1);
+    posix.exit(1);
 }
 
 fn fatalPrintUsage(comptime format: []const u8, args: anytype) noreturn {
     std.log.err(format, args);
     std.io.getStdErr().writeAll(usage) catch {};
-    os.exit(1);
+    posix.exit(1);
 }
 
 fn saturatingCast(comptime T: type, x: anytype) T {