node-mac-recorder 2.16.26 → 2.16.28

package/.claude/settings.local.json

@@ -1,7 +1,8 @@
 {
   "permissions": {
     "allow": [
-      "Bash(FORCE_AVFOUNDATION=1 node test-sequential.js)"
+      "Bash(FORCE_AVFOUNDATION=1 node test-sequential.js)",
+      "Bash(grep:*)"
     ],
     "deny": [],
     "ask": []

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-mac-recorder",
-	"version": "2.16.26",
+	"version": "2.16.28",
 	"description": "Native macOS screen recording package for Node.js applications",
 	"main": "index.js",
 	"keywords": [

package/src/electron_safe/mac_recorder_electron.mm

@@ -114,8 +114,8 @@ Napi::Value StartRecordingElectronSafe(const Napi::CallbackInfo& info) {
                     double width = areaObj.Get("width").As<Napi::Number>().DoubleValue();
                     double height = areaObj.Get("height").As<Napi::Number>().DoubleValue();
                     
-                    // Validate bounds
-                    if (width > 0 && height > 0 && x >= 0 && y >= 0) {
+                    // Validate bounds - allow negative coordinates for external displays
+                    if (width > 0 && height > 0) {
                         mutableOptions[@"captureArea"] = @{
                             @"x": @(x),
                             @"y": @(y),

package/src/screen_capture_kit.mm

@@ -103,6 +103,7 @@ static NSString *g_outputPath = nil;
         SCContentFilter *filter = nil;
         NSInteger recordingWidth = 0;
         NSInteger recordingHeight = 0;
+        SCDisplay *targetDisplay = nil;  // Move to shared scope
         
         // WINDOW RECORDING
         if (windowId && [windowId integerValue] != 0) {
@@ -130,7 +131,6 @@ static NSString *g_outputPath = nil;
         }
         // DISPLAY RECORDING
         else {
-            SCDisplay *targetDisplay = nil;
             
             if (displayId && [displayId integerValue] != 0) {
                 // Find specific display
@@ -187,17 +187,40 @@ static NSString *g_outputPath = nil;
         streamConfig.pixelFormat = kCVPixelFormatType_32BGRA;
         streamConfig.scalesToFit = NO;
         
-        // Apply crop area using sourceRect
+        // Apply crop area using sourceRect - CONVERT GLOBAL TO DISPLAY-RELATIVE COORDINATES
         if (captureRect && captureRect[@"x"] && captureRect[@"y"] && captureRect[@"width"] && captureRect[@"height"]) {
-            CGFloat cropX = [captureRect[@"x"] doubleValue];
-            CGFloat cropY = [captureRect[@"y"] doubleValue];
+            CGFloat globalX = [captureRect[@"x"] doubleValue];
+            CGFloat globalY = [captureRect[@"y"] doubleValue];
             CGFloat cropWidth = [captureRect[@"width"] doubleValue];
             CGFloat cropHeight = [captureRect[@"height"] doubleValue];
             
-            if (cropWidth > 0 && cropHeight > 0) {
-                CGRect sourceRect = CGRectMake(cropX, cropY, cropWidth, cropHeight);
-                streamConfig.sourceRect = sourceRect;
-                NSLog(@"✂️ Crop sourceRect applied: (%.0f,%.0f) %.0fx%.0f", cropX, cropY, cropWidth, cropHeight);
+            if (cropWidth > 0 && cropHeight > 0 && targetDisplay) {
+                // Convert global coordinates to display-relative coordinates
+                CGRect displayBounds = targetDisplay.frame;
+                CGFloat displayRelativeX = globalX - displayBounds.origin.x;
+                CGFloat displayRelativeY = globalY - displayBounds.origin.y;
+                
+                NSLog(@"🌐 Global coords: (%.0f,%.0f) on Display ID=%u", globalX, globalY, targetDisplay.displayID);
+                NSLog(@"🖥️ Display bounds: (%.0f,%.0f,%.0fx%.0f)", 
+                      displayBounds.origin.x, displayBounds.origin.y, 
+                      displayBounds.size.width, displayBounds.size.height);
+                NSLog(@"📍 Display-relative: (%.0f,%.0f) -> SourceRect", displayRelativeX, displayRelativeY);
+                
+                // Validate coordinates are within display bounds
+                if (displayRelativeX >= 0 && displayRelativeY >= 0 && 
+                    displayRelativeX + cropWidth <= displayBounds.size.width &&
+                    displayRelativeY + cropHeight <= displayBounds.size.height) {
+                    
+                    CGRect sourceRect = CGRectMake(displayRelativeX, displayRelativeY, cropWidth, cropHeight);
+                    streamConfig.sourceRect = sourceRect;
+                    NSLog(@"✂️ Crop sourceRect applied: (%.0f,%.0f) %.0fx%.0f (display-relative)", 
+                          displayRelativeX, displayRelativeY, cropWidth, cropHeight);
+                } else {
+                    NSLog(@"❌ Crop coordinates out of display bounds - skipping crop");
+                    NSLog(@"   Relative: (%.0f,%.0f) size:(%.0fx%.0f) vs display:(%.0fx%.0f)",
+                          displayRelativeX, displayRelativeY, cropWidth, cropHeight,
+                          displayBounds.size.width, displayBounds.size.height);
+                }
             }
         }
         

package/src/window_selector.mm

@@ -475,8 +475,45 @@ void updateScreenOverlays();
     NSLog(@"🔥 Current window under cursor: %@", g_currentWindowUnderCursor);
     
     if (g_currentWindowUnderCursor) {
-        g_selectedWindowInfo = [g_currentWindowUnderCursor retain];
-        NSLog(@"🔥 Selected window info set: %@", g_selectedWindowInfo);
+        // Get window's screen information for display ID
+        NSMutableDictionary *windowInfoWithDisplay = [g_currentWindowUnderCursor mutableCopy];
+        
+        // Get window bounds to determine which screen it's on
+        NSNumber *windowX = [g_currentWindowUnderCursor objectForKey:@"x"];
+        NSNumber *windowY = [g_currentWindowUnderCursor objectForKey:@"y"];
+        
+        if (windowX && windowY) {
+            CGFloat x = [windowX doubleValue];
+            CGFloat y = [windowY doubleValue];
+            
+            // Find the display that contains this window
+            CGDirectDisplayID activeDisplays[32];
+            uint32_t displayCount;
+            CGGetActiveDisplayList(32, activeDisplays, &displayCount);
+            
+            CGDirectDisplayID targetDisplayID = 0;
+            for (uint32_t i = 0; i < displayCount; i++) {
+                CGDirectDisplayID displayID = activeDisplays[i];
+                CGRect displayBounds = CGDisplayBounds(displayID);
+                
+                // Check if window center is within this display
+                if (x >= displayBounds.origin.x && x < displayBounds.origin.x + displayBounds.size.width &&
+                    y >= displayBounds.origin.y && y < displayBounds.origin.y + displayBounds.size.height) {
+                    targetDisplayID = displayID;
+                    break;
+                }
+            }
+            
+            if (targetDisplayID != 0) {
+                [windowInfoWithDisplay setObject:@(targetDisplayID) forKey:@"screenId"];
+                NSLog(@"🎯 Window on display ID: %u", targetDisplayID);
+            } else {
+                NSLog(@"⚠️ Could not determine display ID for window");
+            }
+        }
+        
+        g_selectedWindowInfo = [windowInfoWithDisplay retain];
+        NSLog(@"🔥 Selected window info with display ID: %@", g_selectedWindowInfo);
         cleanupWindowSelector();
     } else {
         NSLog(@"⚠️ No window under cursor when button clicked!");