node-mac-recorder 1.8.0 → 1.10.0

package/index.js

@@ -139,19 +139,21 @@ class MacRecorder extends EventEmitter {
 		// WindowId varsa captureArea'yı otomatik ayarla
 		if (this.options.windowId && !this.options.captureArea) {
 			try {
-				const windows = await this.getWindows();
-				const displays = await this.getDisplays();
-				const targetWindow = windows.find(
-					(w) => w.id === this.options.windowId
-				);
-
-				if (targetWindow) {
-					// Pencere hangi display'de olduğunu bul
+				// Window selector'dan seçilen pencere bilgisini al
+				const WindowSelector = require('./window-selector');
+				const selector = new WindowSelector();
+				const selectedWindow = selector.getSelectedWindow();
+				
+				// Eğer window selector'dan overlay koordinatları varsa onları kullan
+				if (selectedWindow && selectedWindow.overlayX !== undefined) {
+					console.log('🎯 Using overlay coordinates for exact recording match');
+					console.log(`Overlay coords: (${selectedWindow.overlayX}, ${selectedWindow.overlayY}) ${selectedWindow.overlayWidth}x${selectedWindow.overlayHeight}`);
+					
+					const displays = await this.getDisplays();
+					const targetWindow = selectedWindow;
+					
+					// Display ID'yi bul
 					let targetDisplayId = null;
-					let adjustedX = targetWindow.x;
-					let adjustedY = targetWindow.y;
-
-					// Pencere hangi display'de?
 					for (let i = 0; i < displays.length; i++) {
 						const display = displays[i];
 						const displayWidth = parseInt(display.resolution.split("x")[0]);
@@ -159,24 +161,73 @@ class MacRecorder extends EventEmitter {
 
 						// Pencere bu display sınırları içinde mi?
 						if (
-							targetWindow.x >= display.x &&
-							targetWindow.x < display.x + displayWidth &&
-							targetWindow.y >= display.y &&
-							targetWindow.y < display.y + displayHeight
+							targetWindow.overlayX >= display.x &&
+							targetWindow.overlayX < display.x + displayWidth &&
+							targetWindow.overlayY >= display.y &&
+							targetWindow.overlayY < display.y + displayHeight
 						) {
-							targetDisplayId = display.id; // Use actual display ID, not array index
-							// Koordinatları display'e göre normalize et
-							adjustedX = targetWindow.x - display.x;
-							
-							// Y coordinate fix: Window selector uses NSScreen.frame (excludes menu bar)
-							// but recording uses CGDisplayBounds (includes menu bar)
-							// For primary display, add menu bar height (~22-25px) to Y coordinate
-							const isMainDisplay = display.isPrimary;
-							const menuBarHeight = isMainDisplay ? 25 : 0; // Menu bar height adjustment
-							adjustedY = targetWindow.y - display.y + menuBarHeight;
+							targetDisplayId = display.id;
 							break;
 						}
 					}
+					
+					// Display ID'yi ayarla
+					if (targetDisplayId !== null) {
+						this.options.displayId = targetDisplayId;
+						const targetDisplay = displays.find(d => d.id === targetDisplayId);
+						this.recordingDisplayInfo = {
+							displayId: targetDisplayId,
+							x: targetDisplay.x,
+							y: targetDisplay.y,
+							width: parseInt(targetDisplay.resolution.split("x")[0]),
+							height: parseInt(targetDisplay.resolution.split("x")[1]),
+						};
+					}
+
+					// Overlay koordinatlarını direkt kullan - display offset'ini çıkar
+					const targetDisplay = displays.find(d => d.id === targetDisplayId);
+					this.options.captureArea = {
+						x: targetWindow.overlayX - (targetDisplay ? targetDisplay.x : 0),
+						y: targetWindow.overlayY - (targetDisplay ? targetDisplay.y : 0),
+						width: targetWindow.overlayWidth,
+						height: targetWindow.overlayHeight,
+					};
+
+					console.log(`🎬 Recording area: x=${this.options.captureArea.x}, y=${this.options.captureArea.y}, w=${this.options.captureArea.width}, h=${this.options.captureArea.height}`);
+				} else {
+					// Fallback: Eski yöntem
+					const windows = await this.getWindows();
+					const displays = await this.getDisplays();
+					const targetWindow = windows.find(
+						(w) => w.id === this.options.windowId
+					);
+
+					if (targetWindow) {
+						// Pencere hangi display'de olduğunu bul
+						let targetDisplayId = null;
+						let adjustedX = targetWindow.x;
+						let adjustedY = targetWindow.y;
+
+						// Pencere hangi display'de?
+						for (let i = 0; i < displays.length; i++) {
+							const display = displays[i];
+							const displayWidth = parseInt(display.resolution.split("x")[0]);
+							const displayHeight = parseInt(display.resolution.split("x")[1]);
+
+							// Pencere bu display sınırları içinde mi?
+							if (
+								targetWindow.x >= display.x &&
+								targetWindow.x < display.x + displayWidth &&
+								targetWindow.y >= display.y &&
+								targetWindow.y < display.y + displayHeight
+							) {
+								targetDisplayId = display.id; // Use actual display ID, not array index
+								// Koordinatları display'e göre normalize et
+								adjustedX = targetWindow.x - display.x;
+								adjustedY = targetWindow.y - display.y;
+								break;
+							}
+						}
 
 					// Eğer display bulunamadıysa ana display kullan
 					if (targetDisplayId === null) {

package/package.json

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

package/src/screen_capture.mm

@@ -25,11 +25,32 @@
     CGDirectDisplayID *displayList = (CGDirectDisplayID *)malloc(displayCount * sizeof(CGDirectDisplayID));
     CGGetActiveDisplayList(displayCount, displayList, &displayCount);
     
+    // Get NSScreen list for consistent coordinate system
+    NSArray<NSScreen *> *screens = [NSScreen screens];
+    
     for (uint32_t i = 0; i < displayCount; i++) {
         CGDirectDisplayID displayID = displayList[i];
         
-        // Get display bounds
-        CGRect bounds = CGDisplayBounds(displayID);
+        // Find corresponding NSScreen for this display ID
+        NSScreen *matchingScreen = nil;
+        for (NSScreen *screen in screens) {
+            // Match by display ID (requires screen.deviceDescription lookup)
+            NSDictionary *deviceDescription = [screen deviceDescription];
+            NSNumber *screenDisplayID = [deviceDescription objectForKey:@"NSScreenNumber"];
+            if (screenDisplayID && [screenDisplayID unsignedIntValue] == displayID) {
+                matchingScreen = screen;
+                break;
+            }
+        }
+        
+        // Use NSScreen.frame if found, fallback to CGDisplayBounds
+        CGRect bounds;
+        if (matchingScreen) {
+            NSRect screenFrame = [matchingScreen frame];
+            bounds = CGRectMake(screenFrame.origin.x, screenFrame.origin.y, screenFrame.size.width, screenFrame.size.height);
+        } else {
+            bounds = CGDisplayBounds(displayID);
+        }
         
         // Create display info dictionary
         NSDictionary *displayInfo = @{

package/src/window_selector.mm

@@ -990,11 +990,24 @@ Napi::Value GetSelectedWindowInfo(const Napi::CallbackInfo& info) {
         result.Set("id", Napi::Number::New(env, [[g_selectedWindowInfo objectForKey:@"id"] intValue]));
         result.Set("title", Napi::String::New(env, [[g_selectedWindowInfo objectForKey:@"title"] UTF8String]));
         result.Set("appName", Napi::String::New(env, [[g_selectedWindowInfo objectForKey:@"appName"] UTF8String]));
+        // Original CGWindow coordinates
         result.Set("x", Napi::Number::New(env, [[g_selectedWindowInfo objectForKey:@"x"] intValue]));
         result.Set("y", Napi::Number::New(env, [[g_selectedWindowInfo objectForKey:@"y"] intValue]));
         result.Set("width", Napi::Number::New(env, [[g_selectedWindowInfo objectForKey:@"width"] intValue]));
         result.Set("height", Napi::Number::New(env, [[g_selectedWindowInfo objectForKey:@"height"] intValue]));
         
+        // Add overlay coordinates for direct use in recording
+        // These are the exact coordinates used by the recording preview overlay
+        int windowX = [[g_selectedWindowInfo objectForKey:@"x"] intValue];
+        int windowY = [[g_selectedWindowInfo objectForKey:@"y"] intValue];
+        int windowWidth = [[g_selectedWindowInfo objectForKey:@"width"] intValue];
+        int windowHeight = [[g_selectedWindowInfo objectForKey:@"height"] intValue];
+        
+        result.Set("overlayX", Napi::Number::New(env, windowX));
+        result.Set("overlayY", Napi::Number::New(env, windowY));
+        result.Set("overlayWidth", Napi::Number::New(env, windowWidth));
+        result.Set("overlayHeight", Napi::Number::New(env, windowHeight));
+        
         // Determine which screen this window is on
         int x = [[g_selectedWindowInfo objectForKey:@"x"] intValue];
         int y = [[g_selectedWindowInfo objectForKey:@"y"] intValue];