mac/common: fix window position on multi monitor setups

video/out/mac/window.swift

@@ -78,13 +78,11 @@ class Window: NSWindow, NSWindowDelegate {
 
         // workaround for an AppKit bug where the NSWindow can't be placed on a
         // none Main screen NSScreen outside the Main screen's frame bounds
-        if let wantedScreen = screen, screen != NSScreen.main {
-            var absoluteWantedOrigin = contentRect.origin
-            absoluteWantedOrigin.x += wantedScreen.frame.origin.x
-            absoluteWantedOrigin.y += wantedScreen.frame.origin.y
+        if screen != NSScreen.main {
+            let absolutePos = absolutePosition(for: contentRect, screen: screen)
 
-            if absoluteWantedOrigin != self.frame.origin {
-                self.setFrameOrigin(absoluteWantedOrigin)
+            if absolutePos.origin != self.frame.origin {
+                self.setFrameOrigin(absolutePos.origin)
             }
         }
 
@@ -342,11 +340,11 @@ class Window: NSWindow, NSWindowDelegate {
         }
     }
 
-    func updateFrame(_ rect: NSRect) {
+    func updateFrame(_ rect: NSRect, _ screen: NSScreen? = nil) {
         if rect != frame {
             unfsContentFrame = rect
             if !isInFullscreen {
-                let cRect = frameRect(forContentRect: rect)
+                let cRect = absolutePosition(for: frameRect(forContentRect: rect), screen: screen)
                 setFrame(cRect, display: true)
                 common.windowDidUpdateFrame()
             }
@@ -371,6 +369,14 @@ class Window: NSWindow, NSWindowDelegate {
         if keepAspect { contentAspectRatio = unfsContentFrame.size }
     }
 
+    func absolutePosition(for rect: NSRect, screen: NSScreen?) -> NSRect {
+        guard let tScreen = screen else { return rect }
+        var absolutePosition = rect
+        absolutePosition.origin.x += tScreen.frame.origin.x
+        absolutePosition.origin.y += tScreen.frame.origin.y
+        return absolutePosition
+    }
+
     func centeredContentSize(for rect: NSRect, size sz: NSSize) -> NSRect {
         let cRect = contentRect(forFrameRect: rect)
         let dx = (cRect.size.width  - sz.width)  / 2

video/out/mac_common.swift

@@ -47,7 +47,7 @@ class MacCommon: Common {
             let previousActiveApp = getActiveApp()
             initApp()
 
-            let (_, wr, forcePosition) = getInitProperties(vo)
+            let (screen, wr, forcePosition) = getInitProperties(vo)
             guard let layer = self.layer else {
                 log.error("Something went wrong, no MetalLayer was initialized")
                 exit(1)
@@ -60,7 +60,7 @@ class MacCommon: Common {
             }
 
             if forcePosition {
-                window?.updateFrame(wr)
+                window?.updateFrame(wr, screen)
             } else if option.vo.auto_window_resize {
                 window?.updateSize(wr.size)
             }