node-mac-recorder 1.10.0 → 1.12.0

package/index.js

@@ -139,21 +139,19 @@ class MacRecorder extends EventEmitter {
 		// WindowId varsa captureArea'yı otomatik ayarla
 		if (this.options.windowId && !this.options.captureArea) {
 			try {
-				// 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
+				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]);
@@ -161,73 +159,34 @@ class MacRecorder extends EventEmitter {
 
 						// Pencere bu display sınırları içinde mi?
 						if (
-							targetWindow.overlayX >= display.x &&
-							targetWindow.overlayX < display.x + displayWidth &&
-							targetWindow.overlayY >= display.y &&
-							targetWindow.overlayY < display.y + displayHeight
+							targetWindow.x >= display.x &&
+							targetWindow.x < display.x + displayWidth &&
+							targetWindow.y >= display.y &&
+							targetWindow.y < display.y + displayHeight
 						) {
-							targetDisplayId = display.id;
+							targetDisplayId = display.id; // Use actual display ID, not array index
+							// Koordinatları display'e göre normalize et
+							adjustedX = targetWindow.x - display.x;
+							// Dynamic Y coordinate offset calculation
+							// Get display bounds using both coordinate systems to calculate difference
+							const nativeBinding = require("./build/Release/mac_recorder.node") || require("./build/Debug/mac_recorder.node");
+							const displays = nativeBinding.getDisplays();
+							const nativeDisplay = displays.find(d => d.id === targetDisplayId);
+							
+							if (nativeDisplay && display) {
+								// Calculate Y height difference between coordinate systems
+								// display.y comes from NSScreen.frame (window selector)
+								// nativeDisplay.y comes from CGDisplayBounds (recording)
+								const yOffset = Math.abs(display.y - nativeDisplay.y);
+								console.log(`📏 Dynamic Y offset calculated: ${yOffset}px (NSScreen: ${display.y}, CGDisplay: ${nativeDisplay.y})`);
+								adjustedY = Math.max(0, targetWindow.y - display.y - yOffset);
+							} else {
+								// Fallback to fixed offset if dynamic calculation fails
+								adjustedY = Math.max(0, targetWindow.y - display.y - 25);
+							}
 							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.10.0",
+	"version": "1.12.0",
 	"description": "Native macOS screen recording package for Node.js applications",
 	"main": "index.js",
 	"keywords": [