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

Currently a map-to-output input config setting loses effect when an
output is disabled and re-enabled for example.

.builds/alpine.yml

@@ -14,7 +14,6 @@ packages:
   - xcb-util-wm-dev
   - pixman-dev
   - libevdev-dev
-  - wayland-dev
   - wayland-protocols
   - xwayland-dev
   - meson
@@ -24,23 +23,28 @@ packages:
   - xz
 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.19.0
+      git checkout 0.17.2
-      meson setup build --auto-features=enabled -Drenderers=gles2 \
+      meson setup build --auto-features=enabled -Drenderers=gles2 -Dexamples=false \
-            -Dcolor-management=disabled -Dlibliftoff=disabled \
+            -Dwerror=false -Db_ndebug=false -Dxcb-errors=disabled --prefix /usr
-            -Dexamples=false -Dwerror=false -Db_ndebug=false \
-            -Dxcb-errors=disabled --prefix /usr
       sudo ninja -C build/ install
       cd ..
 
       # Eat Github's resources rather than the Zig Software Foundation's resources!
-      wget -nv https://github.com/ifreund/zig-tarball-mirror/releases/download/0.14.0/zig-linux-x86_64-0.14.0.tar.xz
+      wget -nv https://github.com/ifreund/zig-tarball-mirror/releases/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz
-      tar xf zig-linux-x86_64-0.14.0.tar.xz
+      tar xf zig-linux-x86_64-0.13.0.tar.xz
-      sudo mv zig-linux-x86_64-0.14.0/zig /usr/bin/
+      sudo mv zig-linux-x86_64-0.13.0/zig /usr/bin/
-      sudo mv zig-linux-x86_64-0.14.0/lib /usr/lib/zig
+      sudo mv zig-linux-x86_64-0.13.0/lib /usr/lib/zig
   - build: |
       cd river
       zig build --summary all
@@ -53,3 +57,4 @@ tasks:
       zig fmt --check riverctl/
       zig fmt --check rivertile/
       zig fmt --check build.zig
+      zig fmt --check build.zig.zon

.builds/archlinux.yml

@@ -21,23 +21,28 @@ packages:
   - xz
 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.19.0
+      git checkout 0.17.2
-      meson setup build --auto-features=enabled -Drenderers=gles2 \
+      meson setup build --auto-features=enabled -Drenderers=gles2 -Dexamples=false \
-            -Dcolor-management=disabled -Dlibliftoff=disabled \
+            -Dwerror=false -Db_ndebug=false --prefix /usr
-            -Dexamples=false -Dwerror=false -Db_ndebug=false \
-            -Dxcb-errors=disabled --prefix /usr
       sudo ninja -C build/ install
       cd ..
 
       # Eat Github's resources rather than the Zig Software Foundation's resources!
-      wget -nv https://github.com/ifreund/zig-tarball-mirror/releases/download/0.14.0/zig-linux-x86_64-0.14.0.tar.xz
+      wget -nv https://github.com/ifreund/zig-tarball-mirror/releases/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz
-      tar xf zig-linux-x86_64-0.14.0.tar.xz
+      tar xf zig-linux-x86_64-0.13.0.tar.xz
-      sudo mv zig-linux-x86_64-0.14.0/zig /usr/bin/
+      sudo mv zig-linux-x86_64-0.13.0/zig /usr/bin/
-      sudo mv zig-linux-x86_64-0.14.0/lib /usr/lib/zig
+      sudo mv zig-linux-x86_64-0.13.0/lib /usr/lib/zig
   - build: |
       cd river
       zig build --summary all
@@ -50,3 +55,4 @@ tasks:
       zig fmt --check riverctl/
       zig fmt --check rivertile/
       zig fmt --check build.zig
+      zig fmt --check build.zig.zon

.builds/freebsd.yml

@@ -7,7 +7,6 @@ packages:
   - devel/meson
   - devel/pkgconf
   - graphics/mesa-libs
-  - graphics/wayland
   - graphics/wayland-protocols
   - misc/hwdata
   - x11/libX11
@@ -27,24 +26,28 @@ packages:
   - 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.19.0
+      git checkout 0.17.2
-      meson setup build --auto-features=enabled -Drenderers=gles2 \
+      meson setup build --auto-features=enabled -Drenderers=gles2 -Dexamples=false \
-            -Dallocators=gbm \
+            -Dwerror=false -Db_ndebug=false --prefix /usr
-            -Dcolor-management=disabled -Dlibliftoff=disabled \
-            -Dexamples=false -Dwerror=false -Db_ndebug=false \
-            -Dxcb-errors=disabled --prefix /usr
       sudo ninja -C build/ install
       cd ..
 
       # Eat Github's resources rather than the Zig Software Foundation's resources!
-      wget -nv https://github.com/ifreund/zig-tarball-mirror/releases/download/0.14.0/zig-freebsd-x86_64-0.14.0-unofficial.tar.xz
+      wget -nv https://github.com/ifreund/zig-tarball-mirror/releases/download/0.13.0/zig-freebsd-x86_64-0.13.0.tar.xz
-      tar xf zig-freebsd-x86_64-0.14.0-unofficial.tar.xz
+      tar xf zig-freebsd-x86_64-0.13.0.tar.xz
-      sudo mv zig-freebsd-x86_64-0.14.0-unofficial/zig /usr/bin/
+      sudo mv zig-freebsd-x86_64-0.13.0/zig /usr/bin/
-      sudo mv zig-freebsd-x86_64-0.14.0-unofficial/lib /usr/lib/zig
+      sudo mv zig-freebsd-x86_64-0.13.0/lib /usr/lib/zig
   - build: |
       cd river
       zig build --summary all

.gitignore

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

README.md

@@ -7,7 +7,7 @@
 River is a dynamic tiling Wayland compositor with flexible runtime
 configuration.
 
-Check [packaging status](https://repology.org/project/river-compositor/versions) —
+Install from your [package manager](https://repology.org/project/river/versions) —
 Join us at [#river](https://web.libera.chat/?channels=#river) on irc.libera.chat —
 Read our man pages, [wiki](https://codeberg.org/river/wiki), and
 [Code of Conduct](CODE_OF_CONDUCT.md)
@@ -57,10 +57,10 @@ 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.14
+- [zig](https://ziglang.org/download/) 0.13
 - wayland
 - wayland-protocols
-- [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots) 0.19
+- [wlroots](https://gitlab.freedesktop.org/wlroots/wlroots) 0.17.2
 - xkbcommon
 - libevdev
 - pixman
@@ -72,7 +72,6 @@ Then run, for example:
 zig build -Doptimize=ReleaseSafe --prefix ~/.local install
 ```
 To enable Xwayland support pass the `-Dxwayland` option as well.
-Run `zig build -h` to see a list of all options.
 
 ## Usage
 

build.zig

@@ -4,7 +4,13 @@ const Build = std.Build;
 const fs = std.fs;
 const mem = std.mem;
 
-const Scanner = @import("wayland").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.
+/// When a release is tagged, the "-dev" suffix should be removed for the commit that gets tagged.
+/// Directly after the tagged commit, the version should be bumped and the "-dev" suffix added.
+const version = "0.4.0-dev";
 
 pub fn build(b: *Build) !void {
     const target = b.standardTargetOptions(.{});
@@ -65,7 +71,7 @@ pub fn build(b: *Build) !void {
                 .Inherit,
             ) catch break :blk version;
 
-            var it = mem.splitScalar(u8, mem.trim(u8, git_describe_long, &std.ascii.whitespace), '-');
+            var it = mem.split(u8, mem.trim(u8, git_describe_long, &std.ascii.whitespace), "-");
             _ = it.next().?; // previous tag
             const commit_count = it.next().?;
             const commit_hash = it.next().?;
@@ -86,19 +92,18 @@ pub fn build(b: *Build) !void {
     const scanner = Scanner.create(b, .{});
 
     scanner.addSystemProtocol("stable/xdg-shell/xdg-shell.xml");
-    scanner.addSystemProtocol("stable/tablet/tablet-v2.xml");
     scanner.addSystemProtocol("staging/cursor-shape/cursor-shape-v1.xml");
     scanner.addSystemProtocol("staging/ext-session-lock/ext-session-lock-v1.xml");
-    scanner.addSystemProtocol("staging/tearing-control/tearing-control-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(b.path("protocol/river-control-unstable-v1.xml"));
+    scanner.addCustomProtocol("protocol/river-control-unstable-v1.xml");
-    scanner.addCustomProtocol(b.path("protocol/river-status-unstable-v1.xml"));
+    scanner.addCustomProtocol("protocol/river-status-unstable-v1.xml");
-    scanner.addCustomProtocol(b.path("protocol/river-layout-v3.xml"));
+    scanner.addCustomProtocol("protocol/river-layout-v3.xml");
-    scanner.addCustomProtocol(b.path("protocol/wlr-layer-shell-unstable-v1.xml"));
+    scanner.addCustomProtocol("protocol/wlr-layer-shell-unstable-v1.xml");
-    scanner.addCustomProtocol(b.path("protocol/wlr-output-power-management-unstable-v1.xml"));
+    scanner.addCustomProtocol("protocol/wlr-output-power-management-unstable-v1.xml");
 
     // Some of these versions may be out of date with what wlroots implements.
     // This is not a problem in practice though as long as river successfully compiles.
@@ -119,7 +124,6 @@ pub fn build(b: *Build) !void {
     scanner.generate("zxdg_decoration_manager_v1", 1);
     scanner.generate("ext_session_lock_manager_v1", 1);
     scanner.generate("wp_cursor_shape_manager_v1", 1);
-    scanner.generate("wp_tearing_control_manager_v1", 1);
 
     scanner.generate("zriver_control_v1", 1);
     scanner.generate("zriver_status_manager_v1", 4);
@@ -130,10 +134,10 @@ pub fn build(b: *Build) !void {
 
     const wayland = b.createModule(.{ .root_source_file = scanner.result });
 
-    const xkbcommon = b.dependency("xkbcommon", .{}).module("xkbcommon");
+    const xkbcommon = b.dependency("zig-xkbcommon", .{}).module("xkbcommon");
-    const pixman = b.dependency("pixman", .{}).module("pixman");
+    const pixman = b.dependency("zig-pixman", .{}).module("pixman");
 
-    const wlroots = b.dependency("wlroots", .{}).module("wlroots");
+    const wlroots = b.dependency("zig-wlroots", .{}).module("wlroots");
     wlroots.addImport("wayland", wayland);
     wlroots.addImport("xkbcommon", xkbcommon);
     wlroots.addImport("pixman", pixman);
@@ -142,7 +146,7 @@ pub fn build(b: *Build) !void {
     // 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-0.19", .{});
+    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") });
@@ -163,7 +167,7 @@ pub fn build(b: *Build) !void {
         river.linkSystemLibrary("libevdev");
         river.linkSystemLibrary("libinput");
         river.linkSystemLibrary("wayland-server");
-        river.linkSystemLibrary("wlroots-0.19");
+        river.linkSystemLibrary("wlroots");
         river.linkSystemLibrary("xkbcommon");
         river.linkSystemLibrary("pixman-1");
 
@@ -179,6 +183,9 @@ pub fn build(b: *Build) !void {
             .flags = &.{ "-std=c99", "-O2" },
         });
 
+        // TODO: remove when zig issue #131 is implemented
+        scanner.addCSource(river);
+
         river.pie = pie;
         river.root_module.omit_frame_pointer = omit_frame_pointer;
 
@@ -202,6 +209,8 @@ pub fn build(b: *Build) !void {
         riverctl.linkLibC();
         riverctl.linkSystemLibrary("wayland-client");
 
+        scanner.addCSource(riverctl);
+
         riverctl.pie = pie;
         riverctl.root_module.omit_frame_pointer = omit_frame_pointer;
 
@@ -225,6 +234,8 @@ pub fn build(b: *Build) !void {
         rivertile.linkLibC();
         rivertile.linkSystemLibrary("wayland-client");
 
+        scanner.addCSource(rivertile);
+
         rivertile.pie = pie;
         rivertile.root_module.omit_frame_pointer = omit_frame_pointer;
 
@@ -285,31 +296,3 @@ pub fn build(b: *Build) !void {
         test_step.dependOn(&run_globber_test.step);
     }
 }
-
-const version = manifest.version;
-/// Getting rid of this wart requires upstream zig improvements.
-/// See: https://github.com/ziglang/zig/issues/22775
-const manifest: struct {
-    name: @Type(.enum_literal),
-    version: []const u8,
-    paths: []const []const u8,
-    dependencies: struct {
-        pixman: struct {
-            url: []const u8,
-            hash: []const u8,
-        },
-        wayland: struct {
-            url: []const u8,
-            hash: []const u8,
-        },
-        wlroots: struct {
-            url: []const u8,
-            hash: []const u8,
-        },
-        xkbcommon: struct {
-            url: []const u8,
-            hash: []const u8,
-        },
-    },
-    fingerprint: u64,
-} = @import("build.zig.zon");

build.zig.zon

@@ -1,29 +1,23 @@
 .{
-    .name = .river,
+    .name = "river",
-    // While a river release is in development, this string should contain
+    .version = "0.4.0-dev",
-    // the version in development with the "-dev" suffix.
-    // When a release is tagged, the "-dev" suffix should be removed for the
-    // commit that gets tagged. Directly after the tagged commit, the version
-    // should be bumped and the "-dev" suffix added.
-    .version = "0.3.11-dev",
     .paths = .{""},
     .dependencies = .{
-        .pixman = .{
+        .@"zig-pixman" = .{
-            .url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.3.0.tar.gz",
+            .url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz",
-            .hash = "pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX",
+            .hash = "12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56",
         },
-        .wayland = .{
+        .@"zig-wayland" = .{
-            .url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.3.0.tar.gz",
+            .url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz",
-            .hash = "wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl",
+            .hash = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242",
         },
-        .wlroots = .{
+        .@"zig-wlroots" = .{
-            .url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.19.1.tar.gz",
+            .url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.17.1.tar.gz",
-            .hash = "wlroots-0.19.1-jmOlcs7dAwCajnVWlQZIc-ySYjRlbLxy0F5FvTQqYA3P",
+            .hash = "1220c65ab884c236cc950b564c70f6cd04046d86485ee76e0cde886cef7438021b4f",
         },
-        .xkbcommon = .{
+        .@"zig-xkbcommon" = .{
-            .url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.3.0.tar.gz",
+            .url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz",
-            .hash = "xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr",
+            .hash = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f",
         },
     },
-    .fingerprint = 0xf5e3672b8e8d6efc,
 }

common/flags.zig

@@ -42,21 +42,21 @@ pub fn parser(comptime Arg: type, comptime flags: []const Flag) type {
                         .boolean => .{
                             .name = flag.name,
                             .type = bool,
-                            .default_value_ptr = &false,
+                            .default_value = &false,
                             .is_comptime = false,
                             .alignment = @alignOf(bool),
                         },
                         .arg => .{
                             .name = flag.name,
                             .type = ?[:0]const u8,
-                            .default_value_ptr = &@as(?[:0]const u8, null),
+                            .default_value = &@as(?[:0]const u8, null),
                             .is_comptime = false,
                             .alignment = @alignOf(?[:0]const u8),
                         },
                     };
                     fields = fields ++ [_]std.builtin.Type.StructField{field};
                 }
-                break :flags_type @Type(.{ .@"struct" = .{
+                break :flags_type @Type(.{ .Struct = .{
                     .layout = .auto,
                     .fields = fields,
                     .decls = &.{},

common/globber.zig

@@ -18,11 +18,12 @@
 const std = @import("std");
 const mem = std.mem;
 
-/// Validate a glob, returning error.InvalidGlob if is "**" or has a '*'
+/// Validate a glob, returning error.InvalidGlob if it is empty, "**" or has a
-/// at any position other than the first and/or last byte.
+/// '*' at any position other than the first and/or last byte.
 pub fn validate(glob: []const u8) error{InvalidGlob}!void {
     switch (glob.len) {
-        0, 1 => {},
+        0 => return error.InvalidGlob,
+        1 => {},
         2 => if (glob[0] == '*' and glob[1] == '*') return error.InvalidGlob,
         else => if (mem.indexOfScalar(u8, glob[1 .. glob.len - 1], '*') != null) {
             return error.InvalidGlob;
@@ -33,7 +34,6 @@ pub fn validate(glob: []const u8) error{InvalidGlob}!void {
 test validate {
     const testing = std.testing;
 
-    try validate("");
     try validate("*");
     try validate("a");
     try validate("*a");
@@ -48,6 +48,7 @@ test validate {
     try validate("abc*");
     try validate("*abc*");
 
+    try testing.expectError(error.InvalidGlob, validate(""));
     try testing.expectError(error.InvalidGlob, validate("**"));
     try testing.expectError(error.InvalidGlob, validate("***"));
     try testing.expectError(error.InvalidGlob, validate("a*c"));
@@ -66,9 +67,7 @@ pub fn match(s: []const u8, glob: []const u8) bool {
         validate(glob) catch unreachable;
     }
 
-    if (glob.len == 0) {
+    if (glob.len == 1) {
-        return s.len == 0;
-    } else if (glob.len == 1) {
         return glob[0] == '*' or mem.eql(u8, s, glob);
     }
 
@@ -90,9 +89,6 @@ test match {
     const testing = std.testing;
 
     try testing.expect(match("", "*"));
-    try testing.expect(match("", ""));
-    try testing.expect(!match("a", ""));
-    try testing.expect(!match("", "a"));
 
     try testing.expect(match("a", "*"));
     try testing.expect(match("a", "*a*"));
@@ -169,10 +165,8 @@ pub fn order(a: []const u8, b: []const u8) std.math.Order {
         return .lt;
     }
 
-    const count_a = if (a.len != 0) @as(u2, @intFromBool(a[0] == '*')) +
+    const count_a = @as(u2, @intFromBool(a[0] == '*')) + @intFromBool(a[a.len - 1] == '*');
-        @intFromBool(a[a.len - 1] == '*') else 0;
+    const count_b = @as(u2, @intFromBool(b[0] == '*')) + @intFromBool(b[b.len - 1] == '*');
-    const count_b = if (b.len != 0) @as(u2, @intFromBool(b[0] == '*')) +
-        @intFromBool(b[b.len - 1] == '*') else 0;
 
     if (count_a == 0 and count_b == 0) {
         return .eq;
@@ -188,7 +182,6 @@ test order {
     const testing = std.testing;
     const Order = std.math.Order;
 
-    try testing.expectEqual(Order.eq, order("", ""));
     try testing.expectEqual(Order.eq, order("*", "*"));
     try testing.expectEqual(Order.eq, order("*a*", "*b*"));
     try testing.expectEqual(Order.eq, order("a*", "*b"));
@@ -211,7 +204,6 @@ test order {
         "bababab",
         "b",
         "a",
-        "",
     };
 
     for (descending, 0..) |a, i| {

completions/bash/riverctl

@@ -1,9 +1,13 @@
 function __riverctl_completion ()
 {
-	local rule_actions="float no-float ssd csd tags output position relative-position dimensions fullscreen no-fullscreen warp no-warp"
+	local rule_actions="float no-float ssd csd tags output position dimensions fullscreen no-fullscreen"
 	if [ "${COMP_CWORD}" -eq 1 ]
 	then
 		OPTS=" \
+			keyboard-group-create \
+			keyboard-group-destroy \
+			keyboard-group-add \
+			keyboard-group-remove \
 			keyboard-layout \
 			keyboard-layout-file \
 			close \
@@ -95,7 +99,6 @@ function __riverctl_completion ()
 				tap-button-map \
 				scroll-method \
 				scroll-button \
-				scroll-button-lock \
 				map-to-output"
 			COMPREPLY=($(compgen -W "${OPTS}" -- "${COMP_WORDS[3]}"))
 		elif [ "${COMP_WORDS[1]}" == "hide-cursor" ]
@@ -114,7 +117,7 @@ function __riverctl_completion ()
 				"events") OPTS="enabled disabled disabled-on-external-mouse" ;;
 				"accel-profile") OPTS="none flat adaptive" ;;
 				"click-method") OPTS="none button-areas clickfinger" ;;
-				"drag"|"drag-lock"|"disable-while-typing"|"middle-emulation"|"left-handed"|"tap"|"scroll-button-lock") OPTS="enabled disabled" ;;
+				"drag"|"drag-lock"|"disable-while-typing"|"middle-emulation"|"left-handed"|"tap") OPTS="enabled disabled" ;;
 				"tap-button-map") OPTS="left-right-middle left-middle-right" ;;
 				"scroll-method") OPTS="none two-finger edge button" ;;
 				*) return ;;

completions/fish/riverctl.fish

@@ -72,6 +72,11 @@ complete -c riverctl -n '__fish_riverctl_complete_arg 1' -a 'hide-cursor'
 complete -c riverctl -n '__fish_riverctl_complete_arg 1' -a 'set-repeat'             -d 'Set the keyboard repeat rate and repeat delay'
 complete -c riverctl -n '__fish_riverctl_complete_arg 1' -a 'set-cursor-warp'        -d 'Set the cursor warp mode'
 complete -c riverctl -n '__fish_riverctl_complete_arg 1' -a 'xcursor-theme'          -d 'Set the xcursor theme'
+# Keyboardgroups
+complete -c riverctl -n '__fish_riverctl_complete_arg 1' -a 'keyboard-group-create'  -d 'Create a keyboard group'
+complete -c riverctl -n '__fish_riverctl_complete_arg 1' -a 'keyboard-group-destroy' -d 'Destroy a keyboard group'
+complete -c riverctl -n '__fish_riverctl_complete_arg 1' -a 'keyboard-group-add'     -d 'Add a keyboard to a keyboard group'
+complete -c riverctl -n '__fish_riverctl_complete_arg 1' -a 'keyboard-group-remove'  -d 'Remove a keyboard from a keyboard group'
 complete -c riverctl -n '__fish_riverctl_complete_arg 1' -a 'keyboard-layout'        -d 'Set the keyboard layout'
 complete -c riverctl -n '__fish_riverctl_complete_arg 1' -a 'keyboard-layout-file'   -d 'Set the keyboard layout from a file.'
 
@@ -86,10 +91,10 @@ complete -c riverctl -n '__fish_seen_subcommand_from default-attach-mode'
 complete -c riverctl -n '__fish_seen_subcommand_from output-attach-mode'          -n '__fish_riverctl_complete_arg 2' -a 'top bottom above below after'
 complete -c riverctl -n '__fish_seen_subcommand_from focus-follows-cursor'        -n '__fish_riverctl_complete_arg 2' -a 'disabled normal always'
 complete -c riverctl -n '__fish_seen_subcommand_from set-cursor-warp'             -n '__fish_riverctl_complete_arg 2' -a 'disabled on-output-change on-focus-change'
-complete -c riverctl -n '__fish_seen_subcommand_from list-rules'                  -n '__fish_riverctl_complete_arg 2' -a 'float ssd tags output position dimensions fullscreen warp'
+complete -c riverctl -n '__fish_seen_subcommand_from list-rules'                  -n '__fish_riverctl_complete_arg 2' -a 'float ssd tags output position dimensions fullscreen'
 
 # Options and subcommands for 'rule-add' and 'rule-del'
-set -l rule_actions float no-float ssd csd tags output position relative-position dimensions fullscreen no-fullscreen warp no-warp
+set -l rule_actions float no-float ssd csd tags output position dimensions fullscreen no-fullscreen
 complete -c riverctl -n '__fish_seen_subcommand_from rule-add rule-del' -n "not __fish_seen_subcommand_from $rule_actions" -n 'not __fish_seen_argument -o app-id' -o 'app-id' -r
 complete -c riverctl -n '__fish_seen_subcommand_from rule-add rule-del' -n "not __fish_seen_subcommand_from $rule_actions" -n 'not __fish_seen_argument -o title'  -o 'title' -r
 complete -c riverctl -n '__fish_seen_subcommand_from rule-add rule-del' -n "not __fish_seen_subcommand_from $rule_actions" -n 'test (math (count (commandline -opc)) % 2) -eq 0' -a "$rule_actions"
@@ -114,11 +119,10 @@ complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_
 complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_complete_arg 3' -a 'tap-button-map'       -d 'Configure the button mapping for tapping'
 complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_complete_arg 3' -a 'scroll-method'        -d 'Set the scroll method'
 complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_complete_arg 3' -a 'scroll-button'        -d 'Set the scroll button'
-complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_complete_arg 3' -a 'scroll-button-lock'   -d 'Enable or disable the scroll button lock functionality'
 complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_complete_arg 3' -a 'map-to-output'        -d 'Map to a given output'
 
 # Subcommands for the subcommands of 'input'
-complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_complete_arg 4; and __fish_seen_subcommand_from drag drag-lock disable-while-typing disable-while-trackpointing middle-emulation natural-scroll left-handed tap scroll-button-lock' -a 'enabled disabled'
+complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_complete_arg 4; and __fish_seen_subcommand_from drag drag-lock disable-while-typing disable-while-trackpointing middle-emulation natural-scroll left-handed tap' -a 'enabled disabled'
 complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_complete_arg 4; and __fish_seen_subcommand_from events'         -a 'enabled disabled disabled-on-external-mouse'
 complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_complete_arg 4; and __fish_seen_subcommand_from accel-profile'  -a 'none flat adaptive'
 complete -c riverctl -n '__fish_seen_subcommand_from input; and __fish_riverctl_complete_arg 4; and __fish_seen_subcommand_from click-method'   -a 'none button-areas clickfinger'

completions/zsh/_riverctl

@@ -62,6 +62,11 @@ _riverctl_commands()
         'set-repeat:Set the keyboard repeat rate and repeat delay'
         'set-cursor-warp:Set the cursor warp mode.'
         'xcursor-theme:Set the xcursor theme'
+        # Keyboard groups
+        'keyboard-group-create:Create a keyboard group'
+        'keyboard-group-destroy:Destroy a keyboard group'
+        'keyboard-group-add:Add a keyboard to a keyboard group'
+        'keyboard-group-remove:Remove a keyboard from a keyboard group'
         'keyboard-layout:Set the keyboard layout'
         'keyboard-layout-file:Set the keyboard layout from a file'
         # Input
@@ -121,7 +126,6 @@ _riverctl()
                                 'tap-button-map:Configure the button mapping for tapping'
                                 'scroll-method:Set the scroll method'
                                 'scroll-button:Set the scroll button'
-                                'scroll-button-lock:Enable or disable the scroll button lock functionality'
                                 'map-to-output:Map to a given output'
                             )
 
@@ -131,7 +135,7 @@ _riverctl()
                             case "$line[2]" in
                                 events) _alternative 'input-cmds:args:(enabled disabled disabled-on-external-mouse)' ;;
                                 accel-profile) _alternative 'input-cmds:args:(none flat adaptive)' ;;
-                                click-method) _alternative 'input-cmds:args:(none button-areas clickfinger)' ;;
+                                click-method) _alternative 'input-cmds:args:(none button-area clickfinger)' ;;
                                 drag) _alternative 'input-cmds:args:(enabled disabled)' ;;
                                 drag-lock) _alternative 'input-cmds:args:(enabled disabled)' ;;
                                 disable-while-typing) _alternative 'input-cmds:args:(enabled disabled)' ;;
@@ -140,7 +144,6 @@ _riverctl()
                                 natural-scroll) _alternative 'input-cmds:args:(enabled disabled)' ;;
                                 left-handed) _alternative 'input-cmds:args:(enabled disabled)' ;;
                                 tap) _alternative 'input-cmds:args:(enabled disabled)' ;;
-                                scroll-button-lock) _alternative 'input-cmds:args:(enabled disabled)' ;;
                                 tap-button-map) _alternative 'input-cmds:args:(left-right-middle left-middle-right)' ;;
                                 scroll-method) _alternative 'input-cmds:args:(none two-finger edge button)' ;;
                                 *) return 0 ;;
@@ -202,9 +205,9 @@ _riverctl()
                     # In case of a new rule added in river, we just need
                     # to add it to the third option between '()',
                     # i.e (float no-float <new-option>)
-                    _arguments '1: :(-app-id -title)' '2: : ' ':: :(float no-float ssd csd tags output position relative-position dimensions fullscreen no-fullscreen warp no-warp)'
+                    _arguments '1: :(-app-id -title)' '2: : ' ':: :(float no-float ssd csd tags output position dimensions fullscreen no-fullscreen)'
                 ;;
-                list-rules) _alternative 'arguments:args:(float ssd tags output position dimensions fullscreen warp)' ;;
+                list-rules) _alternative 'arguments:args:(float ssd tags output position dimensions fullscreen)' ;;
                 *) return 0 ;;
             esac
         ;;

doc/riverctl.1.scd

@@ -298,33 +298,20 @@ matches everything while _\*\*_ and the empty string are invalid.
 	  with make: _HP Inc._, model: _HP 22w_, and serial: _CNC93720WF_, the
 	  identifier would be: _HP Inc. HP 22w CNC93720WF_. If the make, model, or
 	  serial is unknown, the word "Unknown" is used instead.
-	- *position*: Set the initial position of the view, clamping to the bounds
+	- *position*: Set the initial position of the view, clamping to the
-	  of the output. Requires x and y coordinates of the view as arguments, both
+	  bounds of the output. Requires x and y coordinates of the view as
-	  of which must be non-negative. Applies only to new views.
+	  arguments, both of which must be non-negative. Applies only to new views.
-	- *relative-position*: Set the position of the view relative to
-	  something. Requires the anchor and the x and y coordinates of the
-	  view. The coordinates are either positive or negative numbers that are
-	  relative to the anchor. Applies only to new views.
 	- *dimensions*: Set the initial dimensions of the view, clamping to the
 	  constraints of the view. Requires width and height of the view as
 	  arguments, both of which must be non-negative. Applies only to new views.
 	- *fullscreen*: Make the view fullscreen. Applies only to new views.
 	- *no-fullscreen*: Don't make the view fullscreen. Applies only to
 	  new views.
-	- *tearing*: Allow the view to tear when fullscreen regardless of the
-	  view's preference. Applies to new and existing views.
-	- *no-tearing*: Disable tearing for the view regardless of the view's
-	  preference. Applies to new and existing views.
-	- *warp*: Always warp the cursor when switching to this view, regardless of
-	  the _set-cursor-warp_ setting. Applies to new and existing views.
-	- *no-warp*: Never warp the cursor when switching to this view, regardless
-	  of the _set-cursor-warp_ setting. Applies to new and existing views.
 
 	Both *float* and *no-float* rules are added to the same list,
 	which means that adding a *no-float* rule with the same arguments
 	as a *float* rule will overwrite it. The same holds for *ssd* and
-	*csd*, *fullscreen* and *no-fullscreen*, *tearing* and
+	*csd*, *fullscreen* and *no-fullscreen* rules.
-	*no-tearing*, *warp* and *no-warp* rules.
 
 	If multiple rules in a list match a given view the most specific
 	rule will be applied. For example with the following rules
@@ -352,7 +339,7 @@ matches everything while _\*\*_ and the empty string are invalid.
 *rule-del* [*-app-id* _glob_|*-title* _glob_] _action_
 	Delete a rule created using *rule-add* with the given arguments.
 
-*list-rules* *float*|*ssd*|*tags*|*position*|*dimensions*|*fullscreen*|*warp*
+*list-rules* *float*|*ssd*|*tags*|*position*|*dimensions*|*fullscreen*
 	Print the specified rule list. The output is ordered from most specific
 	to least specific, the same order in which views are checked against
 	when searching for a match. Only the first matching rule in the list
@@ -377,10 +364,6 @@ matches everything while _\*\*_ and the empty string are invalid.
 	Set the attach mode of the currently focused output, overriding the value of
 	default-attach-mode if any.
 
-*allow-tearing* *enabled*|*disabled*
-	Allow fullscreen views to tear if requested by the view. See also the
-	*tearing* rule to force enable tearing for specific views.
-
 *background-color* _0xRRGGBB_|_0xRRGGBBAA_
 	Set the background color.
 
@@ -430,8 +413,7 @@ matches everything while _\*\*_ and the empty string are invalid.
 
 *set-repeat* _rate_ _delay_
 	Set the keyboard repeat rate to _rate_ key repeats per second and
-	repeat delay to _delay_ milliseconds. The default is a rate of 25
+	repeat delay to _delay_ milliseconds.
-	repeats per second and a delay of 600ms.
 
 *xcursor-theme* _theme_name_ [_size_]
 	Set the xcursor theme to _theme_name_ and optionally set the _size_.
@@ -462,10 +444,29 @@ matches everything while _\*\*_ and the empty string are invalid.
 	following URL:
 	https://xkbcommon.org/doc/current/keymap-text-format-v1.html
 
+*keyboard-group-create* _group_name_
+	Create a keyboard group. A keyboard group collects multiple keyboards in
+	a single logical keyboard. This means that all state, like the active
+	modifiers, is shared between the keyboards in a group.
+
+*keyboard-group-destroy* _group_name_
+	Destroy the keyboard group with the given name. All attached keyboards
+	will be released, making them act as separate devices again.
+
+*keyboard-group-add* _group_name_ _input_device_name_
+	Add a keyboard to a keyboard group, identified by the keyboard's
+	input device name. Any currently connected and future keyboards with
+	the given name will be added to the group. Simple globbing patterns are
+	supported, see the rules section for further information on globs.
+
+*keyboard-group-remove* _group_name_ _input_device_name_
+	Remove a keyboard from a keyboard group, identified by the keyboard's
+	input device name.
+
 The _input_ command can be used to create a configuration rule for an input
 device identified by its _name_.
-The _name_ of an input device consists of its type, its decimal vendor id,
+The _name_ of an input device consists of its type, its numerical vendor id,
-its decimal product id and finally its self-advertised name, separated by -.
+its numerical product id and finally its self-advertised name, separated by -.
 Simple globbing patterns are supported, see the rules section for further
 information on globs.
 
@@ -535,11 +536,6 @@ However note that not every input device supports every property.
 	Set the scroll button of an input device. _button_ is the name of a Linux
 	input event code.
 
-*input* _name_ *scroll-button-lock* *enabled*|*disabled*
-	Enable or disable the scroll button lock functionality of the input device. If
-	active, the button does not need to be held down. One press makes the button
-	considered to be held down, and a second press releases the button.
-
 *input* _name_ *map-to-output* _output_|*disabled*
 	Maps the input to a given output. This is valid even if the output isn't
 	currently active and will lead to the device being mapped once it is

river/Config.zig

@@ -58,15 +58,9 @@ pub const HideCursorWhenTypingMode = enum {
     enabled,
 };
 
-pub const Anchor = enum {
-    absolute,
-    mouse,
-};
-
 pub const Position = struct {
-    anchor: Anchor,
+    x: u31,
-    x: i31,
+    y: u31,
-    y: i31,
 };
 
 pub const Dimensions = struct {
@@ -74,9 +68,6 @@ pub const Dimensions = struct {
     height: u31,
 };
 
-/// Whether to allow tearing page flips when fullscreen if a view requests it.
-allow_tearing: bool = false,
-
 /// Color of background in RGBA with premultiplied alpha (alpha should only affect nested sessions)
 background_color: [4]f32 = [_]f32{ 0.0, 0.16862745, 0.21176471, 1.0 }, // Solarized base03
 
@@ -107,8 +98,6 @@ rules: struct {
     position: RuleList(Position) = .{},
     dimensions: RuleList(Dimensions) = .{},
     fullscreen: RuleList(bool) = .{},
-    tearing: RuleList(bool) = .{},
-    warp: RuleList(bool) = .{},
 } = .{},
 
 /// The selected focus_follows_cursor mode
@@ -193,7 +182,6 @@ pub fn deinit(config: *Config) void {
     config.rules.position.deinit();
     config.rules.dimensions.deinit();
     config.rules.fullscreen.deinit();
-    config.rules.warp.deinit();
 
     util.gpa.free(config.default_layout_namespace);
 

river/Control.zig

@@ -84,7 +84,7 @@ fn handleRequest(control_v1: *zriver.ControlV1, request: zriver.ControlV1.Reques
             };
         },
         .run_command => |run_command| {
-            const seat: *Seat = @alignCast(@ptrCast(wlr.Seat.Client.fromWlSeat(run_command.seat).?.seat.data));
+            const seat: *Seat = @ptrFromInt(wlr.Seat.Client.fromWlSeat(run_command.seat).?.seat.data);
 
             const callback = zriver.CommandCallbackV1.create(
                 control_v1.getClient(),

river/Cursor.zig

@@ -108,19 +108,6 @@ const LayoutPoint = struct {
     ly: f64,
 };
 
-const Image = union(enum) {
-    /// No cursor image
-    none,
-    /// Name of the current Xcursor shape
-    xcursor: [*:0]const u8,
-    /// Cursor surface configured by a client
-    client: struct {
-        surface: *wlr.Surface,
-        hotspot_x: i32,
-        hotspot_y: i32,
-    },
-};
-
 const log = std.log.scoped(.cursor);
 
 /// Current cursor mode as well as any state needed to implement that mode
@@ -137,8 +124,9 @@ wlr_cursor: *wlr.Cursor,
 
 /// Xcursor manager for the currently configured Xcursor theme.
 xcursor_manager: *wlr.XcursorManager,
-image: Image = .none,
+/// Name of the current Xcursor shape, or null if a client has configured a
-image_surface_destroy: wl.Listener(*wlr.Surface) = .init(handleImageSurfaceDestroy),
+/// surface to be used as the cursor shape instead.
+xcursor_name: ?[*:0]const u8 = null,
 
 /// Number of distinct buttons currently pressed
 pressed_count: u32 = 0,
@@ -255,30 +243,6 @@ pub fn init(cursor: *Cursor, seat: *Seat) !void {
 }
 
 pub fn deinit(cursor: *Cursor) void {
-    cursor.axis.link.remove();
-    cursor.button.link.remove();
-    cursor.frame.link.remove();
-    cursor.motion_absolute.link.remove();
-    cursor.motion.link.remove();
-    cursor.swipe_begin.link.remove();
-    cursor.swipe_update.link.remove();
-    cursor.swipe_end.link.remove();
-    cursor.pinch_begin.link.remove();
-    cursor.pinch_update.link.remove();
-    cursor.pinch_end.link.remove();
-    cursor.request_set_cursor.link.remove();
-
-    cursor.touch_down.link.remove();
-    cursor.touch_motion.link.remove();
-    cursor.touch_up.link.remove();
-    cursor.touch_cancel.link.remove();
-    cursor.touch_frame.link.remove();
-
-    cursor.tablet_tool_axis.link.remove();
-    cursor.tablet_tool_proximity.link.remove();
-    cursor.tablet_tool_tip.link.remove();
-    cursor.tablet_tool_button.link.remove();
-
     cursor.hide_cursor_timer.remove();
     cursor.xcursor_manager.destroy();
     cursor.wlr_cursor.destroy();
@@ -322,47 +286,25 @@ pub fn setTheme(cursor: *Cursor, theme: ?[*:0]const u8, _size: ?u32) !void {
     cursor.xcursor_manager.destroy();
     cursor.xcursor_manager = xcursor_manager;
 
-    switch (cursor.image) {
+    if (cursor.xcursor_name) |name| {
-        .none, .client => {},
+        cursor.setXcursor(name);
-        .xcursor => |name| cursor.wlr_cursor.setXcursor(xcursor_manager, name),
     }
 }
 
-pub fn setImage(cursor: *Cursor, image: Image) void {
+pub fn setXcursor(cursor: *Cursor, name: [*:0]const u8) void {
-    switch (cursor.image) {
+    cursor.wlr_cursor.setXcursor(cursor.xcursor_manager, name);
-        .none, .xcursor => {},
+    cursor.xcursor_name = name;
-        .client => {
-            cursor.image_surface_destroy.link.remove();
-        },
-    }
-    cursor.image = image;
-    switch (cursor.image) {
-        .none => cursor.wlr_cursor.unsetImage(),
-        .xcursor => |name| cursor.wlr_cursor.setXcursor(cursor.xcursor_manager, name),
-        .client => |client| {
-            cursor.wlr_cursor.setSurface(client.surface, client.hotspot_x, client.hotspot_y);
-            client.surface.events.destroy.add(&cursor.image_surface_destroy);
-        },
-    }
-}
-
-fn handleImageSurfaceDestroy(listener: *wl.Listener(*wlr.Surface), _: *wlr.Surface) void {
-    const cursor: *Cursor = @fieldParentPtr("image_surface_destroy", listener);
-    // wlroots calls wlr_cursor_unset_image() automatically
-    // when the cursor surface is destroyed.
-    cursor.image = .none;
-    cursor.image_surface_destroy.link.remove();
 }
 
 fn clearFocus(cursor: *Cursor) void {
-    cursor.setImage(.{ .xcursor = "default" });
+    cursor.setXcursor("default");
     cursor.seat.wlr_seat.pointerNotifyClearFocus();
 }
 
 /// 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: *Cursor = @fieldParentPtr("axis", listener);
-    const device: *InputDevice = @alignCast(@ptrCast(event.device.data));
+    const device: *InputDevice = @ptrFromInt(event.device.data);
 
     cursor.seat.handleActivity();
     cursor.unhide();
@@ -382,7 +324,6 @@ fn handleAxis(listener: *wl.Listener(*wlr.Pointer.event.Axis), event: *wlr.Point
             math.maxInt(i32) / 2,
         )),
         event.source,
-        event.relative_direction,
     );
 }
 
@@ -482,7 +423,7 @@ fn updateKeyboardFocus(cursor: Cursor, result: Root.AtResult) void {
 /// Requires a call to Root.applyPending()
 fn updateOutputFocus(cursor: Cursor, lx: f64, ly: f64) void {
     if (server.root.output_layout.outputAt(lx, ly)) |wlr_output| {
-        const output: *Output = @alignCast(@ptrCast(wlr_output.data));
+        const output: *Output = @ptrFromInt(wlr_output.data);
         cursor.seat.focusOutput(output);
     }
 }
@@ -627,7 +568,7 @@ fn handleTouchUp(
     cursor.seat.handleActivity();
 
     if (cursor.touch_points.remove(event.touch_id)) {
-        _ = cursor.seat.wlr_seat.touchNotifyUp(event.time_msec, event.touch_id);
+        cursor.seat.wlr_seat.touchNotifyUp(event.time_msec, event.touch_id);
     }
 }
 
@@ -641,9 +582,32 @@ fn handleTouchCancel(
 
     cursor.touch_points.clearRetainingCapacity();
 
-    const wlr_seat = cursor.seat.wlr_seat;
+    // We can't call touchNotifyCancel() from inside the loop over touch points as it also loops
-    while (wlr_seat.touch_state.touch_points.first()) |touch_point| {
+    // over touch points and may destroy multiple touch points in a single call.
-        wlr_seat.touchNotifyCancel(touch_point.client);
+    //
+    // What we should do here is `while (touch_points.first()) |point| cancel()` but since the
+    // surface may be null we can't rely on the fact tha all touch points will be destroyed
+    // and risk an infinite loop if the surface of any wlr_touch_point is null.
+    //
+    // This is all really silly and totally unnecessary since all touchNotifyCancel() does with
+    // the surface argument is obtain a seat client and touch_point.seat_client is never null.
+    // TODO(wlroots) clean this up after the wlroots MR fixing this is merged:
+    // https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4613
+
+    // The upper bound of 32 comes from an implementation detail of libinput which uses
+    // a 32-bit integer as a map to keep track of touch points.
+    var surfaces: std.BoundedArray(*wlr.Surface, 32) = .{};
+    {
+        var it = cursor.seat.wlr_seat.touch_state.touch_points.iterator(.forward);
+        while (it.next()) |touch_point| {
+            if (touch_point.surface) |surface| {
+                surfaces.append(surface) catch break;
+            }
+        }
+    }
+
+    for (surfaces.slice()) |surface| {
+        cursor.seat.wlr_seat.touchNotifyCancel(surface);
     }
 }
 
@@ -659,7 +623,7 @@ fn handleTabletToolAxis(
     _: *wl.Listener(*wlr.Tablet.event.Axis),
     event: *wlr.Tablet.event.Axis,
 ) void {
-    const device: *InputDevice = @alignCast(@ptrCast(event.device.data));
+    const device: *InputDevice = @ptrFromInt(event.device.data);
     const tablet: *Tablet = @fieldParentPtr("device", device);
 
     device.seat.handleActivity();
@@ -673,7 +637,7 @@ fn handleTabletToolProximity(
     _: *wl.Listener(*wlr.Tablet.event.Proximity),
     event: *wlr.Tablet.event.Proximity,
 ) void {
-    const device: *InputDevice = @alignCast(@ptrCast(event.device.data));
+    const device: *InputDevice = @ptrFromInt(event.device.data);
     const tablet: *Tablet = @fieldParentPtr("device", device);
 
     device.seat.handleActivity();
@@ -687,7 +651,7 @@ fn handleTabletToolTip(
     _: *wl.Listener(*wlr.Tablet.event.Tip),
     event: *wlr.Tablet.event.Tip,
 ) void {
-    const device: *InputDevice = @alignCast(@ptrCast(event.device.data));
+    const device: *InputDevice = @ptrFromInt(event.device.data);
     const tablet: *Tablet = @fieldParentPtr("device", device);
 
     device.seat.handleActivity();
@@ -701,7 +665,7 @@ fn handleTabletToolButton(
     _: *wl.Listener(*wlr.Tablet.event.Button),
     event: *wlr.Tablet.event.Button,
 ) void {
-    const device: *InputDevice = @alignCast(@ptrCast(event.device.data));
+    const device: *InputDevice = @ptrFromInt(event.device.data);
     const tablet: *Tablet = @fieldParentPtr("device", device);
 
     device.seat.handleActivity();
@@ -798,15 +762,8 @@ fn handleRequestSetCursor(
         // on the output that it's currently on and continue to do so as the
         // cursor moves between outputs.
         log.debug("focused client set cursor", .{});
-        if (event.surface) |surface| {
+        cursor.wlr_cursor.setSurface(event.surface, event.hotspot_x, event.hotspot_y);
-            cursor.setImage(.{ .client = .{
+        cursor.xcursor_name = null;
-                .surface = surface,
-                .hotspot_x = event.hotspot_x,
-                .hotspot_y = event.hotspot_y,
-            } });
-        } else {
-            cursor.setImage(.none);
-        }
     }
 }
 
@@ -822,6 +779,8 @@ pub fn hide(cursor: *Cursor) void {
 
     cursor.hidden = true;
     cursor.wlr_cursor.unsetImage();
+    cursor.xcursor_name = null;
+    cursor.seat.wlr_seat.pointerNotifyClearFocus();
     cursor.hide_cursor_timer.timerUpdate(0) catch {
         log.err("failed to update cursor hide timeout", .{});
     };
@@ -833,7 +792,6 @@ pub fn unhide(cursor: *Cursor) void {
     };
     if (!cursor.hidden) return;
     cursor.hidden = false;
-    cursor.setImage(cursor.image);
     cursor.updateState();
 }
 
@@ -932,7 +890,7 @@ fn computeEdges(cursor: *const Cursor, view: *const View) wlr.Edges {
     }
 }
 
-fn enterMode(cursor: *Cursor, mode: Mode, view: *View, xcursor: [*:0]const u8) void {
+fn enterMode(cursor: *Cursor, mode: Mode, view: *View, xcursor_name: [*:0]const u8) void {
     assert(cursor.mode == .passthrough or cursor.mode == .down);
     assert(mode == .move or mode == .resize);
 
@@ -948,7 +906,7 @@ fn enterMode(cursor: *Cursor, mode: Mode, view: *View, xcursor: [*:0]const u8) v
     }
 
     cursor.seat.wlr_seat.pointerNotifyClearFocus();
-    cursor.setImage(.{ .xcursor = xcursor });
+    cursor.setXcursor(xcursor_name);
 
     server.root.applyPending();
 }
@@ -1153,14 +1111,10 @@ pub fn updateState(cursor: *Cursor) void {
         .passthrough => {
             cursor.updateFocusFollowsCursorTarget();
             if (!cursor.hidden) {
-                const now = posix.clock_gettime(.MONOTONIC) catch @panic("CLOCK_MONOTONIC not supported");
+                var now: posix.timespec = undefined;
-                // 2^32-1 milliseconds is ~50 days, which is a realistic uptime.
+                posix.clock_gettime(posix.CLOCK.MONOTONIC, &now) catch @panic("CLOCK_MONOTONIC not supported");
-                // This means that we must wrap if the monotonic time is greater than
+                const msec: u32 = @intCast(now.tv_sec * std.time.ms_per_s +
-                // 2^32-1 milliseconds and hope that clients don't get too confused.
+                    @divTrunc(now.tv_nsec, std.time.ns_per_ms));
-                const msec: u32 = @intCast(@rem(
-                    now.sec *% std.time.ms_per_s +% @divTrunc(now.nsec, std.time.ns_per_ms),
-                    math.maxInt(u32),
-                ));
                 cursor.passthrough(msec);
             }
         },
@@ -1246,18 +1200,10 @@ fn warp(cursor: *Cursor) void {
 
     const focused_output = cursor.seat.focused_output orelse return;
 
-    var mode = server.config.warp_cursor;
-    if (cursor.seat.focused == .view) {
-        const view = cursor.seat.focused.view;
-        if (server.config.rules.warp.match(view)) |w| {
-            mode = if (w) .@"on-focus-change" else .disabled;
-        }
-    }
-
     // Warp pointer to center of the focused view/output (In layout coordinates) if enabled.
     var output_layout_box: wlr.Box = undefined;
     server.root.output_layout.getBox(focused_output.wlr_output, &output_layout_box);
-    const target_box = switch (mode) {
+    const target_box = switch (server.config.warp_cursor) {
         .disabled => return,
         .@"on-output-change" => output_layout_box,
         .@"on-focus-change" => switch (cursor.seat.focused) {
@@ -1287,7 +1233,7 @@ fn warp(cursor: *Cursor) void {
     };
     if (!output_layout_box.containsPoint(cursor.wlr_cursor.x, cursor.wlr_cursor.y) or
         (usable_layout_box.containsPoint(cursor.wlr_cursor.x, cursor.wlr_cursor.y) and
-            !target_box.containsPoint(cursor.wlr_cursor.x, cursor.wlr_cursor.y)))
+        !target_box.containsPoint(cursor.wlr_cursor.x, cursor.wlr_cursor.y)))
     {
         const lx: f64 = @floatFromInt(target_box.x + @divTrunc(target_box.width, 2));
         const ly: f64 = @floatFromInt(target_box.y + @divTrunc(target_box.height, 2));
@@ -1300,7 +1246,7 @@ fn warp(cursor: *Cursor) void {
 fn updateDragIcons(cursor: *Cursor) void {
     var it = server.root.drag_icons.children.iterator(.forward);
     while (it.next()) |node| {
-        const icon: *DragIcon = @alignCast(@ptrCast(node.data));
+        const icon = @as(*DragIcon, @ptrFromInt(node.data));
 
         if (icon.wlr_drag_icon.drag.seat == cursor.seat.wlr_seat) {
             icon.updatePosition(cursor);

river/DragIcon.zig

@@ -42,7 +42,7 @@ pub fn create(wlr_drag_icon: *wlr.Drag.Icon, cursor: *Cursor) error{OutOfMemory}
         .wlr_drag_icon = wlr_drag_icon,
         .scene_drag_icon = scene_drag_icon,
     };
-    scene_drag_icon.node.data = drag_icon;
+    scene_drag_icon.node.data = @intFromPtr(drag_icon);
 
     drag_icon.updatePosition(cursor);
 

river/ForeignToplevelHandle.zig

@@ -89,7 +89,7 @@ fn handleForeignActivate(
 ) void {
     const handle: *ForeignToplevelHandle = @fieldParentPtr("foreign_activate", listener);
     const view: *View = @fieldParentPtr("foreign_toplevel_handle", handle);
-    const seat: *Seat = @alignCast(@ptrCast(event.seat.data));
+    const seat: *Seat = @ptrFromInt(event.seat.data);
 
     seat.focus(view);
     server.root.applyPending();

river/IdleInhibitManager.zig

@@ -30,7 +30,7 @@ const View = @import("View.zig");
 wlr_manager: *wlr.IdleInhibitManagerV1,
 new_idle_inhibitor: wl.Listener(*wlr.IdleInhibitorV1) =
     wl.Listener(*wlr.IdleInhibitorV1).init(handleNewIdleInhibitor),
-inhibitors: std.DoublyLinkedList(IdleInhibitor) = .{},
+inhibitors: std.TailQueue(IdleInhibitor) = .{},
 
 pub fn init(inhibit_manager: *IdleInhibitManager) !void {
     inhibit_manager.* = .{
@@ -79,7 +79,7 @@ pub fn checkActive(inhibit_manager: *IdleInhibitManager) void {
 
 fn handleNewIdleInhibitor(listener: *wl.Listener(*wlr.IdleInhibitorV1), inhibitor: *wlr.IdleInhibitorV1) void {
     const inhibit_manager: *IdleInhibitManager = @fieldParentPtr("new_idle_inhibitor", listener);
-    const inhibitor_node = util.gpa.create(std.DoublyLinkedList(IdleInhibitor).Node) catch return;
+    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);
         return;

river/IdleInhibitor.zig

@@ -49,7 +49,7 @@ fn handleDestroy(listener: *wl.Listener(*wlr.Surface), _: *wlr.Surface) void {
 
     inhibitor.destroy.link.remove();
 
-    const node: *std.DoublyLinkedList(IdleInhibitor).Node = @fieldParentPtr("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

@@ -215,18 +215,6 @@ pub const ScrollButton = struct {
     }
 };
 
-pub const ScrollButtonLock = enum {
-    enabled,
-    disabled,
-
-    fn apply(scroll_button_lock: ScrollButtonLock, device: *c.libinput_device) void {
-        _ = c.libinput_device_config_scroll_set_button_lock(device, switch (scroll_button_lock) {
-            .enabled => c.LIBINPUT_CONFIG_SCROLL_BUTTON_LOCK_ENABLED,
-            .disabled => c.LIBINPUT_CONFIG_SCROLL_BUTTON_LOCK_DISABLED,
-        });
-    }
-};
-
 pub const MapToOutput = struct {
     output_name: ?[]const u8,
 
@@ -244,7 +232,7 @@ pub const MapToOutput = struct {
         };
 
         switch (device.wlr_device.type) {
-            .pointer, .touch, .tablet => {
+            .pointer, .touch, .tablet_tool => {
                 log.debug("mapping input '{s}' -> '{s}'", .{
                     device.identifier,
                     if (wlr_output) |o| o.name else "<no output>",
@@ -252,14 +240,14 @@ pub const MapToOutput = struct {
 
                 device.seat.cursor.wlr_cursor.mapInputToOutput(device.wlr_device, wlr_output);
 
-                if (device.wlr_device.type == .tablet) {
+                if (device.wlr_device.type == .tablet_tool) {
                     const tablet: *Tablet = @fieldParentPtr("device", device);
                     tablet.output_mapping = wlr_output;
                 }
             },
 
             // These devices do not support being mapped to outputs.
-            .keyboard, .tablet_pad, .@"switch" => {},
+            .keyboard, .tablet_pad, .switch_device => {},
         }
     }
 };
@@ -291,7 +279,6 @@ tap: ?TapState = null,
 @"pointer-accel": ?PointerAccel = null,
 @"scroll-method": ?ScrollMethod = null,
 @"scroll-button": ?ScrollButton = null,
-@"scroll-button-lock": ?ScrollButtonLock = null,
 @"map-to-output": ?MapToOutput = null,
 
 pub fn deinit(config: *InputConfig) void {
@@ -307,7 +294,7 @@ pub fn apply(config: *const InputConfig, device: *InputDevice) void {
     const libinput_device: *c.libinput_device = @ptrCast(device.wlr_device.getLibinputDevice() orelse return);
     log.debug("applying input configuration '{s}' to device '{s}'.", .{ config.glob, device.identifier });
 
-    inline for (@typeInfo(InputConfig).@"struct".fields) |field| {
+    inline for (@typeInfo(InputConfig).Struct.fields) |field| {
         if (comptime mem.eql(u8, field.name, "glob")) continue;
 
         if (@field(config, field.name)) |setting| {
@@ -324,7 +311,7 @@ pub fn apply(config: *const InputConfig, device: *InputDevice) void {
 }
 
 pub fn parse(config: *InputConfig, setting: []const u8, value: []const u8) !void {
-    inline for (@typeInfo(InputConfig).@"struct".fields) |field| {
+    inline for (@typeInfo(InputConfig).Struct.fields) |field| {
         if (comptime mem.eql(u8, field.name, "glob")) continue;
 
         if (mem.eql(u8, setting, field.name)) {
@@ -358,8 +345,8 @@ pub fn parse(config: *InputConfig, setting: []const u8, value: []const u8) !void
                 }
                 config.@"map-to-output" = .{ .output_name = output_name_owned };
             } else {
-                const T = @typeInfo(field.type).optional.child;
+                const T = @typeInfo(field.type).Optional.child;
-                if (@typeInfo(T) != .@"enum") {
+                if (@typeInfo(T) != .Enum) {
                     @compileError("You forgot to implement parsing for an input configuration setting.");
                 }
                 @field(config, field.name) = meta.stringToEnum(T, value) orelse
@@ -376,7 +363,7 @@ pub fn parse(config: *InputConfig, setting: []const u8, value: []const u8) !void
 pub fn write(config: *InputConfig, writer: anytype) !void {
     try writer.print("{s}\n", .{config.glob});
 
-    inline for (@typeInfo(InputConfig).@"struct".fields) |field| {
+    inline for (@typeInfo(InputConfig).Struct.fields) |field| {
         if (comptime mem.eql(u8, field.name, "glob")) continue;
 
         if (comptime mem.eql(u8, field.name, "map-to-output")) {
@@ -396,8 +383,8 @@ pub fn write(config: *InputConfig, writer: anytype) !void {
                     mem.sliceTo(c.libevdev_event_code_get_name(c.EV_KEY, setting.button), 0),
                 });
             } else {
-                const T = @typeInfo(field.type).optional.child;
+                const T = @typeInfo(field.type).Optional.child;
-                if (@typeInfo(T) != .@"enum") {
+                if (@typeInfo(T) != .Enum) {
                     @compileError("You forgot to implement listing for an input configuration setting.");
                 }
                 try writer.print("\t{s}: {s}\n", .{ field.name, @tagName(setting) });

river/InputDevice.zig

@@ -24,7 +24,6 @@ const wl = @import("wayland").server.wl;
 
 const globber = @import("globber");
 
-const c = @import("c.zig");
 const server = &@import("main.zig").server;
 const util = @import("util.zig");
 
@@ -53,21 +52,19 @@ config: struct {
 link: wl.list.Link,
 
 pub fn init(device: *InputDevice, seat: *Seat, wlr_device: *wlr.InputDevice) !void {
-    var vendor: c_uint = 0;
+    const device_type: []const u8 = switch (wlr_device.type) {
-    var product: c_uint = 0;
+        .switch_device => "switch",
-
+        .tablet_tool => "tablet",
-    if (wlr_device.getLibinputDevice()) |d| {
+        else => @tagName(wlr_device.type),
-        vendor = c.libinput_device_get_id_vendor(@ptrCast(d));
+    };
-        product = c.libinput_device_get_id_product(@ptrCast(d));
-    }
 
     const identifier = try std.fmt.allocPrint(
         util.gpa,
         "{s}-{}-{}-{s}",
         .{
-            @tagName(wlr_device.type),
+            device_type,
-            vendor,
+            wlr_device.vendor,
-            product,
+            wlr_device.product,
             mem.trim(u8, mem.sliceTo(wlr_device.name orelse "unknown", 0), &ascii.whitespace),
         },
     );
@@ -86,7 +83,7 @@ pub fn init(device: *InputDevice, seat: *Seat, wlr_device: *wlr.InputDevice) !vo
         .link = undefined,
     };
 
-    wlr_device.data = device;
+    wlr_device.data = @intFromPtr(device);
 
     wlr_device.events.destroy.add(&device.destroy);
 
@@ -117,7 +114,7 @@ pub fn deinit(device: *InputDevice) void {
         device.seat.updateCapabilities();
     }
 
-    device.wlr_device.data = null;
+    device.wlr_device.data = 0;
 
     device.* = undefined;
 }
@@ -142,11 +139,11 @@ fn handleDestroy(listener: *wl.Listener(*wlr.InputDevice), _: *wlr.InputDevice)
             device.deinit();
             util.gpa.destroy(device);
         },
-        .tablet => {
+        .tablet_tool => {
             const tablet: *Tablet = @fieldParentPtr("device", device);
             tablet.destroy();
         },
-        .@"switch" => {
+        .switch_device => {
             const switch_device: *Switch = @fieldParentPtr("device", device);
             switch_device.deinit();
             util.gpa.destroy(switch_device);

river/InputManager.zig

@@ -58,7 +58,7 @@ tablet_manager: *wlr.TabletManagerV2,
 configs: std.ArrayList(InputConfig),
 
 devices: wl.list.Head(InputDevice, .link),
-seats: std.DoublyLinkedList(Seat) = .{},
+seats: std.TailQueue(Seat) = .{},
 
 exclusive_client: ?*wl.Client = null,
 
@@ -74,7 +74,7 @@ new_text_input: wl.Listener(*wlr.TextInputV3) =
     wl.Listener(*wlr.TextInputV3).init(handleNewTextInput),
 
 pub fn init(input_manager: *InputManager) !void {
-    const seat_node = try util.gpa.create(std.DoublyLinkedList(Seat).Node);
+    const seat_node = try util.gpa.create(std.TailQueue(Seat).Node);
     errdefer util.gpa.destroy(seat_node);
 
     input_manager.* = .{
@@ -185,7 +185,7 @@ fn handleNewVirtualKeyboard(
     _: *wl.Listener(*wlr.VirtualKeyboardV1),
     virtual_keyboard: *wlr.VirtualKeyboardV1,
 ) void {
-    const seat: *Seat = @alignCast(@ptrCast(virtual_keyboard.seat.data));
+    const seat: *Seat = @ptrFromInt(virtual_keyboard.seat.data);
     seat.addDevice(&virtual_keyboard.keyboard.base);
 }
 
@@ -200,7 +200,7 @@ fn handleNewConstraint(
 }
 
 fn handleNewInputMethod(_: *wl.Listener(*wlr.InputMethodV2), input_method: *wlr.InputMethodV2) void {
-    const seat: *Seat = @alignCast(@ptrCast(input_method.seat.data));
+    const seat: *Seat = @ptrFromInt(input_method.seat.data);
 
     log.debug("new input method on seat {s}", .{seat.wlr_seat.name});
 

river/Keyboard.zig

@@ -54,7 +54,7 @@ pub const Pressed = struct {
         // Furthermore, wlroots will continue to forward key press/release events to river if more
         // than 32 keys are pressed. Therefore river chooses to ignore keypresses that would take
         // the keyboard beyond 32 simultaneously pressed keys.
-        assert(capacity == @typeInfo(std.meta.fieldInfo(wlr.Keyboard, .keycodes).type).array.len);
+        assert(capacity == @typeInfo(std.meta.fieldInfo(wlr.Keyboard, .keycodes).type).Array.len);
     }
 
     keys: std.BoundedArray(Key, capacity) = .{},
@@ -96,14 +96,21 @@ pub fn init(keyboard: *Keyboard, seat: *Seat, wlr_device: *wlr.InputDevice) !voi
     errdefer keyboard.device.deinit();
 
     const wlr_keyboard = keyboard.device.wlr_device.toKeyboard();
-    wlr_keyboard.data = keyboard;
+    wlr_keyboard.data = @intFromPtr(keyboard);
 
     // wlroots will log a more detailed error if this fails.
     if (!wlr_keyboard.setKeymap(server.config.keymap)) return error.OutOfMemory;
 
-    if (wlr.KeyboardGroup.fromKeyboard(wlr_keyboard) == null) {
+    // Add to keyboard-group, if applicable.
-        // wlroots will log an error on failure
+    var group_it = seat.keyboard_groups.first;
-        _ = seat.keyboard_group.addKeyboard(wlr_keyboard);
+    outer: while (group_it) |group_node| : (group_it = group_node.next) {
+        for (group_node.data.globs.items) |glob| {
+            if (globber.match(glob, keyboard.device.identifier)) {
+                // wlroots will log an error if this fails explaining the reason.
+                _ = group_node.data.wlr_group.addKeyboard(wlr_keyboard);
+                break :outer;
+            }
+        }
     }
 
     wlr_keyboard.setRepeatInfo(server.config.repeat_rate, server.config.repeat_delay);

river/KeyboardGroup.zig

@@ -0,0 +1,141 @@
+// This file is part of river, a dynamic tiling wayland compositor.
+//
+// Copyright 2022 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, version 3.
+//
+// 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 KeyboardGroup = @This();
+
+const std = @import("std");
+const assert = std.debug.assert;
+const mem = std.mem;
+
+const globber = @import("globber");
+const wlr = @import("wlroots");
+const wl = @import("wayland").server.wl;
+const xkb = @import("xkbcommon");
+
+const log = std.log.scoped(.keyboard_group);
+
+const server = &@import("main.zig").server;
+const util = @import("util.zig");
+
+const Seat = @import("Seat.zig");
+const Keyboard = @import("Keyboard.zig");
+
+seat: *Seat,
+wlr_group: *wlr.KeyboardGroup,
+name: []const u8,
+globs: std.ArrayListUnmanaged([]const u8) = .{},
+
+pub fn create(seat: *Seat, name: []const u8) !void {
+    log.debug("new keyboard group: '{s}'", .{name});
+
+    const node = try util.gpa.create(std.TailQueue(KeyboardGroup).Node);
+    errdefer util.gpa.destroy(node);
+
+    const wlr_group = try wlr.KeyboardGroup.create();
+    errdefer wlr_group.destroy();
+
+    const owned_name = try util.gpa.dupe(u8, name);
+    errdefer util.gpa.free(owned_name);
+
+    node.data = .{
+        .wlr_group = wlr_group,
+        .name = owned_name,
+        .seat = seat,
+    };
+
+    seat.addDevice(&wlr_group.keyboard.base);
+    seat.keyboard_groups.append(node);
+}
+
+pub fn destroy(group: *KeyboardGroup) void {
+    log.debug("destroying keyboard group: '{s}'", .{group.name});
+
+    util.gpa.free(group.name);
+
+    for (group.globs.items) |glob| {
+        util.gpa.free(glob);
+    }
+    group.globs.deinit(util.gpa);
+
+    group.wlr_group.destroy();
+
+    const node: *std.TailQueue(KeyboardGroup).Node = @fieldParentPtr("data", group);
+    group.seat.keyboard_groups.remove(node);
+    util.gpa.destroy(node);
+}
+
+pub fn addIdentifier(group: *KeyboardGroup, new_id: []const u8) !void {
+    for (group.globs.items) |glob| {
+        if (mem.eql(u8, glob, new_id)) return;
+    }
+
+    log.debug("keyboard group '{s}' adding identifier: '{s}'", .{ group.name, new_id });
+
+    const owned_id = try util.gpa.dupe(u8, new_id);
+    errdefer util.gpa.free(owned_id);
+
+    // Glob is validated in the command handler.
+    try group.globs.append(util.gpa, owned_id);
+    errdefer {
+        // Not used now, but if at any point this function is modified to that
+        // it may return an error after the glob pattern is added to the list,
+        // the list will have a pointer to freed memory in its last position.
+        _ = group.globs.pop();
+    }
+
+    // Add any existing matching keyboards to the group.
+    var it = server.input_manager.devices.iterator(.forward);
+    while (it.next()) |device| {
+        if (device.seat != group.seat) continue;
+        if (device.wlr_device.type != .keyboard) continue;
+
+        if (globber.match(device.identifier, new_id)) {
+            log.debug("found existing matching keyboard; adding to group", .{});
+
+            if (!group.wlr_group.addKeyboard(device.wlr_device.toKeyboard())) {
+                // wlroots logs an error message to explain why this failed.
+                continue;
+            }
+        }
+
+        // Continue, because we may have more than one device with the exact
+        // same identifier. That is in fact one reason for the keyboard group
+        // feature to exist in the first place.
+    }
+}
+
+pub fn removeIdentifier(group: *KeyboardGroup, id: []const u8) !void {
+    for (group.globs.items, 0..) |glob, index| {
+        if (mem.eql(u8, glob, id)) {
+            _ = group.globs.orderedRemove(index);
+            break;
+        }
+    } else {
+        return;
+    }
+
+    var it = server.input_manager.devices.iterator(.forward);
+    while (it.next()) |device| {
+        if (device.seat != group.seat) continue;
+        if (device.wlr_device.type != .keyboard) continue;
+
+        if (globber.match(device.identifier, id)) {
+            const wlr_keyboard = device.wlr_device.toKeyboard();
+            assert(wlr_keyboard.group == group.wlr_group);
+            group.wlr_group.removeKeyboard(wlr_keyboard);
+        }
+    }
+}

river/LayerSurface.zig

@@ -43,7 +43,7 @@ commit: wl.Listener(*wlr.Surface) = wl.Listener(*wlr.Surface).init(handleCommit)
 new_popup: wl.Listener(*wlr.XdgPopup) = wl.Listener(*wlr.XdgPopup).init(handleNewPopup),
 
 pub fn create(wlr_layer_surface: *wlr.LayerSurfaceV1) error{OutOfMemory}!void {
-    const output: *Output = @alignCast(@ptrCast(wlr_layer_surface.output.?.data));
+    const output: *Output = @ptrFromInt(wlr_layer_surface.output.?.data);
     const layer_surface = try util.gpa.create(LayerSurface);
     errdefer util.gpa.destroy(layer_surface);
 
@@ -59,13 +59,18 @@ pub fn create(wlr_layer_surface: *wlr.LayerSurfaceV1) error{OutOfMemory}!void {
     try SceneNodeData.attach(&layer_surface.scene_layer_surface.tree.node, .{ .layer_surface = layer_surface });
     try SceneNodeData.attach(&layer_surface.popup_tree.node, .{ .layer_surface = layer_surface });
 
-    wlr_layer_surface.surface.data = &layer_surface.scene_layer_surface.tree.node;
+    wlr_layer_surface.surface.data = @intFromPtr(&layer_surface.scene_layer_surface.tree.node);
 
     wlr_layer_surface.events.destroy.add(&layer_surface.destroy);
     wlr_layer_surface.surface.events.map.add(&layer_surface.map);
     wlr_layer_surface.surface.events.unmap.add(&layer_surface.unmap);
     wlr_layer_surface.surface.events.commit.add(&layer_surface.commit);
     wlr_layer_surface.events.new_popup.add(&layer_surface.new_popup);
+
+    // wlroots only informs us of the new surface after the first commit,
+    // so our listener does not get called for this first commit. However,
+    // we do want our listener called in order to send the initial configure.
+    handleCommit(&layer_surface.commit, wlr_layer_surface.surface);
 }
 
 pub fn destroyPopups(layer_surface: *LayerSurface) void {
@@ -82,33 +87,24 @@ fn handleDestroy(listener: *wl.Listener(*wlr.LayerSurfaceV1), _: *wlr.LayerSurfa
     layer_surface.map.link.remove();
     layer_surface.unmap.link.remove();
     layer_surface.commit.link.remove();
-    layer_surface.new_popup.link.remove();
 
     layer_surface.destroyPopups();
 
     layer_surface.popup_tree.node.destroy();
 
     // The wlr_surface may outlive the wlr_layer_surface so we must clean up the user data.
-    layer_surface.wlr_layer_surface.surface.data = null;
+    layer_surface.wlr_layer_surface.surface.data = 0;
 
     util.gpa.destroy(layer_surface);
 }
 
 fn handleMap(listener: *wl.Listener(void)) void {
     const layer_surface: *LayerSurface = @fieldParentPtr("map", listener);
-    const wlr_surface = layer_surface.wlr_layer_surface;
 
-    log.debug("layer surface '{s}' mapped", .{wlr_surface.namespace});
+    log.debug("layer surface '{s}' mapped", .{layer_surface.wlr_layer_surface.namespace});
 
     layer_surface.output.arrangeLayers();
-
+    handleKeyboardInteractiveExclusive(layer_surface.output);
-    const consider = wlr_surface.current.keyboard_interactive == .on_demand and
-        (wlr_surface.current.layer == .top or wlr_surface.current.layer == .overlay);
-    handleKeyboardInteractiveExclusive(
-        layer_surface.output,
-        if (consider) layer_surface else null,
-    );
-
     server.root.applyPending();
 }
 
@@ -118,7 +114,7 @@ fn handleUnmap(listener: *wl.Listener(void)) void {
     log.debug("layer surface '{s}' unmapped", .{layer_surface.wlr_layer_surface.namespace});
 
     layer_surface.output.arrangeLayers();
-    handleKeyboardInteractiveExclusive(layer_surface.output, null);
+    handleKeyboardInteractiveExclusive(layer_surface.output);
     server.root.applyPending();
 }
 
@@ -138,26 +134,24 @@ fn handleCommit(listener: *wl.Listener(*wlr.Surface), _: *wlr.Surface) void {
         @as(u32, @bitCast(wlr_layer_surface.current.committed)) != 0)
     {
         layer_surface.output.arrangeLayers();
-        handleKeyboardInteractiveExclusive(layer_surface.output, null);
+        handleKeyboardInteractiveExclusive(layer_surface.output);
         server.root.applyPending();
     }
 }
 
-/// Focus topmost keyboard-interactivity-exclusive layer surface above normal
-/// content, or if none found, focus the surface given as `consider`.
 /// Requires a call to Root.applyPending()
-fn handleKeyboardInteractiveExclusive(output: *Output, consider: ?*LayerSurface) void {
+fn handleKeyboardInteractiveExclusive(output: *Output) void {
     if (server.lock_manager.state != .unlocked) return;
 
-    // Find the topmost layer surface (if any) in the top or overlay layers which
+    // Find the topmost layer surface in the top or overlay layers which
-    // requests exclusive keyboard interactivity.
+    // requests keyboard interactivity if any.
-    const to_focus = outer: for ([_]zwlr.LayerShellV1.Layer{ .overlay, .top }) |layer| {
+    const topmost_surface = outer: for ([_]zwlr.LayerShellV1.Layer{ .overlay, .top }) |layer| {
         const tree = output.layerSurfaceTree(layer);
         // Iterate in reverse to match rendering order.
         var it = tree.children.iterator(.reverse);
         while (it.next()) |node| {
             assert(node.type == .tree);
-            if (@as(?*SceneNodeData, @alignCast(@ptrCast(node.data)))) |node_data| {
+            if (@as(?*SceneNodeData, @ptrFromInt(node.data))) |node_data| {
                 const layer_surface = node_data.data.layer_surface;
                 const wlr_layer_surface = layer_surface.wlr_layer_surface;
                 if (wlr_layer_surface.surface.mapped and
@@ -167,21 +161,17 @@ fn handleKeyboardInteractiveExclusive(output: *Output, consider: ?*LayerSurface)
                 }
             }
         }
-    } else consider;
+    } else null;
-
-    if (to_focus) |s| {
-        assert(s.wlr_layer_surface.current.keyboard_interactive != .none);
-    }
 
     var it = server.input_manager.seats.first;
     while (it) |node| : (it = node.next) {
         const seat = &node.data;
 
         if (seat.focused_output == output) {
-            if (to_focus) |s| {
+            if (topmost_surface) |to_focus| {
                 // If we found a surface on the output that requires focus, grab the focus of all
                 // seats that are focusing that output.
-                seat.setFocusRaw(.{ .layer = s });
+                seat.setFocusRaw(.{ .layer = to_focus });
                 continue;
             }
         }

river/Layout.zig

@@ -47,7 +47,7 @@ pub fn create(client: *wl.Client, version: u32, id: u32, output: *Output, namesp
         return;
     }
 
-    const node = try util.gpa.create(std.DoublyLinkedList(Layout).Node);
+    const node = try util.gpa.create(std.TailQueue(Layout).Node);
     errdefer util.gpa.destroy(node);
     node.data = .{
         .layout_v3 = layout_v3,
@@ -186,7 +186,7 @@ pub fn destroy(layout: *Layout) void {
     );
 
     // Remove layout from the list
-    const node: *std.DoublyLinkedList(Layout).Node = @fieldParentPtr("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

@@ -68,7 +68,7 @@ fn handleRequest(
         .get_layout => |req| {
             // Ignore if the output is inert
             const wlr_output = wlr.Output.fromWlOutput(req.output) orelse return;
-            const output: *Output = @alignCast(@ptrCast(wlr_output.data));
+            const output: *Output = @ptrFromInt(wlr_output.data);
 
             log.debug("bind layout '{s}' on output '{s}'", .{ req.namespace, output.wlr_output.name });
 

river/LockManager.zig

@@ -266,7 +266,7 @@ pub fn updateLockSurfaceSize(manager: *LockManager, output: *Output) void {
 
     var it = lock.surfaces.iterator(.forward);
     while (it.next()) |wlr_lock_surface| {
-        const lock_surface: *LockSurface = @alignCast(@ptrCast(wlr_lock_surface.data));
+        const lock_surface: *LockSurface = @ptrFromInt(wlr_lock_surface.data);
         if (output == lock_surface.getOutput()) {
             lock_surface.configure();
         }

river/LockSurface.zig

@@ -44,7 +44,7 @@ pub fn create(wlr_lock_surface: *wlr.SessionLockSurfaceV1, lock: *wlr.SessionLoc
         .wlr_lock_surface = wlr_lock_surface,
         .lock = lock,
     };
-    wlr_lock_surface.data = lock_surface;
+    wlr_lock_surface.data = @intFromPtr(lock_surface);
 
     const output = lock_surface.getOutput();
     const tree = try output.locked_content.createSceneSubsurfaceTree(wlr_lock_surface.surface);
@@ -52,7 +52,7 @@ pub fn create(wlr_lock_surface: *wlr.SessionLockSurfaceV1, lock: *wlr.SessionLoc
 
     try SceneNodeData.attach(&tree.node, .{ .lock_surface = lock_surface });
 
-    wlr_lock_surface.surface.data = &tree.node;
+    wlr_lock_surface.surface.data = @intFromPtr(&tree.node);
 
     wlr_lock_surface.surface.events.map.add(&lock_surface.map);
     wlr_lock_surface.events.destroy.add(&lock_surface.surface_destroy);
@@ -65,7 +65,7 @@ pub fn destroy(lock_surface: *LockSurface) void {
         var surface_it = lock_surface.lock.surfaces.iterator(.forward);
         const new_focus: Seat.FocusTarget = while (surface_it.next()) |surface| {
             if (surface != lock_surface.wlr_lock_surface)
-                break .{ .lock_surface = @alignCast(@ptrCast(surface.data)) };
+                break .{ .lock_surface = @ptrFromInt(surface.data) };
         } else .none;
 
         var seat_it = server.input_manager.seats.first;
@@ -86,13 +86,13 @@ pub fn destroy(lock_surface: *LockSurface) void {
     lock_surface.surface_destroy.link.remove();
 
     // The wlr_surface may outlive the wlr_lock_surface so we must clean up the user data.
-    lock_surface.wlr_lock_surface.surface.data = null;
+    lock_surface.wlr_lock_surface.surface.data = 0;
 
     util.gpa.destroy(lock_surface);
 }
 
 pub fn getOutput(lock_surface: *LockSurface) *Output {
-    return @alignCast(@ptrCast(lock_surface.wlr_lock_surface.output.data));
+    return @ptrFromInt(lock_surface.wlr_lock_surface.output.data);
 }
 
 pub fn configure(lock_surface: *LockSurface) void {

river/Output.zig

@@ -125,6 +125,10 @@ lock_render_state: enum {
     lock_surface,
 } = .blanked,
 
+/// Set to true if a gamma control client makes a set gamma request.
+/// This request is handled while rendering the next frame in handleFrame().
+gamma_dirty: bool = false,
+
 /// The state of the output that is directly acted upon/modified through user input.
 ///
 /// Pending state will be copied to the inflight state and communicated to clients
@@ -167,7 +171,7 @@ previous_tags: u32 = 1 << 0,
 attach_mode: ?Config.AttachMode = null,
 
 /// List of all layouts
-layouts: std.DoublyLinkedList(Layout) = .{},
+layouts: std.TailQueue(Layout) = .{},
 
 /// The current layout namespace of the output. If null,
 /// config.default_layout_namespace should be used instead.
@@ -291,7 +295,7 @@ pub fn create(wlr_output: *wlr.Output) !void {
         },
         .status = undefined,
     };
-    wlr_output.data = output;
+    wlr_output.data = @intFromPtr(output);
 
     output.pending.focus_stack.init();
     output.pending.wm_stack.init();
@@ -360,11 +364,9 @@ fn sendLayerConfigures(
         var it = tree.children.safeIterator(.forward);
         while (it.next()) |node| {
             assert(node.type == .tree);
-            if (@as(?*SceneNodeData, @alignCast(@ptrCast(node.data)))) |node_data| {
+            if (@as(?*SceneNodeData, @ptrFromInt(node.data))) |node_data| {
                 const layer_surface = node_data.data.layer_surface;
 
-                if (!layer_surface.wlr_layer_surface.initialized) continue;
-
                 const exclusive = layer_surface.wlr_layer_surface.current.exclusive_zone > 0;
                 if (exclusive != (mode == .exclusive)) {
                     continue;
@@ -389,15 +391,11 @@ fn sendLayerConfigures(
                     usable_box.* = new_usable_box;
                 }
 
-                const x = layer_surface.scene_layer_surface.tree.node.x;
+                layer_surface.popup_tree.node.setPosition(
-                const y = layer_surface.scene_layer_surface.tree.node.y;
+                    layer_surface.scene_layer_surface.tree.node.x,
-                layer_surface.popup_tree.node.setPosition(x, y);
+                    layer_surface.scene_layer_surface.tree.node.y,
-                layer_surface.scene_layer_surface.tree.node.subsurfaceTreeSetClip(&.{
+                );
-                    .x = -x,
+                layer_surface.scene_layer_surface.tree.node.subsurfaceTreeSetClip(&full_box);
-                    .y = -y,
-                    .width = full_box.width,
-                    .height = full_box.height,
-                });
             }
         }
     }
@@ -429,7 +427,7 @@ fn handleDestroy(listener: *wl.Listener(*wlr.Output), _: *wlr.Output) void {
 
     if (output.layout_namespace) |namespace| util.gpa.free(namespace);
 
-    output.wlr_output.data = null;
+    output.wlr_output.data = 0;
 
     util.gpa.destroy(output);
 
@@ -527,34 +525,37 @@ fn handleFrame(listener: *wl.Listener(*wlr.Output), _: *wlr.Output) void {
 
     // TODO this should probably be retried on failure
     output.renderAndCommit(scene_output) catch |err| switch (err) {
+        error.OutOfMemory => log.err("out of memory", .{}),
         error.CommitFailed => log.err("output commit failed for {s}", .{output.wlr_output.name}),
     };
 
-    var now = posix.clock_gettime(.MONOTONIC) catch @panic("CLOCK_MONOTONIC not supported");
+    var now: posix.timespec = undefined;
+    posix.clock_gettime(posix.CLOCK.MONOTONIC, &now) catch @panic("CLOCK_MONOTONIC not supported");
     scene_output.sendFrameDone(&now);
 }
 
 fn renderAndCommit(output: *Output, scene_output: *wlr.SceneOutput) !void {
-    if (!scene_output.needsFrame()) return;
+    if (output.gamma_dirty) {
+        var state = wlr.Output.State.init();
+        defer state.finish();
 
-    var state = wlr.Output.State.init();
+        if (server.root.gamma_control_manager.getControl(output.wlr_output)) |control| {
-    defer state.finish();
+            log.info("applying gamma settings from client", .{});
-
+            if (!control.apply(&state)) return error.OutOfMemory;
-    if (!scene_output.buildState(&state, null)) return error.CommitFailed;
+        } else {
-
+            log.info("clearing gamma settings from client", .{});
-    if (output.current.fullscreen) |fullscreen| {
+            state.clearGammaLut();
-        if (fullscreen.allowTearing()) {
-            state.tearing_page_flip = true;
-            if (!output.wlr_output.testState(&state)) {
-                log.debug("tearing page flip test failed for {s}, retrying without tearing", .{
-                    output.wlr_output.name,
-                });
-                state.tearing_page_flip = false;
-            }
         }
-    }
 
-    if (!output.wlr_output.commitState(&state)) return error.CommitFailed;
+        if (!scene_output.buildState(&state, null)) return error.CommitFailed;
+
+        if (!output.wlr_output.commitState(&state)) return error.CommitFailed;
+
+        scene_output.damage_ring.rotate();
+        output.gamma_dirty = false;
+    } else {
+        if (!scene_output.commit(null)) return error.CommitFailed;
+    }
 
     if (server.lock_manager.state == .locked or
         (server.lock_manager.state == .waiting_for_lock_surfaces and output.locked_content.node.enabled) or

river/PointerConstraint.zig

@@ -42,12 +42,12 @@ state: union(enum) {
 } = .inactive,
 
 destroy: wl.Listener(*wlr.PointerConstraintV1) = wl.Listener(*wlr.PointerConstraintV1).init(handleDestroy),
-commit: wl.Listener(*wlr.Surface) = wl.Listener(*wlr.Surface).init(handleCommit),
+set_region: wl.Listener(void) = wl.Listener(void).init(handleSetRegion),
 
 node_destroy: wl.Listener(void) = wl.Listener(void).init(handleNodeDestroy),
 
 pub fn create(wlr_constraint: *wlr.PointerConstraintV1) error{OutOfMemory}!void {
-    const seat: *Seat = @alignCast(@ptrCast(wlr_constraint.seat.data));
+    const seat: *Seat = @ptrFromInt(wlr_constraint.seat.data);
 
     const constraint = try util.gpa.create(PointerConstraint);
     errdefer util.gpa.destroy(constraint);
@@ -55,10 +55,10 @@ pub fn create(wlr_constraint: *wlr.PointerConstraintV1) error{OutOfMemory}!void
     constraint.* = .{
         .wlr_constraint = wlr_constraint,
     };
-    wlr_constraint.data = constraint;
+    wlr_constraint.data = @intFromPtr(constraint);
 
     wlr_constraint.events.destroy.add(&constraint.destroy);
-    wlr_constraint.surface.events.commit.add(&constraint.commit);
+    wlr_constraint.events.set_region.add(&constraint.set_region);
 
     if (seat.wlr_seat.keyboard_state.focused_surface) |surface| {
         if (surface == wlr_constraint.surface) {
@@ -70,7 +70,7 @@ pub fn create(wlr_constraint: *wlr.PointerConstraintV1) error{OutOfMemory}!void
 }
 
 pub fn maybeActivate(constraint: *PointerConstraint) void {
-    const seat: *Seat = @alignCast(@ptrCast(constraint.wlr_constraint.seat.data));
+    const seat: *Seat = @ptrFromInt(constraint.wlr_constraint.seat.data);
 
     assert(seat.cursor.constraint == constraint);
 
@@ -102,7 +102,7 @@ pub fn maybeActivate(constraint: *PointerConstraint) void {
 
 /// Called when the cursor position or content in the scene graph changes
 pub fn updateState(constraint: *PointerConstraint) void {
-    const seat: *Seat = @alignCast(@ptrCast(constraint.wlr_constraint.seat.data));
+    const seat: *Seat = @ptrFromInt(constraint.wlr_constraint.seat.data);
 
     constraint.maybeActivate();
 
@@ -154,7 +154,7 @@ pub fn confine(constraint: *PointerConstraint, dx: *f64, dy: *f64) void {
 }
 
 pub fn deactivate(constraint: *PointerConstraint) void {
-    const seat: *Seat = @alignCast(@ptrCast(constraint.wlr_constraint.seat.data));
+    const seat: *Seat = @ptrFromInt(constraint.wlr_constraint.seat.data);
 
     assert(seat.cursor.constraint == constraint);
     assert(constraint.state == .active);
@@ -167,9 +167,9 @@ pub fn deactivate(constraint: *PointerConstraint) void {
 }
 
 fn warpToHintIfSet(constraint: *PointerConstraint) void {
-    const seat: *Seat = @alignCast(@ptrCast(constraint.wlr_constraint.seat.data));
+    const seat: *Seat = @ptrFromInt(constraint.wlr_constraint.seat.data);
 
-    if (constraint.wlr_constraint.current.cursor_hint.enabled) {
+    if (constraint.wlr_constraint.current.committed.cursor_hint) {
         var lx: i32 = undefined;
         var ly: i32 = undefined;
         _ = constraint.state.active.node.coords(&lx, &ly);
@@ -190,7 +190,7 @@ fn handleNodeDestroy(listener: *wl.Listener(void)) void {
 
 fn handleDestroy(listener: *wl.Listener(*wlr.PointerConstraintV1), _: *wlr.PointerConstraintV1) void {
     const constraint: *PointerConstraint = @fieldParentPtr("destroy", listener);
-    const seat: *Seat = @alignCast(@ptrCast(constraint.wlr_constraint.seat.data));
+    const seat: *Seat = @ptrFromInt(constraint.wlr_constraint.seat.data);
 
     if (constraint.state == .active) {
         // We can't simply call deactivate() here as it calls sendDeactivated(),
@@ -201,7 +201,7 @@ fn handleDestroy(listener: *wl.Listener(*wlr.PointerConstraintV1), _: *wlr.Point
     }
 
     constraint.destroy.link.remove();
-    constraint.commit.link.remove();
+    constraint.set_region.link.remove();
 
     if (seat.cursor.constraint == constraint) {
         seat.cursor.constraint = null;
@@ -210,19 +210,16 @@ fn handleDestroy(listener: *wl.Listener(*wlr.PointerConstraintV1), _: *wlr.Point
     util.gpa.destroy(constraint);
 }
 
-// It is necessary to listen for the commit event rather than the set_region
+fn handleSetRegion(listener: *wl.Listener(void)) void {
-// event as the latter is not triggered by wlroots when the input region of
+    const constraint: *PointerConstraint = @fieldParentPtr("set_region", listener);
-// the surface changes.
+    const seat: *Seat = @ptrFromInt(constraint.wlr_constraint.seat.data);
-fn handleCommit(listener: *wl.Listener(*wlr.Surface), _: *wlr.Surface) void {
-    const constraint: *PointerConstraint = @fieldParentPtr("commit", listener);
-    const seat: *Seat = @alignCast(@ptrCast(constraint.wlr_constraint.seat.data));
 
     switch (constraint.state) {
         .active => |state| {
             const sx: i32 = @intFromFloat(state.sx);
             const sy: i32 = @intFromFloat(state.sy);
             if (!constraint.wlr_constraint.region.containsPoint(sx, sy, null)) {
-                log.info("deactivating pointer constraint, (input) region change left pointer outside constraint", .{});
+                log.info("deactivating pointer constraint, region change left pointer outside constraint", .{});
                 constraint.deactivate();
             }
         },

river/Root.zig

@@ -97,6 +97,8 @@ power_manager_set_mode: wl.Listener(*wlr.OutputPowerManagerV1.event.SetMode) =
     wl.Listener(*wlr.OutputPowerManagerV1.event.SetMode).init(handlePowerManagerSetMode),
 
 gamma_control_manager: *wlr.GammaControlManagerV1,
+gamma_control_set_gamma: wl.Listener(*wlr.GammaControlManagerV1.event.SetGamma) =
+    wl.Listener(*wlr.GammaControlManagerV1.event.SetGamma).init(handleSetGamma),
 
 /// A list of all outputs
 all_outputs: wl.list.Head(Output, .all_link),
@@ -115,17 +117,12 @@ transaction_timeout: *wl.EventSource,
 pending_state_dirty: bool = false,
 
 pub fn init(root: *Root) !void {
-    const output_layout = try wlr.OutputLayout.create(server.wl_server);
+    const output_layout = try wlr.OutputLayout.create();
     errdefer output_layout.destroy();
 
     const scene = try wlr.Scene.create();
     errdefer scene.tree.node.destroy();
 
-    const gamma_control_manager = try wlr.GammaControlManagerV1.create(server.wl_server);
-    scene.setGammaControlManagerV1(gamma_control_manager);
-
-    if (server.linux_dmabuf) |linux_dmabuf| scene.setLinuxDmabufV1(linux_dmabuf);
-
     const interactive_content = try scene.tree.createSceneTree();
     const drag_icons = try scene.tree.createSceneTree();
     const hidden_tree = try scene.tree.createSceneTree();
@@ -134,6 +131,9 @@ pub fn init(root: *Root) !void {
     const outputs = try interactive_content.createSceneTree();
     const override_redirect = if (build_options.xwayland) try interactive_content.createSceneTree();
 
+    const presentation = try wlr.Presentation.create(server.wl_server, server.backend);
+    scene.setPresentation(presentation);
+
     const event_loop = server.wl_server.getEventLoop();
     const transaction_timeout = try event_loop.addTimer(*Root, handleTransactionTimeout, root);
     errdefer transaction_timeout.remove();
@@ -166,11 +166,11 @@ pub fn init(root: *Root) !void {
         .all_outputs = undefined,
         .active_outputs = undefined,
 
-        .presentation = try wlr.Presentation.create(server.wl_server, server.backend, 2),
+        .presentation = presentation,
         .xdg_output_manager = try wlr.XdgOutputManagerV1.create(server.wl_server, output_layout),
         .output_manager = try wlr.OutputManagerV1.create(server.wl_server),
         .power_manager = try wlr.OutputPowerManagerV1.create(server.wl_server),
-        .gamma_control_manager = gamma_control_manager,
+        .gamma_control_manager = try wlr.GammaControlManagerV1.create(server.wl_server),
         .transaction_timeout = transaction_timeout,
     };
     root.hidden.pending.focus_stack.init();
@@ -190,14 +190,10 @@ pub fn init(root: *Root) !void {
     root.output_manager.events.@"test".add(&root.manager_test);
     root.output_layout.events.change.add(&root.layout_change);
     root.power_manager.events.set_mode.add(&root.power_manager_set_mode);
+    root.gamma_control_manager.events.set_gamma.add(&root.gamma_control_set_gamma);
 }
 
 pub fn deinit(root: *Root) void {
-    root.manager_apply.link.remove();
-    root.manager_test.link.remove();
-    root.layout_change.link.remove();
-    root.power_manager_set_mode.link.remove();
-
     root.output_layout.destroy();
     root.transaction_timeout.remove();
 }
@@ -330,7 +326,7 @@ pub fn deactivateOutput(root: *Root, output: *Output) void {
         var it = tree.children.safeIterator(.forward);
         while (it.next()) |scene_node| {
             assert(scene_node.type == .tree);
-            if (@as(?*SceneNodeData, @alignCast(@ptrCast(scene_node.data)))) |node_data| {
+            if (@as(?*SceneNodeData, @ptrFromInt(scene_node.data))) |node_data| {
                 node_data.data.layer_surface.wlr_layer_surface.destroy();
             }
         }
@@ -680,12 +676,24 @@ fn commitTransaction(root: *Root) void {
         while (focus_stack_it.next()) |view| {
             assert(view.inflight.output == output);
 
-            if (view.inflight.float) {
+            if (view.current.output != view.inflight.output or
-                view.tree.node.reparent(output.layers.float);
+                (output.current.fullscreen == view and output.inflight.fullscreen != view))
-            } else {
+            {
-                view.tree.node.reparent(output.layers.layout);
+                if (view.inflight.float) {
+                    view.tree.node.reparent(output.layers.float);
+                } else {
+                    view.tree.node.reparent(output.layers.layout);
+                }
+                view.popup_tree.node.reparent(output.layers.popups);
+            }
+
+            if (view.current.float != view.inflight.float) {
+                if (view.inflight.float) {
+                    view.tree.node.reparent(output.layers.float);
+                } else {
+                    view.tree.node.reparent(output.layers.layout);
+                }
             }
-            view.popup_tree.node.reparent(output.layers.popups);
 
             view.commitTransaction();
 
@@ -698,13 +706,15 @@ fn commitTransaction(root: *Root) void {
             }
         }
 
-        if (output.inflight.fullscreen) |view| {
+        if (output.inflight.fullscreen != output.current.fullscreen) {
-            assert(view.inflight.output == output);
+            if (output.inflight.fullscreen) |view| {
-            assert(view.current.output == output);
+                assert(view.inflight.output == output);
-            view.tree.node.reparent(output.layers.fullscreen);
+                assert(view.current.output == output);
+                view.tree.node.reparent(output.layers.fullscreen);
+            }
+            output.current.fullscreen = output.inflight.fullscreen;
+            output.layers.fullscreen.node.setEnabled(output.current.fullscreen != null);
         }
-        output.current.fullscreen = output.inflight.fullscreen;
-        output.layers.fullscreen.node.setEnabled(output.current.fullscreen != null);
 
         output.status.handleTransactionCommit(output);
     }
@@ -805,7 +815,7 @@ fn processOutputConfig(
     var it = config.heads.iterator(.forward);
     while (it.next()) |head| {
         const wlr_output = head.state.output;
-        const output: *Output = @alignCast(@ptrCast(wlr_output.data));
+        const output: *Output = @ptrFromInt(wlr_output.data);
 
         var proposed_state = wlr.Output.State.init();
         head.state.apply(&proposed_state);
@@ -857,7 +867,7 @@ fn handlePowerManagerSetMode(
     event: *wlr.OutputPowerManagerV1.event.SetMode,
 ) void {
     // The output may have been destroyed, in which case there is nothing to do
-    const output: *Output = @alignCast(@ptrCast(event.output.data orelse return));
+    const output = @as(?*Output, @ptrFromInt(event.output.data)) orelse return;
 
     std.log.debug("client requested dpms {s} for output {s}", .{
         @tagName(event.mode),
@@ -888,3 +898,16 @@ fn handlePowerManagerSetMode(
 
     output.updateLockRenderStateOnEnableDisable();
 }
+
+fn handleSetGamma(
+    _: *wl.Listener(*wlr.GammaControlManagerV1.event.SetGamma),
+    event: *wlr.GammaControlManagerV1.event.SetGamma,
+) void {
+    // The output may have been destroyed, in which case there is nothing to do
+    const output = @as(?*Output, @ptrFromInt(event.output.data)) orelse return;
+
+    std.log.debug("client requested to set gamma", .{});
+
+    output.gamma_dirty = true;
+    output.wlr_output.scheduleFrame();
+}

river/SceneNodeData.zig

@@ -46,7 +46,7 @@ pub fn attach(node: *wlr.SceneNode, data: Data) error{OutOfMemory}!void {
         .node = node,
         .data = data,
     };
-    node.data = scene_node_data;
+    node.data = @intFromPtr(scene_node_data);
 
     node.events.destroy.add(&scene_node_data.destroy);
 }
@@ -54,7 +54,7 @@ pub fn attach(node: *wlr.SceneNode, data: Data) error{OutOfMemory}!void {
 pub fn fromNode(node: *wlr.SceneNode) ?*SceneNodeData {
     var n = node;
     while (true) {
-        if (@as(?*SceneNodeData, @alignCast(@ptrCast(n.data)))) |scene_node_data| {
+        if (@as(?*SceneNodeData, @ptrFromInt(n.data))) |scene_node_data| {
             return scene_node_data;
         }
         if (n.parent) |parent_tree| {
@@ -66,7 +66,7 @@ pub fn fromNode(node: *wlr.SceneNode) ?*SceneNodeData {
 }
 
 pub fn fromSurface(surface: *wlr.Surface) ?*SceneNodeData {
-    if (@as(?*wlr.SceneNode, @alignCast(@ptrCast(surface.getRootSurface().data)))) |node| {
+    if (@as(?*wlr.SceneNode, @ptrFromInt(surface.getRootSurface().data))) |node| {
         return fromNode(node);
     }
     return null;
@@ -76,7 +76,7 @@ fn handleDestroy(listener: *wl.Listener(void)) void {
     const scene_node_data: *SceneNodeData = @fieldParentPtr("destroy", listener);
 
     scene_node_data.destroy.link.remove();
-    scene_node_data.node.data = null;
+    scene_node_data.node.data = 0;
 
     util.gpa.destroy(scene_node_data);
 }

river/Seat.zig

@@ -33,6 +33,7 @@ const InputDevice = @import("InputDevice.zig");
 const InputManager = @import("InputManager.zig");
 const InputRelay = @import("InputRelay.zig");
 const Keyboard = @import("Keyboard.zig");
+const KeyboardGroup = @import("KeyboardGroup.zig");
 const LayerSurface = @import("LayerSurface.zig");
 const LockSurface = @import("LockSurface.zig");
 const Mapping = @import("Mapping.zig");
@@ -83,7 +84,7 @@ mapping_repeat_timer: *wl.EventSource,
 /// Currently repeating mapping, if any
 repeating_mapping: ?*const Mapping = null,
 
-keyboard_group: *wlr.KeyboardGroup,
+keyboard_groups: std.TailQueue(KeyboardGroup) = .{},
 
 /// Currently focused output. Null only when there are no outputs at all.
 focused_output: ?*Output = null,
@@ -120,15 +121,12 @@ pub fn init(seat: *Seat, name: [*:0]const u8) !void {
         .cursor = undefined,
         .relay = undefined,
         .mapping_repeat_timer = mapping_repeat_timer,
-        .keyboard_group = try wlr.KeyboardGroup.create(),
     };
-    seat.wlr_seat.data = seat;
+    seat.wlr_seat.data = @intFromPtr(seat);
 
     try seat.cursor.init(seat);
     seat.relay.init();
 
-    try seat.tryAddDevice(&seat.keyboard_group.keyboard.base);
-
     seat.wlr_seat.events.request_set_selection.add(&seat.request_set_selection);
     seat.wlr_seat.events.request_start_drag.add(&seat.request_start_drag);
     seat.wlr_seat.events.start_drag.add(&seat.start_drag);
@@ -144,7 +142,9 @@ pub fn deinit(seat: *Seat) void {
     seat.cursor.deinit();
     seat.mapping_repeat_timer.remove();
 
-    seat.keyboard_group.destroy();
+    while (seat.keyboard_groups.first) |node| {
+        node.data.destroy();
+    }
 
     seat.request_set_selection.link.remove();
     seat.request_start_drag.link.remove();
@@ -165,21 +165,14 @@ pub fn focus(seat: *Seat, _target: ?*View) void {
     // Views may not receive focus while locked.
     if (server.lock_manager.state != .unlocked) return;
 
-    // A layer surface with exclusive focus will prevent any view from gaining
+    // While a layer surface is exclusively focused, views may not receive focus
-    // focus if it is on the top or overlay layer. Otherwise, only steal focus
-    // from a focused layer surface if there is an explicit target view.
     if (seat.focused == .layer) {
         const wlr_layer_surface = seat.focused.layer.wlr_layer_surface;
         assert(wlr_layer_surface.surface.mapped);
-        switch (wlr_layer_surface.current.keyboard_interactive) {
+        if (wlr_layer_surface.current.keyboard_interactive == .exclusive and
-            .none => {},
+            (wlr_layer_surface.current.layer == .top or wlr_layer_surface.current.layer == .overlay))
-            .exclusive => switch (wlr_layer_surface.current.layer) {
+        {
-                .top, .overlay => return,
+            return;
-                .bottom, .background => if (target == null) return,
-                _ => {},
-            },
-            .on_demand => if (target == null) return,
-            _ => {},
         }
     }
 
@@ -289,7 +282,7 @@ pub fn setFocusRaw(seat: *Seat, new_focus: FocusTarget) void {
             if (seat.cursor.constraint) |constraint| {
                 assert(constraint.wlr_constraint == wlr_constraint);
             } else {
-                seat.cursor.constraint = @alignCast(@ptrCast(wlr_constraint.data));
+                seat.cursor.constraint = @ptrFromInt(wlr_constraint.data);
                 assert(seat.cursor.constraint != null);
             }
         }
@@ -316,7 +309,7 @@ pub fn keyboardEnterOrLeave(seat: *Seat, target_surface: ?*wlr.Surface) void {
 
 fn keyboardNotifyEnter(seat: *Seat, wlr_surface: *wlr.Surface) void {
     if (seat.wlr_seat.getKeyboard()) |wlr_keyboard| {
-        const keyboard: *Keyboard = @alignCast(@ptrCast(wlr_keyboard.data));
+        const keyboard: *Keyboard = @ptrFromInt(wlr_keyboard.data);
 
         var keycodes: std.BoundedArray(u32, Keyboard.Pressed.capacity) = .{};
         for (keyboard.pressed.keys.constSlice()) |item| {
@@ -511,11 +504,11 @@ fn tryAddDevice(seat: *Seat, wlr_device: *wlr.InputDevice) !void {
 
             seat.cursor.wlr_cursor.attachInputDevice(wlr_device);
         },
-        .tablet => {
+        .tablet_tool => {
             try Tablet.create(seat, wlr_device);
             seat.cursor.wlr_cursor.attachInputDevice(wlr_device);
         },
-        .@"switch" => {
+        .switch_device => {
             const switch_device = try util.gpa.create(Switch);
             errdefer util.gpa.destroy(switch_device);
 
@@ -538,7 +531,7 @@ pub fn updateCapabilities(seat: *Seat) void {
             switch (device.wlr_device.type) {
                 .keyboard => capabilities.keyboard = true,
                 .touch => capabilities.touch = true,
-                .pointer, .@"switch", .tablet => {},
+                .pointer, .switch_device, .tablet_tool => {},
                 .tablet_pad => unreachable,
             }
         }

river/Server.zig

@@ -19,7 +19,6 @@ const Server = @This();
 const build_options = @import("build_options");
 const std = @import("std");
 const assert = std.debug.assert;
-const mem = std.mem;
 const posix = std.posix;
 const wlr = @import("wlroots");
 const wl = @import("wayland").server.wl;
@@ -39,7 +38,6 @@ const Root = @import("Root.zig");
 const Seat = @import("Seat.zig");
 const SceneNodeData = @import("SceneNodeData.zig");
 const StatusManager = @import("StatusManager.zig");
-const TabletTool = @import("TabletTool.zig");
 const XdgDecoration = @import("XdgDecoration.zig");
 const XdgToplevel = @import("XdgToplevel.zig");
 const XwaylandOverrideRedirect = @import("XwaylandOverrideRedirect.zig");
@@ -61,8 +59,8 @@ allocator: *wlr.Allocator,
 security_context_manager: *wlr.SecurityContextManagerV1,
 
 shm: *wlr.Shm,
+drm: ?*wlr.Drm = null,
 linux_dmabuf: ?*wlr.LinuxDmabufV1 = null,
-linux_drm_syncobj_manager: ?*wlr.LinuxDrmSyncobjManagerV1 = null,
 single_pixel_buffer_manager: *wlr.SinglePixelBufferManagerV1,
 
 viewporter: *wlr.Viewporter,
@@ -85,10 +83,6 @@ screencopy_manager: *wlr.ScreencopyManagerV1,
 
 foreign_toplevel_manager: *wlr.ForeignToplevelManagerV1,
 
-tearing_control_manager: *wlr.TearingControlManagerV1,
-
-alpha_modifier: *wlr.AlphaModifierV1,
-
 input_manager: InputManager,
 root: Root,
 config: Config,
@@ -102,10 +96,8 @@ xwayland: if (build_options.xwayland) ?*wlr.Xwayland else void = if (build_optio
 new_xwayland_surface: if (build_options.xwayland) wl.Listener(*wlr.XwaylandSurface) else void =
     if (build_options.xwayland) wl.Listener(*wlr.XwaylandSurface).init(handleNewXwaylandSurface),
 
-renderer_lost: wl.Listener(void) = wl.Listener(void).init(handleRendererLost),
+new_xdg_surface: wl.Listener(*wlr.XdgSurface) =
-
+    wl.Listener(*wlr.XdgSurface).init(handleNewXdgSurface),
-new_xdg_toplevel: wl.Listener(*wlr.XdgToplevel) =
-    wl.Listener(*wlr.XdgToplevel).init(handleNewXdgToplevel),
 new_toplevel_decoration: wl.Listener(*wlr.XdgToplevelDecorationV1) =
     wl.Listener(*wlr.XdgToplevelDecorationV1).init(handleNewToplevelDecoration),
 new_layer_surface: wl.Listener(*wlr.LayerSurfaceV1) =
@@ -121,14 +113,14 @@ pub fn init(server: *Server, runtime_xwayland: bool) !void {
     // This keeps the code simpler and more readable.
 
     const wl_server = try wl.Server.create();
-    const loop = wl_server.getEventLoop();
 
     var session: ?*wlr.Session = undefined;
-    const backend = try wlr.Backend.autocreate(loop, &session);
+    const backend = try wlr.Backend.autocreate(wl_server, &session);
     const renderer = try wlr.Renderer.autocreate(backend);
 
     const compositor = try wlr.Compositor.create(wl_server, 6, renderer);
 
+    const loop = wl_server.getEventLoop();
     server.* = .{
         .wl_server = wl_server,
         .sigint_source = try loop.addSignal(*wl.Server, posix.SIG.INT, terminate, wl_server),
@@ -164,10 +156,6 @@ pub fn init(server: *Server, runtime_xwayland: bool) !void {
 
         .foreign_toplevel_manager = try wlr.ForeignToplevelManagerV1.create(wl_server),
 
-        .tearing_control_manager = try wlr.TearingControlManagerV1.create(wl_server, 1),
-
-        .alpha_modifier = try wlr.AlphaModifierV1.create(wl_server),
-
         .config = try Config.init(),
 
         .root = undefined,
@@ -179,15 +167,15 @@ pub fn init(server: *Server, runtime_xwayland: bool) !void {
         .lock_manager = undefined,
     };
 
-    if (renderer.getTextureFormats(@intFromEnum(wlr.BufferCap.dmabuf)) != null) {
+    if (renderer.getDmabufFormats() != null and renderer.getDrmFd() >= 0) {
+        // wl_drm is a legacy interface and all clients should switch to linux_dmabuf.
+        // However, enough widely used clients still rely on wl_drm that the pragmatic option
+        // is to keep it around for the near future.
+        // TODO remove wl_drm support
+        server.drm = try wlr.Drm.create(wl_server, renderer);
+
         server.linux_dmabuf = try wlr.LinuxDmabufV1.createWithRenderer(wl_server, 4, renderer);
     }
-    if (renderer.features.timeline and backend.features.timeline) {
-        const drm_fd = renderer.getDrmFd();
-        if (drm_fd >= 0) {
-            server.linux_drm_syncobj_manager = wlr.LinuxDrmSyncobjManagerV1.create(wl_server, 1, drm_fd);
-        }
-    }
 
     if (build_options.xwayland and runtime_xwayland) {
         server.xwayland = try wlr.Xwayland.create(wl_server, compositor, false);
@@ -202,8 +190,7 @@ pub fn init(server: *Server, runtime_xwayland: bool) !void {
     try server.idle_inhibit_manager.init();
     try server.lock_manager.init();
 
-    server.renderer.events.lost.add(&server.renderer_lost);
+    server.xdg_shell.events.new_surface.add(&server.new_xdg_surface);
-    server.xdg_shell.events.new_toplevel.add(&server.new_xdg_toplevel);
     server.xdg_decoration_manager.events.new_toplevel_decoration.add(&server.new_toplevel_decoration);
     server.layer_shell.events.new_surface.add(&server.new_layer_surface);
     server.xdg_activation.events.request_activate.add(&server.request_activate);
@@ -217,8 +204,7 @@ pub fn deinit(server: *Server) void {
     server.sigint_source.remove();
     server.sigterm_source.remove();
 
-    server.renderer_lost.link.remove();
+    server.new_xdg_surface.link.remove();
-    server.new_xdg_toplevel.link.remove();
     server.new_toplevel_decoration.link.remove();
     server.new_layer_surface.link.remove();
     server.request_activate.link.remove();
@@ -233,8 +219,6 @@ pub fn deinit(server: *Server) void {
 
     server.wl_server.destroyClients();
 
-    server.input_manager.new_input.link.remove();
-    server.root.new_output.link.remove();
     server.backend.destroy();
 
     // The scene graph needs to be destroyed after the backend but before the renderer
@@ -293,30 +277,31 @@ fn globalFilter(client: *const wl.Client, global: *const wl.Global, server: *Ser
     }
 }
 
+fn hackGlobal(ptr: *anyopaque) *wl.Global {
+    // TODO(wlroots) MR that eliminates the need for this hack:
+    // https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4612
+    if (wlr.version.major != 0 or wlr.version.minor != 17) @compileError("FIXME");
+
+    return @as(*extern struct { global: *wl.Global }, @alignCast(@ptrCast(ptr))).global;
+}
+
 /// Returns true if the global is allowlisted for security contexts
 fn allowlist(server: *Server, global: *const wl.Global) bool {
-    if (server.linux_dmabuf) |linux_dmabuf| {
+    if (server.drm) |drm| if (global == drm.global) return true;
-        if (global == linux_dmabuf.global) return true;
+    if (server.linux_dmabuf) |linux_dmabuf| if (global == linux_dmabuf.global) return true;
-    }
-    if (server.linux_drm_syncobj_manager) |linux_drm_syncobj_manager| {
-        if (global == linux_drm_syncobj_manager.global) return true;
-    }
 
     // We must use the getInterface() approach for dynamically created globals
     // such as wl_output and wl_seat since the wl_global_create() function will
     // advertise the global to clients and invoke this filter before returning
     // the new global pointer.
-    if ((mem.orderZ(u8, global.getInterface().name, "wl_output") == .eq) or
+    //
-        (mem.orderZ(u8, global.getInterface().name, "wl_seat") == .eq))
-    {
-        return true;
-    }
-
     // For other globals I like the current pointer comparison approach as it
     // should catch river accidentally exposing multiple copies of e.g. wl_shm
     // with an assertion failure.
-    return global == server.shm.global or
+    return global.getInterface() == wl.Output.getInterface() or
-        global == server.single_pixel_buffer_manager.global or
+        global.getInterface() == wl.Seat.getInterface() or
+        global == hackGlobal(server.shm) or
+        global == hackGlobal(server.single_pixel_buffer_manager) or
         global == server.viewporter.global or
         global == server.fractional_scale_manager.global or
         global == server.compositor.global or
@@ -334,9 +319,7 @@ fn allowlist(server: *Server, global: *const wl.Global) bool {
         global == server.input_manager.text_input_manager.global or
         global == server.input_manager.tablet_manager.global or
         global == server.input_manager.pointer_gestures.global or
-        global == server.idle_inhibit_manager.wlr_manager.global or
+        global == server.idle_inhibit_manager.wlr_manager.global;
-        global == server.tearing_control_manager.global or
-        global == server.alpha_modifier.global;
 }
 
 /// Returns true if the global is blocked for security contexts
@@ -353,7 +336,7 @@ fn blocklist(server: *Server, global: *const wl.Global) bool {
         global == server.root.output_manager.global or
         global == server.root.power_manager.global or
         global == server.root.gamma_control_manager.global or
-        global == server.input_manager.idle_notifier.global or
+        global == hackGlobal(server.input_manager.idle_notifier) or
         global == server.input_manager.virtual_pointer_manager.global or
         global == server.input_manager.virtual_keyboard_manager.global or
         global == server.input_manager.input_method_manager.global or
@@ -366,55 +349,17 @@ fn terminate(_: c_int, wl_server: *wl.Server) c_int {
     return 0;
 }
 
-fn handleRendererLost(listener: *wl.Listener(void)) void {
+fn handleNewXdgSurface(_: *wl.Listener(*wlr.XdgSurface), xdg_surface: *wlr.XdgSurface) void {
-    const server: *Server = @fieldParentPtr("renderer_lost", listener);
+    if (xdg_surface.role == .popup) {
-
+        log.debug("new xdg_popup", .{});
-    log.info("recovering from GPU reset", .{});
+        return;
-
-    // There's not much that can be done if creating a new renderer or allocator fails.
-    // With luck there might be another GPU reset after which we try again and succeed.
-
-    server.recoverFromGpuReset() catch |err| switch (err) {
-        error.RendererCreateFailed => log.err("failed to create new renderer after GPU reset", .{}),
-        error.AllocatorCreateFailed => log.err("failed to create new allocator after GPU reset", .{}),
-    };
-}
-
-fn recoverFromGpuReset(server: *Server) !void {
-    const new_renderer = try wlr.Renderer.autocreate(server.backend);
-    errdefer new_renderer.destroy();
-
-    const new_allocator = try wlr.Allocator.autocreate(server.backend, new_renderer);
-    errdefer comptime unreachable; // no failure allowed after this point
-
-    server.renderer_lost.link.remove();
-    new_renderer.events.lost.add(&server.renderer_lost);
-
-    server.compositor.setRenderer(new_renderer);
-
-    {
-        var it = server.root.all_outputs.iterator(.forward);
-        while (it.next()) |output| {
-            // This should never fail here as failure with this combination of
-            // renderer, allocator, and backend should have prevented creating
-            // the output in the first place.
-            _ = output.wlr_output.initRender(new_allocator, new_renderer);
-        }
     }
 
-    server.renderer.destroy();
-    server.renderer = new_renderer;
-
-    server.allocator.destroy();
-    server.allocator = new_allocator;
-}
-
-fn handleNewXdgToplevel(_: *wl.Listener(*wlr.XdgToplevel), xdg_toplevel: *wlr.XdgToplevel) void {
     log.debug("new xdg_toplevel", .{});
 
-    XdgToplevel.create(xdg_toplevel) catch {
+    XdgToplevel.create(xdg_surface.role_data.toplevel.?) catch {
         log.err("out of memory", .{});
-        xdg_toplevel.resource.postNoMemory();
+        xdg_surface.resource.postNoMemory();
         return;
     };
 }
@@ -505,27 +450,17 @@ fn handleRequestSetCursorShape(
     _: *wl.Listener(*wlr.CursorShapeManagerV1.event.RequestSetShape),
     event: *wlr.CursorShapeManagerV1.event.RequestSetShape,
 ) void {
-    const seat: *Seat = @alignCast(@ptrCast(event.seat_client.seat.data));
+    // Ignore requests to set a tablet tool's cursor shape for now
+    // TODO(wlroots): https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3821
+    if (event.device_type == .tablet_tool) return;
 
-    if (event.tablet_tool) |wp_tool| {
+    const focused_client = event.seat_client.seat.pointer_state.focused_client;
-        assert(event.device_type == .tablet_tool);
 
-        const tool = TabletTool.get(event.seat_client.seat, wp_tool.wlr_tool) catch return;
+    // This can be sent by any client, so we check to make sure this one is
-
+    // actually has pointer focus first.
-        if (tool.allowSetCursor(event.seat_client, event.serial)) {
+    if (focused_client == event.seat_client) {
-            const name = wlr.CursorShapeManagerV1.shapeName(event.shape);
+        const seat: *Seat = @ptrFromInt(event.seat_client.seat.data);
-            tool.wlr_cursor.setXcursor(seat.cursor.xcursor_manager, name);
+        const name = wlr.CursorShapeManagerV1.shapeName(event.shape);
-        }
+        seat.cursor.setXcursor(name);
-    } else {
-        assert(event.device_type == .pointer);
-
-        const focused_client = event.seat_client.seat.pointer_state.focused_client;
-
-        // This can be sent by any client, so we check to make sure this one is
-        // actually has pointer focus first.
-        if (focused_client == event.seat_client) {
-            const name = wlr.CursorShapeManagerV1.shapeName(event.shape);
-            seat.cursor.setImage(.{ .xcursor = name });
-        }
     }
 }

river/StatusManager.zig

@@ -69,7 +69,7 @@ fn handleRequest(
         .get_river_output_status => |req| {
             // ignore if the output is inert
             const wlr_output = wlr.Output.fromWlOutput(req.output) orelse return;
-            const output: *Output = @alignCast(@ptrCast(wlr_output.data));
+            const output: *Output = @ptrFromInt(wlr_output.data);
 
             const resource = zriver.OutputStatusV1.create(
                 status_manager_v1.getClient(),
@@ -86,7 +86,7 @@ fn handleRequest(
         .get_river_seat_status => |req| {
             // ignore if the seat is inert
             const wlr_seat = wlr.Seat.Client.fromWlSeat(req.seat) orelse return;
-            const seat: *Seat = @alignCast(@ptrCast(wlr_seat.seat.data));
+            const seat: *Seat = @ptrFromInt(wlr_seat.seat.data);
 
             const node = util.gpa.create(std.SinglyLinkedList(SeatStatus).Node) catch {
                 status_manager_v1.getClient().postNoMemory();

river/Tablet.zig

@@ -33,7 +33,7 @@ wp_tablet: *wlr.TabletV2Tablet,
 output_mapping: ?*wlr.Output = null,
 
 pub fn create(seat: *Seat, wlr_device: *wlr.InputDevice) !void {
-    assert(wlr_device.type == .tablet);
+    assert(wlr_device.type == .tablet_tool);
 
     const tablet = try util.gpa.create(Tablet);
     errdefer util.gpa.destroy(tablet);

river/TabletTool.zig

@@ -59,7 +59,7 @@ set_cursor: wl.Listener(*wlr.TabletV2TabletTool.event.SetCursor) =
     wl.Listener(*wlr.TabletV2TabletTool.event.SetCursor).init(handleSetCursor),
 
 pub fn get(wlr_seat: *wlr.Seat, wlr_tool: *wlr.TabletTool) error{OutOfMemory}!*TabletTool {
-    if (@as(?*TabletTool, @alignCast(@ptrCast(wlr_tool.data)))) |tool| {
+    if (@as(?*TabletTool, @ptrFromInt(wlr_tool.data))) |tool| {
         return tool;
     } else {
         return TabletTool.create(wlr_seat, wlr_tool);
@@ -81,7 +81,7 @@ fn create(wlr_seat: *wlr.Seat, wlr_tool: *wlr.TabletTool) error{OutOfMemory}!*Ta
         .wlr_cursor = wlr_cursor,
     };
 
-    wlr_tool.data = tool;
+    wlr_tool.data = @intFromPtr(tool);
 
     wlr_tool.events.destroy.add(&tool.destroy);
     tool.wp_tool.events.set_cursor.add(&tool.set_cursor);
@@ -92,7 +92,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: *TabletTool = @fieldParentPtr("destroy", listener);
 
-    tool.wp_tool.wlr_tool.data = null;
+    tool.wp_tool.wlr_tool.data = 0;
 
     tool.wlr_cursor.destroy();
 
@@ -102,29 +102,24 @@ fn handleDestroy(listener: *wl.Listener(*wlr.TabletTool), _: *wlr.TabletTool) vo
     util.gpa.destroy(tool);
 }
 
-pub fn allowSetCursor(tool: *TabletTool, seat_client: *wlr.Seat.Client, serial: u32) bool {
-    if (tool.wp_tool.focused_surface == null or
-        tool.wp_tool.focused_surface.?.resource.getClient() != seat_client.client)
-    {
-        log.debug("client tried to set cursor without focus", .{});
-        return false;
-    }
-    if (serial != tool.wp_tool.proximity_serial) {
-        log.debug("focused client tried to set cursor with incorrect serial", .{});
-        return false;
-    }
-    return true;
-}
-
 fn handleSetCursor(
     listener: *wl.Listener(*wlr.TabletV2TabletTool.event.SetCursor),
     event: *wlr.TabletV2TabletTool.event.SetCursor,
 ) void {
     const tool: *TabletTool = @fieldParentPtr("set_cursor", listener);
 
-    if (tool.allowSetCursor(event.seat_client, event.serial)) {
+    if (tool.wp_tool.focused_surface == null or
-        tool.wlr_cursor.setSurface(event.surface, event.hotspot_x, event.hotspot_y);
+        tool.wp_tool.focused_surface.?.resource.getClient() != event.seat_client.client)
+    {
+        log.debug("client tried to set cursor without focus", .{});
+        return;
     }
+    if (event.serial != tool.wp_tool.proximity_serial) {
+        log.debug("focused client tried to set cursor with incorrect serial", .{});
+        return;
+    }
+
+    tool.wlr_cursor.setSurface(event.surface, event.hotspot_x, event.hotspot_y);
 }
 
 pub fn axis(tool: *TabletTool, tablet: *Tablet, event: *wlr.Tablet.event.Axis) void {

river/TextInput.zig

@@ -43,7 +43,7 @@ destroy: wl.Listener(*wlr.TextInputV3) =
     wl.Listener(*wlr.TextInputV3).init(handleDestroy),
 
 pub fn create(wlr_text_input: *wlr.TextInputV3) !void {
-    const seat: *Seat = @alignCast(@ptrCast(wlr_text_input.seat.data));
+    const seat: *Seat = @ptrFromInt(wlr_text_input.seat.data);
 
     const text_input = try util.gpa.create(TextInput);
 
@@ -64,7 +64,7 @@ pub fn create(wlr_text_input: *wlr.TextInputV3) !void {
 
 fn handleEnable(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) void {
     const text_input: *TextInput = @fieldParentPtr("enable", listener);
-    const seat: *Seat = @alignCast(@ptrCast(text_input.wlr_text_input.seat.data));
+    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", .{});
@@ -91,7 +91,7 @@ fn handleEnable(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) v
 
 fn handleCommit(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) void {
     const text_input: *TextInput = @fieldParentPtr("commit", listener);
-    const seat: *Seat = @alignCast(@ptrCast(text_input.wlr_text_input.seat.data));
+    const seat: *Seat = @ptrFromInt(text_input.wlr_text_input.seat.data);
 
     if (seat.relay.text_input != text_input) {
         log.err("inactive text input tried to commit an update, client bug?", .{});
@@ -105,7 +105,7 @@ fn handleCommit(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) v
 
 fn handleDisable(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) void {
     const text_input: *TextInput = @fieldParentPtr("disable", listener);
-    const seat: *Seat = @alignCast(@ptrCast(text_input.wlr_text_input.seat.data));
+    const seat: *Seat = @ptrFromInt(text_input.wlr_text_input.seat.data);
 
     if (seat.relay.text_input == text_input) {
         seat.relay.disableTextInput();
@@ -114,7 +114,7 @@ fn handleDisable(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3)
 
 fn handleDestroy(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) void {
     const text_input: *TextInput = @fieldParentPtr("destroy", listener);
-    const seat: *Seat = @alignCast(@ptrCast(text_input.wlr_text_input.seat.data));
+    const seat: *Seat = @ptrFromInt(text_input.wlr_text_input.seat.data);
 
     if (seat.relay.text_input == text_input) {
         seat.relay.disableTextInput();

river/View.zig

@@ -23,7 +23,6 @@ const math = std.math;
 const posix = std.posix;
 const wlr = @import("wlroots");
 const wl = @import("wayland").server.wl;
-const wp = @import("wayland").server.wp;
 
 const server = &@import("main.zig").server;
 const util = @import("util.zig");
@@ -60,12 +59,6 @@ const AttachRelativeMode = enum {
     below,
 };
 
-const TearingMode = enum {
-    no_tearing,
-    tearing,
-    window_hint,
-};
-
 pub const State = struct {
     /// The output the view is currently assigned to.
     /// May be null if there are no outputs or for newly created views.
@@ -184,8 +177,6 @@ foreign_toplevel_handle: ForeignToplevelHandle = .{},
 /// Connector name of the output this view occupied before an evacuation.
 output_before_evac: ?[]const u8 = null,
 
-tearing_mode: TearingMode = .window_hint,
-
 pub fn create(impl: Impl) error{OutOfMemory}!*View {
     assert(impl != .none);
 
@@ -446,11 +437,7 @@ pub fn updateSceneState(view: *View) void {
         for (&view.borders, &border_boxes) |border, *border_box| {
             border_box.x += box.x;
             border_box.y += box.y;
-            if (!border_box.intersection(border_box, &output_box)) {
+            _ = border_box.intersection(border_box, &output_box);
-                // TODO(wlroots): remove this redundant code after fixed upstream
-                // https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5084
-                border_box.* = .{ .x = 0, .y = 0, .width = 0, .height = 0 };
-            }
             border_box.x -= box.x;
             border_box.y -= box.y;
 
@@ -486,7 +473,8 @@ pub fn rootSurface(view: View) ?*wlr.Surface {
 pub fn sendFrameDone(view: View) void {
     assert(view.mapped and !view.destroying);
 
-    const now = posix.clock_gettime(.MONOTONIC) 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);
 }
 
@@ -584,22 +572,6 @@ pub fn getAppId(view: View) ?[*:0]const u8 {
     };
 }
 
-/// Return true if tearing should be allowed for the view.
-pub fn allowTearing(view: *View) bool {
-    switch (view.tearing_mode) {
-        .no_tearing => return false,
-        .tearing => return true,
-        .window_hint => {
-            if (server.config.allow_tearing) {
-                if (view.rootSurface()) |root_surface| {
-                    return server.tearing_control_manager.hintFromSurface(root_surface) == .@"async";
-                }
-            }
-            return false;
-        },
-    }
-}
-
 /// Clamp the width/height of the box to the constraints of the view
 pub fn applyConstraints(view: *View, box: *wlr.Box) void {
     box.width = math.clamp(box.width, view.constraints.min_width, view.constraints.max_width);
@@ -668,10 +640,6 @@ pub fn map(view: *View) !void {
         view.pending.ssd = ssd;
     }
 
-    if (server.config.rules.tearing.match(view)) |tearing| {
-        view.tearing_mode = if (tearing) .tearing else .no_tearing;
-    }
-
     if (server.config.rules.dimensions.match(view)) |dimensions| {
         view.pending.box.width = dimensions.width;
         view.pending.box.height = dimensions.height;
@@ -681,18 +649,8 @@ pub fn map(view: *View) !void {
         server.input_manager.defaultSeat().focused_output;
 
     if (server.config.rules.position.match(view)) |position| {
-        var base_x: i31 = 0;
+        view.pending.box.x = position.x;
-        var base_y: i31 = 0;
+        view.pending.box.y = position.y;
-        switch (position.anchor) {
-            .absolute => {},
-            .mouse => {
-                const cursor = server.input_manager.defaultSeat().wlr_seat.pointer_state;
-                base_x = @intCast(@as(i31, @intFromFloat(cursor.sx)));
-                base_y = @intCast(@as(i31, @intFromFloat(cursor.sy)));
-            },
-        }
-        view.pending.box.x = base_x + position.x;
-        view.pending.box.y = base_y + position.y;
     } else if (output) |o| {
         // Center the initial pending box on the output
         view.pending.box.x = @divTrunc(@max(0, o.usable_box.width - view.pending.box.width), 2);

river/XdgDecoration.zig

@@ -34,7 +34,7 @@ request_mode: wl.Listener(*wlr.XdgToplevelDecorationV1) =
     wl.Listener(*wlr.XdgToplevelDecorationV1).init(handleRequestMode),
 
 pub fn init(wlr_decoration: *wlr.XdgToplevelDecorationV1) void {
-    const toplevel: *XdgToplevel = @alignCast(@ptrCast(wlr_decoration.toplevel.base.data));
+    const toplevel: *XdgToplevel = @ptrFromInt(wlr_decoration.toplevel.base.data);
 
     toplevel.decoration = .{ .wlr_decoration = wlr_decoration };
     const decoration = &toplevel.decoration.?;
@@ -42,13 +42,18 @@ pub fn init(wlr_decoration: *wlr.XdgToplevelDecorationV1) void {
     wlr_decoration.events.destroy.add(&decoration.destroy);
     wlr_decoration.events.request_mode.add(&decoration.request_mode);
 
-    if (toplevel.wlr_toplevel.base.initialized) {
+    const ssd = server.config.rules.ssd.match(toplevel.view) orelse
-        handleRequestMode(&decoration.request_mode, wlr_decoration);
+        (decoration.wlr_decoration.requested_mode != .client_side);
-    }
+
+    // TODO(wlroots): make sure this is properly batched in a single configure
+    // with all other initial state when wlroots makes this possible.
+    _ = wlr_decoration.setMode(if (ssd) .server_side else .client_side);
+
+    toplevel.view.pending.ssd = ssd;
 }
 
 pub fn deinit(decoration: *XdgDecoration) void {
-    const toplevel: *XdgToplevel = @alignCast(@ptrCast(decoration.wlr_decoration.toplevel.base.data));
+    const toplevel: *XdgToplevel = @ptrFromInt(decoration.wlr_decoration.toplevel.base.data);
 
     decoration.destroy.link.remove();
     decoration.request_mode.link.remove();
@@ -72,7 +77,7 @@ fn handleRequestMode(
 ) void {
     const decoration: *XdgDecoration = @fieldParentPtr("request_mode", listener);
 
-    const toplevel: *XdgToplevel = @alignCast(@ptrCast(decoration.wlr_decoration.toplevel.base.data));
+    const toplevel: *XdgToplevel = @ptrFromInt(decoration.wlr_decoration.toplevel.base.data);
     const view = toplevel.view;
 
     const ssd = server.config.rules.ssd.match(toplevel.view) orelse

river/XdgPopup.zig

@@ -35,7 +35,6 @@ root: *wlr.SceneTree,
 tree: *wlr.SceneTree,
 
 destroy: wl.Listener(void) = wl.Listener(void).init(handleDestroy),
-commit: wl.Listener(*wlr.Surface) = wl.Listener(*wlr.Surface).init(handleCommit),
 new_popup: wl.Listener(*wlr.XdgPopup) = wl.Listener(*wlr.XdgPopup).init(handleNewPopup),
 reposition: wl.Listener(void) = wl.Listener(void).init(handleReposition),
 
@@ -54,31 +53,23 @@ pub fn create(
         .tree = try parent.createSceneXdgSurface(wlr_xdg_popup.base),
     };
 
-    wlr_xdg_popup.events.destroy.add(&xdg_popup.destroy);
+    wlr_xdg_popup.base.events.destroy.add(&xdg_popup.destroy);
-    wlr_xdg_popup.base.surface.events.commit.add(&xdg_popup.commit);
     wlr_xdg_popup.base.events.new_popup.add(&xdg_popup.new_popup);
     wlr_xdg_popup.events.reposition.add(&xdg_popup.reposition);
+
+    handleReposition(&xdg_popup.reposition);
 }
 
 fn handleDestroy(listener: *wl.Listener(void)) void {
     const xdg_popup: *XdgPopup = @fieldParentPtr("destroy", listener);
 
     xdg_popup.destroy.link.remove();
-    xdg_popup.commit.link.remove();
     xdg_popup.new_popup.link.remove();
     xdg_popup.reposition.link.remove();
 
     util.gpa.destroy(xdg_popup);
 }
 
-fn handleCommit(listener: *wl.Listener(*wlr.Surface), _: *wlr.Surface) void {
-    const xdg_popup: *XdgPopup = @fieldParentPtr("commit", listener);
-
-    if (xdg_popup.wlr_xdg_popup.base.initial_commit) {
-        handleReposition(&xdg_popup.reposition);
-    }
-}
-
 fn handleNewPopup(listener: *wl.Listener(*wlr.XdgPopup), wlr_xdg_popup: *wlr.XdgPopup) void {
     const xdg_popup: *XdgPopup = @fieldParentPtr("new_popup", listener);
 

river/XdgToplevel.zig

@@ -62,12 +62,12 @@ configure_state: union(enum) {
 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),
 new_popup: wl.Listener(*wlr.XdgPopup) = wl.Listener(*wlr.XdgPopup).init(handleNewPopup),
 
 // Listeners that are only active while the view is mapped
 ack_configure: wl.Listener(*wlr.XdgSurface.Configure) =
     wl.Listener(*wlr.XdgSurface.Configure).init(handleAckConfigure),
+commit: wl.Listener(*wlr.Surface) = wl.Listener(*wlr.Surface).init(handleCommit),
 request_fullscreen: wl.Listener(void) = wl.Listener(void).init(handleRequestFullscreen),
 request_move: wl.Listener(*wlr.XdgToplevel.event.Move) =
     wl.Listener(*wlr.XdgToplevel.event.Move).init(handleRequestMove),
@@ -100,14 +100,15 @@ pub fn create(wlr_toplevel: *wlr.XdgToplevel) error{OutOfMemory}!void {
 
     toplevel.view = view;
 
-    wlr_toplevel.base.data = toplevel;
+    wlr_toplevel.base.data = @intFromPtr(toplevel);
-    wlr_toplevel.base.surface.data = &view.tree.node;
+    wlr_toplevel.base.surface.data = @intFromPtr(&view.tree.node);
 
     // Add listeners that are active over the toplevel's entire lifetime
-    wlr_toplevel.events.destroy.add(&toplevel.destroy);
+    wlr_toplevel.base.events.destroy.add(&toplevel.destroy);
     wlr_toplevel.base.surface.events.map.add(&toplevel.map);
-    wlr_toplevel.base.surface.events.commit.add(&toplevel.commit);
     wlr_toplevel.base.events.new_popup.add(&toplevel.new_popup);
+
+    _ = wlr_toplevel.setWmCapabilities(.{ .fullscreen = true });
 }
 
 /// Send a configure event, applying the inflight state of the view.
@@ -212,11 +213,9 @@ fn handleDestroy(listener: *wl.Listener(void)) void {
     toplevel.destroy.link.remove();
     toplevel.map.link.remove();
     toplevel.unmap.link.remove();
-    toplevel.commit.link.remove();
-    toplevel.new_popup.link.remove();
 
-    // The wlr_surface may outlive the wlr_xdg_toplevel so we must clean up the user data.
+    // The wlr_surface may outlive the wlr_xdg_surface so we must clean up the user data.
-    toplevel.wlr_toplevel.base.surface.data = null;
+    toplevel.wlr_toplevel.base.surface.data = 0;
 
     const view = toplevel.view;
     view.impl = .none;
@@ -229,13 +228,14 @@ fn handleMap(listener: *wl.Listener(void)) void {
 
     // Add listeners that are only active while mapped
     toplevel.wlr_toplevel.base.events.ack_configure.add(&toplevel.ack_configure);
+    toplevel.wlr_toplevel.base.surface.events.commit.add(&toplevel.commit);
     toplevel.wlr_toplevel.events.request_fullscreen.add(&toplevel.request_fullscreen);
     toplevel.wlr_toplevel.events.request_move.add(&toplevel.request_move);
     toplevel.wlr_toplevel.events.request_resize.add(&toplevel.request_resize);
     toplevel.wlr_toplevel.events.set_title.add(&toplevel.set_title);
     toplevel.wlr_toplevel.events.set_app_id.add(&toplevel.set_app_id);
 
-    toplevel.geometry = toplevel.wlr_toplevel.base.geometry;
+    toplevel.wlr_toplevel.base.getGeometry(&toplevel.geometry);
 
     view.pending.box = .{
         .x = 0,
@@ -270,6 +270,7 @@ fn handleUnmap(listener: *wl.Listener(void)) void {
 
     // Remove listeners that are only active while mapped
     toplevel.ack_configure.link.remove();
+    toplevel.commit.link.remove();
     toplevel.request_fullscreen.link.remove();
     toplevel.request_move.link.remove();
     toplevel.request_resize.link.remove();
@@ -308,23 +309,6 @@ fn handleCommit(listener: *wl.Listener(*wlr.Surface), _: *wlr.Surface) void {
     const toplevel: *XdgToplevel = @fieldParentPtr("commit", listener);
     const view = toplevel.view;
 
-    if (toplevel.wlr_toplevel.base.initial_commit) {
-        _ = toplevel.wlr_toplevel.setWmCapabilities(.{ .fullscreen = true });
-
-        if (toplevel.decoration) |decoration| {
-            const ssd = server.config.rules.ssd.match(toplevel.view) orelse
-                (decoration.wlr_decoration.requested_mode != .client_side);
-            _ = decoration.wlr_decoration.setMode(if (ssd) .server_side else .client_side);
-            toplevel.view.pending.ssd = ssd;
-        }
-
-        return;
-    }
-
-    if (!view.mapped) {
-        return;
-    }
-
     {
         const state = &toplevel.wlr_toplevel.current;
         view.constraints = .{
@@ -338,7 +322,7 @@ fn handleCommit(listener: *wl.Listener(*wlr.Surface), _: *wlr.Surface) void {
     switch (toplevel.configure_state) {
         .idle, .committed, .timed_out => {
             const old_geometry = toplevel.geometry;
-            toplevel.geometry = toplevel.wlr_toplevel.base.geometry;
+            toplevel.wlr_toplevel.base.getGeometry(&toplevel.geometry);
 
             const size_changed = toplevel.geometry.width != old_geometry.width or
                 toplevel.geometry.height != old_geometry.height;
@@ -381,7 +365,7 @@ fn handleCommit(listener: *wl.Listener(*wlr.Surface), _: *wlr.Surface) void {
         // stashed buffer from when the transaction started.
         .inflight => view.sendFrameDone(),
         .acked, .timed_out_acked => {
-            toplevel.geometry = toplevel.wlr_toplevel.base.geometry;
+            toplevel.wlr_toplevel.base.getGeometry(&toplevel.geometry);
 
             if (view.inflight.resizing) {
                 view.resizeUpdatePosition(toplevel.geometry.width, toplevel.geometry.height);
@@ -423,7 +407,7 @@ fn handleRequestMove(
     event: *wlr.XdgToplevel.event.Move,
 ) void {
     const toplevel: *XdgToplevel = @fieldParentPtr("request_move", listener);
-    const seat: *Seat = @alignCast(@ptrCast(event.seat.seat.data));
+    const seat: *Seat = @ptrFromInt(event.seat.seat.data);
     const view = toplevel.view;
 
     if (view.pending.fullscreen) return;
@@ -446,7 +430,7 @@ fn handleRequestMove(
 
 fn handleRequestResize(listener: *wl.Listener(*wlr.XdgToplevel.event.Resize), event: *wlr.XdgToplevel.event.Resize) void {
     const toplevel: *XdgToplevel = @fieldParentPtr("request_resize", listener);
-    const seat: *Seat = @alignCast(@ptrCast(event.seat.seat.data));
+    const seat: *Seat = @ptrFromInt(event.seat.seat.data);
     const view = toplevel.view;
 
     if (view.pending.fullscreen) return;

river/XwaylandOverrideRedirect.zig

@@ -120,7 +120,7 @@ fn mapImpl(override_redirect: *XwaylandOverrideRedirect) error{OutOfMemory}!void
         .override_redirect = override_redirect,
     });
 
-    surface.data = &override_redirect.surface_tree.?.node;
+    surface.data = @intFromPtr(&override_redirect.surface_tree.?.node);
 
     override_redirect.surface_tree.?.node.setPosition(
         override_redirect.xwayland_surface.x,
@@ -159,7 +159,7 @@ fn handleUnmap(listener: *wl.Listener(void)) void {
 
     override_redirect.set_geometry.link.remove();
 
-    override_redirect.xwayland_surface.surface.?.data = null;
+    override_redirect.xwayland_surface.surface.?.data = 0;
     override_redirect.surface_tree.?.node.destroy();
     override_redirect.surface_tree = null;
 

river/XwaylandView.zig

@@ -100,16 +100,16 @@ pub fn configure(xwayland_view: XwaylandView) bool {
         xwayland_view.xwayland_surface.height == inflight.box.height and
         (inflight.focus != 0) == (current.focus != 0) and
         (output.inflight.fullscreen == xwayland_view.view) ==
-            (current.output != null and current.output.?.current.fullscreen == xwayland_view.view))
+        (current.output != null and current.output.?.current.fullscreen == xwayland_view.view))
     {
         return false;
     }
 
     xwayland_view.xwayland_surface.configure(
-        math.lossyCast(i16, inflight.box.x + output_box.x),
+        @intCast(inflight.box.x + output_box.x),
-        math.lossyCast(i16, inflight.box.y + output_box.y),
+        @intCast(inflight.box.y + output_box.y),
-        math.lossyCast(u16, inflight.box.width),
+        @intCast(inflight.box.width),
-        math.lossyCast(u16, inflight.box.height),
+        @intCast(inflight.box.height),
     );
 
     xwayland_view.setActivated(inflight.focus != 0);
@@ -164,7 +164,7 @@ pub fn handleMap(listener: *wl.Listener(void)) void {
 
     const xwayland_surface = xwayland_view.xwayland_surface;
     const surface = xwayland_surface.surface.?;
-    surface.data = &view.tree.node;
+    surface.data = @intFromPtr(&view.tree.node);
 
     // Add listeners that are only active while mapped
     xwayland_surface.events.set_title.add(&xwayland_view.set_title);
@@ -215,12 +215,11 @@ pub fn handleMap(listener: *wl.Listener(void)) void {
 fn handleUnmap(listener: *wl.Listener(void)) void {
     const xwayland_view: *XwaylandView = @fieldParentPtr("unmap", listener);
 
-    xwayland_view.xwayland_surface.surface.?.data = null;
+    xwayland_view.xwayland_surface.surface.?.data = 0;
 
     // Remove listeners that are only active while mapped
     xwayland_view.set_title.link.remove();
     xwayland_view.set_class.link.remove();
-    xwayland_view.set_decorations.link.remove();
     xwayland_view.request_fullscreen.link.remove();
     xwayland_view.request_minimize.link.remove();
 

river/command.zig

@@ -41,7 +41,6 @@ const command_impls = std.StaticStringMap(
 ).initComptime(
     .{
         // zig fmt: off
-        .{ "allow-tearing",             @import("command/config.zig").allowTearing },
         .{ "attach-mode",               @import("command/attach_mode.zig").defaultAttachMode },
         .{ "background-color",          @import("command/config.zig").backgroundColor },
         .{ "border-color-focused",      @import("command/config.zig").borderColorFocused },

river/command/config.zig

@@ -24,20 +24,6 @@ const Error = @import("../command.zig").Error;
 const Seat = @import("../Seat.zig");
 const Config = @import("../Config.zig");
 
-pub fn allowTearing(
-    _: *Seat,
-    args: []const [:0]const u8,
-    _: *?[]const u8,
-) Error!void {
-    if (args.len < 2) return Error.NotEnoughArguments;
-    if (args.len > 2) return Error.TooManyArguments;
-
-    const arg = std.meta.stringToEnum(enum { enabled, disabled }, args[1]) orelse
-        return Error.UnknownOption;
-
-    server.config.allow_tearing = arg == .enabled;
-}
-
 pub fn borderWidth(
     _: *Seat,
     args: []const [:0]const u8,

river/command/keyboard_group.zig

@@ -24,13 +24,77 @@ const util = @import("../util.zig");
 
 const Error = @import("../command.zig").Error;
 const Seat = @import("../Seat.zig");
+const KeyboardGroup = @import("../KeyboardGroup.zig");
 
-pub const keyboardGroupCreate = keyboardGroupDeprecated;
+pub fn keyboardGroupCreate(
-pub const keyboardGroupDestroy = keyboardGroupDeprecated;
+    seat: *Seat,
-pub const keyboardGroupAdd = keyboardGroupDeprecated;
+    args: []const [:0]const u8,
-pub const keyboardGroupRemove = keyboardGroupDeprecated;
+    out: *?[]const u8,
+) Error!void {
+    if (args.len < 2) return Error.NotEnoughArguments;
+    if (args.len > 2) return Error.TooManyArguments;
 
-fn keyboardGroupDeprecated(_: *Seat, _: []const [:0]const u8, out: *?[]const u8) Error!void {
+    if (keyboardGroupFromName(seat, args[1]) != null) {
-    out.* = try util.gpa.dupe(u8, "warning: explicit keyboard groups are deprecated, " ++
+        const msg = try util.gpa.dupe(u8, "error: failed to create keybaord group: group of same name already exists\n");
-        "all keyboards are now automatically added to a single group\n");
+        out.* = msg;
+        return;
+    }
+
+    try KeyboardGroup.create(seat, args[1]);
+}
+
+pub fn keyboardGroupDestroy(
+    seat: *Seat,
+    args: []const [:0]const u8,
+    out: *?[]const u8,
+) Error!void {
+    if (args.len < 2) return Error.NotEnoughArguments;
+    if (args.len > 2) return Error.TooManyArguments;
+    const group = keyboardGroupFromName(seat, args[1]) orelse {
+        const msg = try util.gpa.dupe(u8, "error: no keyboard group with that name exists\n");
+        out.* = msg;
+        return;
+    };
+    group.destroy();
+}
+
+pub fn keyboardGroupAdd(
+    seat: *Seat,
+    args: []const [:0]const u8,
+    out: *?[]const u8,
+) Error!void {
+    if (args.len < 3) return Error.NotEnoughArguments;
+    if (args.len > 3) return Error.TooManyArguments;
+
+    const group = keyboardGroupFromName(seat, args[1]) orelse {
+        const msg = try util.gpa.dupe(u8, "error: no keyboard group with that name exists\n");
+        out.* = msg;
+        return;
+    };
+    try globber.validate(args[2]);
+    try group.addIdentifier(args[2]);
+}
+
+pub fn keyboardGroupRemove(
+    seat: *Seat,
+    args: []const [:0]const u8,
+    out: *?[]const u8,
+) Error!void {
+    if (args.len < 3) return Error.NotEnoughArguments;
+    if (args.len > 3) return Error.TooManyArguments;
+
+    const group = keyboardGroupFromName(seat, args[1]) orelse {
+        const msg = try util.gpa.dupe(u8, "error: no keyboard group with that name exists\n");
+        out.* = msg;
+        return;
+    };
+    try group.removeIdentifier(args[2]);
+}
+
+fn keyboardGroupFromName(seat: *Seat, name: []const u8) ?*KeyboardGroup {
+    var it = seat.keyboard_groups.first;
+    while (it) |node| : (it = node.next) {
+        if (mem.eql(u8, node.data.name, name)) return &node.data;
+    }
+    return null;
 }

river/command/map.zig

@@ -285,7 +285,7 @@ fn parseKeysym(name: [:0]const u8, out: *?[]const u8) !xkb.Keysym {
 }
 
 fn parseModifiers(modifiers_str: []const u8, out: *?[]const u8) !wlr.Keyboard.ModifierMask {
-    var it = mem.splitScalar(u8, modifiers_str, '+');
+    var it = mem.split(u8, modifiers_str, "+");
     var modifiers = wlr.Keyboard.ModifierMask{};
     outer: while (it.next()) |mod_name| {
         if (mem.eql(u8, mod_name, "None")) continue;

river/command/output.zig

@@ -109,7 +109,7 @@ fn getOutput(seat: *Seat, str: []const u8) !?*Output {
                 .previous => link.prev.?,
             };
         }
-        return @fieldParentPtr("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);
@@ -121,7 +121,7 @@ fn getOutput(seat: *Seat, str: []const u8) !?*Output {
             @floatFromInt(focus_box.x + @divTrunc(focus_box.width, 2)),
             @floatFromInt(focus_box.y + @divTrunc(focus_box.height, 2)),
         ) orelse return null;
-        return @alignCast(@ptrCast(wlr_output.data));
+        return @as(*Output, @ptrFromInt(wlr_output.data));
     } else {
         // Check if an output matches by name
         var it = server.root.active_outputs.iterator(.forward);

river/command/rule.zig

@@ -26,8 +26,6 @@ const util = @import("../util.zig");
 const Error = @import("../command.zig").Error;
 const Seat = @import("../Seat.zig");
 const View = @import("../View.zig");
-const Anchor = @import("../Config.zig").Anchor;
-const RuleGlobs = @import("../rule_list.zig").RuleGlobs;
 
 const Action = enum {
     float,
@@ -37,14 +35,9 @@ const Action = enum {
     tags,
     output,
     position,
-    @"relative-position",
     dimensions,
     fullscreen,
     @"no-fullscreen",
-    tearing,
-    @"no-tearing",
-    warp,
-    @"no-warp",
 };
 
 pub fn ruleAdd(_: *Seat, args: []const [:0]const u8, _: *?[]const u8) Error!void {
@@ -60,10 +53,9 @@ pub fn ruleAdd(_: *Seat, args: []const [:0]const u8, _: *?[]const u8) Error!void
     const action = std.meta.stringToEnum(Action, result.args[0]) orelse return Error.UnknownOption;
 
     const positional_arguments_count: u8 = switch (action) {
-        .float, .@"no-float", .ssd, .csd, .fullscreen, .@"no-fullscreen", .tearing, .@"no-tearing", .warp, .@"no-warp" => 1,
+        .float, .@"no-float", .ssd, .csd, .fullscreen, .@"no-fullscreen" => 1,
         .tags, .output => 2,
         .position, .dimensions => 3,
-        .@"relative-position" => 4,
     };
     if (result.args.len > positional_arguments_count) return Error.TooManyArguments;
     if (result.args.len < positional_arguments_count) return Error.NotEnoughArguments;
@@ -91,14 +83,6 @@ pub fn ruleAdd(_: *Seat, args: []const [:0]const u8, _: *?[]const u8) Error!void
             apply_ssd_rules();
             server.root.applyPending();
         },
-        .tearing, .@"no-tearing" => {
-            try server.config.rules.tearing.add(.{
-                .app_id_glob = app_id_glob,
-                .title_glob = title_glob,
-                .value = (action == .tearing),
-            });
-            apply_tearing_rules();
-        },
         .tags => {
             const tags = try fmt.parseInt(u32, result.args[1], 10);
             try server.config.rules.tags.add(.{
@@ -117,32 +101,14 @@ pub fn ruleAdd(_: *Seat, args: []const [:0]const u8, _: *?[]const u8) Error!void
             });
         },
         .position => {
-            const x = try fmt.parseInt(i31, result.args[1], 10);
+            const x = try fmt.parseInt(u31, result.args[1], 10);
-            const y = try fmt.parseInt(i31, result.args[2], 10);
+            const y = try fmt.parseInt(u31, result.args[2], 10);
-            if (x < 0 or y < 0) return Error.OutOfBounds;
             try server.config.rules.position.add(.{
                 .app_id_glob = app_id_glob,
                 .title_glob = title_glob,
                 .value = .{
-                    .anchor = .absolute,
+                    .x = x,
-                    .x = @intCast(x),
+                    .y = y,
-                    .y = @intCast(y),
-                },
-            });
-        },
-        .@"relative-position" => {
-            const anchor = std.meta.stringToEnum(Anchor, result.args[1]) orelse return Error.UnknownOption;
-            // force the use of the normal position command for absolute positions
-            if (anchor == .absolute) return Error.UnknownOption;
-            const x_off = try fmt.parseInt(i31, result.args[2], 10);
-            const y_off = try fmt.parseInt(i31, result.args[3], 10);
-            try server.config.rules.position.add(.{
-                .app_id_glob = app_id_glob,
-                .title_glob = title_glob,
-                .value = .{
-                    .anchor = anchor,
-                    .x = x_off,
-                    .y = y_off,
                 },
             });
         },
@@ -165,13 +131,6 @@ pub fn ruleAdd(_: *Seat, args: []const [:0]const u8, _: *?[]const u8) Error!void
                 .value = (action == .fullscreen),
             });
         },
-        .warp, .@"no-warp" => {
-            try server.config.rules.warp.add(.{
-                .app_id_glob = app_id_glob,
-                .title_glob = title_glob,
-                .value = (action == .warp),
-            });
-        },
     }
 }
 
@@ -188,7 +147,7 @@ pub fn ruleDel(_: *Seat, args: []const [:0]const u8, _: *?[]const u8) Error!void
 
     const action = std.meta.stringToEnum(Action, result.args[0]) orelse return Error.UnknownOption;
 
-    const rule: RuleGlobs = .{
+    const rule = .{
         .app_id_glob = result.flags.@"app-id" orelse "*",
         .title_glob = result.flags.title orelse "*",
     };
@@ -209,7 +168,7 @@ pub fn ruleDel(_: *Seat, args: []const [:0]const u8, _: *?[]const u8) Error!void
                 util.gpa.free(output_rule);
             }
         },
-        .position, .@"relative-position" => {
+        .position => {
             _ = server.config.rules.position.del(rule);
         },
         .dimensions => {
@@ -218,13 +177,6 @@ pub fn ruleDel(_: *Seat, args: []const [:0]const u8, _: *?[]const u8) Error!void
         .fullscreen, .@"no-fullscreen" => {
             _ = server.config.rules.fullscreen.del(rule);
         },
-        .tearing, .@"no-tearing" => {
-            _ = server.config.rules.tearing.del(rule);
-            apply_tearing_rules();
-        },
-        .warp, .@"no-warp" => {
-            _ = server.config.rules.warp.del(rule);
-        },
     }
 }
 
@@ -239,17 +191,6 @@ fn apply_ssd_rules() void {
     }
 }
 
-fn apply_tearing_rules() void {
-    var it = server.root.views.iterator(.forward);
-    while (it.next()) |view| {
-        if (view.destroying) continue;
-
-        if (server.config.rules.tearing.match(view)) |tearing| {
-            view.tearing_mode = if (tearing) .tearing else .no_tearing;
-        }
-    }
-}
-
 pub fn listRules(_: *Seat, args: []const [:0]const u8, out: *?[]const u8) Error!void {
     if (args.len < 2) return error.NotEnoughArguments;
     if (args.len > 2) return error.TooManyArguments;
@@ -262,8 +203,6 @@ pub fn listRules(_: *Seat, args: []const [:0]const u8, out: *?[]const u8) Error!
         position,
         dimensions,
         fullscreen,
-        tearing,
-        warp,
     }, args[1]) orelse return Error.UnknownOption;
     const max_glob_len = switch (rule_list) {
         inline else => |list| @field(server.config.rules, @tagName(list)).getMaxGlobLen(),
@@ -279,14 +218,12 @@ pub fn listRules(_: *Seat, args: []const [:0]const u8, out: *?[]const u8) Error!
     try writer.writeAll("action\n");
 
     switch (rule_list) {
-        inline .float, .ssd, .output, .fullscreen, .tearing, .warp => |list| {
+        inline .float, .ssd, .output, .fullscreen => |list| {
             const rules = switch (list) {
                 .float => server.config.rules.float.rules.items,
                 .ssd => server.config.rules.ssd.rules.items,
                 .output => server.config.rules.output.rules.items,
                 .fullscreen => server.config.rules.fullscreen.rules.items,
-                .tearing => server.config.rules.tearing.rules.items,
-                .warp => server.config.rules.warp.rules.items,
                 else => unreachable,
             };
             for (rules) |rule| {
@@ -297,8 +234,6 @@ pub fn listRules(_: *Seat, args: []const [:0]const u8, out: *?[]const u8) Error!
                     .ssd => if (rule.value) "ssd" else "csd",
                     .output => rule.value,
                     .fullscreen => if (rule.value) "fullscreen" else "no-fullscreen",
-                    .tearing => if (rule.value) "tearing" else "no-tearing",
-                    .warp => if (rule.value) "warp" else "no-warp",
                     else => unreachable,
                 }});
             }
@@ -314,7 +249,7 @@ pub fn listRules(_: *Seat, args: []const [:0]const u8, out: *?[]const u8) Error!
             for (server.config.rules.position.rules.items) |rule| {
                 try fmt.formatBuf(rule.title_glob, .{ .width = title_column_max, .alignment = .left }, writer);
                 try fmt.formatBuf(rule.app_id_glob, .{ .width = app_id_column_max, .alignment = .left }, writer);
-                try writer.print("{s},{d},{d}", .{ @tagName(rule.value.anchor), rule.value.x, rule.value.y });
+                try writer.print("{d},{d}\n", .{ rule.value.x, rule.value.y });
             }
         },
         .dimensions => {

river/main.zig

@@ -31,6 +31,12 @@ const process = @import("process.zig");
 
 const Server = @import("Server.zig");
 
+comptime {
+    if (wlr.version.major != 0 or wlr.version.minor != 17 or wlr.version.micro < 2) {
+        @compileError("river requires at least wlroots version 0.17.2 due to bugs in wlroots 0.17.0/0.17.1");
+    }
+}
+
 const usage: []const u8 =
     \\usage: river [options]
     \\
@@ -84,7 +90,7 @@ pub fn main() anyerror!void {
             posix.exit(1);
         }
     }
-    const runtime_xwayland = !result.flags.@"no-xwayland";
+    const enable_xwayland = !result.flags.@"no-xwayland";
     const startup_command = blk: {
         if (result.flags.c) |command| {
             break :blk try util.gpa.dupeZ(u8, command);
@@ -95,25 +101,17 @@ pub fn main() anyerror!void {
 
     log.info("river version {s}, initializing server", .{build_options.version});
 
+    process.setup();
+
     river_init_wlroots_log(switch (runtime_log_level) {
         .debug => .debug,
         .info => .info,
         .warn, .err => .err,
     });
 
-    try server.init(runtime_xwayland);
+    try server.init(enable_xwayland);
     defer server.deinit();
 
-    // wlroots starts the Xwayland process from an idle event source, the reasoning being that
-    // this gives the compositor time to set up event listeners before Xwayland is actually
-    // started. We want Xwayland to be started by wlroots before we modify our rlimits in
-    // process.setup() since wlroots does not offer a way for us to reset the rlimit post-fork.
-    if (build_options.xwayland and runtime_xwayland) {
-        server.wl_server.getEventLoop().dispatchIdle();
-    }
-
-    process.setup();
-
     try server.start();
 
     // Run the child in a new process group so that we can send SIGTERM to all

river/process.zig

@@ -29,7 +29,7 @@ pub fn setup() void {
         .mask = posix.empty_sigset,
         .flags = 0,
     };
-    posix.sigaction(posix.SIG.PIPE, &sig_ign, null);
+    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
@@ -68,7 +68,7 @@ pub fn cleanupChild() void {
         .mask = posix.empty_sigset,
         .flags = 0,
     };
-    posix.sigaction(posix.SIG.PIPE, &sig_dfl, null);
+    posix.sigaction(posix.SIG.PIPE, &sig_dfl, null) catch unreachable;
 
     if (original_rlimit) |original| {
         posix.setrlimit(.NOFILE, original) catch {

river/rule_list.zig

@@ -23,11 +23,6 @@ const util = @import("util.zig");
 
 const View = @import("View.zig");
 
-pub const RuleGlobs = struct {
-    app_id_glob: []const u8,
-    title_glob: []const u8,
-};
-
 pub const MaxGlobLen = struct {
     app_id: usize,
     title: usize,
@@ -88,7 +83,7 @@ pub fn RuleList(comptime T: type) type {
             });
         }
 
-        pub fn del(list: *List, rule: RuleGlobs) ?T {
+        pub fn del(list: *List, rule: struct { app_id_glob: []const u8, title_glob: []const u8 }) ?T {
             for (list.rules.items, 0..) |existing, i| {
                 if (mem.eql(u8, rule.app_id_glob, existing.app_id_glob) and
                     mem.eql(u8, rule.title_glob, existing.title_glob))

riverctl/main.zig

@@ -110,10 +110,10 @@ fn _main() !void {
 fn registryListener(registry: *wl.Registry, event: wl.Registry.Event, globals: *Globals) void {
     switch (event) {
         .global => |global| {
-            if (mem.orderZ(u8, global.interface, wl.Seat.interface.name) == .eq) {
+            if (mem.orderZ(u8, global.interface, wl.Seat.getInterface().name) == .eq) {
                 assert(globals.seat == null); // TODO: support multiple seats
                 globals.seat = registry.bind(global.name, wl.Seat, 1) catch @panic("out of memory");
-            } else if (mem.orderZ(u8, global.interface, zriver.ControlV1.interface.name) == .eq) {
+            } else if (mem.orderZ(u8, global.interface, zriver.ControlV1.getInterface().name) == .eq) {
                 globals.control = registry.bind(global.name, zriver.ControlV1, 1) catch @panic("out of memory");
             }
         },

rivertile/main.zig

@@ -91,12 +91,12 @@ const gpa = std.heap.c_allocator;
 const Context = struct {
     initialized: bool = false,
     layout_manager: ?*river.LayoutManagerV3 = null,
-    outputs: std.DoublyLinkedList(Output) = .{},
+    outputs: std.TailQueue(Output) = .{},
 
     fn addOutput(context: *Context, registry: *wl.Registry, name: u32) !void {
         const wl_output = try registry.bind(name, wl.Output, 3);
         errdefer wl_output.release();
-        const node = try gpa.create(std.DoublyLinkedList(Output).Node);
+        const node = try gpa.create(std.TailQueue(Output).Node);
         errdefer gpa.destroy(node);
         try node.data.init(context, wl_output, name);
         context.outputs.append(node);
@@ -140,7 +140,7 @@ const Output = struct {
             .namespace_in_use => fatal("namespace 'rivertile' already in use.", .{}),
 
             .user_command => |ev| {
-                var it = mem.tokenizeScalar(u8, mem.span(ev.command), ' ');
+                var it = mem.tokenize(u8, mem.span(ev.command), " ");
                 const raw_cmd = it.next() orelse {
                     std.log.err("not enough arguments", .{});
                     return;
@@ -382,9 +382,9 @@ pub fn main() !void {
 fn registryListener(registry: *wl.Registry, event: wl.Registry.Event, context: *Context) void {
     switch (event) {
         .global => |global| {
-            if (mem.orderZ(u8, global.interface, river.LayoutManagerV3.interface.name) == .eq) {
+            if (mem.orderZ(u8, global.interface, river.LayoutManagerV3.getInterface().name) == .eq) {
                 context.layout_manager = registry.bind(global.name, river.LayoutManagerV3, 1) catch return;
-            } else if (mem.orderZ(u8, global.interface, wl.Output.interface.name) == .eq) {
+            } else if (mem.orderZ(u8, global.interface, wl.Output.getInterface().name) == .eq) {
                 context.addOutput(registry, global.name) catch |err| fatal("failed to bind output: {}", .{err});
             }
         },