battery: Trigger dgpu refresh on toggle

Author: Drakulix

cosmic-applet-battery/src/app.rs

@@ -81,6 +81,7 @@ struct CosmicBatteryApplet {
     battery_percent: f64,
     on_battery: bool,
     gpus: HashMap<PathBuf, GPUData>,
+    update_trigger: Option<UnboundedSender<()>>,
     time_remaining: Duration,
     max_kbd_brightness: Option<i32>,
     kbd_brightness: Option<i32>,
@@ -180,6 +181,7 @@ enum Message {
     SetChargingLimit(chain::Toggler, bool),
     KeyboardBacklight(KeyboardBacklightUpdate),
     UpowerDevice(DeviceDbusEvent),
+    GpuInit(UnboundedSender<()>),
     GpuOn(PathBuf, String, Option<Vec<Entry>>),
     GpuOff(PathBuf),
     ToggleGpuApps(PathBuf),
@@ -338,6 +340,9 @@ impl cosmic::Application for CosmicBatteryApplet {
                     if let Some(tx) = self.power_profile_sender.as_ref() {
                         let _ = tx.send(PowerProfileRequest::Get);
                     }
+                    if let Some(tx) = self.update_trigger.as_ref() {
+                        let _ = tx.send(());
+                    }
                     let mut tasks = vec![get_popup(popup_settings)];
                     // Try again every time a popup is opened
                     if self.charging_limit.is_none() {
@@ -424,6 +429,9 @@ impl cosmic::Application for CosmicBatteryApplet {
                     tokio::spawn(cosmic::process::spawn(cmd));
                 }
             },
+            Message::GpuInit(tx) => {
+                self.update_trigger = Some(tx);
+            }
             Message::GpuOn(path, name, app_list) => {
                 let toggled = self
                     .gpus
@@ -845,6 +853,7 @@ impl cosmic::Application for CosmicBatteryApplet {
                 PowerProfileUpdate::Error(e) => Message::Errored(e), // TODO: handle error
             }),
             dgpu_subscription(0).map(|event| match event {
+                GpuUpdate::Init(tx) => Message::GpuInit(tx),
                 GpuUpdate::On(path, name, list) => Message::GpuOn(path, name, list),
                 GpuUpdate::Off(path) => Message::GpuOff(path),
             }),

cosmic-applet-battery/src/dgpu.rs

@@ -19,6 +19,7 @@ use drm::control::Device as ControlDevice;
 use futures::{FutureExt, SinkExt};
 use tokio::{
     io::unix::AsyncFd,
+    sync::mpsc::{self, UnboundedReceiver, UnboundedSender},
     task::spawn_blocking,
     time::{self, Interval},
 };
@@ -396,12 +397,13 @@ pub fn dgpu_subscription<I: 'static + Hash + Copy + Send + Sync + Debug>(
 #[derive(Debug)]
 pub enum State {
     Ready,
-    Waiting(GpuMonitor),
+    Waiting(GpuMonitor, UnboundedReceiver<()>),
     Finished,
 }
 
 #[derive(Debug)]
 pub enum GpuUpdate {
+    Init(UnboundedSender<()>),
     Off(PathBuf),
     On(PathBuf, String, Option<Vec<Entry>>),
 }
@@ -412,10 +414,17 @@ async fn start_listening(
 ) -> State {
     match state {
         State::Ready => match GpuMonitor::new().await {
-            Some(monitor) => State::Waiting(monitor),
+            Some(monitor) => {
+                let (tx, rx) = mpsc::unbounded_channel();
+                if output.send(GpuUpdate::Init(tx)).await.is_err() {
+                    State::Finished
+                } else {
+                    State::Waiting(monitor, rx)
+                }
+            }
             None => State::Finished,
         },
-        State::Waiting(mut monitor) => {
+        State::Waiting(mut monitor, mut trigger) => {
             let select_all = futures::future::select_all(
                 monitor
                     .gpus
@@ -503,7 +512,7 @@ async fn start_listening(
                 i = select_all => {
                     let gpu = &mut monitor.gpus[i];
                     if gpu.path == monitor.primary_gpu {
-                        return State::Waiting(monitor);
+                        return State::Waiting(monitor, trigger);
                     }
 
                     trace!("Polling gpu {}", gpu.path.display());
@@ -529,9 +538,14 @@ async fn start_listening(
                         return State::Finished;
                     }
                 }
+                _ = trigger.recv() => {
+                    for gpu in &mut monitor.gpus {
+                        gpu.interval.reset_immediately();
+                    }
+                }
             };
 
-            State::Waiting(monitor)
+            State::Waiting(monitor, trigger)
         }
         State::Finished => iced::futures::future::pending().await,
     }