monolith

public

Star0

Fork 0

Watch0

174 commits 1 branch 0 tags 0 releases1.5 MiB

Commit `ad802fd23506`

tarball

atagen <boss@atagen.co>2026-10-19 07:54 UTC

4 files changed+38-16

config: report reload warnings and duplicate binds

IPC reload answered Ok even when the config had warnings, so a typo only showed up in the log. Binds that normalise to the same chord, like Mod+h and Super+h, silently resolved to whichever sorted first. Reload now replies with Answer::Warnings when there are any and plain Ok otherwise, so old clients keep working.

Modified file: crates/ipc/src/lib.rs+1

@@ -277,6 +277,7 @@ pub enum Reply {

277277 pub enum Answer {

278278 State(State),

279279 Version(String),

280+ Warnings(Vec<String>),

280281 }

281282

282283 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Default)]

Modified file: crates/monolith/src/commands.rs+28 additions−15 deletions@@ -8,29 +8,39 @@ use smithay::reexports::calloop::{Interest, Mode, PostAction};
 use std::os::fd::{FromRawFd, OwnedFd, RawFd};
 use std::process::{Child, Stdio};
 
-pub struct Binds(Vec<(Mods, Keysym, Command)>);
+pub struct Binds {
+    binds: Vec<(Mods, Keysym, Command)>,
+    pub warnings: Vec<String>,
+}
 
 impl Binds {
     pub fn new(config: &Config) -> Self {
-        let binds = config
-            .binds
-            .iter()
-            .filter_map(|b| {
-                let sym = xkb::keysym_from_name(&b.key, xkb::KEYSYM_CASE_INSENSITIVE);
-                if sym.raw() == xkb::keysyms::KEY_NoSymbol {
-                    tracing::warn!("bind: unknown key {:?}", b.key);
-                    return None;
-                }
-                Some((b.mods, sym, b.command.clone()))
-            })
-            .collect();
-        Self(binds)
+        let mut warnings = Vec::new();
+        let mut binds: Vec<(Mods, Keysym, Command)> = Vec::new();
+        for b in &config.binds {
+            let sym = xkb::keysym_from_name(&b.key, xkb::KEYSYM_CASE_INSENSITIVE);
+            if sym.raw() == xkb::keysyms::KEY_NoSymbol {
+                warnings.push(format!("bind: unknown key {:?}", b.key));
+                continue;
+            }
+            if binds.iter().any(|(m, s, _)| *m == b.mods && *s == sym) {
+                warnings.push(format!(
+                    "bind: {:?} with {:?} duplicates an earlier bind, which wins",
+                    b.key, b.mods
+                ));
+            }
+            binds.push((b.mods, sym, b.command.clone()));
+        }
+        for w in &warnings {
+            tracing::warn!("{w}");
+        }
+        Self { binds, warnings }
     }
 
     /// Matches on the unshifted keysyms so `Mod+Shift+1` means the 1 key.
     pub fn find(&self, mods: &ModifiersState, syms: &[Keysym]) -> Option<Command> {
         let held = held(mods);
-        self.0
+        self.binds
             .iter()
             .find(|(m, sym, _)| *m == held && syms.contains(sym))
             .map(|(_, _, c)| c.clone())
@@ -216,10 +226,13 @@ impl State {
     /// running config untouched.
     pub fn reload(&mut self) -> Result<(), String> {
         let loaded = Config::load(self.settings.path.as_deref()).map_err(|e| e.to_string())?;
+        let mut warnings = loaded.warnings.clone();
         let config = warn_config(loaded);
         let keyboard_changed = config.keyboard != self.settings.config.keyboard;
         let input_changed = config.input != self.settings.config.input;
         self.settings.binds = Binds::new(&config);
+        warnings.extend(self.settings.binds.warnings.iter().cloned());
+        self.settings.warnings = warnings;
         self.wm.layout.gaps = crate::state::gaps(&config);
         self.wm.layout.autotile = config.general.autotile;
         self.wm.anim.settings = config.animation.clone();

Modified file: crates/monolith/src/ipc.rs+7 additions−1 deletions@@ -104,7 +104,12 @@ fn handle_line(state: &mut State, stream: &UnixStream, line: &[u8]) -> Option<En
         return Some(Envelope::new(id, Reply::Error(msg)));
     }
     let reply = match req.body {
-        Request::Run(cmd) => match state.run(cmd) {
+        Request::Run(cmd) => match state.run(cmd.clone()) {
+            Ok(())
+                if cmd == monolith_ipc::Command::Reload && !state.settings.warnings.is_empty() =>
+            {
+                Reply::Ok(Some(Answer::Warnings(state.settings.warnings.clone())))
+            }
             Ok(()) => Reply::Ok(None),
             Err(e) => Reply::Error(e),
         },
@@ -245,6 +250,7 @@ fn talk(request: Request) -> ExitCode {
             Reply::Ok(None) => {}
             Reply::Ok(Some(answer)) => match answer {
                 Answer::Version(v) => println!("{v}"),
+                Answer::Warnings(ws) => ws.iter().for_each(|w| eprintln!("config: {w}")),
                 Answer::State(s) => {
                     println!("{}", serde_json::to_string_pretty(&s).unwrap_or_default())
                 }

Modified file: crates/monolith/src/state.rs+2 additions@@ -97,6 +97,7 @@ pub struct Settings {
     pub config: Config,
     pub path: Option<PathBuf>,
     pub binds: Binds,
+    pub warnings: Vec<String>,
 }
 
 impl State {
@@ -171,6 +172,7 @@ impl State {
                 binds: Binds::new(&config),
                 config,
                 path: config_path,
+                warnings: Vec::new(),
             },
             renderer,
             wm: Wm::new(layout, Animator::new(animation)),

monolith

Commit ad802fd23506

Commit `ad802fd23506`