gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-01-22 17:33:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Luke Jones
2025-03-01 16:26:55 +13:00
parent a08ca3af98
commit 5655f63dff
3 changed files with 164 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

428
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

13
rog-control-center/src/main.rs
View File

@@ -8,7 +8,7 @@ use std::time::Duration;
use config_traits::{StdConfig, StdConfigLoad1}; use config_traits::{StdConfig, StdConfigLoad1};
use dmi_id::DMIID; use dmi_id::DMIID;
use gumdrop::Options; use gumdrop::Options;
use log::{info, warn, LevelFilter}; use log::{debug, info, warn, LevelFilter};
use rog_control_center::cli_options::CliStart; use rog_control_center::cli_options::CliStart;
use rog_control_center::config::Config; use rog_control_center::config::Config;
use rog_control_center::error::Result; use rog_control_center::error::Result;
@@ -35,21 +35,20 @@ async fn main() -> Result<()> {
// If we're running under gamescope we have to set WAYLAND_DISPLAY for winit to // If we're running under gamescope we have to set WAYLAND_DISPLAY for winit to
// use // use
if let Ok(gamescope) = env::var("GAMESCOPE_WAYLAND_DISPLAY") { if let Ok(gamescope) = env::var("GAMESCOPE_WAYLAND_DISPLAY") {
dbg!(1); debug!("Gamescope detected");
if !gamescope.is_empty() { if !gamescope.is_empty() {
dbg!(2); debug!("Setting WAYLAND_DISPLAY to {}", gamescope);
env::set_var("WAYLAND_DISPLAY", gamescope); env::set_var("WAYLAND_DISPLAY", gamescope);
} }
// gamescope-0 // gamescope-0
else if let Ok(wayland) = env::var("WAYLAND_DISPLAY") { else if let Ok(wayland) = env::var("WAYLAND_DISPLAY") {
dbg!(3); debug!("Wayland display detected");
if wayland.is_empty() { if wayland.is_empty() {
dbg!(4); debug!("Setting WAYLAND_DISPLAY to gamescope-0");
env::set_var("WAYLAND_DISPLAY", "gamescope-0"); env::set_var("WAYLAND_DISPLAY", "gamescope-0");
} }
} }
} }
dbg!("SHITR");
// Try to open a proxy and check for app state first // Try to open a proxy and check for app state first
{ {
@@ -76,7 +75,7 @@ async fn main() -> Result<()> {
.unwrap(); .unwrap();
if asusd_version != self_version { if asusd_version != self_version {
println!("Version mismatch: asusctl = {self_version}, asusd = {asusd_version}"); println!("Version mismatch: asusctl = {self_version}, asusd = {asusd_version}");
return Ok(()); // return Ok(());
} }
// start tokio // start tokio

9
rog-control-center/src/ui/mod.rs
View File

@@ -86,8 +86,13 @@ pub fn setup_window(config: Arc<Mutex<Config>>) -> MainWindow {
slint::set_xdg_app_id("rog-control-center") slint::set_xdg_app_id("rog-control-center")
.map_err(|e| warn!("Couldn't set application ID: {e:?}")) .map_err(|e| warn!("Couldn't set application ID: {e:?}"))
.ok(); .ok();
let ui = MainWindow::new().unwrap(); let ui = MainWindow::new()
ui.window().show().unwrap(); .map_err(|e| warn!("Couldn't create main window: {e:?}"))
.unwrap();
ui.window()
.show()
.map_err(|e| warn!("Couldn't show main window: {e:?}"))
.unwrap();
let available = list_iface_blocking().unwrap_or_default(); let available = list_iface_blocking().unwrap_or_default();
ui.set_sidebar_items_avilable( ui.set_sidebar_items_avilable(