feat: stack layout

Author: acsandmann

README.md

@@ -26,6 +26,7 @@
   - Binary Space Partitioning (bspwm-like)
   - Master-stack (dwm-like)
   - Scrolling columns (niri-style)
+  - Stack (accordion)
 - Menubar icon that opens a menu for switching workspaces, changing layouts, and accessing quick Rift controls <details> <summary><sup>click to see the menu bar icon</sup></summary><img src="assets/menu_menu.png" alt="Rift menu bar icon" /></details>
 - MacOS-style mission control that allows you to visually navigate between workspaces <details><summary><sup>click to see mission control</sup></summary><img src="assets/mission_control.png" alt="Rift Mission Control view" /></details>
 - Focus follows the mouse with auto raise

rift.default.toml

@@ -68,6 +68,7 @@ hot_reload = true
 # Layout Types:
 # 	- "traditional" (i3/sway-like containers)
 #	- "bsp" (binary space partitioning),
+#   - "stack" (single stacked container)
 #   - "master_stack" (master area + stack area)
 # defaults to "traditional" if omitted
 #
@@ -238,7 +239,7 @@ reapply_app_rules_on_title_change = false
 
 # Workspace-specific rules
 # - workspace: target workspace by index (integer) or name (string)
-# - layout: layout mode to use ("traditional", "bsp", "master_stack", "scrolling")
+# - layout: layout mode to use ("traditional", "bsp", "stack", "master_stack", "scrolling")
 # workspace_rules = [
 #   { workspace = 1, layout = "bsp" },
 #   { workspace = "second", layout = "scrolling" }
@@ -348,8 +349,8 @@ comb1 = "Alt + Shift"
 # - move_window_to_workspace = N / move_window_to_workspace = { workspace = N, window_id = 123 } (optional window id)
 # - create_workspace
 # - switch_to_last_workspace
-# - set_workspace_layout = { mode = "traditional"|"bsp"|"master_stack"|"scrolling" } (active workspace)
-# - set_workspace_layout = { workspace = N, mode = "traditional"|"bsp"|"master_stack"|"scrolling" }
+# - set_workspace_layout = { mode = "traditional"|"bsp"|"stack"|"master_stack"|"scrolling" } (active workspace)
+# - set_workspace_layout = { workspace = N, mode = "traditional"|"bsp"|"stack"|"master_stack"|"scrolling" }
 # - next_window / prev_window (focus wraps when it reaches last window in current workspace)
 # - ascend / descend
 # - move_focus = "left"|"right"|"up"|"down"

src/bin/rift-cli.rs

@@ -188,7 +188,7 @@ enum WorkspaceCommands {
         /// Workspace index (0-based). Defaults to active workspace if omitted.
         #[arg(long)]
         workspace_id: Option<usize>,
-        /// Layout mode: traditional, bsp, master_stack, scrolling
+        /// Layout mode: traditional, bsp, stack, master_stack, scrolling
         mode: String,
     },
 }
@@ -613,10 +613,11 @@ fn parse_layout_mode(value: &str) -> Result<LayoutMode, String> {
     match value.trim().to_ascii_lowercase().as_str() {
         "traditional" => Ok(LayoutMode::Traditional),
         "bsp" => Ok(LayoutMode::Bsp),
+        "stack" => Ok(LayoutMode::Stack),
         "master_stack" => Ok(LayoutMode::MasterStack),
         "scrolling" => Ok(LayoutMode::Scrolling),
         other => Err(format!(
-            "Invalid layout mode '{}'; must be traditional, bsp, master_stack, or scrolling",
+            "Invalid layout mode '{}'; must be traditional, bsp, stack, master_stack, or scrolling",
             other
         )),
     }

src/common/config.rs

@@ -551,7 +551,7 @@ impl StackLineSettings {
 #[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Default)]
 #[serde(deny_unknown_fields)]
 pub struct LayoutSettings {
-    /// Layout mode: "traditional" (i3/sway style containers)
+    /// Layout mode: "traditional", "bsp", "stack", "master_stack", or "scrolling"
     #[serde(default)]
     pub mode: LayoutMode,
     /// Stack system configuration
@@ -577,6 +577,8 @@ pub enum LayoutMode {
     Traditional,
     /// Binary space partitioning tiling
     Bsp,
+    /// Dedicated stacked layout (single stack container)
+    Stack,
     /// Master/stack layout (master area + stack area)
     MasterStack,
     /// Scrolling column layout (niri-style)
@@ -588,6 +590,7 @@ impl ToString for LayoutMode {
         match self {
             LayoutMode::Traditional => "traditional".to_string(),
             LayoutMode::Bsp => "bsp".to_string(),
+            LayoutMode::Stack => "stack".to_string(),
             LayoutMode::MasterStack => "master_stack".to_string(),
             LayoutMode::Scrolling => "scrolling".to_string(),
         }
@@ -1070,7 +1073,9 @@ fn yes() -> bool { true }
 
 fn default_stack_offset() -> f64 { 40.0 }
 
-fn default_stack_orientation() -> StackDefaultOrientation { StackDefaultOrientation::Perpendicular }
+pub fn default_stack_orientation() -> StackDefaultOrientation {
+    StackDefaultOrientation::Perpendicular
+}
 
 fn default_master_stack_new_window_placement() -> MasterStackNewWindowPlacement {
     MasterStackNewWindowPlacement::Master

src/layout_engine.rs

@@ -11,7 +11,7 @@ pub use graph::{Direction, LayoutKind, Orientation};
 pub(crate) use systems::LayoutId;
 pub use systems::{
     BspLayoutSystem, LayoutSystem, LayoutSystemKind, MasterStackLayoutSystem,
-    ScrollingLayoutSystem, TraditionalLayoutSystem,
+    ScrollingLayoutSystem, StackLayoutSystem, TraditionalLayoutSystem,
 };
 pub(crate) use workspaces::WorkspaceLayouts;
 

src/layout_engine/engine.rs

@@ -330,6 +330,29 @@ impl LayoutEngine {
                     )
                 }
             }
+            LayoutSystemKind::Stack(s) => {
+                if selection_path_only {
+                    s.collect_group_containers_in_selection_path(
+                        layout_id,
+                        screen,
+                        stack_offset,
+                        gaps,
+                        stack_line_thickness,
+                        stack_line_horiz,
+                        stack_line_vert,
+                    )
+                } else {
+                    s.collect_group_containers(
+                        layout_id,
+                        screen,
+                        stack_offset,
+                        gaps,
+                        stack_line_thickness,
+                        stack_line_horiz,
+                        stack_line_vert,
+                    )
+                }
+            }
             LayoutSystemKind::MasterStack(s) => {
                 if selection_path_only {
                     s.collect_group_containers_in_selection_path(
@@ -364,6 +387,9 @@ impl LayoutEngine {
 
         for (_, ws) in self.virtual_workspace_manager.workspaces.iter_mut() {
             match &mut ws.layout_system {
+                LayoutSystemKind::Stack(system) => {
+                    system.update_settings(settings.stack.default_orientation);
+                }
                 LayoutSystemKind::MasterStack(system) => {
                     system.update_settings(settings.master_stack.clone());
                 }
@@ -405,6 +431,7 @@ impl LayoutEngine {
             match self.workspace_tree(ws_id) {
                 LayoutSystemKind::Traditional(_) => "traditional",
                 LayoutSystemKind::Bsp(_) => "bsp",
+                LayoutSystemKind::Stack(_) => "stack",
                 LayoutSystemKind::MasterStack(_) => "master_stack",
                 LayoutSystemKind::Scrolling(_) => "scrolling",
             }
@@ -418,6 +445,7 @@ impl LayoutEngine {
             match self.workspace_tree(ws_id) {
                 LayoutSystemKind::Traditional(_) => crate::common::config::LayoutMode::Traditional,
                 LayoutSystemKind::Bsp(_) => crate::common::config::LayoutMode::Bsp,
+                LayoutSystemKind::Stack(_) => crate::common::config::LayoutMode::Stack,
                 LayoutSystemKind::MasterStack(_) => crate::common::config::LayoutMode::MasterStack,
                 LayoutSystemKind::Scrolling(_) => crate::common::config::LayoutMode::Scrolling,
             }
@@ -1589,6 +1617,9 @@ impl LayoutEngine {
                     LayoutSystemKind::Bsp(s) => {
                         Self::toggle_orientation_for_system(s, layout, default_orientation)
                     }
+                    LayoutSystemKind::Stack(s) => {
+                        Self::toggle_orientation_for_system(s, layout, default_orientation)
+                    }
                     LayoutSystemKind::MasterStack(s) => {
                         Self::toggle_orientation_for_system(s, layout, default_orientation)
                     }

src/layout_engine/systems.rs

@@ -104,6 +104,8 @@ mod master_stack;
 pub use master_stack::MasterStackLayoutSystem;
 mod scrolling;
 pub use scrolling::ScrollingLayoutSystem;
+mod stack;
+pub use stack::StackLayoutSystem;
 
 #[derive(Serialize, Deserialize)]
 #[serde(tag = "kind", rename_all = "snake_case")]
@@ -114,4 +116,5 @@ pub enum LayoutSystemKind {
     Bsp(BspLayoutSystem),
     MasterStack(MasterStackLayoutSystem),
     Scrolling(ScrollingLayoutSystem),
+    Stack(StackLayoutSystem),
 }