Resize window, transport mouse, and more.

DeskPad/AppDelegate.swift

@@ -11,12 +11,17 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     func applicationDidFinishLaunching(_: Notification) {
         let viewController = ScreenViewController()
         window = NSWindow(contentViewController: viewController)
+        window.delegate = viewController
         window.title = "DeskPad"
         window.makeKeyAndOrderFront(nil)
-        window?.titlebarAppearsTransparent = true
+        window.titlebarAppearsTransparent = true
         window.isMovableByWindowBackground = true
         window.titleVisibility = .hidden
         window.backgroundColor = .white
+        window.contentMinSize = CGSize(width: 400, height: 300)
+        window.contentMaxSize = CGSize(width: 3840, height: 2160)
+        window.styleMask.insert(.resizable)
+        window.collectionBehavior.insert(.fullScreenNone)
 
         let mainMenu = NSMenu()
         let mainMenuItem = NSMenuItem()

DeskPad/Backend/MouseLocation/MouseLocationSideEffect.swift

@@ -5,10 +5,11 @@ private var timer: Timer?
 
 enum MouseLocationAction: Action {
     case located(isWithinScreen: Bool)
+    case requestMove(toPoint: NSPoint)
 }
 
 func mouseLocationSideEffect() -> SideEffect {
-    return { _, dispatch, getState in
+    return { action, dispatch, getState in
         if timer == nil {
             timer = Timer.scheduledTimer(withTimeInterval: 0.25, repeats: true) { _ in
                 let mouseLocation = NSEvent.mouseLocation
@@ -18,5 +19,14 @@ func mouseLocationSideEffect() -> SideEffect {
                 dispatch(MouseLocationAction.located(isWithinScreen: isWithinScreen))
             }
         }
+        switch action {
+        case let MouseLocationAction.requestMove(point):
+            guard let displayID = getState()?.screenConfigurationState.displayID else {
+                return
+            }
+            CGDisplayMoveCursorToPoint(displayID, point)
+        default:
+            return
+        }
     }
 }

DeskPad/Frontend/Screen/ScreenViewController.swift

@@ -5,10 +5,11 @@ enum ScreenViewAction: Action {
     case setDisplayID(CGDirectDisplayID)
 }
 
-class ScreenViewController: SubscriberViewController<ScreenViewData> {
+class ScreenViewController: SubscriberViewController<ScreenViewData>, NSWindowDelegate {
     override func loadView() {
         view = NSView()
         view.wantsLayer = true
+        view.addGestureRecognizer(NSClickGestureRecognizer(target: self, action: #selector(didClickOnScreen)))
     }
 
     private var display: CGVirtualDisplay!
@@ -22,8 +23,8 @@ class ScreenViewController: SubscriberViewController<ScreenViewData> {
         let descriptor = CGVirtualDisplayDescriptor()
         descriptor.setDispatchQueue(DispatchQueue.main)
         descriptor.name = "DeskPad Display"
-        descriptor.maxPixelsWide = 1920
-        descriptor.maxPixelsHigh = 1200
+        descriptor.maxPixelsWide = 3840
+        descriptor.maxPixelsHigh = 2160
         descriptor.sizeInMillimeters = CGSize(width: 1600, height: 1000)
         descriptor.productID = 0x1234
         descriptor.vendorID = 0x3456
@@ -37,11 +38,14 @@ class ScreenViewController: SubscriberViewController<ScreenViewData> {
         settings.hiDPI = 1
         settings.modes = [
             // 16:9
+            CGVirtualDisplayMode(width: 3840, height: 2160, refreshRate: 60),
+            CGVirtualDisplayMode(width: 2560, height: 1440, refreshRate: 60),
             CGVirtualDisplayMode(width: 1920, height: 1080, refreshRate: 60),
             CGVirtualDisplayMode(width: 1600, height: 900, refreshRate: 60),
             CGVirtualDisplayMode(width: 1366, height: 768, refreshRate: 60),
             CGVirtualDisplayMode(width: 1280, height: 720, refreshRate: 60),
             // 16:10
+            CGVirtualDisplayMode(width: 2560, height: 1600, refreshRate: 60),
             CGVirtualDisplayMode(width: 1920, height: 1200, refreshRate: 60),
             CGVirtualDisplayMode(width: 1680, height: 1050, refreshRate: 60),
             CGVirtualDisplayMode(width: 1440, height: 900, refreshRate: 60),
@@ -64,9 +68,8 @@ class ScreenViewController: SubscriberViewController<ScreenViewData> {
         if viewData.resolution != .zero, viewData.resolution != previousResolution {
             previousResolution = viewData.resolution
             stream = nil
-            view.window?.contentMinSize = viewData.resolution
-            view.window?.contentMaxSize = viewData.resolution
             view.window?.setContentSize(viewData.resolution)
+            view.window?.contentAspectRatio = viewData.resolution
             view.window?.center()
             let stream = CGDisplayStream(
                 dispatchQueueDisplay: display.displayID,
@@ -85,4 +88,28 @@ class ScreenViewController: SubscriberViewController<ScreenViewData> {
             stream?.start()
         }
     }
+
+    func windowWillResize(_ window: NSWindow, to frameSize: NSSize) -> NSSize {
+        let snappingOffset: CGFloat = 30
+        let contentSize = window.contentRect(forFrameRect: NSRect(origin: .zero, size: frameSize)).size
+        guard
+            let screenResolution = previousResolution,
+            abs(contentSize.width - screenResolution.width) < snappingOffset
+        else {
+            return frameSize
+        }
+        return window.frameRect(forContentRect: NSRect(origin: .zero, size: screenResolution)).size
+    }
+
+    @objc private func didClickOnScreen(_ gestureRecognizer: NSGestureRecognizer) {
+        guard let screenResolution = previousResolution else {
+            return
+        }
+        let clickedPoint = gestureRecognizer.location(in: view)
+        let onScreenPoint = NSPoint(
+            x: clickedPoint.x / view.frame.width * screenResolution.width,
+            y: (view.frame.height - clickedPoint.y) / view.frame.height * screenResolution.height
+        )
+        store.dispatch(MouseLocationAction.requestMove(toPoint: onScreenPoint))
+    }
 }