.builds/alpine.yml

@@ -40,17 +40,16 @@ tasks:
       sudo ninja -C build/ install
       cd ..
 
-      # Eat Github's resources rather than the Zig Software Foundation's resources!
+      wget -nv https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.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.13.0.tar.xz
       sudo mv zig-linux-x86_64-0.13.0/zig /usr/bin/
       sudo mv zig-linux-x86_64-0.13.0/lib /usr/lib/zig
   - build: |
       cd river
-      zig build --summary all
+      zig build
   - build_xwayland: |
       cd river
-      zig build --summary all -Dxwayland
+      zig build -Dxwayland
   - fmt: |
       cd river
       zig fmt --check river/

.builds/archlinux.yml

@@ -38,17 +38,16 @@ tasks:
       sudo ninja -C build/ install
       cd ..
 
-      # Eat Github's resources rather than the Zig Software Foundation's resources!
+      wget -nv https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.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.13.0.tar.xz
       sudo mv zig-linux-x86_64-0.13.0/zig /usr/bin/
       sudo mv zig-linux-x86_64-0.13.0/lib /usr/lib/zig
   - build: |
       cd river
-      zig build --summary all
+      zig build
   - build_xwayland: |
       cd river
-      zig build --summary all -Dxwayland
+      zig build -Dxwayland
   - fmt: |
       cd river
       zig fmt --check river/

.builds/freebsd.yml

@@ -1,62 +0,0 @@
-image: freebsd/latest
-packages:
-  - devel/evdev-proto
-  - devel/libevdev
-  - devel/libepoll-shim
-  - devel/libudev-devd
-  - devel/meson
-  - devel/pkgconf
-  - graphics/mesa-libs
-  - graphics/wayland-protocols
-  - misc/hwdata
-  - x11/libX11
-  - x11/libinput
-  - x11/libxcb
-  - x11/libxkbcommon
-  - x11/pixman
-  - x11/xcb-util-errors
-  - x11/xcb-util-renderutil
-  - x11/xcb-util-wm
-  - x11-servers/xwayland
-  - security/ca_root_nss
-  - sysutils/seatd
-  - sysutils/libdisplay-info
-  - gmake
-  - scdoc
-  - wget
-sources:
-  - https://codeberg.org/river/river
-  - https://gitlab.freedesktop.org/wayland/wayland.git
-  - https://gitlab.freedesktop.org/wlroots/wlroots.git
-tasks:
-  - install_deps: |
-      cd wayland
-      git checkout 1.22.0
-      meson setup build -Ddocumentation=false -Dtests=false --prefix /usr
-      sudo ninja -C build install
-      cd ..
-
-      cd wlroots
-      git checkout 0.17.2
-      meson setup build --auto-features=enabled -Drenderers=gles2 -Dexamples=false \
-            -Dwerror=false -Db_ndebug=false --prefix /usr
-      sudo ninja -C build/ install
-      cd ..
-
-      # Eat Github's resources rather than the Zig Software Foundation's resources!
-      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.13.0.tar.xz
-      sudo mv zig-freebsd-x86_64-0.13.0/zig /usr/bin/
-      sudo mv zig-freebsd-x86_64-0.13.0/lib /usr/lib/zig
-  - build: |
-      cd river
-      zig build --summary all
-  - build_xwayland: |
-      cd river
-      zig build --summary all -Dxwayland
-  - fmt: |
-      cd river
-      zig fmt --check river/
-      zig fmt --check riverctl/
-      zig fmt --check rivertile/
-      zig fmt --check build.zig

river/LayerSurface.zig

@@ -55,6 +55,7 @@ pub fn create(wlr_layer_surface: *wlr.LayerSurfaceV1) error{OutOfMemory}!void {
         .scene_layer_surface = try layer_tree.createSceneLayerSurfaceV1(wlr_layer_surface),
         .popup_tree = try output.layers.popups.createSceneTree(),
     };
+    wlr_layer_surface.data = @intFromPtr(layer_surface);
 
     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 });
@@ -92,9 +93,6 @@ fn handleDestroy(listener: *wl.Listener(*wlr.LayerSurfaceV1), _: *wlr.LayerSurfa
 
     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 = 0;
-
     util.gpa.destroy(layer_surface);
 }
 

river/LockSurface.zig

@@ -85,9 +85,6 @@ pub fn destroy(lock_surface: *LockSurface) void {
     lock_surface.map.link.remove();
     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 = 0;
-
     util.gpa.destroy(lock_surface);
 }
 

river/Root.zig

@@ -416,9 +416,6 @@ pub fn activateOutput(root: *Root, output: *Output) void {
     }
     assert(root.fallback_pending.focus_stack.empty());
     assert(root.fallback_pending.wm_stack.empty());
-
-    // Enforce map-to-output configuration for the newly active output.
-    server.input_manager.reconfigureDevices();
 }
 
 /// Trigger asynchronous application of pending state for all outputs and views.