External/qemu-display
1
0
Fork 0
mirror of https://gitlab.com/marcandre.lureau/qemu-display.git synced 2024-10-24 01:43:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

rdp: misc improvements

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2024-07-24 22:00:13 +04:00
parent edc7c26a54
commit ccfef172f0
7 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qemu-display/src/display.rs
View File

@ -45,7 +45,7 @@ impl<'d> Display<'d> {
.receive_name_owner_changed()
.await?;
loop {
let list = Display::by_name(conn).await?;
let list = Display::list_by_name(conn).await?;
if let Some(name) = name {
let res = list.get(name);
if res.is_some() {
@ -61,7 +61,7 @@ impl<'d> Display<'d> {
}
}
pub async fn by_name(conn: &Connection) -> Result<HashMap<String, OwnedUniqueName>> {
pub async fn list_by_name(conn: &Connection) -> Result<HashMap<String, OwnedUniqueName>> {
let mut hm = HashMap::new();
let list = match fdo::DBusProxy::new(conn)
.await?
@ -93,7 +93,7 @@ impl<'d> Display<'d> {
D: TryInto<BusName<'d>>,
D::Error: Into<Error>,
{
let builder = fdo::ObjectManagerProxy::builder(conn);
let builder = fdo::ObjectManagerProxy::builder(conn).destination("org.qemu")?;
let builder = if let Some(dest) = dest {
let dest = dest.try_into().map_err(Into::into)?;
builder.destination(dest)?
@ -101,7 +101,11 @@ impl<'d> Display<'d> {
builder
};
let proxy = builder.path("/org/qemu/Display1")?.build().await?;
let objects = proxy.get_managed_objects().await?;
let objects = proxy
.get_managed_objects()
.await
.map_err(|e| Error::Failed(format!("Unreachable QEMU display ({})", e)))?;
// TODO: listen for changes
let inner = Inner {
// owner_changed,
@ -121,6 +125,10 @@ impl<'d> Display<'d> {
&self.inner.conn
}
pub fn destination(&self) -> &BusName<'_> {
self.inner.proxy.inner().destination()
}
#[cfg(windows)]
pub fn peer_pid(&self) -> u32 {
self.inner.peer_pid

6
qemu-rdp/src/server/clipboard.rs
View File

@ -19,7 +19,7 @@ use ironrdp::{
};
use tracing::{debug, error, warn};
use qemu_display::{zbus, Clipboard, ClipboardSelection};
use qemu_display::{Clipboard, ClipboardSelection, Display};
use tokio::{
sync::{
mpsc::{self, Receiver, Sender},
@ -335,8 +335,8 @@ impl Inner {
}
impl ClipboardHandler {
pub async fn connect(dbus: zbus::Connection) -> Result<Self> {
let clipboard = Clipboard::new(&dbus).await?;
pub async fn connect(display: &Display<'_>) -> Result<Self> {
let clipboard = Clipboard::new(display.connection()).await?;
let selection = ClipboardSelection::Clipboard;
let (tx, rx) = tokio::sync::mpsc::channel(30);

6
qemu-rdp/src/server/display.rs
View File

@ -1,5 +1,5 @@
use anyhow::Result;
use qemu_display::{zbus, Console, ConsoleListenerHandler, Cursor, MouseSet, Scanout, Update};
use qemu_display::{Console, ConsoleListenerHandler, Cursor, Display, MouseSet, Scanout, Update};
use ironrdp::{
connector::DesktopSize,
@ -20,8 +20,8 @@ struct DisplayUpdates {
}
impl DisplayHandler {
pub async fn connect(dbus: zbus::Connection) -> Result<Self> {
let console = Console::new(&dbus, 0).await?;
pub async fn connect(display: &Display<'_>) -> Result<Self> {
let console = Console::new(display.connection(), 0).await?;
Ok(Self { console })
}

6
qemu-rdp/src/server/input.rs
View File

@ -1,4 +1,4 @@
use qemu_display::{zbus, Console, MouseButton};
use qemu_display::{Console, Display, MouseButton};
use ironrdp::server::{KeyboardEvent, MouseEvent, RdpServerInputHandler};
use tokio::{
@ -79,8 +79,8 @@ async fn input_receive_task(mut rx: Receiver<InputEvent>, console: Console) {
}
impl InputHandler {
pub async fn connect(dbus: zbus::Connection) -> anyhow::Result<InputHandler> {
let console = Console::new(&dbus, 0).await?;
pub async fn connect(display: &Display<'_>) -> anyhow::Result<InputHandler> {
let console = Console::new(display.connection(), 0).await?;
let (tx, rx) = tokio::sync::mpsc::channel(30);
let _task = task::spawn(async move { input_receive_task(rx, console).await });

12
qemu-rdp/src/server/mod.rs
View File

@ -6,7 +6,7 @@ mod sound;
use anyhow::{anyhow, Context, Error};
use ironrdp::server::tokio_rustls::{rustls, TlsAcceptor};
use qemu_display::zbus;
use qemu_display::{zbus, Display};
use rustls_pemfile::{certs, pkcs8_private_keys};
use std::{fs::File, io::BufReader, sync::Arc};
use tracing::debug;
@ -39,10 +39,12 @@ impl Server {
.map(|(cert, key)| acceptor(cert, key).unwrap())
.ok_or_else(|| anyhow!("Failed to setup TLS"))?;
let handler = InputHandler::connect(self.dbus.clone()).await?;
let display = DisplayHandler::connect(self.dbus.clone()).await?;
let clipboard = ClipboardHandler::connect(self.dbus.clone()).await?;
let sound = match SoundHandler::connect::<()>(self.dbus.clone(), None).await {
let dbus_display = Display::new::<()>(&self.dbus, None).await?;
let handler = InputHandler::connect(&dbus_display).await?;
let display = DisplayHandler::connect(&dbus_display).await?;
let clipboard = ClipboardHandler::connect(&dbus_display).await?;
let sound = match SoundHandler::connect(&dbus_display).await {
Ok(h) => Some(h),
Err(e) => {
debug!("Can't connect audio: {}", e);

12
qemu-rdp/src/server/sound.rs
View File

@ -14,7 +14,7 @@ use ironrdp::{
};
use tokio::sync::mpsc;
use qemu_display::{zbus, Audio, AudioOutHandler, PCMInfo, Volume};
use qemu_display::{Audio, AudioOutHandler, Display, PCMInfo, Volume};
use tracing::{debug, warn};
#[derive(Debug, PartialEq)]
@ -168,12 +168,9 @@ impl SoundServerFactory for SoundHandler {
}
impl SoundHandler {
pub async fn connect<D>(dbus: zbus::Connection, dest: Option<D>) -> Result<Self>
where
D: TryInto<zbus::names::BusName<'static>>,
D::Error: Into<qemu_display::Error>,
{
let audio = Audio::new(&dbus, dest).await?;
pub async fn connect(display: &Display<'_>) -> Result<Self> {
let audio =
Audio::new(display.connection(), Some(display.destination().to_owned())).await?;
let inner = Arc::new(Mutex::new(Inner {
start_time: Instant::now(),
state: State::Init,
@ -182,6 +179,7 @@ impl SoundHandler {
rdp_started: false,
}));
// TODO: register only after connection?
let handler = DBusHandler {
inner: inner.clone(),
};

8
qemu-rdw/src/main.rs
View File

@ -61,7 +61,7 @@ async fn display_from_opt(opt: Rc<RefCell<AppOptions>>) -> Option<Display<'stati
});
if opt.borrow().list {
let list = Display::by_name(&conn).await.unwrap();
let list = Display::list_by_name(&conn).await.unwrap();
for (name, dest) in list {
println!("{} (at {})", name, dest);
}
@ -204,11 +204,11 @@ impl App {
}
};
let disp = display.clone();
let app = app_clone.clone();
MainContext::default().spawn_local(async move {
let mut changed = disp.receive_owner_changed().await.unwrap();
while let Some(name) = changed.next().await {
dbg!(name);
}
let _ = changed.next().await;
app.inner.app.quit();
});
let console = Console::new(