summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock48
-rw-r--r--Cargo.toml2
-rw-r--r--src/protocol.rs2
-rw-r--r--src/state.rs4
4 files changed, 26 insertions, 30 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 436f1d9..71be33f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -110,7 +110,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
@@ -272,9 +272,9 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
[[package]]
name = "libc"
-version = "0.2.143"
+version = "0.2.144"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edc207893e85c5d6be840e969b496b53d94cec8be2d501b214f50daa97fa8024"
+checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
[[package]]
name = "memchr"
@@ -284,9 +284,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "memmap2"
-version = "0.5.10"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+checksum = "a0aa1b505aeecb0adb017db2b6a79a17a38e64f882a201f05e9de8a982cd6096"
dependencies = [
"libc",
]
@@ -460,9 +460,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.26"
+version = "1.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
dependencies = [
"proc-macro2",
]
@@ -475,22 +475,22 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
[[package]]
name = "serde"
-version = "1.0.162"
+version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.162"
+version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
@@ -575,9 +575,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.15"
+version = "2.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01"
dependencies = [
"proc-macro2",
"quote",
@@ -586,9 +586,9 @@ dependencies = [
[[package]]
name = "system-deps"
-version = "6.0.5"
+version = "6.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0fe581ad25d11420b873cf9aedaca0419c2b411487b134d4d21065f3d092055"
+checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2"
dependencies = [
"cfg-expr",
"heck",
@@ -620,7 +620,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
@@ -694,31 +694,31 @@ dependencies = [
[[package]]
name = "wayrs-protocols"
-version = "0.10.1"
+version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9923e775b301381afdd0a2f24991fc56bcb7cbd7378805ed37ec244dedfe8531"
+checksum = "7c520c3952cdd3b1455d7266754de5b8ea4634b09fd6ba5d5c40bdd0a6cb95bf"
dependencies = [
"wayrs-client",
]
[[package]]
name = "wayrs-scanner"
-version = "0.10.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66f2d9f749863856126fd50440d008bf62031243665df9d80871039316bde61"
+checksum = "2d850152fda7745af06e54f942fba8f2e50d1c80d3ee2006f3b059beef330028"
dependencies = [
"convert_case",
"proc-macro2",
"quick-xml",
"quote",
- "syn 2.0.15",
+ "syn 2.0.16",
]
[[package]]
name = "wayrs-utils"
-version = "0.4.0-beta.7"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53da39108877bc36d9d25e5d442565b06ce42f85f0bbc9c0475cc2713448f0ed"
+checksum = "7e4f07b0947176066dd83cef1b0e855003d0ec5bc8914c358a8a5633e6cb34a9"
dependencies = [
"memmap2",
"shmemfdrs",
diff --git a/Cargo.toml b/Cargo.toml
index 0b7549f..928e8b9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ signal-hook = { version = "0.3", default-features = false }
nix = { version = "0.26", default-features = false, features = ["fs", "poll"] }
wayrs-client = "0.10"
-wayrs-utils = { version = "0.4.0-beta.7", features = ["cursor", "shm_alloc", "seats"] }
+wayrs-utils = { version = "0.5.0", features = ["cursor", "shm_alloc", "seats"] }
wayrs-protocols = { version = "0.10", features = ["wlr-layer-shell-unstable-v1", "viewporter", "fractional-scale-v1"] }
[profile.release]
diff --git a/src/protocol.rs b/src/protocol.rs
index e8f464e..8e9a217 100644
--- a/src/protocol.rs
+++ b/src/protocol.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::enum_variant_names)]
-
use wayrs_client;
pub use wayrs_client::protocol::*;
pub use wayrs_protocols::fractional_scale_v1::*;
diff --git a/src/state.rs b/src/state.rs
index b9a5ac1..de99179 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -61,8 +61,6 @@ impl State {
conn.add_registry_cb(wl_registry_cb);
- let wl_shm = globals.bind(conn, 1..=1).expect("could not bind wl_shm");
-
let cursor_theme = CursorTheme::new(None, None);
let default_cursor = cursor_theme
.get_image("default")
@@ -82,7 +80,7 @@ impl State {
bars: Vec::new(),
shared_state: SharedState {
- shm: ShmAlloc::new(wl_shm),
+ shm: ShmAlloc::bind(conn, globals).unwrap(),
config,
status_cmd,
blocks_cache: BlocksCache::default(),