From ac370d7f6bceb63d444563a949e6ab39ff8a9ef0 Mon Sep 17 00:00:00 2001
From: lars-berger <lars.berger@yahoo.com>
Date: Sun, 29 Sep 2024 05:44:08 +0800
Subject: [PATCH] fix: shutdown and config reload commands get run from tray
 menu (#742)

---
 packages/wm/src/app_command.rs                | 23 ++-----------------
 .../wm/src/common/commands/reload_config.rs   |  9 ++++++++
 packages/wm/src/main.rs                       | 19 ++++++++++-----
 packages/wm/src/wm.rs                         |  1 +
 resources/assets/sample-config.yaml           | 22 ++++++++----------
 5 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/packages/wm/src/app_command.rs b/packages/wm/src/app_command.rs
index 33835e8f..4440b1a9 100644
--- a/packages/wm/src/app_command.rs
+++ b/packages/wm/src/app_command.rs
@@ -10,7 +10,7 @@ use crate::{
   common::{
     commands::{
       cycle_focus, disable_binding_mode, enable_binding_mode,
-      platform_sync, reload_config, shell_exec,
+      reload_config, shell_exec,
     },
     Direction, LengthValue, RectDelta, TilingDirection,
   },
@@ -604,14 +604,6 @@ impl InvokeCommand {
         enable_binding_mode(name, state, config)
       }
       InvokeCommand::WmExit => {
-        Self::run_multiple(
-          config.value.general.shutdown_commands.clone(),
-          subject_container,
-          state,
-          config,
-        )?;
-        platform_sync(state, config)?;
-
         state.emit_exit();
         Ok(())
       }
@@ -624,18 +616,7 @@ impl InvokeCommand {
 
         Ok(())
       }
-      InvokeCommand::WmReloadConfig => {
-        reload_config(state, config)?;
-
-        Self::run_multiple(
-          config.value.general.config_reload_commands.clone(),
-          subject_container,
-          state,
-          config,
-        )?;
-        platform_sync(state, config)?;
-        Ok(())
-      }
+      InvokeCommand::WmReloadConfig => reload_config(state, config),
     }
   }
 
diff --git a/packages/wm/src/common/commands/reload_config.rs b/packages/wm/src/common/commands/reload_config.rs
index 8c233af8..91710a50 100644
--- a/packages/wm/src/common/commands/reload_config.rs
+++ b/packages/wm/src/common/commands/reload_config.rs
@@ -2,6 +2,7 @@ use anyhow::Context;
 use tracing::{info, warn};
 
 use crate::{
+  app_command::InvokeCommand,
   containers::traits::{CommonGetters, TilingSizeGetters},
   user_config::{ParsedConfig, UserConfig, WindowRuleEvent},
   windows::{commands::run_window_rules, traits::WindowGetters},
@@ -55,6 +56,14 @@ pub fn reload_config(
     parsed_config: config.value.clone(),
   });
 
+  // Run config reload commands.
+  InvokeCommand::run_multiple(
+    config.value.general.config_reload_commands.clone(),
+    state.focused_container().context("No focused container.")?,
+    state,
+    config,
+  )?;
+
   Ok(())
 }
 
diff --git a/packages/wm/src/main.rs b/packages/wm/src/main.rs
index 26cf0f3f..2d051e6d 100644
--- a/packages/wm/src/main.rs
+++ b/packages/wm/src/main.rs
@@ -190,12 +190,19 @@ async fn start_wm(
     }
   }
 
-  // Broadcast `WmEvent::ApplicationExiting` on shutdown.
-  if let Err(err) = ipc_server.process_event(WmEvent::ApplicationExiting) {
-    warn!(
-      "Failed to emit `WmEvent::ApplicationExiting` event over IPC: {:?}",
-      err
-    );
+  // Run shutdown commands.
+  let shutdown_commands = config.value.general.shutdown_commands.clone();
+  wm.process_commands(shutdown_commands, None, &mut config)?;
+
+  wm.state.emit_event(WmEvent::ApplicationExiting);
+
+  // Emit remaining WM events before exiting.
+  while let Ok(wm_event) = wm.event_rx.try_recv() {
+    info!("Emitting WM event before shutting down: {:?}", wm_event);
+
+    if let Err(err) = ipc_server.process_event(wm_event) {
+      warn!("{:?}", err);
+    }
   }
 
   Ok(())
diff --git a/packages/wm/src/wm.rs b/packages/wm/src/wm.rs
index 210d6938..33150d39 100644
--- a/packages/wm/src/wm.rs
+++ b/packages/wm/src/wm.rs
@@ -124,6 +124,7 @@ impl WindowManager {
       state,
       config,
     )?;
+
     platform_sync(state, config)?;
 
     Ok(new_subject_container_id)
diff --git a/resources/assets/sample-config.yaml b/resources/assets/sample-config.yaml
index 2d7a255b..b8387791 100644
--- a/resources/assets/sample-config.yaml
+++ b/resources/assets/sample-config.yaml
@@ -1,17 +1,15 @@
 general:
-  # Commands to run when the WM has started (e.g. to run a script or launch
-  # another application). Here we are running a batch script to start Zebar.
-  startup_commands: ['shell-exec %userprofile%/.glzr/zebar/start.bat']
-  # Similarly commands can be executed just before the WM is shutdown
-  # and after the config has reloaded.
-  # Here we shutdown Zebar when the WM is shutdown.
+  # Commands to run when the WM has started. This is useful for running a
+  # script or launching another application.
+  # Example: The below command launches Zebar.
+  startup_commands: ['shell-exec zebar']
+
+  # Commands to run just before the WM is shutdown.
+  # Example: The below command kills Zebar.
   shutdown_commands: ['shell-exec taskkill /IM zebar.exe /F']
-  # Here we restart Zebar to reload the Zebar config when reloading the
-  # WM config.
-  config_reload_commands: [
-    'shell-exec taskkill /IM zebar.exe /F',
-    'shell-exec %userprofile%/.glzr/zebar/start.bat'
-  ]
+
+  # Commands to run after the WM config is reloaded.
+  config_reload_commands: []
 
   # Whether to automatically focus windows underneath the cursor.
   focus_follows_cursor: false