client lib

This commit is contained in:
Robin Appelman 2020-04-11 14:32:28 +02:00
commit 6b81b14b81
4 changed files with 130 additions and 0 deletions

View file

@ -4,6 +4,14 @@ version = "0.1.0"
authors = ["Robin Appelman <robin@icewind.nl>"] authors = ["Robin Appelman <robin@icewind.nl>"]
edition = "2018" edition = "2018"
[lib]
name = "shortcutd_client"
path = "src/lib.rs"
[[bin]]
name = "shortcutd_server"
path = "src/server.rs"
[dependencies] [dependencies]
evdev = "0.10.1" evdev = "0.10.1"
main_error = "0.1.0" main_error = "0.1.0"

23
examples/client.rs Normal file
View file

@ -0,0 +1,23 @@
use shortcutd_client::{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))?;
}
}

99
src/lib.rs Normal file
View file

@ -0,0 +1,99 @@
use dbus::arg;
use dbus::blocking;
mod keyboard;
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.
pub use crate::keyboard::Shortcut;
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(())
}
}