fix: added missing global values (dry, allow_toasts, etc.)

Signed-off-by: Enrico Stemmer <enrico@h3rmt.zip>

config/hyprswitch.ron

@@ -13,7 +13,7 @@ Config(
         windows: (
             show_title: true,
             workspaces_per_row: 4,
-            strip_html_from_title: true,
+            strip_html_from_workspace_title: true,
             // removed
             icon_size: 512,
             // removed

src/config/config_structs.rs

@@ -42,7 +42,7 @@ pub struct Windows {
     #[default = 5]
     pub workspaces_per_row: u8,
     #[default = true]
-    pub strip_html_from_title: bool,
+    pub strip_html_from_workspace_title: bool,
 }
 
 #[derive(Debug, Deserialize, Serialize)]

src/daemon/gui/gui_handle.rs

@@ -1,3 +1,4 @@
+use std::ops::Deref;
 use crate::daemon::cache::cache_run;
 use crate::daemon::gui::launcher::show_launch_spawn;
 use crate::daemon::gui::reload_desktop_maps;
@@ -6,7 +7,6 @@ use crate::handle::{clear_recent_clients, run_program, switch_to_active};
 use crate::{global, Active, ClientId, MonitorId, Warn, WorkspaceId};
 use anyhow::Context;
 use gtk4::glib::clone;
-use std::ops::Deref;
 use std::thread;
 use tracing::{trace, warn};
 

src/daemon/gui/launcher/mod.rs

@@ -4,7 +4,7 @@ use crate::daemon::gui::gui_handle::{
 use crate::daemon::gui::maps::get_all_desktop_files;
 use crate::daemon::gui::LauncherRefs;
 use crate::daemon::{Exec, GUISend, LaunchState, ReverseKey, Share, UpdateCause};
-use crate::Warn;
+use crate::{global, Warn};
 use async_channel::Sender;
 use gtk4::gdk::{Key, Texture};
 use gtk4::glib::{clone, ControlFlow, Propagation};
@@ -106,6 +106,8 @@ pub(super) fn update_launcher(
     selected: Option<usize>,
     launch_state: &LaunchState,
     reverse_key: &ReverseKey,
+    launcher_max_items: u8,
+    show_launcher_execs: bool,
 ) -> Vec<Exec> {
     while let Some(child) = list.first_child() {
         list.remove(&child);
@@ -137,8 +139,10 @@ pub(super) fn update_launcher(
         }
     }
 
-    for (index, (name, icon, exec, path, terminal)) in
-        matches.into_iter().take(*LAUNCHER_MAX_ITEMS).enumerate()
+    for (index, (name, icon, exec, path, terminal)) in matches
+        .into_iter()
+        .take(launcher_max_items as usize)
+        .enumerate()
     {
         let i = index as i32 - selected.unwrap_or(0) as i32;
         let widget = create_launch_widget(
@@ -171,6 +175,7 @@ pub(super) fn update_launcher(
             } else {
                 None
             },
+            show_launcher_execs,
         );
         list.append(&widget);
         execs.push(Exec {
@@ -191,6 +196,7 @@ fn create_launch_widget(
     raw_index: usize,
     index: &str,
     selected: Option<&LaunchState>,
+    show_launcher_execs: bool,
 ) -> ListBoxRow {
     let hbox = gtk4::Box::builder()
         .orientation(Orientation::Horizontal)
@@ -228,7 +234,7 @@ fn create_launch_widget(
         .build();
     hbox.append(&title);
 
-    if *SHOW_LAUNCHER_EXECS {
+    if show_launcher_execs {
         let exec = Label::builder()
             .halign(Align::Start)
             .valign(Align::Center)
@@ -300,7 +306,13 @@ pub fn show_launch_spawn(share: Share, cause: Option<u8>) {
         trace!("Received refresh finish from GUI: {rec:?}");
 
         // wait for the GUI to update
-        thread::sleep(Duration::from_millis(*LAUNCHER_ANIMATE_LAUNCH_TIME));
+        thread::sleep(Duration::from_millis(
+            global::OPTS
+                .get()
+                .map(|o| o.animate_launch_time)
+                .warn("Failed to access global animate_launch_time")
+                .unwrap_or(300),
+        ));
 
         {
             let mut lat = latest.lock().expect("Failed to lock");

src/daemon/gui/mod.rs

@@ -182,6 +182,7 @@ async fn handle_update(
                         init_gui_config.show_title,
                         data.gui_config.show_workspaces_on_all_monitors,
                         init_gui_config.size_factor,
+                        init_gui_config.strip_html_workspace_title,
                     );
 
                     trace!("Refresh window {:?}", window);
@@ -233,6 +234,8 @@ async fn handle_update(
                         data.launcher_data.selected,
                         &data.launcher_data.launch_state,
                         &data.submap_config.reverse_key,
+                        init_gui_config.launcher_max_items,
+                        init_gui_config.show_execs,
                     );
                     data.launcher_data.execs = execs;
                 });

src/daemon/gui/windows/init.rs

@@ -20,6 +20,7 @@ pub fn init_windows(
     show_title: bool,
     show_workspaces_on_all_monitors: bool,
     size_factor: f64,
+    strip_html_workspace_title: bool,
 ) {
     // clear_monitor(monitor_data);
     let workspaces = {
@@ -40,7 +41,7 @@ pub fn init_windows(
 
         let id_string = wid.to_string();
         let title = if show_title && !workspace.name.trim().is_empty() {
-            if *REMOVE_HTML_FROM_WORKSPACE_NAME {
+            if strip_html_workspace_title {
                 regex.replace_all(&workspace.name, "$1")
             } else {
                 Cow::from(&workspace.name)

src/daemon/mod.rs

@@ -17,8 +17,8 @@ mod handle_fns;
 
 pub use data::*;
 
-pub use gui::{debug_desktop_files, debug_list, debug_search_class};
 pub use cache::get_cached_runs;
+pub use gui::{debug_desktop_files, debug_list, debug_search_class};
 #[derive(Debug, Clone)]
 pub(crate) enum GUISend {
     Refresh,
@@ -63,6 +63,11 @@ pub struct InitGuiConfig {
     pub show_title: bool,
     pub workspaces_per_row: u8,
     pub size_factor: f64,
+    pub launcher_max_items: u8,
+    pub default_terminal: Option<String>,
+    pub show_execs: bool,
+    pub animate_launch_time: u64,
+    pub strip_html_workspace_title: bool,
 }
 
 pub fn start_daemon(init_gui_config: InitGuiConfig) -> anyhow::Result<()> {

src/handle/exec.rs

@@ -7,7 +7,7 @@ use hyprland::prelude::HyprDataActive;
 use hyprland::shared::{Address, MonitorId, WorkspaceId};
 use tracing::{debug, span, warn, Level};
 
-use crate::{global, to_client_address, Active, FindByFirst, HyprlandData};
+use crate::{global, to_client_address, Active, FindByFirst, HyprlandData, Warn};
 
 pub fn switch_to_active(
     active: Option<&Active>,
@@ -30,13 +30,24 @@ pub fn switch_to_active(
                     id: data.workspace,
                     name: workspace_data.name.clone(),
                 },
-                *global::DRY.get().expect("DRY not set"),
+                global::OPTS
+                    .get()
+                    .map(|o| o.dry)
+                    .warn("Failed to access global dry")
+                    .unwrap_or(false),
             )
             .with_context(|| {
                 format!("Failed to execute switch workspace with workspace_data {workspace_data:?}")
             })?;
-            switch_client(&to_client_address(*addr), *global::DRY.get().expect("DRY not set"))
-                .with_context(|| format!("Failed to execute with addr {addr:?}"))?;
+            switch_client(
+                &to_client_address(*addr),
+                global::OPTS
+                    .get()
+                    .map(|o| o.dry)
+                    .warn("Failed to access global dry")
+                    .unwrap_or(false),
+            )
+            .with_context(|| format!("Failed to execute with addr {addr:?}"))?;
         }
         Some(Active::Workspace(wid)) => {
             let workspace_data = clients_data
@@ -48,16 +59,26 @@ pub fn switch_to_active(
                     id: *wid,
                     name: workspace_data.name.clone(),
                 },
-                *global::DRY.get().expect("DRY not set"),
+                global::OPTS
+                    .get()
+                    .map(|o| o.dry)
+                    .warn("Failed to access global dry")
+                    .unwrap_or(false),
             )
             .with_context(|| {
                 format!("Failed to execute switch workspace with workspace_data {workspace_data:?}")
             })?;
         }
         Some(Active::Monitor(mid)) => {
-            switch_monitor(mid, *global::DRY.get().expect("DRY not set")).with_context(|| {
-                format!("Failed to execute switch monitor with monitor_id {mid:?}")
-            })?;
+            switch_monitor(
+                mid,
+                global::OPTS
+                    .get()
+                    .map(|o| o.dry)
+                    .warn("Failed to access global dry")
+                    .unwrap_or(false),
+            )
+            .with_context(|| format!("Failed to execute switch monitor with monitor_id {mid:?}"))?;
         }
         None => {
             warn!("Not executing switch (active = Unknown)");

src/handle/run.rs

@@ -1,13 +1,17 @@
-use crate::Warn;
-use std::ops::Deref;
+use crate::{global, Warn};
 use std::os::unix::prelude::CommandExt;
 use std::process::{Command, Stdio};
 use std::{io, thread};
 use tracing::{debug, info};
 
 pub fn run_program(run: &str, path: &Option<Box<str>>, terminal: bool) {
     if terminal {
-        if let Some(term) = DEFAULT_TERMINAL.deref() {
+        if let Some(term) = global::OPTS
+            .get()
+            .map(|o| o.default_terminal.as_ref())
+            .warn("Failed to access global default terminal")
+            .unwrap_or_default()
+        {
             let mut process = Command::new(term);
             process.arg("-e");
             run_command(&mut process, run, path).warn("Failed to run command");

src/lib.rs

@@ -20,11 +20,18 @@ pub use hypr_data::*;
 const MIN_VERSION: Version = Version::new(0, 42, 0);
 
 pub mod global {
-    /// global variable to store if we are in dry mode
-    pub static DRY: std::sync::OnceLock<bool> = std::sync::OnceLock::new();
-
-    /// global variable to store if gui is open
+    /// global variable to store if gui is open TODO check if this can be put in shared data
     pub static OPEN: std::sync::OnceLock<std::sync::Mutex<bool>> = std::sync::OnceLock::new();
+
+    /// immutable global variable to store global options
+    pub static OPTS: std::sync::OnceLock<Global> = std::sync::OnceLock::new();
+
+    pub struct Global {
+        pub dry: bool,
+        pub toasts_allowed: bool,
+        pub animate_launch_time: u64,
+        pub default_terminal: Option<String>,
+    }
 }
 
 type WorkspaceId = i32;
@@ -95,7 +102,12 @@ impl<A, E: Display> Warn<A> for Result<A, E> {
 }
 
 pub fn toast(_body: &str) {
-    if !*envs::DISABLE_TOASTS {
+    if global::OPTS
+        .get()
+        .map(|o| o.toasts_allowed)
+        .warn("Failed to access global toasts_allowed")
+        .unwrap_or(true)
+    {
         #[cfg(not(debug_assertions))]
         let _ = notify_rust::Notification::new()
             .summary(&format!(

src/main.rs

@@ -44,19 +44,22 @@ fn main() -> anyhow::Result<()> {
         .finish();
     tracing::subscriber::set_global_default(subscriber).warn("Unable to initialize logging");
 
-    check_version().warn("Unable to check Hyprland version, continuing anyway");
-
     global::DRY
         .set(cli.global_opts.dry_run)
-        .expect("unable to set DRY (already filled???)");
+        .warn("unable to set DRY (already filled???)");
     global::OPEN
         .set(Mutex::new(false))
-        .expect("unable to set ACTIVE (already filled???)");
+        .warn("unable to set ACTIVE (already filled???)");
+
+    check_version().warn("Unable to check Hyprland version, continuing anyway");
 
     match cli.command {
         cli::Command::Run { config_file, .. } => {
             info!("Loading config");
             let config = hyprswitch::config::load(config_file).context("Failed to load config")?;
+            global::TOASTS_ALLOWED
+                .set(!config.general.disable_toast)
+                .warn("unable to set TOASTS_ALLOWED (already filled???)");
             trace!(
                 "Config read: {}",
                 serde_json::to_string(&config).unwrap_or("Failed to serialize config".to_string())
@@ -67,6 +70,11 @@ fn main() -> anyhow::Result<()> {
                 show_title: config.general.windows.show_title,
                 workspaces_per_row: config.general.windows.workspaces_per_row,
                 size_factor: config.general.size_factor,
+                launcher_max_items: config.general.launcher.items,
+                default_terminal: config.general.launcher.default_terminal.clone(),
+                show_execs: config.general.launcher.show_execs,
+                animate_launch_time: config.general.launcher.animate_launch_time_ms,
+                strip_html_workspace_title: config.general.windows.strip_html_from_workspace_title,
             };
             let list = hyprswitch::config::create_binds_and_submaps(config)
                 .context("Failed to create binds and submaps")?;