Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
195c6a9b1f | ||
|
|
ecac7885dd | ||
|
|
ef44ef7ac6 | ||
|
|
715bb28c1b |
+27
-13
@@ -119,33 +119,47 @@ enum LoginItem {
|
||||
}
|
||||
}
|
||||
|
||||
func runOCRSelfTest() {
|
||||
let text = "Kapture OCR test 1234, hello world"
|
||||
let size = NSSize(width: 1600, height: 220)
|
||||
func renderTestImage(_ text: String, fontSize: CGFloat = 56) -> CGImage? {
|
||||
let size = NSSize(width: 1900, height: 220)
|
||||
guard let rep = NSBitmapImageRep(
|
||||
bitmapDataPlanes: nil, pixelsWide: Int(size.width), pixelsHigh: Int(size.height),
|
||||
bitsPerSample: 8, samplesPerPixel: 4, hasAlpha: true, isPlanar: false,
|
||||
colorSpaceName: .deviceRGB, bytesPerRow: 0, bitsPerPixel: 0
|
||||
) else { exit(1) }
|
||||
|
||||
) else { return nil }
|
||||
NSGraphicsContext.saveGraphicsState()
|
||||
NSGraphicsContext.current = NSGraphicsContext(bitmapImageRep: rep)
|
||||
NSColor.white.setFill()
|
||||
NSRect(origin: .zero, size: size).fill()
|
||||
let attrs: [NSAttributedString.Key: Any] = [
|
||||
.font: NSFont.boldSystemFont(ofSize: 56),
|
||||
.font: NSFont.systemFont(ofSize: fontSize),
|
||||
.foregroundColor: NSColor.black,
|
||||
]
|
||||
text.draw(at: NSPoint(x: 60, y: 75), withAttributes: attrs)
|
||||
NSGraphicsContext.restoreGraphicsState()
|
||||
return rep.cgImage
|
||||
}
|
||||
|
||||
guard let cgImage = rep.cgImage else { exit(1) }
|
||||
OCRService.shared.recognize(cgImage) { recognized in
|
||||
print("expected: \(text)")
|
||||
print("got: \(recognized)")
|
||||
let ok = recognized == text
|
||||
print(ok ? "PASS" : "FAIL")
|
||||
exit(ok ? 0 : 1)
|
||||
func runOCRSelfTest() {
|
||||
let cases: [(expected: String, contains: String)] = [
|
||||
("Kapture OCR test 1234, hello world", "Kapture OCR test 1234"),
|
||||
("你好世界,这是一个测试", "你好世界"),
|
||||
]
|
||||
var index = 0
|
||||
|
||||
func runNext() {
|
||||
guard index < cases.count else { exit(0) }
|
||||
let current = cases[index]
|
||||
index += 1
|
||||
guard let image = renderTestImage(current.expected) else { exit(1) }
|
||||
OCRService.shared.recognize(image) { recognized in
|
||||
print("case: \(current.expected)")
|
||||
print("got: \(recognized)")
|
||||
let ok = recognized.contains(current.contains)
|
||||
print(ok ? "PASS" : "FAIL")
|
||||
if !ok { exit(1) }
|
||||
runNext()
|
||||
}
|
||||
}
|
||||
runNext()
|
||||
RunLoop.main.run()
|
||||
}
|
||||
|
||||
@@ -84,21 +84,26 @@ final class CaptureController: NSObject {
|
||||
}
|
||||
isSelecting = true
|
||||
previousApp = NSWorkspace.shared.frontmostApplication
|
||||
// Activation is async on macOS 26; wait a tick so the app is active
|
||||
// before the overlays appear (otherwise clicks pass through).
|
||||
NSApp.activate(ignoringOtherApps: true)
|
||||
CaptureController.log("begin: activate issued, active=\(NSApp.isActive)")
|
||||
// With the event tap driving input we must NOT activate: stealing
|
||||
// focus turns the target app into background mode (dimmed chrome),
|
||||
// and that is what would end up in the screenshot. Activate only on
|
||||
// the fallback path, where panel events are the only input.
|
||||
let usesTap = AXIsProcessTrusted()
|
||||
if !usesTap {
|
||||
NSApp.activate(ignoringOtherApps: true)
|
||||
}
|
||||
CaptureController.log("begin: usesTap=\(usesTap) active=\(NSApp.isActive)")
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) { [weak self] in
|
||||
guard let self, self.isSelecting else { return }
|
||||
CaptureController.log("begin: active=\(NSApp.isActive) — showing overlays")
|
||||
self.overlays = NSScreen.screens.map { screen in
|
||||
let panel = OverlayWindow(screen: screen, controller: self)
|
||||
(panel.contentView as? OverlayView)?.controller = self
|
||||
return panel
|
||||
}
|
||||
self.overlays.forEach { $0.makeKeyAndOrderFront(nil) }
|
||||
// orderFrontRegardless: show without taking key/focus.
|
||||
self.overlays.forEach { $0.orderFrontRegardless() }
|
||||
self.overlayIDs = self.overlays.map { $0.windowNumber }
|
||||
CaptureController.log("begin: \(self.overlays.count) overlays, ids=\(self.overlayIDs), active=\(NSApp.isActive)")
|
||||
CaptureController.log("begin: \(self.overlays.count) overlays, ids=\(self.overlayIDs) — prior app stays focused")
|
||||
self.installEventTap()
|
||||
}
|
||||
}
|
||||
@@ -262,9 +267,21 @@ final class CaptureController: NSObject {
|
||||
return nil
|
||||
}
|
||||
|
||||
/// System dialogs (permission prompts, System Settings) must always
|
||||
/// receive their clicks even while we're selecting.
|
||||
private func isSystemDialogFrontmost() -> Bool {
|
||||
guard let front = NSWorkspace.shared.frontmostApplication else { return false }
|
||||
let id = front.bundleIdentifier ?? ""
|
||||
return id.hasPrefix("com.apple.security") || id.hasPrefix("com.apple.SystemSettings") || id == "com.apple.systempreferences"
|
||||
}
|
||||
|
||||
/// Returns the event to pass through, or nil to consume it.
|
||||
func handleTap(_ type: CGEventType, _ event: CGEvent) -> CGEvent? {
|
||||
guard isSelecting else { return event }
|
||||
if isSystemDialogFrontmost() {
|
||||
CaptureController.log("tap: system dialog frontmost — passing through \(type)")
|
||||
return event
|
||||
}
|
||||
|
||||
switch type {
|
||||
case .tapDisabledByUserInput, .tapDisabledByTimeout:
|
||||
@@ -301,8 +318,11 @@ final class CaptureController: NSObject {
|
||||
}
|
||||
return event
|
||||
}
|
||||
// Drag: grow the marquee
|
||||
// Drag: grow the marquee — but only after real movement, so a
|
||||
// click's micro-jitter keeps the hovered window eligible.
|
||||
guard let start = marqueeStart else { return nil }
|
||||
let distance = hypot(appKitPoint.x - start.x, appKitPoint.y - start.y)
|
||||
guard distance >= 4 else { return nil }
|
||||
let rect = NSRect(
|
||||
x: min(start.x, appKitPoint.x),
|
||||
y: min(start.y, appKitPoint.y),
|
||||
@@ -443,28 +463,43 @@ final class ScreenCapture {
|
||||
let detected = Self.detectCornerRadius(of: result)
|
||||
let radius = min(max((detected.map { $0 * 1.23 + 2.6 }) ?? (10 * scaleX), 4), 40)
|
||||
CaptureController.log("corners: detected=\(detected.map { String(format: "%.1f", $0) } ?? "nil") using=\(Int(radius))px")
|
||||
// Anti-aliased gray mask: supersample 3x, downsample, then draw
|
||||
// the image through it ONCE at 1x (no content resampling blur).
|
||||
let ss = 3
|
||||
let W = result.width * ss, H = result.height * ss
|
||||
guard let hiCtx = CGContext(
|
||||
guard let hiMask = CGContext(
|
||||
data: nil, width: W, height: H,
|
||||
bitsPerComponent: 8, bytesPerRow: 0,
|
||||
space: CGColorSpaceCreateDeviceRGB(),
|
||||
bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue
|
||||
space: CGColorSpaceCreateDeviceGray(),
|
||||
bitmapInfo: CGImageAlphaInfo.none.rawValue
|
||||
) else { return result }
|
||||
hiCtx.addPath(CGPath(roundedRect: CGRect(x: 0, y: 0, width: W, height: H), cornerWidth: radius * CGFloat(ss), cornerHeight: radius * CGFloat(ss), transform: nil))
|
||||
hiCtx.clip()
|
||||
hiCtx.interpolationQuality = .high
|
||||
hiCtx.draw(result, in: CGRect(x: 0, y: 0, width: W, height: H))
|
||||
guard let hi = hiCtx.makeImage(),
|
||||
let downCtx = CGContext(
|
||||
hiMask.setFillColor(CGColor(gray: 1, alpha: 1))
|
||||
hiMask.fill(CGRect(x: 0, y: 0, width: W, height: H))
|
||||
hiMask.setFillColor(CGColor(gray: 0, alpha: 1))
|
||||
let cornerPath = CGMutablePath()
|
||||
cornerPath.addRect(CGRect(x: 0, y: 0, width: W, height: H))
|
||||
cornerPath.addRoundedRect(in: CGRect(x: 0, y: 0, width: W, height: H), cornerWidth: radius * CGFloat(ss), cornerHeight: radius * CGFloat(ss), transform: .identity)
|
||||
hiMask.addPath(cornerPath)
|
||||
hiMask.fillPath(using: .evenOdd)
|
||||
guard let hiMaskImg = hiMask.makeImage(),
|
||||
let downMask = CGContext(
|
||||
data: nil, width: result.width, height: result.height,
|
||||
bitsPerComponent: 8, bytesPerRow: 0,
|
||||
space: CGColorSpaceCreateDeviceGray(),
|
||||
bitmapInfo: CGImageAlphaInfo.none.rawValue
|
||||
) else { return result }
|
||||
downMask.interpolationQuality = .high
|
||||
downMask.draw(hiMaskImg, in: CGRect(x: 0, y: 0, width: result.width, height: result.height))
|
||||
guard let mask1x = downMask.makeImage(),
|
||||
let ctx = CGContext(
|
||||
data: nil, width: result.width, height: result.height,
|
||||
bitsPerComponent: 8, bytesPerRow: 0,
|
||||
space: CGColorSpaceCreateDeviceRGB(),
|
||||
bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue
|
||||
) else { return result }
|
||||
downCtx.interpolationQuality = .high
|
||||
downCtx.draw(hi, in: CGRect(x: 0, y: 0, width: result.width, height: result.height))
|
||||
if let masked = downCtx.makeImage() {
|
||||
ctx.clip(to: CGRect(x: 0, y: 0, width: result.width, height: result.height), mask: mask1x)
|
||||
ctx.draw(result, in: CGRect(x: 0, y: 0, width: result.width, height: result.height))
|
||||
if let masked = ctx.makeImage() {
|
||||
result = masked
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,6 +12,11 @@ final class OCRService {
|
||||
request.recognitionLevel = .accurate
|
||||
request.usesLanguageCorrection = true
|
||||
request.recognitionLanguages = ["en-US", "zh-Hans", "zh-Hant", "ja-JP", "ko-KR"]
|
||||
// Without this, Vision defaults to the first listed language and
|
||||
// renders CJK as Latin garbage (verified: 你好世界 -> "177WR").
|
||||
if #available(macOS 13.0, *) {
|
||||
request.automaticallyDetectsLanguage = true
|
||||
}
|
||||
|
||||
let handler = VNImageRequestHandler(cgImage: cgImage, options: [:])
|
||||
do {
|
||||
|
||||
@@ -6,8 +6,11 @@ final class OverlayWindow: NSPanel {
|
||||
init(screen: NSScreen, controller: CaptureController) {
|
||||
let content = OverlayView()
|
||||
super.init(
|
||||
// Non-activating: the overlay must NOT steal focus, so the app
|
||||
// being captured keeps its active appearance (undimmed chrome).
|
||||
// Input comes from the CGEventTap, not panel events.
|
||||
contentRect: screen.frame,
|
||||
styleMask: [.borderless],
|
||||
styleMask: [.borderless, .nonactivatingPanel],
|
||||
backing: .buffered,
|
||||
defer: false
|
||||
)
|
||||
@@ -57,6 +60,23 @@ final class OverlayView: NSView {
|
||||
NSColor.black.withAlphaComponent(0.35).setFill()
|
||||
NSBezierPath(rect: bounds).fill()
|
||||
|
||||
// Esc hint — the only way out once clicks are consumed by the tap.
|
||||
let hint = "Drag to select · hover + click a window to capture it · Esc to cancel"
|
||||
let hintAttrs: [NSAttributedString.Key: Any] = [
|
||||
.font: NSFont.monospacedSystemFont(ofSize: 12, weight: .medium),
|
||||
.foregroundColor: NSColor.white.withAlphaComponent(0.85),
|
||||
]
|
||||
let hintSize = hint.size(withAttributes: hintAttrs)
|
||||
let hintRect = NSRect(
|
||||
x: (bounds.width - hintSize.width) / 2 - 10,
|
||||
y: bounds.height - 46,
|
||||
width: hintSize.width + 20,
|
||||
height: hintSize.height + 12
|
||||
)
|
||||
NSColor.black.withAlphaComponent(0.65).setFill()
|
||||
NSBezierPath(roundedRect: hintRect, xRadius: 8, yRadius: 8).fill()
|
||||
hint.draw(at: NSPoint(x: hintRect.minX + 10, y: hintRect.minY + 6), withAttributes: hintAttrs)
|
||||
|
||||
guard let controller else { return }
|
||||
|
||||
// Highlight the hovered window (rounded, like real window corners)
|
||||
|
||||
+2
-2
@@ -108,9 +108,9 @@ cat > "$APP/Contents/Info.plist" <<'PLIST'
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>Icon</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.8.5</string>
|
||||
<string>1.9.1</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>85</string>
|
||||
<string>91</string>
|
||||
<key>LSUIElement</key>
|
||||
<true/>
|
||||
<key>NSHighResolutionCapable</key>
|
||||
|
||||
Reference in New Issue
Block a user