Use waybackend for our wayland code

.github/workflows/check.yml

@@ -17,6 +17,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy
+      - run: sudo apt install -y libwayland-dev wayland-protocols
       - run: cargo clippy --version
       - run: cargo clippy --workspace --locked --tests
 

.github/workflows/nix-tests.yml

@@ -13,5 +13,6 @@ jobs:
           experimental-features = nix-command flakes
           access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
     - run: nix flake show
+    - run: nix-env -i nixpkgs#wayland nixpkgs#wayland-protocols
     - run: nix flake check --print-build-logs
     - run: nix build --print-build-logs

.github/workflows/test.yml

@@ -16,6 +16,7 @@ jobs:
       - uses: mozilla-actions/[email protected]
       - uses: dtolnay/rust-toolchain@nightly
       - uses: taiki-e/install-action@cargo-nextest
+      - run: sudo apt install -y libwayland-dev wayland-protocols
       - run: cargo build --workspace --locked --verbose
       - run: cargo nextest run --workspace --locked
 
@@ -26,6 +27,7 @@ jobs:
       - uses: mozilla-actions/[email protected]
       - uses: dtolnay/rust-toolchain@stable
       - uses: taiki-e/install-action@cargo-nextest
+      - run: sudo apt install -y libwayland-dev wayland-protocols
       - run: cargo build --workspace --locked --verbose
       - run: cargo nextest run --workspace --locked
 
@@ -43,5 +45,6 @@ jobs:
         with:
           toolchain: ${{ steps.msrv.outputs.value }}
       - uses: taiki-e/install-action@cargo-nextest
+      - run: sudo apt install -y libwayland-dev wayland-protocols
       - run: cargo build --workspace --locked --verbose
       - run: cargo nextest run --workspace --locked

.gitignore

@@ -1,5 +1,5 @@
 target/*
 completions/*
-test_images/*
+tests/test_images/*
 # Nix
 result

Cargo.toml

@@ -1,15 +1,15 @@
 [workspace]
 # cargo complains that this defaults to one in virtual package manifests (for some reason)
 resolver = "2"
-members = ["client", "daemon", "common"]
+members = ["client", "daemon", "common", "tests"]
 default-members = ["client", "daemon"]
 
 [workspace.package]
 version = "0.9.5-masterV3"
 authors = ["Leonardo Gibrowski Faé <[email protected]>"]
 edition = "2021"
 license-file = "LICENSE"
-rust-version = "1.82"
+rust-version = "1.85"
 
 [workspace.dependencies]
 common = { path = "common" }

README.md

@@ -6,9 +6,7 @@
 
 ## Dependencies
 
- - a compositor that implements:
-   * wlr-layer-shell (typically wlroots based compositors)
-   * xdg-output
+ - a compositor that implements the wlr-layer-shell (typically wlroots based compositors)
  - [lz4](https://github.com/lz4/lz4) (for compressing frames when animating)
 
 **Note that this means `swww` will not run on Gnome, because it does not implement the `wlr-layer-shell` protocol**.
@@ -21,7 +19,8 @@
 
 ### Dependencies:
 
-  - Up to date stable rustc compiler and cargo (specifically, MSRV is 1.82.0)
+ - wayland-client and wayland-protocol `.xml` files installed in your system (`pkg-config` must be able to find it)
+ - Up to date stable rustc compiler and cargo (specifically, MSRV is 1.82.0)
 
 To build, clone this repository and run:
 ```

client/Cargo.toml

@@ -28,14 +28,11 @@ image = { version = "0.25", default-features = false, features = [
   "tiff",
   "webp",
 ] }
-fast_image_resize = "5.0"
+fast_image_resize = "5.1"
 clap = { version = "4.5", features = ["derive", "wrap_help", "env"] }
-fastrand = { version = "2.1", default-features = false, features = ["std"] }
+fastrand = { version = "2.3", default-features = false, features = ["std"] }
 common = { workspace = true }
 
-[dev-dependencies]
-assert_cmd = "2.0"
-
 [build-dependencies]
 clap = { version = "4.5", features = ["derive", "env"] }
 clap_complete = "4.5"

common/Cargo.toml

@@ -10,7 +10,7 @@ license-file.workspace = true
 workspace = true
 
 [dependencies]
-rustix = { version = "0.38", default-features = false, features = [
+rustix = { version = "1.0", default-features = false, features = [
   "std",
   "net",
   "shm",
@@ -23,7 +23,7 @@ rustix = { version = "0.38", default-features = false, features = [
 pkg-config = "0.3"
 
 [dev-dependencies]
-fastrand = { version = "2.1", default-features = false, features = ["std"] }
+fastrand = { version = "2.3", default-features = false, features = ["std"] }
 criterion = { version = "0.5", default-features = false }
 
 [[bench]]

common/src/compression/comp/mod.rs

@@ -142,7 +142,11 @@ mod tests {
             for x in &mut b[..i] {
                 *x = 1;
             }
-            assert_eq!(unsafe { count_different(&a, &b, 0) }, (i + 2) / 3, "i: {i}");
+            assert_eq!(
+                unsafe { count_different(&a, &b, 0) },
+                i.div_ceil(3),
+                "i: {i}"
+            );
         }
     }
 }