feat: focus next/prev workspace by config order; add —next-active-workspace and —prev-active-workspace

packages/wm/src/app_command.rs

@@ -325,6 +325,14 @@ impl InvokeCommand {
           focus_workspace(WorkspaceTarget::Previous, state, config)?;
         }
 
+        if args.next_order_workspace {
+          focus_workspace(WorkspaceTarget::NextOrder, state, config)?;
+        }
+
+        if args.prev_order_workspace {
+          focus_workspace(WorkspaceTarget::PreviousOrder, state, config)?;
+        }
+
         if args.recent_workspace {
           focus_workspace(WorkspaceTarget::Recent, state, config)?;
         }
@@ -376,6 +384,24 @@ impl InvokeCommand {
               )?;
             }
 
+            if args.next_order_workspace {
+              move_window_to_workspace(
+                window.clone(),
+                WorkspaceTarget::NextOrder,
+                state,
+                config,
+              )?;
+            }
+
+            if args.prev_order_workspace {
+              move_window_to_workspace(
+                window.clone(),
+                WorkspaceTarget::PreviousOrder,
+                state,
+                config,
+              )?;
+            }
+
             if args.recent_workspace {
               move_window_to_workspace(
                 window,
@@ -729,6 +755,12 @@ pub struct InvokeFocusCommand {
   #[clap(long)]
   prev_workspace: bool,
 
+  #[clap(long)]
+  next_order_workspace: bool,
+
+  #[clap(long)]
+  prev_order_workspace: bool,
+
   #[clap(long)]
   recent_workspace: bool,
 }
@@ -750,6 +782,12 @@ pub struct InvokeMoveCommand {
   #[clap(long)]
   prev_workspace: bool,
 
+  #[clap(long)]
+  next_order_workspace: bool,
+
+  #[clap(long)]
+  prev_order_workspace: bool,
+
   #[clap(long)]
   recent_workspace: bool,
 }

packages/wm/src/wm_state.rs

@@ -334,6 +334,47 @@ impl WmState {
           prev_workspace.cloned(),
         )
       }
+      WorkspaceTarget::PreviousOrder => {
+        let workspaces = &config.value.workspaces; 
+        let origin_name = origin_workspace.config().name.clone();
+        let origin_index = workspaces.iter()
+            .position(|workspace| workspace.name == origin_name)
+            .unwrap_or_else(|| workspaces.len()); 
+
+        let previous_workspace_config = if origin_index > 0 {
+            workspaces.get(origin_index - 1)
+        } else {
+            workspaces.last()
+        };
+
+        let previous_workspace_name = previous_workspace_config.map(|config| config.name.clone());
+        let previous_workspace = previous_workspace_name
+            .as_ref()
+            .and_then(|name| self.workspace_by_name(name));
+
+        (previous_workspace_name, previous_workspace)
+      }
+
+      WorkspaceTarget::NextOrder => {
+          let workspaces = &config.value.workspaces; 
+          let origin_name = origin_workspace.config().name.clone();
+          let origin_index = workspaces.iter()
+              .position(|workspace| workspace.name == origin_name)
+              .unwrap_or_else(|| workspaces.len()); 
+
+          let next_workspace_config = if origin_index < workspaces.len() - 1 {
+              workspaces.get(origin_index + 1)
+          } else {
+              workspaces.first()
+          };
+
+          let next_workspace_name = next_workspace_config.map(|config| config.name.clone());
+          let next_workspace = next_workspace_name
+              .as_ref()
+              .and_then(|name| self.workspace_by_name(name));
+
+          (next_workspace_name, next_workspace)
+      }
       WorkspaceTarget::Direction(direction) => {
         let origin_monitor =
           origin_workspace.monitor().context("No focused monitor.")?;

packages/wm/src/workspaces/workspace_target.rs

@@ -5,5 +5,7 @@ pub enum WorkspaceTarget {
   Recent,
   Next,
   Previous,
+  NextOrder,
+  PreviousOrder,
   Direction(Direction),
 }