split crates

client/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "shortcutd"
+version = "0.1.0"
+authors = ["Robin Appelman <robin@icewind.nl>"]
+edition = "2018"
+
+[lib]
+name = "shortcutd"
+path = "src/lib.rs"
+
+[dependencies]
+dbus = { version = "0.8.2", path = "../../dbus-rs/dbus" }
+evdev-shortcut = { version = "0.1", path = "../../evdev-shortcut", default_features = false }
+
+[dev-dependencies]
+test-case = "1.0.0"

client/examples/client.rs

@@ -0,0 +1,23 @@
+use shortcutd::{Shortcut, ShortcutClient};
+use std::error::Error;
+use std::time::Duration;
+
+fn main() -> Result<(), Box<dyn Error>> {
+    let mut client = ShortcutClient::new()?;
+
+    let shortcut: Shortcut = "<Ctrl><Alt>-KeyP".parse()?;
+
+    client.register(shortcut, |s| {
+        eprintln!("shortcut1 {}", s);
+    })?;
+
+    let shortcut: Shortcut = "<Ctrl><Alt>-KeyO".parse()?;
+
+    client.register(shortcut, |s| {
+        eprintln!("shortcut2 {}", s);
+    })?;
+
+    loop {
+        client.process(Duration::from_millis(1000))?;
+    }
+}

client/src/lib.rs

@@ -0,0 +1,97 @@
+use dbus::arg;
+use dbus::blocking;
+use evdev_shortcut::Shortcut;
+
+const INTERFACE: &'static str = "nl.icewind.shortcutd";
+
+pub trait NlIcewindShortcutd {
+    fn register(&self, shortcut: &str) -> Result<String, dbus::Error>;
+}
+
+impl<'a, C: ::std::ops::Deref<Target = blocking::Connection>> NlIcewindShortcutd
+    for blocking::Proxy<'a, C>
+{
+    fn register(&self, shortcut: &str) -> Result<String, dbus::Error> {
+        self.method_call(INTERFACE, "Register", (shortcut,))
+            .and_then(|r: (String,)| Ok(r.0))
+    }
+}
+
+#[derive(Debug)]
+pub struct NlIcewindShortcutdTriggered {}
+
+impl arg::AppendAll for NlIcewindShortcutdTriggered {
+    fn append(&self, _: &mut arg::IterAppend) {}
+}
+
+impl arg::ReadAll for NlIcewindShortcutdTriggered {
+    fn read(_: &mut arg::Iter) -> Result<Self, arg::TypeMismatchError> {
+        Ok(NlIcewindShortcutdTriggered {})
+    }
+}
+
+impl dbus::message::SignalArgs for NlIcewindShortcutdTriggered {
+    const NAME: &'static str = "Triggered";
+    const INTERFACE: &'static str = INTERFACE;
+}
+
+pub trait OrgFreedesktopDBusIntrospectable {
+    fn introspect(&self) -> Result<String, dbus::Error>;
+}
+
+impl<'a, C: ::std::ops::Deref<Target = blocking::Connection>> OrgFreedesktopDBusIntrospectable
+    for blocking::Proxy<'a, C>
+{
+    fn introspect(&self) -> Result<String, dbus::Error> {
+        self.method_call("org.freedesktop.DBus.Introspectable", "Introspect", ())
+            .and_then(|r: (String,)| Ok(r.0))
+    }
+}
+
+// Autogenerated code ends here.
+
+use dbus::blocking::Connection;
+use dbus::Message;
+use std::time::Duration;
+
+pub struct ShortcutClient {
+    connection: Connection,
+}
+
+impl ShortcutClient {
+    pub fn new() -> Result<Self, dbus::Error> {
+        Ok(ShortcutClient {
+            connection: Connection::new_system()?,
+        })
+    }
+
+    pub fn register(
+        &mut self,
+        shortcut: Shortcut,
+        handler: impl Fn(Shortcut) + Send + 'static,
+    ) -> Result<(), dbus::Error> {
+        let path = self
+            .connection
+            .with_proxy(INTERFACE, "/register", Duration::from_millis(5000))
+            .register(&format!("{}", shortcut))?;
+
+        let proxy = self
+            .connection
+            .with_proxy(INTERFACE, &path, Duration::from_millis(5000));
+
+        // Let's start listening to signals.
+        let _id = proxy.match_signal(
+            move |_: NlIcewindShortcutdTriggered, _: &Connection, _: &Message| {
+                handler(shortcut.clone());
+                true
+            },
+        );
+
+        Ok(())
+    }
+
+    pub fn process(&mut self, timeout: Duration) -> Result<(), dbus::Error> {
+        self.connection.process(timeout)?;
+        Ok(())
+    }
+}