update wayrs

Cargo.toml

@@ -17,11 +17,11 @@ serde_json = "1"
 serde = { version = "1", features = ["derive"] }
 signal-hook = { version = "0.3", default-features = false }
 toml = { version = "0.8", default-features = false, features = ["parse"] }
-wayrs-client = "0.12" 
-wayrs-protocols = { version = "0.12", features = ["wlr-layer-shell-unstable-v1", "viewporter", "fractional-scale-v1"] }
-wayrs-utils = { version = "0.12", features = ["cursor", "shm_alloc", "seats"] }
-clap = { version = "4.3.23", default-features = false, features = ["derive", "std", "help"] }
-libc = "0.2.147"
+wayrs-client = "1.0" 
+wayrs-protocols = { version = "0.13", features = ["wlr-layer-shell-unstable-v1", "viewporter", "fractional-scale-v1"] }
+wayrs-utils = { version = "0.13", features = ["cursor", "shm_alloc", "seats"] }
+clap = { version = "4.3", default-features = false, features = ["derive", "std", "help"] }
+libc = "0.2"
 
 [profile.release]
 lto = "fat"

src/protocol.rs

@@ -2,5 +2,5 @@ pub use wayrs_client::protocol::*;
 pub use wayrs_protocols::fractional_scale_v1::*;
 pub use wayrs_protocols::viewporter::*;
 pub use wayrs_protocols::wlr_layer_shell_unstable_v1::*;
-wayrs_client::scanner::generate!("protocols/river-status-unstable-v1.xml");
-wayrs_client::scanner::generate!("protocols/river-control-unstable-v1.xml");
+wayrs_client::generate!("protocols/river-status-unstable-v1.xml");
+wayrs_client::generate!("protocols/river-control-unstable-v1.xml");

src/wm_info_provider/river.rs

@@ -1,7 +1,8 @@
 use std::ffi::CString;
 
-use wayrs_client::{cstr, Connection};
-use wayrs_client::{global::*, EventCtx};
+use wayrs_client::global::*;
+use wayrs_client::proxy::Proxy;
+use wayrs_client::{cstr, Connection, EventCtx};
 
 use super::*;
 use crate::state::State;
@@ -34,19 +35,20 @@ impl RiverInfoProvider {
         globals: &Globals,
         config: &WmConfig,
     ) -> Option<Self> {
-        let status_manager = globals.bind(conn, 1..=4).ok()?;
-        let wl_seat: WlSeat = globals.bind(conn, ..).ok()?; // river supports just one seat
+        let status_manager: ZriverStatusManagerV1 = globals.bind(conn, 1..=4).ok()?;
+        let wl_seat: WlSeat = globals.bind(conn, ..=5).ok()?; // river supports just one seat
+        let seat_status =
+            status_manager.get_river_seat_status_with_cb(conn, wl_seat, seat_status_cb);
+        if wl_seat.version() >= 5 {
+            wl_seat.release(conn);
+        }
         Some(Self {
             status_manager,
             control: globals.bind(conn, 1).ok()?,
             output_statuses: Vec::new(),
             max_tag: config.river.max_tag,
             seat_status: SeatStatus {
-                _status: status_manager.get_river_seat_status_with_cb(
-                    conn,
-                    wl_seat,
-                    seat_status_cb,
-                ),
+                _status: seat_status,
                 mode: None,
             },
         })