5/n Reorganize FrozenTreeNode and closedWindowsCache

nikitabobko · Nov 27, 2024 · 82ec7be · 82ec7be
1 parent 15ec7d0
commit 82ec7be
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 56 deletions.
diff --git a/Sources/AppBundle/tree/frozen/FrozenTreeNode.swift b/Sources/AppBundle/tree/frozen/FrozenTreeNode.swift
@@ -0,0 +1,46 @@
+import AppKit
+import Common
+
+enum FrozenTreeNode {
+    case container(FrozenContainer)
+    case window(FrozenWindow)
+}
+
+struct FrozenContainer {
+    let children: [FrozenTreeNode]
+    let layout: Layout
+    let orientation: Orientation
+    let weight: CGFloat
+
+    init(_ container: TilingContainer) {
+        children = container.children.map {
+            switch $0.nodeCases {
+                case .window(let w): .window(FrozenWindow(w))
+                case .tilingContainer(let c): .container(FrozenContainer(c))
+                case .workspace,
+                     .macosMinimizedWindowsContainer,
+                     .macosHiddenAppsWindowsContainer,
+                     .macosFullscreenWindowsContainer,
+                     .macosPopupWindowsContainer:
+                    illegalChildParentRelation(child: $0, parent: container)
+            }
+        }
+        layout = container.layout
+        orientation = container.orientation
+        weight = getWeightOrNil(container) ?? 1
+    }
+}
+
+struct FrozenWindow {
+    let id: UInt32
+    let weight: CGFloat
+
+    init(_ window: Window) {
+        id = window.windowId
+        weight = getWeightOrNil(window) ?? 1
+    }
+}
+
+private func getWeightOrNil(_ node: TreeNode) -> CGFloat? {
+    ((node.parent as? TilingContainer)?.orientation).map { node.getWeight($0) }
+}
diff --git a/Sources/AppBundle/tree/frozen/FrozenWindow.swift b/Sources/AppBundle/tree/frozen/FrozenWindow.swift
diff --git a/...es/AppBundle/tree/frozen/FrozenTree.swift → ...ndle/tree/frozen/closedWindowsCache.swift b/...es/AppBundle/tree/frozen/FrozenTree.swift → ...ndle/tree/frozen/closedWindowsCache.swift
@@ -1,5 +1,12 @@
 import AppKit
-import Common
+
+/// First line of defence against lock screen
+///
+/// When you lock the screen, all accessibility API becomes unobservable (all attributes become empty, window id
+/// becomes nil, etc.) which tricks AeroSpace into thinking that all windows were closed.
+/// That's why every time a window dies AeroSpace caches the "entire world" (unless window is already presented in the cache)
+/// so that once the screen is unlocked, AeroSpace could restore windows to where they were
+private var closedWindowsCache = FrozenWorld(workspaces: [], monitors: [])
 
 struct FrozenMonitor {
     let topLeftCorner: CGPoint
@@ -25,62 +32,10 @@ struct FrozenWorkspace {
         floatingWindows = workspace.floatingWindows.map(FrozenWindow.init)
         macosUnconventionalWindows =
             workspace.macOsNativeHiddenAppsWindowsContainer.children.map { FrozenWindow($0 as! Window) } +
-                workspace.macOsNativeFullscreenWindowsContainer.children.map { FrozenWindow($0 as! Window) }
-    }
-}
-
-enum FrozenTreeNode {
-    case container(FrozenContainer)
-    case window(FrozenWindow)
-}
-
-struct FrozenContainer {
-    let children: [FrozenTreeNode]
-    let layout: Layout
-    let orientation: Orientation
-    let weight: CGFloat
-
-    init(_ container: TilingContainer) {
-        children = container.children.map {
-            switch $0.nodeCases {
-                case .window(let w): .window(FrozenWindow(w))
-                case .tilingContainer(let c): .container(FrozenContainer(c))
-                case .workspace,
-                     .macosMinimizedWindowsContainer,
-                     .macosHiddenAppsWindowsContainer,
-                     .macosFullscreenWindowsContainer,
-                     .macosPopupWindowsContainer:
-                    illegalChildParentRelation(child: $0, parent: container)
-            }
-        }
-        layout = container.layout
-        orientation = container.orientation
-        weight = getWeightOrNil(container) ?? 1
+            workspace.macOsNativeFullscreenWindowsContainer.children.map { FrozenWindow($0 as! Window) }
     }
 }
 
-struct FrozenWindow {
-    let id: UInt32
-    let weight: CGFloat
-
-    init(_ window: Window) {
-        id = window.windowId
-        weight = getWeightOrNil(window) ?? 1
-    }
-}
-
-func getWeightOrNil(_ node: TreeNode) -> CGFloat? {
-    ((node.parent as? TilingContainer)?.orientation).map { node.getWeight($0) }
-}
-
-/// First line of defence against lock screen
-///
-/// When you lock the screen, all accessibility API becomes unobservable (all attributes become empty, window id
-/// becomes nil, etc.) which tricks AeroSpace into thinking that all windows were closed.
-/// That's why every time a window dies AeroSpace caches the "entire world" (unless window is already presented in the cache)
-/// so that once the screen is unlocked, AeroSpace could restore windows to where they were
-private var closedWindowsCache = FrozenWorld(workspaces: [], monitors: [])
-
 func cacheClosedWindowIfNeeded(window: Window) {
     if closedWindowsCache.windowIds.contains(window.windowId) {
         return // already cached
@@ -134,8 +89,7 @@ private func restoreTreeRecursive(frozenContainer: FrozenContainer, parent: NonL
         index: index
     )
 
-    loop:
-    for (index, child) in frozenContainer.children.enumerated() {
+    loop: for (index, child) in frozenContainer.children.enumerated() {
         switch child {
             case .window(let w):
                 // Stop the loop if can't find the window, because otherwise all the subsequent windows will have incorrect index