mirror of
https://github.com/Zedfrigg/ironbar.git
synced 2025-09-15 19:26:58 +02:00
Jake Stanger
c702f6fffaThis does away with `lazy_static` singletons for all the clients, instead putting them all inside a `Clients` struct on the `Ironbar` struct. Client code has been refactored in places to accommodate this, and module code has been updated to get the clients the new way. The Wayland client has been re-written from the ground up to remove a lot of the needless complications, provide a nicer interface and reduce some duplicate data. The MPD music client has been overhauled to use the `mpd_utils` crate, which simplifies the code within Ironbar and should offer more robustness and better recovery when connection is lost to the server. The launcher module in particular has been affected by the refactor.
35 lines
1 KiB
Rust
35 lines
1 KiB
Rust
use crate::register_client;
|
|
use std::sync::Arc;
|
|
use upower_dbus::UPowerProxy;
|
|
use zbus::fdo::PropertiesProxy;
|
|
|
|
pub async fn create_display_proxy() -> Arc<PropertiesProxy<'static>> {
|
|
let dbus = Box::pin(zbus::Connection::system())
|
|
.await
|
|
.expect("failed to create connection to system bus");
|
|
|
|
let device_proxy = UPowerProxy::new(&dbus)
|
|
.await
|
|
.expect("failed to create upower proxy");
|
|
|
|
let display_device = device_proxy
|
|
.get_display_device()
|
|
.await
|
|
.unwrap_or_else(|_| panic!("failed to get display device for {device_proxy:?}"));
|
|
|
|
let path = display_device.path().to_owned();
|
|
|
|
let proxy = PropertiesProxy::builder(&dbus)
|
|
.destination("org.freedesktop.UPower")
|
|
.expect("failed to set proxy destination address")
|
|
.path(path)
|
|
.expect("failed to set proxy path")
|
|
.cache_properties(zbus::CacheProperties::No)
|
|
.build()
|
|
.await
|
|
.expect("failed to build proxy");
|
|
|
|
Arc::new(proxy)
|
|
}
|
|
|
|
register_client!(PropertiesProxy<'static>, upower);
|