GFX control, no-tokio, no-async, dbus client refactor

- Working gfx modes <iGPU only, dGPU only, or hybrid>
- Add signal for gfx vendor change and make CLI wait for signal
- Add polling for led brightness to save to config
- Move daemon to zbus crate
- dbus client refactor
- Further dbus methods and updates
- Add basic notification user daemon and systemd service

asus-nb-ctrl/src/main.rs

@@ -3,10 +3,13 @@ use asus_nb::{
     core_dbus::AuraDbusClient,
     profile::{ProfileCommand, ProfileEvent},
 };
+use ctrl_gfx::vendors::GfxVendors;
 use daemon::ctrl_fan_cpu::FanLevel;
 use gumdrop::Options;
 use log::LevelFilter;
 use std::io::Write;
+use yansi_term::Colour::Green;
+use yansi_term::Colour::Red;
 
 #[derive(Options)]
 struct CLIStart {
@@ -20,6 +23,8 @@ struct CLIStart {
     pwr_profile: Option<FanLevel>,
     #[options(meta = "CHRG", help = "<20-100>")]
     chg_limit: Option<u8>,
+    #[options(help = "Set graphics mode: <nvidia, hybrid, compute, integrated>")]
+    graphics: Option<GfxVendors>,
     #[options(command)]
     command: Option<Command>,
 }
@@ -40,8 +45,7 @@ struct LedModeCommand {
     command: Option<SetAuraBuiltin>,
 }
 
-#[tokio::main]
-pub async fn main() -> Result<(), Box<dyn std::error::Error>> {
+fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut logger = env_logger::Builder::new();
     logger
         .target(env_logger::Target::Stdout)
@@ -78,5 +82,52 @@ pub async fn main() -> Result<(), Box<dyn std::error::Error>> {
     if let Some(chg_limit) = parsed.chg_limit {
         writer.write_charge_limit(chg_limit)?;
     }
+    if let Some(gfx) = parsed.graphics {
+        println!("Updating settings, please wait...");
+        println!("If this takes longer than 30s, ctrl+c then check journalctl");
+
+        writer.write_gfx_mode(gfx)?;
+        let res = writer.wait_gfx_changed()?;
+        match res.as_str() {
+            "reboot" => println!(
+                "{}\n{}",
+                Green.paint("\nGraphics vendor mode changed successfully\n"),
+                Red.paint("\nPlease reboot to complete switch to iGPU\n")
+            ),
+            "restartx" => {
+                println!(
+                    "{}",
+                    Green.paint("\nGraphics vendor mode changed successfully\n")
+                );
+                restart_x()?;
+                std::process::exit(1)
+            }
+            _ => std::process::exit(-1),
+        }
+        std::process::exit(-1)
+    }
+    Ok(())
+}
+
+fn restart_x() -> Result<(), Box<dyn std::error::Error>> {
+    println!("Restart X server? y/n");
+
+    let mut buf = String::new();
+    std::io::stdin().read_line(&mut buf).expect("Input failed");
+    let input = buf.chars().next().unwrap() as char;
+
+    if input == 'Y' || input == 'y' {
+        println!("Restarting X server");
+        let status = std::process::Command::new("systemctl")
+            .arg("restart")
+            .arg("display-manager.service")
+            .status()?;
+
+        if !status.success() {
+            println!("systemctl: display-manager returned with {}", status);
+        }
+    } else {
+        println!("{}", Red.paint("Cancelled. Please restart X when ready"));
+    }
     Ok(())
 }