Add multimonitor support

[rbdr/captura] / Captura / CapturaApp.swift

diff --git a/Captura/CapturaApp.swift b/Captura/CapturaApp.swift
index c6ec9f05c6316a5074a02aa20a1a85a899a3c1f4..00c5cc422f0e3728f24951a411c24c67ca1b9be5 100644 (file)
--- a/Captura/CapturaApp.swift
+++ b/Captura/CapturaApp.swift
@@ -1,12 +1,11 @@
 import SwiftUI
 import SwiftUI

-import SwiftData

 import Cocoa
 import Combine
 import AVFoundation
 
 @main
 struct CapturaApp: App {
 import Cocoa
 import Combine
 import AVFoundation
 
 @main
 struct CapturaApp: App {

-  
+

     @NSApplicationDelegateAdaptor(CapturaAppDelegate.self) var appDelegate
 
     var body: some Scene {
     @NSApplicationDelegateAdaptor(CapturaAppDelegate.self) var appDelegate
 
     var body: some Scene {


@@ -20,7 +19,7 @@ struct CapturaApp: App {
       }
 }
 
       }
 }
 

-class CapturaAppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
+@objc(CapturaAppDelegate) class CapturaAppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {

     
   @Environment(\.openURL) var openURL
   var statusItem: NSStatusItem!
     
   @Environment(\.openURL) var openURL
   var statusItem: NSStatusItem!


@@ -39,7 +38,7 @@ class CapturaAppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
   var remoteFiles: [CapturaRemoteFile] = []
   var captureSessionConfiguration: CaptureSessionConfiguration = CaptureSessionConfiguration()
   
   var remoteFiles: [CapturaRemoteFile] = []
   var captureSessionConfiguration: CaptureSessionConfiguration = CaptureSessionConfiguration()
   

-  @objc var scriptedPreferences: ScriptedPreferences?
+  @objc dynamic var scriptedPreferences: ScriptedPreferences = ScriptedPreferences()

   
   func applicationDidFinishLaunching(_ notification: Notification) {
     setupStatusBar()
   
   func applicationDidFinishLaunching(_ notification: Notification) {
     setupStatusBar()


@@ -50,8 +49,6 @@ class CapturaAppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
       object: nil)
     closeWindow()
     fetchRemoteItems()
       object: nil)
     closeWindow()
     fetchRemoteItems()

-    
-    scriptedPreferences = ScriptedPreferences()

   }
   
   // MARK: - Setup Functions
   }
   
   // MARK: - Setup Functions


@@ -101,7 +98,7 @@ class CapturaAppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
       window.close()
     }
   }
       window.close()
     }
   }

-  
+

   // MARK: - URL Event Handler
   
   func application(_ application: NSApplication, open urls: [URL]) {
   // MARK: - URL Event Handler
   
   func application(_ application: NSApplication, open urls: [URL]) {


@@ -110,13 +107,14 @@ class CapturaAppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
         if let action = CapturaURLDecoder.decodeParams(url: url) {
           switch action {
             case let .configure(config):
         if let action = CapturaURLDecoder.decodeParams(url: url) {
           switch action {
             case let .configure(config):

-              CapturaSettings.apply(config)
+            NotificationCenter.default.post(name: .setConfiguration, object: nil, userInfo: [
+              "config": config
+            ])

             case let .record(config):
             case let .record(config):

-              let config = CaptureSessionConfiguration(from: config)
-            NotificationCenter.default.post(name: .startAreaSelection, object: nil, userInfo: [
+            NotificationCenter.default.post(name: .setCaptureSessionConfiguration, object: nil, userInfo: [

               "config": config
             ])
               "config": config
             ])

-              NotificationCenter.default.post(name: .startAreaSelection, object: nil, userInfo: nil)
+            NotificationCenter.default.post(name: .startAreaSelection, object: nil, userInfo: nil)

           }
         }
       }
           }
         }
       }


@@ -134,9 +132,14 @@ class CapturaAppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
   
   func menuWillOpen(_ menu: NSMenu) {
     if captureState != .idle {
   
   func menuWillOpen(_ menu: NSMenu) {
     if captureState != .idle {

-      menu.cancelTracking()
+      menu.cancelTrackingWithoutAnimation()
+      if captureState == .selectingArea {
+        NotificationCenter.default.post(name: .startRecording, object: nil, userInfo: nil)
+        return
+      }

       if captureState == .recording {
         NotificationCenter.default.post(name: .stopRecording, object: nil, userInfo: nil)
       if captureState == .recording {
         NotificationCenter.default.post(name: .stopRecording, object: nil, userInfo: nil)

+        return

       }
     }
   }
       }
     }
   }


@@ -203,8 +206,16 @@ class CapturaAppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
       if let frame = notification.userInfo?["frame"] {
         receivedFrame(frame as! CVImageBuffer)
       }
       if let frame = notification.userInfo?["frame"] {
         receivedFrame(frame as! CVImageBuffer)
       }

+    case .setConfiguration:
+      DispatchQueue.main.async {
+        if let userInfo = notification.userInfo {
+          if let config = userInfo["config"] as? ConfigureAction {
+            self.setConfiguration(config)
+          }
+        }
+      }

     case .reloadConfiguration:
     case .reloadConfiguration:

-      reloadConfiguration()
+        reloadConfiguration()

     case .setCaptureSessionConfiguration:
       if let userInfo = notification.userInfo {
         if let config = userInfo["config"] as? RecordAction {
     case .setCaptureSessionConfiguration:
       if let userInfo = notification.userInfo {
         if let config = userInfo["config"] as? RecordAction {


@@ -320,7 +331,10 @@ class CapturaAppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     if now - gifCallbackTimer > .nanoseconds(1_000_000_000 / UInt64(captureSessionConfiguration.frameRate)) {
       gifCallbackTimer = now
       DispatchQueue.main.async {
     if now - gifCallbackTimer > .nanoseconds(1_000_000_000 / UInt64(captureSessionConfiguration.frameRate)) {
       gifCallbackTimer = now
       DispatchQueue.main.async {

-        if let cgImage = frame.cgImage?.resize(by: self.pixelDensity) {
+        if var cgImage = frame.cgImage {
+          if self.pixelDensity > 1 {
+            cgImage = cgImage.resize(by: self.pixelDensity) ?? cgImage
+          }

           self.images.append(cgImage)
         }
       }
           self.images.append(cgImage)
         }
       }


@@ -339,6 +353,10 @@ class CapturaAppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     }
   }
   
     }
   }
   

+  func setConfiguration(_ config: ConfigureAction) {
+    CapturaSettings.apply(config)
+  }
+  

   func reloadConfiguration() {
     self.captureSessionConfiguration = CaptureSessionConfiguration()
   }
   func reloadConfiguration() {
     self.captureSessionConfiguration = CaptureSessionConfiguration()
   }