config: workspace display order

toml-config/src/config.rs

@@ -35,6 +35,7 @@ use {
         theme::Color,
         video::{ColorSpace, Format, GfxApi, TearingMode, TransferFunction, Transform, VrrMode},
         window::{ContentType, TileState, WindowType},
+        workspace::WorkspaceDisplayOrder,
         xwayland::XScalingMode,
     },
     std::{
@@ -509,6 +510,7 @@ pub struct Config {
     pub focus_history: Option<FocusHistory>,
     pub middle_click_paste: Option<bool>,
     pub input_modes: AHashMap<String, InputMode>,
+    pub workspace_display_order: Option<WorkspaceDisplayOrder>,
 }
 
 #[derive(Debug, Error)]

toml-config/src/config/parsers.rs

@@ -47,6 +47,7 @@ mod vrr;
 mod window_match;
 mod window_rule;
 mod window_type;
+mod workspace_display_order;
 mod xwayland;
 
 #[derive(Debug, Error)]

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

@@ -36,6 +36,7 @@ use {
                 ui_drag::UiDragParser,
                 vrr::VrrParser,
                 window_rule::WindowRulesParser,
+                workspace_display_order::WorkspaceDisplayOrderParser,
                 xwayland::XwaylandParser,
             },
             spanned::SpannedErrorExt,
@@ -138,7 +139,7 @@ impl Parser for ConfigParser<'_> {
                 show_bar,
                 focus_history_val,
             ),
-            (middle_click_paste, input_modes_val),
+            (middle_click_paste, input_modes_val, workspace_display_order_val),
         ) = ext.extract((
             (
                 opt(val("keymap")),
@@ -188,7 +189,11 @@ impl Parser for ConfigParser<'_> {
                 recover(opt(bol("show-bar"))),
                 opt(val("focus-history")),
             ),
-            (recover(opt(bol("middle-click-paste"))), opt(val("modes"))),
+            (
+                recover(opt(bol("middle-click-paste"))),
+                opt(val("modes")),
+                opt(val("workspace-display-order")),
+            ),
         ))?;
         let mut keymap = None;
         if let Some(value) = keymap_val {
@@ -486,6 +491,18 @@ impl Parser for ConfigParser<'_> {
                 }
             }
         }
+        let mut workspace_display_order = None;
+        if let Some(value) = workspace_display_order_val {
+            match value.parse(&mut WorkspaceDisplayOrderParser) {
+                Ok(v) => workspace_display_order = Some(v),
+                Err(e) => {
+                    log::warn!(
+                        "Could not parse the workspace display order: {}",
+                        self.0.error(e)
+                    );
+                }
+            }
+        }
         Ok(Config {
             keymap,
             repeat_rate,
@@ -528,6 +545,7 @@ impl Parser for ConfigParser<'_> {
             focus_history,
             middle_click_paste: middle_click_paste.despan(),
             input_modes,
+            workspace_display_order,
         })
     }
 }

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

@@ -0,0 +1,32 @@
+use {
+    crate::{
+        config::parser::{DataType, ParseResult, Parser, UnexpectedDataType},
+        toml::toml_span::{Span, SpannedExt},
+    },
+    jay_config::workspace::WorkspaceDisplayOrder,
+    thiserror::Error,
+};
+
+#[derive(Debug, Error)]
+pub enum WorkspaceDisplayOrderParserError {
+    #[error(transparent)]
+    Expected(#[from] UnexpectedDataType),
+    #[error("Unknown workspace display order {0}")]
+    Unknown(String),
+}
+
+pub struct WorkspaceDisplayOrderParser;
+
+impl Parser for WorkspaceDisplayOrderParser {
+    type Value = WorkspaceDisplayOrder;
+    type Error = WorkspaceDisplayOrderParserError;
+    const EXPECTED: &'static [DataType] = &[DataType::String];
+
+    fn parse_string(&mut self, span: Span, string: &str) -> ParseResult<Self> {
+        match string {
+            "manual" => Ok(WorkspaceDisplayOrder::Manual),
+            "sorted" => Ok(WorkspaceDisplayOrder::Sorted),
+            _ => Err(WorkspaceDisplayOrderParserError::Unknown(string.to_string()).spanned(span)),
+        }
+    }
+}

toml-config/src/lib.rs

@@ -50,6 +50,7 @@ use {
             set_tearing_mode, set_vrr_cursor_hz, set_vrr_mode,
         },
         window::Window,
+        workspace::set_workspace_display_order,
         xwayland::set_x_scaling_mode,
     },
     run_on_drop::on_drop,
@@ -1306,6 +1307,9 @@ fn load_config(initial_load: bool, persistent: &Rc<PersistentState>) {
     if let Some(v) = config.middle_click_paste {
         set_middle_click_paste_enabled(v);
     }
+    if let Some(v) = config.workspace_display_order {
+        set_workspace_display_order(v);
+    }
 }
 
 fn create_command(exec: &Exec) -> Command {