tree: add window-management mode

toml-config/src/config.rs

@@ -51,6 +51,7 @@ pub enum SimpleCommand {
     ToggleMono,
     ToggleSplit,
     Forward(bool),
+    EnableWindowManagement(bool),
 }
 
 #[derive(Debug, Clone)]
@@ -316,6 +317,7 @@ pub struct Config {
     pub idle: Option<Duration>,
     pub explicit_sync_enabled: Option<bool>,
     pub focus_follows_mouse: bool,
+    pub window_management_key: Option<ModifiedKeySym>,
 }
 
 #[derive(Debug, Error)]

toml-config/src/config/parsers/action.rs

@@ -111,6 +111,8 @@ impl ActionParser<'_> {
             "none" => None,
             "forward" => Forward(true),
             "consume" => Forward(false),
+            "enable-window-management" => EnableWindowManagement(true),
+            "disable-window-management" => EnableWindowManagement(false),
             _ => {
                 return Err(ActionParserError::UnknownSimpleAction(string.to_string()).spanned(span))
             }

toml-config/src/config/parsers/config.rs

@@ -2,7 +2,7 @@ use {
     crate::{
         config::{
             context::Context,
-            extractor::{arr, bol, opt, recover, val, Extractor, ExtractorError},
+            extractor::{arr, bol, opt, recover, str, val, Extractor, ExtractorError},
             parser::{DataType, ParseResult, Parser, UnexpectedDataType},
             parsers::{
                 action::ActionParser,
@@ -17,7 +17,10 @@ use {
                 log_level::LogLevelParser,
                 output::OutputsParser,
                 repeat_rate::RepeatRateParser,
-                shortcuts::{ComplexShortcutsParser, ShortcutsParser, ShortcutsParserError},
+                shortcuts::{
+                    parse_modified_keysym_str, ComplexShortcutsParser, ShortcutsParser,
+                    ShortcutsParserError,
+                },
                 status::StatusParser,
                 theme::ThemeParser,
             },
@@ -97,7 +100,13 @@ impl Parser for ConfigParser<'_> {
                 _,
                 idle_val,
             ),
-            (explicit_sync, repeat_rate_val, complex_shortcuts_val, focus_follows_mouse),
+            (
+                explicit_sync,
+                repeat_rate_val,
+                complex_shortcuts_val,
+                focus_follows_mouse,
+                window_management_key_val,
+            ),
         ) = ext.extract((
             (
                 opt(val("keymap")),
@@ -128,6 +137,7 @@ impl Parser for ConfigParser<'_> {
                 opt(val("repeat-rate")),
                 opt(val("complex-shortcuts")),
                 recover(opt(bol("focus-follows-mouse"))),
+                recover(opt(str("window-management-key"))),
             ),
         ))?;
         let mut keymap = None;
@@ -286,6 +296,12 @@ impl Parser for ConfigParser<'_> {
                 }
             }
         }
+        let mut window_management_key = None;
+        if let Some(value) = window_management_key_val {
+            if let Some(key) = parse_modified_keysym_str(self.0, value.span, value.value) {
+                window_management_key = Some(key);
+            }
+        }
         Ok(Config {
             keymap,
             repeat_rate,
@@ -309,6 +325,7 @@ impl Parser for ConfigParser<'_> {
             inputs,
             idle,
             focus_follows_mouse: focus_follows_mouse.despan().unwrap_or(true),
+            window_management_key,
         })
     }
 }

toml-config/src/config/parsers/shortcuts.rs

@@ -175,10 +175,18 @@ fn parse_action(cx: &Context<'_>, key: &str, value: &Spanned<Value>) -> Option<A
 }
 
 fn parse_modified_keysym(cx: &Context<'_>, key: &Spanned<String>) -> Option<ModifiedKeySym> {
-    match ModifiedKeysymParser.parse_string(key.span, &key.value) {
+    parse_modified_keysym_str(cx, key.span, &key.value)
+}
+
+pub fn parse_modified_keysym_str(
+    cx: &Context<'_>,
+    span: Span,
+    value: &str,
+) -> Option<ModifiedKeySym> {
+    match ModifiedKeysymParser.parse_string(span, value) {
         Ok(k) => Some(k),
         Err(e) => {
-            log::warn!("Could not parse keysym {}: {}", key.value, cx.error(e));
+            log::warn!("Could not parse keysym {}: {}", value, cx.error(e));
             None
         }
     }

toml-config/src/lib.rs

@@ -89,6 +89,9 @@ impl Action {
                 SimpleCommand::ReloadConfigSo => B::new(reload),
                 SimpleCommand::None => B::new(|| ()),
                 SimpleCommand::Forward(bool) => B::new(move || s.set_forward(bool)),
+                SimpleCommand::EnableWindowManagement(bool) => {
+                    B::new(move || s.set_window_management_enabled(bool))
+                }
             },
             Action::Multi { actions } => {
                 let actions: Vec<_> = actions.into_iter().map(|a| a.into_fn(state)).collect();
@@ -1009,6 +1012,11 @@ fn load_config(initial_load: bool, persistent: &Rc<PersistentState>) {
             true => FocusFollowsMouseMode::True,
             false => FocusFollowsMouseMode::False,
         });
+    if let Some(window_management_key) = config.window_management_key {
+        persistent
+            .seat
+            .set_window_management_key(window_management_key);
+    }
 }
 
 fn create_command(exec: &Exec) -> Command {