diff options
| -rw-r--r-- | Cargo.lock | 16 | ||||
| -rw-r--r-- | Cargo.toml | 6 | ||||
| -rw-r--r-- | src/bar.rs | 6 | ||||
| -rw-r--r-- | src/state.rs | 2 | ||||
| -rw-r--r-- | src/text.rs | 2 |
5 files changed, 16 insertions, 16 deletions
@@ -676,9 +676,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wayrs-client" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098a127d8e6d3f494be68f1b9776d62c8f1bb3a8c5d156ba9a7f46352f994ce9" +checksum = "1fd73714d8e51e1791075df5d80476339085ef909715d60c0b4b22b0c3d0f28e" dependencies = [ "nix", "thiserror", @@ -687,18 +687,18 @@ dependencies = [ [[package]] name = "wayrs-protocols" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5ff47d73ff0b4a6988e20d6275be363d04975b7f4149d7092ad38128d1afb8" +checksum = "31bd7783d7acf6409aa8c494c536b34e3273453745a6ff5cb29d8a6a0d90e2ce" dependencies = [ "wayrs-client", ] [[package]] name = "wayrs-scanner" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "967e9f2382b08f553ebf6a7b639b72fb18c11f45d821a943dcdaabad0cb6c190" +checksum = "b66f2d9f749863856126fd50440d008bf62031243665df9d80871039316bde61" dependencies = [ "convert_case", "proc-macro2", @@ -709,9 +709,9 @@ dependencies = [ [[package]] name = "wayrs-utils" -version = "0.4.0-beta.5" +version = "0.4.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "217ea9444c2b07e91464be1d6bc5babddd9436d94bc173d78e05452f55b74dd9" +checksum = "53da39108877bc36d9d25e5d442565b06ce42f85f0bbc9c0475cc2713448f0ed" dependencies = [ "memmap2", "shmemfdrs", @@ -18,9 +18,9 @@ memchr = "2" signal-hook = { version = "0.3", default-features = false } nix = { version = "0.26", default-features = false, features = ["fs", "poll"] } -wayrs-client = "0.8" -wayrs-utils = { version = "0.4.0-beta.5", features = ["cursor", "shm_alloc", "seats"] } -wayrs-protocols = { version = "0.8", features = ["wlr-layer-shell-unstable-v1", "viewporter", "fractional-scale-v1"] } +wayrs-client = "0.10" +wayrs-utils = { version = "0.4.0-beta.7", features = ["cursor", "shm_alloc", "seats"] } +wayrs-protocols = { version = "0.10", features = ["wlr-layer-shell-unstable-v1", "viewporter", "fractional-scale-v1"] } [profile.release] lto = "fat" @@ -1,7 +1,6 @@ use pangocairo::cairo; use wayrs_client::connection::Connection; -use wayrs_client::proxy::Proxy; use wayrs_utils::shm_alloc::BufferSpec; use crate::blocks_cache::ComputedBlock; @@ -234,7 +233,8 @@ impl Bar { self.viewport .set_destination(conn, self.width as i32, self.height as i32); - self.surface.attach(conn, buffer.into_wl_buffer(), 0, 0); + self.surface + .attach(conn, Some(buffer.into_wl_buffer()), 0, 0); self.surface.damage(conn, 0, 0, i32::MAX, i32::MAX); self.surface.commit(conn); } @@ -283,7 +283,7 @@ impl Bar { pub fn hide(&mut self, conn: &mut Connection<State>) { self.hidden = true; self.mapped = false; - self.surface.attach(conn, WlBuffer::null(), 0, 0); + self.surface.attach(conn, None, 0, 0); self.surface.commit(conn); } } diff --git a/src/state.rs b/src/state.rs index 86eb45d..5476f6c 100644 --- a/src/state.rs +++ b/src/state.rs @@ -152,7 +152,7 @@ impl State { let layer_surface = self.layer_shell.get_layer_surface_with_cb( conn, surface, - output, + Some(output), zwlr_layer_shell_v1::Layer::Top, wayrs_client::cstr!("i3bar-river").into(), layer_surface_cb, diff --git a/src/text.rs b/src/text.rs index dcad438..61bf5ca 100644 --- a/src/text.rs +++ b/src/text.rs @@ -60,7 +60,7 @@ impl ComputedText { pub fn new(text: &str, mut attr: Attributes) -> Self { let text = text.replace('\n', "\u{23CE}"); - let layout = PANGO_CTX.with(|ctx| pango::Layout::new(ctx)); + let layout = PANGO_CTX.with(pango::Layout::new); layout.set_font_description(Some(attr.font)); if attr.markup { layout.set_markup(&text); |