Capture is now a decision, not a hidden setting. The popover shows a four-way scope control with the target named under it (800 x 600 on Display 1, the frontmost window, the front browser window, the whole display), and the window header carries the same choice beside the verbs. Picking Window or Browser hides Redline, dims the screen, names the app under the pointer and highlights its window; a click captures exactly that window, Escape cancels, and the desktop highlights the whole screen. New Session is one click: the current captures stay in their own folder, a fresh session opens, and the area picker comes straight up with the saved area pre-selected — Return keeps it, a drag replaces it. Settings is consolidated into one door (the popover gear, plus Cmd-,): what to capture, saved area, shortcut, ask-on-new-session, sending, session age limit, and a new Updates group with automatic install (on by default; installs only when nothing is unsent). The footer filler and the extra-actions menu are gone.
75 lines
4.0 KiB
Swift
75 lines
4.0 KiB
Swift
import Foundation
|
||
import AppKit // NSScreen, NSDeviceDescriptionKey — macOS-only target, no portability concern
|
||
|
||
/// A remembered rectangle, in CoreGraphics global display coordinates (origin top-left,
|
||
/// y increasing downward — see the conversion note below).
|
||
public struct CaptureRegion: Codable, Sendable, Equatable {
|
||
public let displayID: CGDirectDisplayID
|
||
public let rect: CGRect
|
||
public let capturedScale: CGFloat
|
||
|
||
public init(displayID: CGDirectDisplayID, rect: CGRect, capturedScale: CGFloat) {
|
||
self.displayID = displayID
|
||
self.rect = rect
|
||
self.capturedScale = capturedScale
|
||
}
|
||
|
||
/// Converts an AppKit rect in GLOBAL AppKit coordinates (bottom-left origin, y increasing
|
||
/// upward, anchored at the bottom-left of the PRIMARY screen — exactly what
|
||
/// `NSWindow.frame`, `NSEvent.mouseLocation` and `NSScreen.frame` already report; no
|
||
/// screen-local conversion is needed here) into global CoreGraphics coordinates
|
||
/// (top-left origin, y increasing downward, same primary-screen anchor). Both coordinate
|
||
/// systems share the SAME horizontal origin and the SAME anchor rectangle (the primary
|
||
/// screen's bounds) — only the vertical axis is mirrored around the primary's height.
|
||
/// That is why the flip below is correct for every attached screen, including one with a
|
||
/// negative AppKit x (to the left of primary) or a y that places it above the primary
|
||
/// (whose CG y then comes out negative): x is untouched, and the primary height is the
|
||
/// one fixed reference both systems agree on regardless of which physical screen the
|
||
/// rect is actually on.
|
||
public static func fromAppKit(rect: CGRect, on screen: NSScreen) -> CaptureRegion {
|
||
let displayID = (screen.deviceDescription[NSDeviceDescriptionKey("NSScreenNumber")]
|
||
as? NSNumber)?.uint32Value ?? CGMainDisplayID()
|
||
let primaryHeight = NSScreen.screens.first?.frame.height ?? screen.frame.height
|
||
return fromAppKit(rect: rect, displayID: displayID,
|
||
capturedScale: screen.backingScaleFactor, primaryHeight: primaryHeight)
|
||
}
|
||
|
||
/// Injectable overload for deterministic geometry tests — no dependency on real attached
|
||
/// displays. The public overload above is a thin adapter over this.
|
||
static func fromAppKit(rect: CGRect, displayID: CGDirectDisplayID,
|
||
capturedScale: CGFloat, primaryHeight: CGFloat) -> CaptureRegion {
|
||
let cgY = primaryHeight - rect.origin.y - rect.height
|
||
let cgRect = CGRect(x: rect.origin.x, y: cgY, width: rect.width, height: rect.height)
|
||
return CaptureRegion(displayID: displayID, rect: cgRect, capturedScale: capturedScale)
|
||
}
|
||
|
||
/// True when `displayID` is still attached AND `rect` still lies inside its current
|
||
/// bounds. Uses `CGDisplayIsActive` (returns 0 safely for an unknown id, never traps) and
|
||
/// `CGDisplayBounds` — both real CoreGraphics calls, no injection needed since this is a
|
||
/// live-state check by design.
|
||
public var isStillValid: Bool {
|
||
guard CGDisplayIsActive(displayID) != 0 else { return false }
|
||
let bounds = CGDisplayBounds(displayID)
|
||
return bounds.contains(rect)
|
||
}
|
||
|
||
/// Persisted in UserDefaults under this key BY THE APP (WP-4a), never by this type.
|
||
public static let defaultsKey = "ai.flowmaster.shotdeck.region"
|
||
|
||
/// 1-based position of this region's display in the current screen list; 1 when the
|
||
/// display is no longer attached.
|
||
public var displayNumber: Int {
|
||
let match = NSScreen.screens.firstIndex { screen in
|
||
let id = (screen.deviceDescription[NSDeviceDescriptionKey("NSScreenNumber")]
|
||
as? NSNumber)?.uint32Value
|
||
return id == displayID
|
||
}
|
||
return (match ?? 0) + 1
|
||
}
|
||
|
||
/// "800 × 600 on Display 1" — the line the popover shows under the capture control.
|
||
public var summary: String {
|
||
String(format: "%.0f × %.0f on Display %d", rect.width, rect.height, displayNumber)
|
||
}
|
||
}
|