1 files changed, 68 insertions, 47 deletions

diff --git a/src/river_protocols/control.rs b/src/river_protocols/control.rs
index 525a9db..7cce23d 100644
--- a/src/river_protocols/control.rs
+++ b/src/river_protocols/control.rs
@@ -1,67 +1,34 @@
-pub mod protocol {
-    use smithay_client_toolkit::reexports::client as wayland_client;
-    use smithay_client_toolkit::reexports::client::protocol::*;
-
-    pub mod __interfaces {
-        use smithay_client_toolkit::reexports::client::protocol::__interfaces::*;
-        wayland_scanner::generate_interfaces!("protocols/river-control-unstable-v1.xml");
-    }
-    use self::__interfaces::*;
-
-    wayland_scanner::generate_client_code!("protocols/river-control-unstable-v1.xml");
-}
-
-mod dispatch;
-
-use std::sync::Arc;
-
-use smithay_client_toolkit::globals::GlobalData;
+use wayland_client::globals::{BindError, GlobalList};
 use wayland_client::{protocol::wl_seat, Connection, Dispatch, QueueHandle};
 
 use protocol::{zriver_command_callback_v1, zriver_control_v1};
 
-use smithay_client_toolkit::error::GlobalError;
-use smithay_client_toolkit::registry::GlobalProxy;
-
 #[derive(Debug, Clone)]
 pub struct RiverControlState {
-    control: Arc<GlobalProxy<zriver_control_v1::ZriverControlV1>>,
+    control: zriver_control_v1::ZriverControlV1,
 }
 
 impl RiverControlState {
-    pub fn new() -> Self {
-        Self {
-            control: Arc::new(GlobalProxy::NotReady),
-        }
-    }
-
-    pub fn is_available(&self) -> bool {
-        self.control.get().is_ok()
-    }
-
-    pub fn control(&self) -> Result<&zriver_control_v1::ZriverControlV1, GlobalError> {
-        self.control.get()
+    pub fn new<D>(globals: &GlobalList, qh: &QueueHandle<D>) -> Result<Self, BindError>
+    where
+        D: Dispatch<zriver_control_v1::ZriverControlV1, (), D> + 'static,
+    {
+        let control = globals.bind(qh, 1..=1, ())?;
+        Ok(Self { control })
     }
 
-    pub fn run_command<D, Args, Arg>(
-        &self,
-        qh: &QueueHandle<D>,
-        seat: &wl_seat::WlSeat,
-        args: Args,
-    ) -> Result<(), GlobalError>
+    pub fn run_command<D, Args, Arg>(&self, qh: &QueueHandle<D>, seat: &wl_seat::WlSeat, args: Args)
     where
-        D: Dispatch<zriver_control_v1::ZriverControlV1, GlobalData>
-            + Dispatch<zriver_command_callback_v1::ZriverCommandCallbackV1, RiverCommandCallbackData>
+        D: Dispatch<zriver_command_callback_v1::ZriverCommandCallbackV1, RiverCommandCallbackData>
             + 'static,
         Args: IntoIterator<Item = Arg>,
         Arg: Into<String>,
     {
-        let control = self.control()?;
         for arg in args {
-            control.add_argument(arg.into());
+            self.control.add_argument(arg.into());
         }
-        control.run_command(seat, qh, RiverCommandCallbackData {});
-        Ok(())
+        self.control
+            .run_command(seat, qh, RiverCommandCallbackData {});
     }
 }
 
@@ -82,10 +49,64 @@ pub struct RiverCommandCallbackData {
 macro_rules! delegate_river_control {
     ($ty: ty) => {
         ::smithay_client_toolkit::reexports::client::delegate_dispatch!($ty: [
-            $crate::river_protocols::control::protocol::zriver_control_v1::ZriverControlV1: ::smithay_client_toolkit::globals::GlobalData
+            $crate::river_protocols::control::protocol::zriver_control_v1::ZriverControlV1: ()
         ] => $crate::river_protocols::control::RiverControlState);
         ::smithay_client_toolkit::reexports::client::delegate_dispatch!($ty: [
             $crate::river_protocols::control::protocol::zriver_command_callback_v1::ZriverCommandCallbackV1: $crate::river_protocols::control::RiverCommandCallbackData
         ] => $crate::river_protocols::control::RiverControlState);
     };
 }
+
+impl<D> Dispatch<zriver_control_v1::ZriverControlV1, (), D> for RiverControlState
+where
+    D: Dispatch<zriver_control_v1::ZriverControlV1, ()> + RiverControlHandler + 'static,
+{
+    fn event(
+        _: &mut D,
+        _: &zriver_control_v1::ZriverControlV1,
+        _: zriver_control_v1::Event,
+        _: &(),
+        _: &Connection,
+        _: &QueueHandle<D>,
+    ) {
+        unreachable!("zriver_control_v1 has no events")
+    }
+}
+
+impl<D> Dispatch<zriver_command_callback_v1::ZriverCommandCallbackV1, RiverCommandCallbackData, D>
+    for RiverControlState
+where
+    D: Dispatch<zriver_command_callback_v1::ZriverCommandCallbackV1, RiverCommandCallbackData>
+        + RiverControlHandler
+        + 'static,
+{
+    fn event(
+        data: &mut D,
+        _callback: &zriver_command_callback_v1::ZriverCommandCallbackV1,
+        event: zriver_command_callback_v1::Event,
+        _udata: &RiverCommandCallbackData,
+        conn: &Connection,
+        qh: &QueueHandle<D>,
+    ) {
+        use zriver_command_callback_v1::Event;
+        match event {
+            Event::Success { output } => data.command_success(conn, qh, output),
+            Event::Failure { failure_message } => data.command_success(conn, qh, failure_message),
+        }
+    }
+}
+
+pub mod protocol {
+    #![allow(non_upper_case_globals)]
+
+    use smithay_client_toolkit::reexports::client as wayland_client;
+    use smithay_client_toolkit::reexports::client::protocol::*;
+
+    pub mod __interfaces {
+        use smithay_client_toolkit::reexports::client::protocol::__interfaces::*;
+        wayland_scanner::generate_interfaces!("protocols/river-control-unstable-v1.xml");
+    }
+    use self::__interfaces::*;
+
+    wayland_scanner::generate_client_code!("protocols/river-control-unstable-v1.xml");
+}