rustdesk/qemu-display
1
0
Fork 0
mirror of https://github.com/rustdesk/qemu-display.git synced 2025-07-01 15:25:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Follow zbus upstream

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2021-12-21 16:35:13 +04:00
parent 13db197622
commit 2c007d8c4c
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -15,6 +15,3 @@ vnc = { git = "https://github.com/elmarco/rust-vnc", branch = "server" }
zbus = { git = "https://gitlab.freedesktop.org/dbus/zbus.git" } zbus = { git = "https://gitlab.freedesktop.org/dbus/zbus.git" }
zvariant = { git = "https://gitlab.freedesktop.org/dbus/zbus.git" } zvariant = { git = "https://gitlab.freedesktop.org/dbus/zbus.git" }
rdw4 = { git = "https://gitlab.gnome.org/malureau/rdw.git" } rdw4 = { git = "https://gitlab.gnome.org/malureau/rdw.git" }
#zbus = { path = "../zbus/zbus" }
#zvariant = { path = "../zbus/zvariant" }
#rdw4 = { path = "../rdw/rdw4" }

4
qemu-display/Cargo.toml
View File

@ -10,9 +10,9 @@ edition = "2018"
log = "0.4" log = "0.4"
derivative = "2.2.0" derivative = "2.2.0"
zbus = { version = "2.0.0-beta.7", features = ["xml"] } zbus = { version = "2.0.0-beta.7", features = ["xml"] }
zvariant = { version = "2.4.0", features = ["serde_bytes"] } zvariant = { version = "3.0", features = ["serde_bytes"] }
libc = "0.2.86" libc = "0.2.86"
enumflags2 = { version = "0.6.4", features = ["serde"] } enumflags2 = { version = "0.7", features = ["serde"] }
serde = { version = "1.0.123", features = ["derive"] } serde = { version = "1.0.123", features = ["derive"] }
serde_repr = "0.1.6" serde_repr = "0.1.6"
serde_bytes = "0.11.5" serde_bytes = "0.11.5"

6
qemu-display/src/clipboard.rs
View File

@ -1,7 +1,7 @@
use serde_repr::{Deserialize_repr, Serialize_repr}; use serde_repr::{Deserialize_repr, Serialize_repr};
use std::convert::TryFrom; use std::convert::TryFrom;
use zbus::{dbus_interface, dbus_proxy, zvariant::ObjectPath}; use zbus::{dbus_interface, dbus_proxy, zvariant::ObjectPath};
use zvariant::derive::Type; use zvariant::Type;
use crate::Result; use crate::Result;
@ -109,12 +109,12 @@ impl Clipboard {
pub async fn register<H: ClipboardHandler>(&self, handler: H) -> Result<()> { pub async fn register<H: ClipboardHandler>(&self, handler: H) -> Result<()> {
self.conn self.conn
.object_server_mut() .object_server()
.await
.at( .at(
"/org/qemu/Display1/Clipboard", "/org/qemu/Display1/Clipboard",
ClipboardListener { handler }, ClipboardListener { handler },
) )
.await
.unwrap(); .unwrap();
Ok(self.proxy.register().await?) Ok(self.proxy.register().await?)
} }

7
qemu-display/src/keyboard.rs
View File

@ -1,10 +1,11 @@
use enumflags2::BitFlags; use enumflags2::{bitflags, BitFlags};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use zbus::dbus_proxy; use zbus::dbus_proxy;
use zvariant::derive::Type; use zvariant::Type;
#[bitflags]
#[repr(u32)] #[repr(u32)]
#[derive(Type, BitFlags, Debug, PartialEq, Copy, Clone, Serialize, Deserialize)] #[derive(Type, Debug, PartialEq, Copy, Clone, Serialize, Deserialize)]
pub enum KeyboardModifiers { pub enum KeyboardModifiers {
Scroll = 0x1, Scroll = 0x1,
Num = 0x2, Num = 0x2,

2
qemu-display/src/mouse.rs
View File

@ -1,6 +1,6 @@
use serde_repr::{Deserialize_repr, Serialize_repr}; use serde_repr::{Deserialize_repr, Serialize_repr};
use zbus::dbus_proxy; use zbus::dbus_proxy;
use zvariant::derive::Type; use zvariant::Type;
#[repr(u32)] #[repr(u32)]
#[derive(Deserialize_repr, Serialize_repr, Type, Debug, Hash, PartialEq, Eq, Clone, Copy)] #[derive(Deserialize_repr, Serialize_repr, Type, Debug, Hash, PartialEq, Eq, Clone, Copy)]