Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
195c6a9b1f | ||
|
|
ecac7885dd |
+25
-11
@@ -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)")
|
||||
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 == text
|
||||
let ok = recognized.contains(current.contains)
|
||||
print(ok ? "PASS" : "FAIL")
|
||||
exit(ok ? 0 : 1)
|
||||
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).
|
||||
// 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: activate issued, active=\(NSApp.isActive)")
|
||||
}
|
||||
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()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
)
|
||||
|
||||
+2
-2
@@ -108,9 +108,9 @@ cat > "$APP/Contents/Info.plist" <<'PLIST'
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>Icon</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.8.7</string>
|
||||
<string>1.9.1</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>87</string>
|
||||
<string>91</string>
|
||||
<key>LSUIElement</key>
|
||||
<true/>
|
||||
<key>NSHighResolutionCapable</key>
|
||||
|
||||
Reference in New Issue
Block a user