2/2 Detect popups more aggressively

nikitabobko#47 (comment)

Motivation: for some reasons, AXCursorActionsWindow isn't set in some
machines

Anyway new aggressive method should also detect context menus (right
mouse click) in IntelliJ, Telegram and who knows what else

Sources/AppBundle/normalizeLayoutReason.swift

@@ -1,9 +1,21 @@
-func normalizeLayoutReason() {
+func normalizeLayoutReason(startup: Bool) {
     for workspace in Workspace.all {
         let windows: [Window] = workspace.allLeafWindowsRecursive
         _normalizeLayoutReason(workspace: workspace, windows: windows)
     }
     _normalizeLayoutReason(workspace: Workspace.focused, windows: macosInvisibleWindowsContainer.children.filterIsInstance(of: Window.self))
+    validateStillPopups(startup: startup)
+}
+
+private func validateStillPopups(startup: Bool) {
+    for node in macosPopupWindowsContainer.children {
+        let popup = (node as! MacWindow)
+        if isWindow(popup.axWindow, popup.macApp) {
+            popup.unbindFromParent()
+            popup.relayoutWindow(on: Workspace.focused)
+            tryOnWindowDetected(popup, startup: startup)
+        }
+    }
 }
 
 private func _normalizeLayoutReason(workspace: Workspace, windows: [Window]) {

Sources/AppBundle/refresh.swift

@@ -31,7 +31,7 @@ func refreshSession<T>(startup: Bool = false, forceFocus: Bool = false, body: ()
         }
 
         updateTrayText()
-        normalizeLayoutReason()
+        normalizeLayoutReason(startup: startup)
         layoutWorkspaces()
     }
     return result

Sources/AppBundle/tree/MacApp.swift

@@ -57,7 +57,11 @@ final class MacApp: AbstractApp {
     }
 
     override func getFocusedWindow(startup: Bool) -> Window? {
-        axApp.get(Ax.focusedWindowAttr)?.lets { MacWindow.get(app: self, axWindow: $0, startup: startup) }
+        getFocusedAxWindow()?.lets { MacWindow.get(app: self, axWindow: $0, startup: startup) }
+    }
+
+    func getFocusedAxWindow() -> AXUIElement? {
+        axApp.get(Ax.focusedWindowAttr)
     }
 
     override func detectNewWindowsAndGetAll(startup: Bool) -> [Window] {

Sources/AppBundle/tree/MacWindow.swift

@@ -3,7 +3,7 @@ import Common
 
 final class MacWindow: Window, CustomStringConvertible {
     let axWindow: AXUIElement
-    private let macApp: MacApp
+    let macApp: MacApp
     // todo take into account monitor proportions
     private var prevUnhiddenEmulationPositionRelativeToWorkspaceAssignedRect: CGPoint?
     fileprivate var previousSize: CGSize?
@@ -19,7 +19,6 @@ final class MacWindow: Window, CustomStringConvertible {
     static var allWindows: [MacWindow] { Array(allWindowsMap.values) }
 
     static func get(app: MacApp, axWindow: AXUIElement, startup: Bool) -> MacWindow? {
-        if !isWindow(axWindow, app) { return nil }
         guard let id = axWindow.containingWindowId() else { return nil }
         if let existing = allWindowsMap[id] {
             return existing
@@ -38,7 +37,8 @@ final class MacWindow: Window, CustomStringConvertible {
                     window.observe(resizedObs, kAXResizedNotification) {
                 debug("New window detected: \(window)")
                 allWindowsMap[id] = window
-                onWindowDetected(window, startup: startup)
+                debugWindowsIfRecording(window)
+                tryOnWindowDetected(window, startup: startup)
                 return window
             } else {
                 window.garbageCollect()
@@ -170,10 +170,26 @@ final class MacWindow: Window, CustomStringConvertible {
     }
 }
 
-private func isWindow(_ axWindow: AXUIElement, _ app: MacApp) -> Bool {
+/// Alternative name: !isPopup
+func isWindow(_ axWindow: AXUIElement, _ app: MacApp) -> Bool {
     let subrole = axWindow.get(Ax.subroleAttr)
-    // Sonoma (macOS 14) keyboard layout switch
-    if axWindow.get(Ax.identifierAttr) == "AXCursorActionsWindow" && subrole == kAXDialogSubrole {
+
+    // Try to filter out incredibly weird popup like AXWindows without any buttons.
+    // E.g.
+    // - Sonoma (macOS 14) keyboard layout switch
+    // - IntelliJ context menu (right mouse click)
+    // - Telegram context menu (right mouse click)
+    if axWindow.get(Ax.closeButtonAttr) == nil &&
+            axWindow.get(Ax.fullscreenButtonAttr) == nil &&
+            axWindow.get(Ax.zoomButtonAttr) == nil &&
+            axWindow.get(Ax.minimizeButtonAttr) == nil &&
+
+            axWindow.get(Ax.isFocused) == false &&  // Three different ways to detect if the window is not focused
+            axWindow.get(Ax.isMainAttr) == false &&
+            app.getFocusedAxWindow()?.containingWindowId() != axWindow.containingWindowId() &&
+
+            subrole != kAXStandardWindowSubrole &&
+            (axWindow.get(Ax.titleAttr) ?? "").isEmpty {
         return false
     }
     return subrole == kAXStandardWindowSubrole ||
@@ -229,9 +245,13 @@ private func isFullscreenable(_ axWindow: AXUIElement) -> Bool {
 }
 
 func getBindingDataForNewWindow(_ axWindow: AXUIElement, _ workspace: Workspace, _ app: MacApp) -> BindingData {
-    shouldFloat(axWindow, app)
-        ? BindingData(parent: workspace as NonLeafTreeNodeObject, adaptiveWeight: WEIGHT_AUTO, index: INDEX_BIND_LAST)
-        : getBindingDataForNewTilingWindow(workspace)
+    if !isWindow(axWindow, app) {
+        return BindingData(parent: macosPopupWindowsContainer, adaptiveWeight: WEIGHT_AUTO, index: INDEX_BIND_LAST)
+    }
+    if shouldFloat(axWindow, app) {
+        return BindingData(parent: workspace, adaptiveWeight: WEIGHT_AUTO, index: INDEX_BIND_LAST)
+    }
+    return getBindingDataForNewTilingWindow(workspace)
 }
 
 func getBindingDataForNewTilingWindow(_ workspace: Workspace) -> BindingData {
@@ -260,9 +280,17 @@ private func destroyedObs(_ obs: AXObserver, ax: AXUIElement, notif: CFString, d
     refreshAndLayout()
 }
 
+func tryOnWindowDetected(_ window: Window, startup: Bool) {
+    switch window.parent.cases {
+        case .tilingContainer, .workspace, .macosInvisibleWindowsContainer, .macosFullscreenWindowsContainer:
+            onWindowDetected(window, startup: startup)
+        case .macosPopupWindowsContainer:
+            break
+    }
+}
+
 private func onWindowDetected(_ window: Window, startup: Bool) {
     check(Thread.current.isMainThread)
-    debugWindowsIfRecording(window)
     for callback in config.onWindowDetected where callback.matches(window, startup: startup) {
         _ = callback.run.run(CommandMutableState(.window(window)))
         if !callback.checkFurtherCallbacks {

Sources/AppBundle/tree/Window.swift

@@ -40,14 +40,6 @@ enum LayoutReason: Equatable {
     case standard
     /// Reason for the cur temp layout is macOS native fullscreen, minimize, or hide
     case macos(prevParentKind: NonLeafTreeNodeKind)
-
-    var isMacos: Bool {
-        if case .macos = self {
-            return true
-        } else {
-            return false
-        }
-    }
 }
 
 extension Window {

Sources/AppBundle/util/accessibility.swift

@@ -222,10 +222,14 @@ enum Ax {
         getter: { $0 as? Bool },
         setter: { $0 as CFTypeRef }
     )
-    //static let axMainAttr = ReadableAttrImpl<Bool>(
-    //    key: kAXMainAttribute,
-    //    getter: { $0 as? Bool }
-    //)
+    static let isFocused = ReadableAttrImpl<Bool>(
+        key: kAXFocusedAttribute,
+        getter: { $0 as? Bool }
+    )
+    static let isMainAttr = ReadableAttrImpl<Bool>(
+        key: kAXMainAttribute,
+        getter: { $0 as? Bool }
+    )
     static let sizeAttr = WritableAttrImpl<CGSize>(
         key: kAXSizeAttribute,
         getter: {
@@ -273,14 +277,14 @@ enum Ax {
         key: kAXFullScreenButtonAttribute,
         getter: { ($0 as! AXUIElement) }
     )
-    //static let zoomButtonAttr = ReadableAttrImpl<AXUIElement>(
-    //    key: kAXZoomButtonAttribute,
-    //    getter: { ($0 as! AXUIElement) }
-    //)
-    //static let minimizeButtonAttr = ReadableAttrImpl<AXUIElement>(
-    //    key: kAXMinimizeButtonAttribute,
-    //    getter: { ($0 as! AXUIElement) }
-    //)
+    static let zoomButtonAttr = ReadableAttrImpl<AXUIElement>(
+        key: kAXZoomButtonAttribute,
+        getter: { ($0 as! AXUIElement) }
+    )
+    static let minimizeButtonAttr = ReadableAttrImpl<AXUIElement>(
+        key: kAXMinimizeButtonAttribute,
+        getter: { ($0 as! AXUIElement) }
+    )
     //static let growAreaAttr = ReadableAttrImpl<AXUIElement>(
     //    key: kAXGrowAreaAttribute,
     //    getter: { ($0 as! AXUIElement) }