{"schema":"decodex/commit/1","summary":"Land Shorten native host Swift file boundaries","authority":"manual"}

Author: yvette-carlisle

docs/reference/workspace-layout.md

@@ -7,12 +7,12 @@ private enum NativeHostAboutLinks {
 }
 
 private struct SoftwareUpdateModePicker: View {
-	let snapshot: NativeHostSoftwareUpdater.Snapshot
-	let onSelect: (NativeHostSoftwareUpdater.Mode) -> Void
+	let snapshot: SoftwareUpdater.Snapshot
+	let onSelect: (SoftwareUpdater.Mode) -> Void
 
 	var body: some View {
 		HStack(spacing: 8) {
-			ForEach(NativeHostSoftwareUpdater.Mode.allCases, id: \.rawValue) { mode in
+			ForEach(SoftwareUpdater.Mode.allCases, id: \.rawValue) { mode in
 				let enabled = isEnabled(mode)
 				ModernSegmentButton(
 					title: mode.title,
@@ -29,7 +29,7 @@ private struct SoftwareUpdateModePicker: View {
 		.segmentedGlassBackground()
 	}
 
-	private func isEnabled(_ mode: NativeHostSoftwareUpdater.Mode) -> Bool {
+	private func isEnabled(_ mode: SoftwareUpdater.Mode) -> Bool {
 		guard snapshot.isConfigured else {
 			return false
 		}
@@ -40,7 +40,7 @@ private struct SoftwareUpdateModePicker: View {
 	}
 
 	private func helpText(
-		for mode: NativeHostSoftwareUpdater.Mode,
+		for mode: SoftwareUpdater.Mode,
 		isEnabled: Bool
 	) -> String {
 		if snapshot.isConfigured == false {

…stKit/NativeHostAboutSettingsPanel.swift …apNativeHostKit/AboutSettingsPanel.swiftnative/macos-host/Sources/RsnapNativeHostKit/NativeHostAboutSettingsPanel.swift renamed to native/macos-host/Sources/RsnapNativeHostKit/AboutSettingsPanel.swift native/macos-host/Sources/RsnapNativeHostKit/NativeHostAboutSettingsPanel.swift renamed to native/macos-host/Sources/RsnapNativeHostKit/AboutSettingsPanel.swift

@@ -1,7 +1,7 @@
 import CoreGraphics
 import Foundation
 
-package struct CaptureHostAnnotationStyleWheelGate: Equatable {
+package struct AnnotationStyleWheelGate: Equatable {
 	package static let deadZone: CGFloat = 0.05
 	package static let preciseStepInterval: TimeInterval = 0.18
 	package static let discreteStepInterval: TimeInterval = 0.04

…aptureHostAnnotationStyleWheelGate.swift …veHostKit/AnnotationStyleWheelGate.swiftnative/macos-host/Sources/RsnapNativeHostKit/CaptureHostAnnotationStyleWheelGate.swift renamed to native/macos-host/Sources/RsnapNativeHostKit/AnnotationStyleWheelGate.swift native/macos-host/Sources/RsnapNativeHostKit/CaptureHostAnnotationStyleWheelGate.swift renamed to native/macos-host/Sources/RsnapNativeHostKit/AnnotationStyleWheelGate.swift

@@ -4,6 +4,14 @@ import Foundation
 import QuartzCore
 import RsnapHostBridge
 
+private struct ChromeRefreshTelemetryKey: Equatable {
+	let targetHz: Int
+	let hudGlassEnabled: Bool
+	let hudGlassMode: String
+	let liquidGlassStyle: String
+	let liquidGlassAvailable: Bool
+}
+
 @MainActor
 final class CaptureHostView: NSView {
 	static let liveDragIntentThreshold: CGFloat = 3
@@ -26,20 +34,20 @@ final class CaptureHostView: NSView {
 	private(set) var chrome = CaptureChromeState()
 	private(set) var settings = NativeHostSettings.defaults
 	private var trackingAreaRef: NSTrackingArea?
-	var annotationStyleWheelGate = CaptureHostAnnotationStyleWheelGate()
+	var annotationStyleWheelGate = AnnotationStyleWheelGate()
 	var lastCursorPresentation: CaptureHostCursorPresentation?
 	let cursorOwner = CaptureHostCursorOwner()
-	var livePrimaryInteraction = CaptureHostLivePrimaryInteractionState()
-	let mouseReleaseRecovery = CaptureHostMouseReleaseRecovery()
-	let livePointerPreview = CaptureHostLivePointerPreviewState()
+	var livePrimaryInteraction = PrimaryInteractionState()
+	let mouseReleaseRecovery = MouseReleaseRecovery()
+	let livePointerPreview = LivePointerPreviewState()
 	var liveHighlightedWindowPreview: WindowSnapshot?
 	var sampleUpdatedLiveChromeRenderInProgress = false
-	var frozenFirstDisplayHandoff = CaptureHostFrozenFirstDisplayHandoffState()
+	var frozenFirstDisplayHandoff = DisplayHandoffState()
 	var lastLivePreviewSnapshot: LivePreviewSnapshot?
-	var liveSampleCache = CaptureHostLiveSampleCache()
-	lazy var frozenToolbar = CaptureHostFrozenToolbarCoordinator(hostView: self)
-	private lazy var materialViews = CaptureHostMaterialViewCoordinator(hostView: self)
-	lazy var pointerDispatchQueue = CaptureHostPointerDispatchQueue(
+	var liveSampleCache = LiveSampleCache()
+	lazy var frozenToolbar = FrozenToolbarCoordinator(hostView: self)
+	private lazy var materialViews = MaterialViewCoordinator(hostView: self)
+	lazy var pointerDispatchQueue = PointerDispatchQueue(
 		targetInterval: { [weak self] in
 			guard let self else {
 				return NativeHostDisplayRefresh.frameInterval(
@@ -55,12 +63,12 @@ final class CaptureHostView: NSView {
 	lazy var liveRenderer = LiveOverlayRenderer(hostView: self)
 	private var liveRendererInstalled = false
 	private var deferredLiveShutdownWorkItem: DispatchWorkItem?
-	private var loggedLiveRefreshTarget: LiveChromeRefreshTelemetryKey?
-	let liveInputTelemetry = CaptureHostLiveInputTelemetry()
+	private var loggedLiveRefreshTarget: ChromeRefreshTelemetryKey?
+	let liveInputTelemetry = LiveInputTelemetry()
 
 	override var acceptsFirstResponder: Bool { true }
 	override var isOpaque: Bool { false }
-	var toolbarHoverState: CaptureHostToolbarHoverState { frozenToolbar.hoverState }
+	var toolbarHoverState: ToolbarHoverState { frozenToolbar.hoverState }
 
 	override func hitTest(_ point: NSPoint) -> NSView? {
 		guard scene.mode == .frozen, chrome.scrollMinimapPreview != nil,
@@ -127,7 +135,7 @@ final class CaptureHostView: NSView {
 		self.chrome = chrome
 		self.settings = settings
 		if hostLocalFrozenSelectingEnded {
-			clearLivePrimaryInteractionState(rendersImmediately: false)
+			clearPrimaryInteractionState(rendersImmediately: false)
 		}
 		if previousMode != scene.mode {
 			window?.acceptsMouseMovedEvents = true
@@ -147,7 +155,7 @@ final class CaptureHostView: NSView {
 				liveHighlightedWindowPreview = scene.highlightedWindow
 			}
 		} else {
-			clearLivePrimaryInteractionState(rendersImmediately: false)
+			clearPrimaryInteractionState(rendersImmediately: false)
 			if scene.mode == .hidden {
 				livePrimaryInteraction.clearHoverChromeSuppression()
 				frozenFirstDisplayHandoff.reset()
@@ -399,7 +407,7 @@ final class CaptureHostView: NSView {
 			seedLivePointerPreview(scene.pointer, recordsInputLatency: false)
 			liveHighlightedWindowPreview = scene.highlightedWindow
 		} else {
-			clearLivePrimaryInteractionState(rendersImmediately: false)
+			clearPrimaryInteractionState(rendersImmediately: false)
 			resetLivePointerPreview()
 			liveHighlightedWindowPreview = nil
 		}
@@ -466,7 +474,7 @@ final class CaptureHostView: NSView {
 			now: ProcessInfo.processInfo.systemUptime
 		)
 		lastLivePreviewSnapshot = retainedLivePreview
-		clearLivePrimaryInteractionState(rendersImmediately: false)
+		clearPrimaryInteractionState(rendersImmediately: false)
 		resetLivePointerPreview()
 		liveHighlightedWindowPreview = nil
 		frozenToolbar.clearHoveredAction()
@@ -585,13 +593,13 @@ final class CaptureHostView: NSView {
 				return
 			}
 			if let selection = localFrozenSelectionRect().map({
-				CaptureHostFrozenPresentationRenderer.pixelAlignedSelectionRect(
+				FrozenSurfaceRenderer.pixelAlignedSelectionRect(
 					$0,
 					backingScaleFactor: window?.screen?.backingScaleFactor ?? 1
 				)
 			}) {
 				let toolbarLayout = toolbarLayout(for: selection)
-				CaptureHostFrozenPresentationRenderer.render(
+				FrozenSurfaceRenderer.render(
 					selection: selection,
 					bounds: bounds,
 					backingScaleFactor: window?.screen?.backingScaleFactor ?? 1,
@@ -600,7 +608,7 @@ final class CaptureHostView: NSView {
 					chrome: chrome,
 					toolbarLayout: toolbarLayout,
 					toolbarHoverState: toolbarHoverState,
-					materialState: CaptureHostFrozenPresentationMaterialState(
+					materialState: FrozenSurfaceMaterialState(
 						toolbarLiquidGlassVisible: materialViews.isFrozenToolbarLiquidGlassVisible,
 						toolbarLiquidGlassContentDrawn: materialViews
 							.isFrozenToolbarLiquidGlassContentDrawn,
@@ -821,7 +829,7 @@ final class CaptureHostView: NSView {
 		deferredLiveShutdownWorkItem?.cancel()
 		deferredLiveShutdownWorkItem = nil
 		let displayTargetHz = currentDisplayTargetFramesPerSecond()
-		let refreshTarget = LiveChromeRefreshTelemetryKey(
+		let refreshTarget = ChromeRefreshTelemetryKey(
 			targetHz: displayTargetHz,
 			hudGlassEnabled: settings.hudGlassEnabled,
 			hudGlassMode: settings.resolvedHudGlassMode.rawValue,

…stKit/NativeHostAppearanceSettings.swift …iveHostKit/AppearanceSettingsPanel.swiftnative/macos-host/Sources/RsnapNativeHostKit/NativeHostAppearanceSettings.swift renamed to native/macos-host/Sources/RsnapNativeHostKit/AppearanceSettingsPanel.swift native/macos-host/Sources/RsnapNativeHostKit/NativeHostAppearanceSettings.swift renamed to native/macos-host/Sources/RsnapNativeHostKit/AppearanceSettingsPanel.swift

@@ -12,7 +12,7 @@ final class CaptureOverlayController {
 	private var focusedWindowNumber: Int?
 	private var collapsedForFrozen = false
 	private lazy var windowSnapshotFeed = WindowSnapshotFeed()
-	private let liveChromePipeline: CaptureOverlayLiveChromePipeline
+	private let liveChromePipeline: LiveChromePipeline
 	private var pendingCaptureStreamPreparation: (() -> Void)?
 	private var primaryMousePassthroughToken: UInt64 = 0
 	private var allMousePassthroughActive = false
@@ -22,10 +22,10 @@ final class CaptureOverlayController {
 		liveFrameStream: LiveFrameStreamBroker,
 		frameRgbSampler: @escaping ChromeSampleFeed.FrameRgbSampler,
 		framePatchSampler: @escaping ChromeSampleFeed.FramePatchSampler,
-		frameRegionSampler: @escaping CaptureOverlayLiveChromePipeline.FrameRegionSampler
+		frameRegionSampler: @escaping LiveChromePipeline.FrameRegionSampler
 	) {
 		self.controller = controller
-		self.liveChromePipeline = CaptureOverlayLiveChromePipeline(
+		self.liveChromePipeline = LiveChromePipeline(
 			liveFrameStream: liveFrameStream,
 			frameRgbSampler: frameRgbSampler,
 			framePatchSampler: framePatchSampler,
@@ -390,7 +390,7 @@ final class CaptureOverlayController {
 
 		for window in windowsToRetire {
 			window.hostView.clearVisibleCursorOverride()
-			window.hostView.clearLivePrimaryInteractionState(rendersImmediately: false)
+			window.hostView.clearPrimaryInteractionState(rendersImmediately: false)
 			window.hostView.finishLivePresentationTelemetry(reason: "close")
 			window.hostView.controller = nil
 			window.ignoresMouseEvents = true
@@ -555,7 +555,7 @@ final class CaptureOverlayController {
 		guard let source = frozenCaptureJobSource(near: point) else {
 			return nil
 		}
-		return CaptureOverlayImageSampler.captureBelowOverlay(in: rect, source: source)
+		return OverlayImageSampler.captureBelowOverlay(in: rect, source: source)
 	}
 
 	static var desktopFrame: CGRect {

…Kit/NativeHostCaptureFrameSettings.swift …NativeHostKit/CaptureFrameSettings.swiftnative/macos-host/Sources/RsnapNativeHostKit/NativeHostCaptureFrameSettings.swift renamed to native/macos-host/Sources/RsnapNativeHostKit/CaptureFrameSettings.swift native/macos-host/Sources/RsnapNativeHostKit/NativeHostCaptureFrameSettings.swift renamed to native/macos-host/Sources/RsnapNativeHostKit/CaptureFrameSettings.swift

@@ -74,8 +74,8 @@ final class CaptureSessionController: NSObject {
 		label: "ink.hack.rsnap.frozen-image-render",
 		qos: .userInitiated
 	)
-	let textRecognitionEngine = NativeTextRecognitionEngine()
-	let frozenPreparedExportStore = FrozenPreparedExportStore()
+	let textRecognitionEngine = TextRecognitionEngine()
+	let frozenPreparedExportStore = PreparedExportStore()
 	let frozenPreparedRecognizeTextImageStore = FrozenPreparedRecognizeTextImageStore()
 	let captureSuccessSound = CaptureSuccessSound.load()
 	let ocrCompletionSound = OcrCompletionSound.load()