Aggregate focus events for sequence of commands

src/AeroSpaceApp.swift

@@ -9,6 +9,7 @@ struct AeroSpaceApp: App {
     init() {
         if !isUnitTest { // Prevent SwiftUI app loading during unit testing
             signal(SIGINT, { signal in
+                check(Thread.current.isMainThread)
                 beforeTermination()
                 exit(signal)
             } as sig_t)

src/command/CloseAllWindowsButCurrentCommand.swift

@@ -1,5 +1,5 @@
 class CloseAllWindowsButCurrentCommand: Command {
-    func runWithoutLayout() {
+    func runWithoutLayout(state: inout FocusState) {
         check(Thread.current.isMainThread)
         guard let focused = focusedWindowOrEffectivelyFocused else { return }
         for window in focused.workspace.allLeafWindowsRecursive {

src/command/Command.swift

@@ -1,8 +1,6 @@
 protocol Command: AeroAny { // todo add exit code and messages
-    // todo Aero: aggregate focus events for sequence of commands
-    //  example: ['focus right', 'focus right'] doesn't work
     @MainActor
-    func runWithoutLayout() async
+    func runWithoutLayout(state: inout FocusState) async
 }
 
 protocol QueryCommand {
@@ -24,12 +22,44 @@ extension [Command] {
         check(Thread.current.isMainThread)
         let commands = TrayMenuModel.shared.isEnabled ? self : (singleOrNil() as? EnableCommand).asList()
         refresh(layout: false)
+        var state: FocusState
+        if let window = focusedWindowOrEffectivelyFocused {
+            state = .windowIsFocused(window)
+        } else {
+            state = .emptyWorkspaceIsFocused(focusedWorkspaceName)
+        }
         for (index, command) in commands.withIndex {
-            await command.runWithoutLayout()
+            await command.runWithoutLayout(state: &state)
             if index != commands.indices.last {
                 refresh(layout: false)
             }
         }
+        state.window?.focus()
         refresh()
     }
 }
+
+enum FocusState {
+    case emptyWorkspaceIsFocused(String)
+    case windowIsFocused(Window)
+}
+
+extension FocusState {
+    var window: Window? {
+        switch self {
+        case .windowIsFocused(let window):
+            return window
+        case .emptyWorkspaceIsFocused:
+            return nil
+        }
+    }
+
+    var workspace: Workspace {
+        switch self {
+        case .windowIsFocused(let window):
+            return window.workspace
+        case .emptyWorkspaceIsFocused(let workspaceName):
+            return Workspace.get(byName: workspaceName)
+        }
+    }
+}

src/command/EnableCommand.swift

@@ -5,7 +5,7 @@ struct EnableCommand: Command {
 
     let targetState: State
 
-    func runWithoutLayout() {
+    func runWithoutLayout(state: inout FocusState) {
         check(Thread.current.isMainThread)
         let prevState = TrayMenuModel.shared.isEnabled
         let newState: Bool

src/command/ExecAndForgetCommand.swift

@@ -1,7 +1,7 @@
 struct ExecAndForgetCommand: Command {
     let bashCommand: String
 
-    func runWithoutLayout() {
+    func runWithoutLayout(state: inout FocusState) {
         check(Thread.current.isMainThread)
         // It doesn't throw if exit code is non-zero
         try! Process.run(URL(filePath: "/bin/bash"), arguments: ["-c", bashCommand])

src/command/ExecAndWaitCommand.swift

@@ -1,7 +1,7 @@
 struct ExecAndWaitCommand: Command {
     let bashCommand: String
 
-    func runWithoutLayout() async {
+    func runWithoutLayout(state: inout FocusState) async {
         check(Thread.current.isMainThread)
         await withCheckedContinuation { (continuation: CheckedContinuation<(), Never>) in
             let process = Process()

src/command/FlattenWorkspaceTreeCommand.swift

@@ -1,8 +1,7 @@
 struct FlattenWorkspaceTreeCommand: Command {
-    func runWithoutLayout() {
+    func runWithoutLayout(state: inout FocusState) {
         check(Thread.current.isMainThread)
-        guard let currentWindow = focusedWindowOrEffectivelyFocused else { return }
-        let workspace = currentWindow.workspace
+        let workspace = state.workspace
         let windows = workspace.rootTilingContainer.allLeafWindowsRecursive
         for window in windows {
             window.unbindFromParent()

src/command/FocusCommand.swift

@@ -1,11 +1,11 @@
 struct FocusCommand: Command {
     let direction: CardinalDirection
 
-    func runWithoutLayout() {
+    func runWithoutLayout(state: inout FocusState) {
         check(Thread.current.isMainThread)
-        guard let currentWindow = focusedWindowOrEffectivelyFocused else { return }
+        guard let currentWindow = state.window else { return }
         let workspace = currentWindow.workspace
-        // todo floating windows break mru
+        // todo bug: floating windows break mru
         let floatingWindows = makeFloatingWindowsSeenAsTiling(workspace: workspace)
         defer {
             restoreFloatingWindows(floatingWindows: floatingWindows, workspace: workspace)
@@ -15,7 +15,9 @@ struct FocusCommand: Command {
         let windowToFocus = parent.children[ownIndex + direction.focusOffset]
             .findFocusTargetRecursive(snappedTo: direction.opposite)
 
-        windowToFocus?.focus()
+        if let windowToFocus {
+            state = .windowIsFocused(windowToFocus)
+        }
     }
 }
 

src/command/FullscreenCommand.swift

@@ -1,7 +1,7 @@
 struct FullscreenCommand: Command {
-    func runWithoutLayout() {
+    func runWithoutLayout(state: inout FocusState) {
         check(Thread.current.isMainThread)
-        guard let window = focusedWindowOrEffectivelyFocused else { return }
+        guard let window = state.window else { return }
         window.isFullscreen = !window.isFullscreen
     }
 }

src/command/JoinWithCommand.swift

@@ -1,9 +1,9 @@
 struct JoinWithCommand: Command {
     let direction: CardinalDirection
 
-    func runWithoutLayout() {
+    func runWithoutLayout(state: inout FocusState) {
         check(Thread.current.isMainThread)
-        guard let currentWindow = focusedWindowOrEffectivelyFocused else { return }
+        guard let currentWindow = state.window else { return }
         guard let (parent, ownIndex) = currentWindow.closestParent(hasChildrenInDirection: direction, withLayout: nil) else { return }
         let moveInTarget = parent.children[ownIndex + direction.focusOffset]
         let prevBinding = moveInTarget.unbindFromParent()

src/command/LayoutCommand.swift

@@ -15,9 +15,9 @@ struct LayoutCommand: Command {
         self.toggleBetween = toggleBetween
     }
 
-    func runWithoutLayout() {
+    func runWithoutLayout(state: inout FocusState) {
         check(Thread.current.isMainThread)
-        guard let window = focusedWindowOrEffectivelyFocused else { return }
+        guard let window = state.window else { return }
         let targetDescription: LayoutDescription = toggleBetween.first(where: { !window.matchesDescription($0) })
             ?? toggleBetween.first!
         if window.matchesDescription(targetDescription) {

src/command/ModeCommand.swift

@@ -1,7 +1,7 @@
 struct ModeCommand: Command {
     let idToActivate: String
 
-    func runWithoutLayout() {
+    func runWithoutLayout(state: inout FocusState) {
         check(Thread.current.isMainThread)
         activateMode(idToActivate)
     }

src/command/MoveNodeToWorkspaceCommand.swift

@@ -1,8 +1,8 @@
 struct MoveNodeToWorkspaceCommand: Command {
     let targetWorkspaceName: String
 
-    func runWithoutLayout() async {
-        guard let focused = focusedWindowOrEffectivelyFocused else { return }
+    func runWithoutLayout(state: inout FocusState) async {
+        guard let focused = state.window else { return }
         let preserveWorkspace = focused.workspace
         let targetWorkspace = Workspace.get(byName: targetWorkspaceName)
         if preserveWorkspace == targetWorkspace {
@@ -13,6 +13,6 @@ struct MoveNodeToWorkspaceCommand: Command {
         // todo different monitor for floating windows
         focused.bind(to: targetContainer, adaptiveWeight: WEIGHT_AUTO, index: INDEX_BIND_LAST)
 
-        WorkspaceCommand(workspaceName: preserveWorkspace.name).runWithoutLayout()
+        WorkspaceCommand(workspaceName: preserveWorkspace.name).runWithoutLayout(state: &state)
     }
 }

src/command/MoveThroughCommand.swift

@@ -1,9 +1,9 @@
 struct MoveThroughCommand: Command {
     let direction: CardinalDirection
 
-    func runWithoutLayout() {
+    func runWithoutLayout(state: inout FocusState) {
         check(Thread.current.isMainThread)
-        guard let currentWindow = focusedWindowOrEffectivelyFocused else { return }
+        guard let currentWindow = state.window else { return }
         switch currentWindow.parent.kind {
         case .tilingContainer(let parent):
             let indexOfCurrent = currentWindow.ownIndex

src/command/MoveWorkspaceToMonitorCommand.swift

@@ -5,9 +5,9 @@ struct MoveWorkspaceToMonitorCommand: Command {
         case next, prev
     }
 
-    func runWithoutLayout() {
+    func runWithoutLayout(state: inout FocusState) {
         check(Thread.current.isMainThread)
-        let focusedWorkspace = Workspace.focused
+        let focusedWorkspace = state.workspace
         let prevMonitor = focusedWorkspace.monitor
         let sortedMonitors = sortedMonitors
         guard let index = sortedMonitors.firstIndex(where: { $0.rect.topLeftCorner == prevMonitor.rect.topLeftCorner }) else { return }

src/command/ReloadConfigCommand.swift

@@ -1,5 +1,5 @@
 struct ReloadConfigCommand: Command {
-    func runWithoutLayout() {
+    func runWithoutLayout(state: inout FocusState) {
         check(Thread.current.isMainThread)
         reloadConfig()
     }

src/command/ResizeCommand.swift

@@ -11,10 +11,10 @@ struct ResizeCommand: Command { // todo cover with tests
     let mode: ResizeMode
     let unit: UInt
 
-    func runWithoutLayout() { // todo support key repeat
+    func runWithoutLayout(state: inout FocusState) { // todo support key repeat
         check(Thread.current.isMainThread)
 
-        let candidates = focusedWindowOrEffectivelyFocused?.parentsWithSelf
+        let candidates = state.window?.parentsWithSelf
             .filter { ($0.parent as? TilingContainer)?.layout == .tiles }
             ?? []
 

src/command/SplitCommand.swift

@@ -5,12 +5,12 @@ struct SplitCommand: Command {
 
     let splitArg: SplitArg
 
-    func runWithoutLayout() {
+    func runWithoutLayout(state: inout FocusState) {
         check(Thread.current.isMainThread)
         if config.enableNormalizationFlattenContainers {
             return // 'split' doesn't work with "flatten container" normalization enabled
         }
-        guard let window = focusedWindowOrEffectivelyFocused else { return }
+        guard let window = state.window else { return }
         switch window.parent.kind {
         case .workspace:
             return // Nothing to do for floating windows

src/command/WorkspaceBackAndForthCommand.swift

@@ -1,7 +1,7 @@
 struct WorkspaceBackAndForthCommand: Command {
-    func runWithoutLayout() {
+    func runWithoutLayout(state: inout FocusState) {
         check(Thread.current.isMainThread)
         guard let previousFocusedWorkspaceName else { return }
-        WorkspaceCommand(workspaceName: previousFocusedWorkspaceName).runWithoutLayout()
+        WorkspaceCommand(workspaceName: previousFocusedWorkspaceName).runWithoutLayout(state: &state)
     }
 }

src/command/WorkspaceCommand.swift

@@ -1,36 +1,19 @@
 struct WorkspaceCommand : Command {
     let workspaceName: String
 
-    func runWithoutLayout() {
+    func runWithoutLayout(state: inout FocusState) {
         check(Thread.current.isMainThread)
         let workspace = Workspace.get(byName: workspaceName)
         // todo drop anyLeafWindowRecursive. It must not be necessary
         if let window = workspace.mostRecentWindow ?? workspace.anyLeafWindowRecursive { // switch to not empty workspace
-            if !workspace.isVisible { // Only do it for invisible workspaces to avoid flickering when switch to already visible workspace
-                // Make sure that stack of windows is correct from macOS perspective (important for closing windows)
-                // Alternative: focus mru window in destroyedObs (con: flickering when windows are closed, because
-                // focusedWindow is source of truth for workspaces)
-                workspace.focusMruReversedRecursive() // todo try to reduce flickering
-            }
             focusedWorkspaceSourceOfTruth = .macOs
-            window.focus()
+            state = .windowIsFocused(window)
         } else { // switch to empty workspace
             check(workspace.isEffectivelyEmpty)
             focusedWorkspaceSourceOfTruth = .ownModel
+            state = .emptyWorkspaceIsFocused(workspaceName)
         }
         check(workspace.monitor.setActiveWorkspace(workspace))
         focusedWorkspaceName = workspace.name
     }
 }
-
-private extension TreeNode {
-    // todo Switch between workspaces can happen via cmd+tab. Maybe this functionality must be moved to refresh
-    func focusMruReversedRecursive() {
-        if let window = self as? Window {
-            window.focus()
-        }
-        for child in mostRecentChildren.reversed() {
-            child.focusMruReversedRecursive()
-        }
-    }
-}

test/command/ExecCommandTest.swift

@@ -4,14 +4,14 @@ import XCTest
 final class ExecCommandTest: XCTestCase {
     func testExecAndWait() async throws {
         let before = Date().timeIntervalSince1970
-        await ExecAndWaitCommand(bashCommand: "sleep 2").runWithoutLayout()
+        await ExecAndWaitCommand(bashCommand: "sleep 2").testRun()
         let after = Date().timeIntervalSince1970
         XCTAssertTrue((after - before) > 1)
     }
 
     func testExecAndForget() async throws {
         let before = Date().timeIntervalSince1970
-        await ExecAndForgetCommand(bashCommand: "sleep 2").runWithoutLayout()
+        await ExecAndForgetCommand(bashCommand: "sleep 2").testRun()
         let after = Date().timeIntervalSince1970
         XCTAssertTrue((after - before) < 1)
     }

test/command/FlattenWorkspaceTreeCommandTest.swift

@@ -15,7 +15,7 @@ final class FlattenWorkspaceTreeCommandTest: XCTestCase {
             TestWindow(id: 3, parent: $0) // floating
         }
 
-        await FlattenWorkspaceTreeCommand().runWithoutLayout()
+        await FlattenWorkspaceTreeCommand().testRun()
         workspace.normalizeContainers()
         XCTAssertEqual(workspace.layoutDescription, .workspace([.h_tiles([.window(1), .window(2)]), .window(3)]))
     }