cargo update

Cargo.toml

@@ -15,9 +15,9 @@ libc = "0.2"
 indexmap = { version = "2.0", features = ["serde"] }
 serde = { version = "1", features = ["derive"] }
 serde_yaml = "0.9"
-wayrs-client = "0.10"
-wayrs-protocols = { version = "0.10", features = ["wlr-layer-shell-unstable-v1"] }
-wayrs-utils = { version = "0.6.0", features = ["shm_alloc", "seats", "keyboard"] }
+wayrs-client = "0.11"
+wayrs-protocols = { version = "0.11", features = ["wlr-layer-shell-unstable-v1"] }
+wayrs-utils = { version = "0.7", features = ["shm_alloc", "seats", "keyboard"] }
 smart-default = "0.7.0"
 clap = { version = "4.3.0", default-features = false, features = ["std", "derive", "help", "usage"] }
 

src/main.rs

@@ -13,11 +13,11 @@ use std::process::{Command, Stdio};
 use clap::Parser;
 use pangocairo::cairo;
 
-use wayrs_client::connection::Connection;
+use wayrs_client::global::*;
 use wayrs_client::object::ObjectId;
 use wayrs_client::protocol::*;
 use wayrs_client::proxy::Proxy;
-use wayrs_client::{global::*, IoMode};
+use wayrs_client::{Connection, IoMode};
 use wayrs_protocols::wlr_layer_shell_unstable_v1::*;
 use wayrs_utils::keyboard::{xkb, Keyboard, KeyboardEvent, KeyboardHandler};
 use wayrs_utils::seats::{SeatHandler, Seats};
@@ -44,8 +44,7 @@ fn main() -> anyhow::Result<()> {
         anyhow::bail!("No key mappings defined");
     }
 
-    let mut conn = Connection::connect()?;
-    let globals = conn.blocking_collect_initial_globals()?;
+    let (mut conn, globals) = Connection::connect_and_collect_globals()?;
     conn.add_registry_cb(wl_registry_cb);
 
     let wl_compositor: WlCompositor = globals.bind(&mut conn, 4..=4)?;