Further attempts to fix space moving focus loss (#1591)

ianyh · Jan 25, 2024 · 4cff96b · 4cff96b
1 parent 725502b
commit 4cff96b
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 7 deletions.
diff --git a/Amethyst/Layout/Layouts/BinarySpacePartitioningLayout.swift b/Amethyst/Layout/Layouts/BinarySpacePartitioningLayout.swift
@@ -245,7 +245,7 @@ class BinarySpacePartitioningLayout<Window: WindowType>: StatefulLayout<Window>
 
             windowNode.windowID = otherWindowID
             otherWindowNode.windowID = windowID
-        case .applicationDeactivate, .applicationActivate, .spaceChange, .layoutChange, .unknown:
+        case .applicationDeactivate, .applicationActivate, .spaceChange, .layoutChange, .tabChange, .none, .unknown:
             break
         }
     }

diff --git a/Amethyst/Layout/Layouts/CustomLayout.swift b/Amethyst/Layout/Layouts/CustomLayout.swift
@@ -314,8 +314,12 @@ class CustomLayout<Window: WindowType>: StatefulLayout<Window> {
             jsChange["change"] = "space_change"
         case .layoutChange:
             jsChange["change"] = "layout_change"
+        case .tabChange:
+            jsChange["change"] = "tab_change"
         case .unknown:
             jsChange["change"] = "unknown"
+        case .none:
+            jsChange["change"] = "none"
         }
 
         return jsChange

diff --git a/Amethyst/Managers/ScreenManager.swift b/Amethyst/Managers/ScreenManager.swift
@@ -168,7 +168,7 @@ final class ScreenManager<Delegate: ScreenManagerDelegate>: NSObject, Codable {
             if lastFocusedWindow == window {
                 lastFocusedWindow = nil
             }
-        case .windowSwap, .applicationActivate, .applicationDeactivate, .spaceChange, .layoutChange, .unknown:
+        case .windowSwap, .applicationActivate, .applicationDeactivate, .spaceChange, .layoutChange, .tabChange, .none, .unknown:
             break
         }
 

diff --git a/Amethyst/Managers/WindowManager.swift b/Amethyst/Managers/WindowManager.swift
@@ -112,7 +112,7 @@ final class WindowManager<Application: ApplicationType>: NSObject, Codable {
         guard let focusedWindow = Window.currentlyFocused(), let screen = focusedWindow.screen() else {
             return
         }
-        markScreen(screen, forReflowWithChange: .unknown)
+        markScreen(screen, forReflowWithChange: .applicationActivate)
 //        doMouseFollowsFocus(focusedWindow: focusedWindow)
     }
 
@@ -374,11 +374,12 @@ extension WindowManager {
         for runningApplication in NSWorkspace.shared.runningApplications {
             add(runningApplication: runningApplication)
         }
-        markAllScreensForReflow(withChange: .unknown)
+        markAllScreensForReflow(withChange: .none)
     }
 
     private func add(window: Window, retries: Int = 5) {
         guard !windows.isWindowTracked(window) else {
+            log.warning("skipping window")
             return
         }
 
@@ -467,7 +468,7 @@ extension WindowManager {
             add(window: window)
             executeTransition(.switchWindows(existingWindow, window))
             windows.regenerateActiveIDCache()
-            markScreen(screen, forReflowWithChange: .unknown)
+            markScreen(screen, forReflowWithChange: .tabChange)
 
             return
         }
@@ -730,6 +731,22 @@ extension WindowManager: WindowTransitionTarget {
             guard let targetScreen = CGSpacesInfo<Window>.screenForSpace(space: targetSpace) else {
                 return
             }
+            if window.isFocused() {
+                if activeWindows(on: screen).count == 1,
+                   let finder = NSWorkspace.shared.runningApplications.first(where: { $0.bundleIdentifier == "com.apple.finder" }) {
+                    var psn = ProcessSerialNumber()
+                    let status = GetProcessForPID(finder.processIdentifier, &psn)
+                    if status != noErr {
+                        log.error(status)
+                    }
+                    let cgStatus = _SLPSSetFrontProcessWithOptions(&psn, 0, kCPSNoWindows)
+                    if cgStatus != .success {
+                        log.error(cgStatus.rawValue)
+                    }
+                } else {
+                    focusTransitionCoordinator.moveFocusClockwise()
+                }
+            }
             markScreen(screen, forReflowWithChange: .remove(window: window))
             window.move(toSpace: targetSpace.id)
             if targetScreen.screenID() != screen.screenID() {
@@ -739,10 +756,10 @@ extension WindowManager: WindowTransitionTarget {
                     window.setFrame(newFrame, withThreshold: CGSize(width: 25, height: 25))
                 }
             }
-            markScreen(targetScreen, forReflowWithChange: .add(window: window))
             if UserConfiguration.shared.followWindowsThrownBetweenSpaces() {
                 window.focus()
             }
+            markScreen(targetScreen, forReflowWithChange: .add(window: window))
         case .resetFocus:
             if let screen = screens.screenManagers.first?.screen {
                 executeTransition(.focusScreen(screen))

diff --git a/Amethyst/Model/Change.swift b/Amethyst/Model/Change.swift
@@ -17,5 +17,7 @@ enum Change<Window: WindowType> {
     case applicationDeactivate
     case spaceChange
     case layoutChange
+    case tabChange
+    case none
     case unknown
 }
diff --git a/Amethyst/Model/Window.swift b/Amethyst/Model/Window.swift
@@ -19,7 +19,11 @@ func _SLPSSetFrontProcessWithOptions(_ psn: inout ProcessSerialNumber, _ wid: UI
 @_silgen_name("SLPSPostEventRecordTo") @discardableResult
 func SLPSPostEventRecordTo(_ psn: inout ProcessSerialNumber, _ bytes: inout UInt8) -> CGError
 
+@_silgen_name("SLSMoveWindowsToManagedSpace")
+func SLSMoveWindowsToManagedSpace(_ cid: Int32, _ window_ids: CFArray, _ sid: Int)
+
 let kCPSUserGenerated: UInt32 = 0x200
+let kCPSNoWindows: UInt32 = 0x400
 // swiftlint:enable identifier_name
 
 /// Generic protocol for objects acting as windows in the system.
@@ -363,6 +367,6 @@ extension AXWindow: WindowType {
     }
 
     func move(toSpace spaceID: CGSSpaceID) {
-        CGSMoveWindowsToManagedSpace(CGSMainConnectionID(), [cgID()] as CFArray, spaceID)
+        SLSMoveWindowsToManagedSpace(CGSMainConnectionID(), [cgID()] as CFArray, spaceID)
     }
 }