Skip to content
This repository was archived by the owner on Oct 31, 2025. It is now read-only.

Commit 97ef589

Browse files
authored
Merge pull request #410 from LGFae/waybackend
Use `waybackend` for our wayland code
2 parents 9220158 + ffb7cd2 commit 97ef589

32 files changed

+1202
-3801
lines changed

.github/workflows/check.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,19 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v4
16-
- uses: mozilla-actions/[email protected].3
16+
- uses: mozilla-actions/[email protected].9
1717
- uses: dtolnay/rust-toolchain@stable
1818
with:
1919
components: clippy
20+
- run: sudo apt install -y libwayland-dev wayland-protocols
2021
- run: cargo clippy --version
2122
- run: cargo clippy --workspace --locked --tests
2223

2324
fmt:
2425
runs-on: ubuntu-latest
2526
steps:
2627
- uses: actions/checkout@v4
27-
- uses: mozilla-actions/[email protected].3
28+
- uses: mozilla-actions/[email protected].9
2829
- uses: dtolnay/rust-toolchain@stable
2930
with:
3031
components: rustfmt

.github/workflows/dependencies.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v4
16-
- uses: mozilla-actions/[email protected].3
16+
- uses: mozilla-actions/[email protected].9
1717
- uses: dtolnay/rust-toolchain@stable
1818
- uses: taiki-e/install-action@cargo-deny
1919
- run: cargo deny check advisories
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- uses: actions/checkout@v4
25-
- uses: mozilla-actions/[email protected].3
25+
- uses: mozilla-actions/[email protected].9
2626
- uses: dtolnay/rust-toolchain@stable
2727
- uses: taiki-e/install-action@cargo-deny
2828
- run: cargo deny check bans
@@ -31,7 +31,7 @@ jobs:
3131
runs-on: ubuntu-latest
3232
steps:
3333
- uses: actions/checkout@v4
34-
- uses: mozilla-actions/[email protected].3
34+
- uses: mozilla-actions/[email protected].9
3535
- uses: dtolnay/rust-toolchain@stable
3636
- uses: taiki-e/install-action@cargo-deny
3737
- run: cargo deny check licenses
@@ -40,7 +40,7 @@ jobs:
4040
runs-on: ubuntu-latest
4141
steps:
4242
- uses: actions/checkout@v4
43-
- uses: mozilla-actions/[email protected].3
43+
- uses: mozilla-actions/[email protected].9
4444
- uses: dtolnay/rust-toolchain@stable
4545
- uses: taiki-e/install-action@cargo-deny
4646
- run: cargo deny check sources

.github/workflows/test.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,29 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v4
16-
- uses: mozilla-actions/[email protected].3
16+
- uses: mozilla-actions/[email protected].9
1717
- uses: dtolnay/rust-toolchain@nightly
1818
- uses: taiki-e/install-action@cargo-nextest
19+
- run: sudo apt install -y libwayland-dev wayland-protocols
1920
- run: cargo build --workspace --locked --verbose
2021
- run: cargo nextest run --workspace --locked
2122

2223
stable:
2324
runs-on: ubuntu-latest
2425
steps:
2526
- uses: actions/checkout@v4
26-
- uses: mozilla-actions/[email protected].3
27+
- uses: mozilla-actions/[email protected].9
2728
- uses: dtolnay/rust-toolchain@stable
2829
- uses: taiki-e/install-action@cargo-nextest
30+
- run: sudo apt install -y libwayland-dev wayland-protocols
2931
- run: cargo build --workspace --locked --verbose
3032
- run: cargo nextest run --workspace --locked
3133

3234
msrv:
3335
runs-on: ubuntu-latest
3436
steps:
3537
- uses: actions/checkout@v4
36-
- uses: mozilla-actions/[email protected].3
38+
- uses: mozilla-actions/[email protected].9
3739
- uses: SebRollen/[email protected]
3840
id: msrv
3941
with:
@@ -43,5 +45,6 @@ jobs:
4345
with:
4446
toolchain: ${{ steps.msrv.outputs.value }}
4547
- uses: taiki-e/install-action@cargo-nextest
48+
- run: sudo apt install -y libwayland-dev wayland-protocols
4649
- run: cargo build --workspace --locked --verbose
4750
- run: cargo nextest run --workspace --locked

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
target/*
22
completions/*
3-
test_images/*
3+
tests/test_images/*
44
# Nix
55
result

Cargo.lock

Lines changed: 66 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[workspace]
22
# cargo complains that this defaults to one in virtual package manifests (for some reason)
33
resolver = "2"
4-
members = ["client", "daemon", "common"]
4+
members = ["client", "daemon", "common", "tests"]
55
default-members = ["client", "daemon"]
66

77
[workspace.package]
88
version = "0.9.5-masterV3"
99
authors = ["Leonardo Gibrowski Faé <[email protected]>"]
1010
edition = "2021"
1111
license-file = "LICENSE"
12-
rust-version = "1.82"
12+
rust-version = "1.85"
1313

1414
[workspace.dependencies]
1515
common = { path = "common" }

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
## Dependencies
88

9-
- a compositor that implements:
10-
* wlr-layer-shell (typically wlroots based compositors)
11-
* xdg-output
9+
- a compositor that implements the wlr-layer-shell (typically wlroots based compositors)
1210
- [lz4](https://github.com/lz4/lz4) (for compressing frames when animating)
1311

1412
**Note that this means `swww` will not run on Gnome, because it does not implement the `wlr-layer-shell` protocol**.
@@ -21,7 +19,8 @@
2119

2220
### Dependencies:
2321

24-
- Up to date stable rustc compiler and cargo (specifically, MSRV is 1.82.0)
22+
- wayland-client and wayland-protocol `.xml` files installed in your system (`pkg-config` must be able to find it)
23+
- Up to date stable rustc compiler and cargo (specifically, MSRV is 1.82.0)
2524

2625
To build, clone this repository and run:
2726
```

0 commit comments

Comments
 (0)