Added --floating-pixels to move command

Author: Yahddyyp

Sources/AppBundle/command/impl/MoveCommand.swift

@@ -5,7 +5,7 @@ struct MoveCommand: Command {
     let args: MoveCmdArgs
     /*conforms*/ var shouldResetClosedWindowsCache = true
 
-    func run(_ env: CmdEnv, _ io: CmdIo) -> Bool {
+    func run(_ env: CmdEnv, _ io: CmdIo) async throws -> Bool {
         let direction = args.direction.val
         guard let target = args.resolveTargetOrReportError(env, io) else { return false }
         guard let currentWindow = target.windowOrNil else {
@@ -29,7 +29,8 @@ struct MoveCommand: Command {
                     return moveOut(window: currentWindow, direction: direction, io, args, env)
                 }
             case .workspace: // floating window
-                return io.err("moving floating windows isn't yet supported") // todo
+                let pixels = args.floatingPixels ?? calculateDefaultPixels(direction: direction, window: currentWindow)
+                return await moveFloatingWindow(window: currentWindow, direction: direction, pixels: pixels)
             case .macosMinimizedWindowsContainer, .macosFullscreenWindowsContainer, .macosHiddenAppsWindowsContainer:
                 return io.err(moveOutMacosUnconventionalWindow)
             case .macosPopupWindowsContainer:
@@ -154,6 +155,23 @@ private let moveOutMacosUnconventionalWindow = "moving macOS fullscreen, minimiz
     return true
 }
 
+@MainActor private func calculateDefaultPixels(direction: CardinalDirection, window: Window) -> Int {
+    guard let monitor = window.nodeMonitor else { return 50 }
+    return direction.orientation == .h
+        ? Int(Double(monitor.width) * 0.1)
+        : Int(Double(monitor.height) * 0.1)
+}
+
+@MainActor private func moveFloatingWindow(window: Window, direction: CardinalDirection, pixels: Int) async -> Bool {
+    guard let currentRect = try? await window.getAxRect() else { return false }
+    let newTopLeft = CGPoint(
+        x: currentRect.topLeftX + Double(direction.xOffset * pixels),
+        y: currentRect.topLeftY + Double(direction.yOffset * pixels)
+    )
+    window.setAxFrame(newTopLeft, nil)
+    return true
+}
+
 extension TilingTreeNodeCases {
     @MainActor fileprivate func findDeepMoveInTargetRecursive(_ orientation: Orientation) -> TilingTreeNodeCases {
         return switch self {

Sources/Common/cmdArgs/impl/MoveCmdArgs.swift

@@ -8,13 +8,15 @@ public struct MoveCmdArgs: CmdArgs {
         flags: [
             "--window-id": optionalWindowIdFlag(),
             "--boundaries": SubArgParser(\.rawBoundaries, upcastSubArgParserFun(parseBoundaries)),
+            "--floating-pixels": SubArgParser(\.rawFloatingPixels, upcastSubArgParserFun(parseFloatingPixels)),
             "--boundaries-action": SubArgParser(\.rawBoundariesAction, upcastSubArgParserFun(parseBoundariesAction)),
         ],
         posArgs: [newArgParser(\.direction, parseCardinalDirectionArg, mandatoryArgPlaceholder: CardinalDirection.unionLiteral)],
     )
 
     public var direction: Lateinit<CardinalDirection> = .uninitialized
     public var rawBoundaries: Boundaries? = nil
+    public var rawFloatingPixels: Int? = nil
     public var rawBoundariesAction: WhenBoundariesCrossed? = nil
 
     public init(rawArgs: [String], _ direction: CardinalDirection) {
@@ -35,6 +37,7 @@ public struct MoveCmdArgs: CmdArgs {
 }
 
 extension MoveCmdArgs {
+    public var floatingPixels: Int? { rawFloatingPixels }
     public var boundaries: Boundaries { rawBoundaries ?? .workspace }
     public var boundariesAction: WhenBoundariesCrossed { rawBoundariesAction ?? .createImplicitContainer }
 }
@@ -58,3 +61,15 @@ private func parseBoundariesAction(i: SubArgParserInput) -> ParsedCliArgs<MoveCm
         return .fail("<action> is mandatory", advanceBy: 0)
     }
 }
+
+private func parseFloatingPixels(i: SubArgParserInput) -> ParsedCliArgs<Int> {
+    if let arg = i.nonFlagArgOrNil() {
+        if let value = Int(arg) {
+            return .succ(value, advanceBy: 1)
+        } else {
+            return .fail("'\(arg)' must be an integer", advanceBy: 1)
+        }
+    } else {
+        return .fail("<pixels> is mandatory", advanceBy: 0)
+    }
+}

Sources/Common/cmdHelpGenerated.swift

@@ -118,7 +118,7 @@ let move_workspace_to_monitor_help_generated = """
        OR: move-workspace-to-monitor [-h|--help] [--workspace <workspace>] <monitor-pattern>...
     """
 let move_help_generated = """
-    USAGE: move [-h|--help] [--window-id <window-id>] [--boundaries <boundary>] [--boundaries-action <boundary-action>] (left|down|up|right)
+    USAGE: move [-h|--help] [--window-id <window-id>] [--boundaries <boundary>] [--boundaries-action <boundary-action>] [--floating-pixels <pixels>] (left|down|up|right)
     """
 let reload_config_help_generated = """
     USAGE: reload-config [-h|--help] [--no-gui] [--dry-run]

Sources/Common/model/CardinalDirection.swift

@@ -13,4 +13,6 @@ public enum CardinalDirection: String, CaseIterable, Equatable, Sendable {
     }
     public var focusOffset: Int { isPositive ? 1 : -1 }
     public var insertionOffset: Int { isPositive ? 1 : 0 }
+    public var xOffset: Int { self == .left ? -1 : (self == .right ? 1 : 0) }
+    public var yOffset: Int { self == .down ? -1 : (self == .up ? 1 : 0) }
 }

docs/aerospace-move.adoc

@@ -9,7 +9,7 @@ include::util/man-attributes.adoc[]
 == Synopsis
 [verse]
 // tag::synopsis[]
-aerospace move [-h|--help] [--window-id <window-id>] [--boundaries <boundary>] [--boundaries-action <boundary-action>] (left|down|up|right)
+aerospace move [-h|--help] [--window-id <window-id>] [--boundaries <boundary>] [--boundaries-action <boundary-action>] [--floating-pixels <pixels>] (left|down|up|right)
 
 // end::synopsis[]
 
@@ -35,10 +35,14 @@ Defines move boundaries. +
 The default is: `workspace`
 
 --boundaries-action <boundary-action>::
-Defines the behavior when requested to move across the `<boundary>`. +
+Define the behavior when requested to move across the `<boundary>`. +
 `<boundary-action>` possible values: `(stop|fail|create-implicit-container)`. +
 The default is: `create-implicit-container`
 
+--floating-pixels <pixels>::
+If window is floating then move it in the specified direction by the specified number of `<pixels>`. +
+If not specified, the default value for `<pixels>` is 10%.
+
 // =========================================================== Examples
 include::util/conditional-examples-header.adoc[]
 

grammar/commands-bnf-grammar.txt

@@ -107,11 +107,12 @@ aerospace -h;
 <mode_id> ::= {{{ aerospace config --get mode --keys }}};
 <workspace> ::= {{{ aerospace list-workspaces --monitor all --empty no }}};
 <number> ::= {{{ true }}};
+<pixels> ::= {{{ true }}};
 <monitor_pattern> ::= {{{ true }}};
 
 <list_workspaces1_flag> ::= --visible [no] | --empty [no] | --format <output_format> | --format <output_format> | --count | --json;
 
-<move_command_flag> ::= --window-id <window_id> | --boundaries <boundary> | --boundaries-action <move_boundaries_action>;
+<move_command_flag> ::= --window-id <window_id> | --boundaries <boundary> | --boundaries-action <move_boundaries_action> | --floating-pixels <pixels>;
 <move_boundaries_action> ::= stop|fail|create-implicit-container;
 
 <move_node_to_monitor1_flag> ::= --window-id <window_id>|--focus-follows-window|--fail-if-noop|--wrap-around;