From 6d2d93e72e27eb743c1b3103e06ece05476bd94f Mon Sep 17 00:00:00 2001 From: Jorgen Bruntveit Date: Wed, 18 Nov 2026 12:01:43 +0100 Subject: [PATCH] Show the real cursor over password prompts drawn above the hand macOS draws some system windows, like SecurityAgent's password prompts, in front of the overlay whatever its level, so the hand was hidden under them while the system cursor was hidden too. Windows in front of the overlay now count like open menus: over them the real cursor shows, even with Keep the hand on, and clicks reach them. Co-Authored-By: Claude Opus 5.5 --- Sources/TinyHand/OverlayController.swift | 44 +++++++++++++++++++----- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/Sources/TinyHand/OverlayController.swift b/Sources/TinyHand/OverlayController.swift index b0eae63..6db5021 100644 --- a/Sources/TinyHand/OverlayController.swift +++ b/Sources/TinyHand/OverlayController.swift @@ -25,6 +25,7 @@ final class OverlayController { private var normalCursor = false private var ownMenuOpen = false private var menuRects: [CGRect] = [] + private var coverRects: [CGRect] = [] private var lastMenuScan = Date.distantPast private var menuOpeningUntil = Date.distantPast private var escHotKey: UInt32? @@ -500,7 +501,11 @@ final class OverlayController { let scanEvery = menuLikely ? OverlayController.menuScanFast : OverlayController.menuScanSlow if Date().timeIntervalSince(lastMenuScan) > scanEvery { lastMenuScan = Date() - menuRects = OverlayController.openMenus() + let hadCover = !coverRects.isEmpty + (menuRects, coverRects) = OverlayController.openMenus(overlay: window.windowNumber) + if hadCover != !coverRects.isEmpty { + Log.write(coverRects.isEmpty ? "no windows in front of the overlay" : "window in front of the overlay: \(coverRects.map { "\(Int($0.minX)),\(Int($0.minY)) \(Int($0.width))x\(Int($0.height))" })") + } } let menuBar = OverlayController.menuBarRect(screen) let cgMouse = OverlayController.cgPoint(mouse) @@ -511,12 +516,13 @@ final class OverlayController { interactHeld = interacting menuHover = overMenu let through = inputTap.clickThrough - let normal = !drawing && !Preferences.interactKeepsHand && ((interacting && !through) || overMenu || ownMenuOpen) + let overCover = coverRects.contains { $0.contains(cgMouse) } + let normal = overCover || (!drawing && !Preferences.interactKeepsHand && ((interacting && !through) || overMenu || ownMenuOpen)) setEscEnabled(menuRects.isEmpty && !ownMenuOpen && !through) if normal != normalCursor { let at = "at \(Int(mouse.x)),\(Int(mouse.y))" - let why = interacting ? "interact key" : menuBar.contains(mouse) ? "menu bar" : "menu" + let why = overCover ? "window in front" : interacting ? "interact key" : menuBar.contains(mouse) ? "menu bar" : "menu" Log.write(normal ? "real cursor (\(why)) \(at)" : "pointer back \(at)") normalCursor = normal armView.pointerHidden = normal @@ -553,20 +559,40 @@ final class OverlayController { return CGRect(x: screen.frame.minX, y: screen.frame.maxY - height, width: screen.frame.width, height: height) } - private static func openMenus() -> [CGRect] { + // Open menus, plus windows macOS draws in front of the overlay whatever its level, like the + // password prompts from SecurityAgent. Over these the real cursor shows and clicks go through. + // Returns all of them, and separately the ones in front of the overlay, which hide the hand. + private static func openMenus(overlay: Int) -> (all: [CGRect], covering: [CGRect]) { guard let list = CGWindowListCopyWindowInfo([.optionOnScreenOnly, .excludeDesktopElements], kCGNullWindowID) as? [[String: Any]] else { - return [] + return ([], []) } let menuLevel = Int(CGWindowLevelForKey(.popUpMenuWindow)) - return list.compactMap { info in - guard (info[kCGWindowLayer as String] as? Int) == menuLevel, + let cursorLevel = Int(CGWindowLevelForKey(.cursorWindow)) + let me = Int(getpid()) + var inFront = true + var rects: [CGRect] = [] + var coveringRects: [CGRect] = [] + // The list runs front to back, so everything before the overlay is drawn over it. + for info in list { + if (info[kCGWindowNumber as String] as? Int) == overlay { + inFront = false + continue + } + guard let layer = info[kCGWindowLayer as String] as? Int, let bounds = info[kCGWindowBounds as String] as? NSDictionary, let rect = CGRect(dictionaryRepresentation: bounds as CFDictionary) else { - return nil + continue + } + let covering = inFront && layer < cursorLevel && (info[kCGWindowOwnerPID as String] as? Int) != me + if layer == menuLevel || covering { + rects.append(rect) + } + if covering { + coveringRects.append(rect) } - return rect } + return (rects, coveringRects) } private static func cgPoint(_ p: CGPoint) -> CGPoint {