feat(cli): fixups for cycle-layout cmd

LGUG2Z · Oct 8, 2023 · bbdcd35 · bbdcd35
1 parent 1a2cad6
commit bbdcd35
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 19 deletions.
diff --git a/komorebi-core/src/default_layout.rs b/komorebi-core/src/default_layout.rs
@@ -128,7 +128,7 @@ impl DefaultLayout {
     }
 
     #[must_use]
-    pub const fn cycle(self) -> Self {
+    pub const fn cycle_next(self) -> Self {
         match self {
             Self::BSP => Self::Columns,
             Self::Columns => Self::Rows,
@@ -138,4 +138,16 @@ impl DefaultLayout {
             Self::UltrawideVerticalStack => Self::BSP,
         }
     }
+
+    #[must_use]
+    pub const fn cycle_previous(self) -> Self {
+        match self {
+            Self::BSP => Self::UltrawideVerticalStack,
+            Self::UltrawideVerticalStack => Self::HorizontalStack,
+            Self::HorizontalStack => Self::VerticalStack,
+            Self::VerticalStack => Self::Rows,
+            Self::Rows => Self::Columns,
+            Self::Columns => Self::BSP,
+        }
+    }
 }
diff --git a/komorebi-core/src/lib.rs b/komorebi-core/src/lib.rs
@@ -77,7 +77,7 @@ pub enum SocketMessage {
     AdjustContainerPadding(Sizing, i32),
     AdjustWorkspacePadding(Sizing, i32),
     ChangeLayout(DefaultLayout),
-    CycleLayout(),
+    CycleLayout(CycleDirection),
     ChangeLayoutCustom(PathBuf),
     FlipLayout(Axis),
     // Monitor and Workspace Commands

diff --git a/komorebi/src/process_command.rs b/komorebi/src/process_command.rs
@@ -448,7 +448,7 @@ impl WindowManager {
             SocketMessage::Retile => self.retile_all(false)?,
             SocketMessage::FlipLayout(layout_flip) => self.flip_layout(layout_flip)?,
             SocketMessage::ChangeLayout(layout) => self.change_workspace_layout_default(layout)?,
-            SocketMessage::CycleLayout() => self.cycle_layout()?,
+            SocketMessage::CycleLayout(direction) => self.cycle_layout(direction)?,
             SocketMessage::ChangeLayoutCustom(ref path) => {
                 self.change_workspace_custom_layout(path.clone())?;
             }

diff --git a/komorebi/src/window_manager.rs b/komorebi/src/window_manager.rs
@@ -1706,22 +1706,25 @@ impl WindowManager {
     }
 
     #[tracing::instrument(skip(self))]
-    pub fn cycle_layout(&mut self) -> Result<()> {
+    pub fn cycle_layout(&mut self, direction: CycleDirection) -> Result<()> {
         tracing::info!("cycling layout");
 
         let workspace = self.focused_workspace_mut()?;
-        let current_layout = workspace.layout()?;
+        let current_layout = workspace.layout();
+
         match current_layout {
-            // For cycling, only Default Layout is supported
-            DefaultLayout => {
-                let new_layout = current_layout.cycle();
-                tracing::info!("Next layout for cycling: {:?}", new_layout);
-                current_layout.set_layout(new_layout);
-            }
-            CustomLayout => {
-                tracing::info!("Current layout is custom, skipping cycling");
+            Layout::Default(current) => {
+                let new_layout = match direction {
+                    CycleDirection::Previous => current.cycle_previous(),
+                    CycleDirection::Next => current.cycle_next(),
+                };
+
+                tracing::info!("next layout: {new_layout}");
+                workspace.set_layout(Layout::Default(new_layout));
             }
+            Layout::Custom(_) => {}
         }
+
         self.update_focused_workspace(self.mouse_follows_focus)
     }
 

diff --git a/komorebic.lib.ahk b/komorebic.lib.ahk
@@ -196,8 +196,8 @@ ChangeLayout(default_layout) {
     RunWait("komorebic.exe change-layout " default_layout, , "Hide")
 }
 
-CycleLayout() {
-  RunWait("komorebic.exe cycle-layout " , , "Hide")
+CycleLayout(operation_direction) {
+    RunWait("komorebic.exe cycle-layout " operation_direction, , "Hide")
 }
 
 LoadCustomLayout(path) {

diff --git a/komorebic/src/main.rs b/komorebic/src/main.rs
@@ -125,7 +125,7 @@ gen_enum_subcommand_args! {
     CycleStack: CycleDirection,
     FlipLayout: Axis,
     ChangeLayout: DefaultLayout,
-    CycleLayout: CycleLayout,
+    CycleLayout: CycleDirection,
     WatchConfiguration: BooleanState,
     MouseFollowsFocus: BooleanState,
     Query: StateQuery,
@@ -855,7 +855,7 @@ enum SubCommand {
     ChangeLayout(ChangeLayout),
     // Cycle between available layouts
     #[clap(arg_required_else_help = false)]
-    CycleLayout(),
+    CycleLayout(CycleLayout),
     /// Load a custom layout from file for the focused workspace
     #[clap(arg_required_else_help = true)]
     LoadCustomLayout(LoadCustomLayout),
@@ -1614,8 +1614,8 @@ Stop-Process -Name:whkd -ErrorAction SilentlyContinue
         SubCommand::ChangeLayout(arg) => {
             send_message(&SocketMessage::ChangeLayout(arg.default_layout).as_bytes()?)?;
         }
-        SubCommand::CycleLayout() => {
-            send_message(&SocketMessage::CycleLayout().as_bytes()?)?;
+        SubCommand::CycleLayout(arg) => {
+            send_message(&SocketMessage::CycleLayout(arg.cycle_direction).as_bytes()?)?;
         }
         SubCommand::LoadCustomLayout(arg) => {
             send_message(