else/clan-sidebus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add proxy for the Settings portal (dark mode, reduced motion, etc.)

Browse source
This commit is contained in:
Val Packett 2025-12-12 04:37:46 -03:00
parent 1d931ae191
commit df832a5141
3 changed files with 92 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

30
sidebus-broker/src/main.rs
View file

@ -149,10 +149,12 @@ async fn main() -> eyre::Result<()> {
cli.guest_mountpoint,
)
.await?;
let settings_imp = portal::settings::Settings::new(&host_session_conn).await?;
async fn on_vm_bus_connected(
vm_bus_conn: zbus::Connection,
file_chooser: portal::file_chooser::FileChooser,
settings: portal::settings::Settings,
) -> Result<(), eyre::Report> {
vm_bus_conn
.request_name("org.freedesktop.portal.Desktop")
@ -164,20 +166,38 @@ async fn main() -> eyre::Result<()> {
{
error!("org.freedesktop.portal.Desktop already provided");
};
if !vm_bus_conn
.object_server()
.at("/org/freedesktop/portal/desktop", settings)
.await?
{
error!("org.freedesktop.portal.Desktop already provided");
};
let settings_ref = vm_bus_conn
.object_server()
.interface::<_, portal::settings::Settings>("/org/freedesktop/portal/desktop")
.await?;
tokio::spawn(async move {
let settings = settings_ref.get().await;
let emitter = settings_ref.signal_emitter();
if let Err(err) = settings.forward_changes(emitter).await {
error!(%err, "forwarding settings changes ended");
}
});
// XXX: no method for "wait until the conn dies"?
Ok(std::future::pending::<()>().await)
}
if let Some(path) = cli.unix_path {
let vm_unix_listener = UnixListener::bind(path)?;
server_tasks.spawn(enclose!((file_chooser_imp) async move {
server_tasks.spawn(enclose!((file_chooser_imp, settings_imp) async move {
while let Ok((socket, remote_addr)) = vm_unix_listener.accept().await {
let f = enclose!((file_chooser_imp) async move {
let f = enclose!((file_chooser_imp, settings_imp) async move {
let client_conn = zbus::connection::Builder::unix_stream(socket)
.auth_mechanism(zbus::AuthMechanism::Anonymous)
.build()
.await?;
on_vm_bus_connected(client_conn, file_chooser_imp).await
on_vm_bus_connected(client_conn, file_chooser_imp, settings_imp).await
});
tokio::spawn(
async {
@ -198,10 +218,10 @@ async fn main() -> eyre::Result<()> {
vsock::ListenerBuilder::new(vsock::VsockAddr::new(vsock::VMADDR_CID_HOST, port))
.with_label("VM Bus")
.listen(move |client| {
enclose!((file_chooser_imp) async move {
enclose!((file_chooser_imp, settings_imp) async move {
// TODO: Not necessary to go through the channel, add vsock support to the Peer too?
let client_conn = client.build().await?;
on_vm_bus_connected(client_conn, file_chooser_imp).await
on_vm_bus_connected(client_conn, file_chooser_imp, settings_imp).await
})
})
.map_ok_or_else(