node-mac-recorder 2.17.2 → 2.17.3

package/index.js

@@ -376,7 +376,8 @@ class MacRecorder extends EventEmitter {
 												width: targetWindow.width,
 												height: targetWindow.height,
 												displayId: this.options.displayId,
-												originalWindow: targetWindow
+												originalWindow: targetWindow,
+												captureArea: this.options.captureArea
 											}
 										}).catch(cursorError => {
 											console.warn('Cursor tracking failed to restart:', cursorError.message);
@@ -393,7 +394,8 @@ class MacRecorder extends EventEmitter {
 											width: targetWindow.width,
 											height: targetWindow.height,
 											displayId: this.options.displayId,
-											originalWindow: targetWindow
+											originalWindow: targetWindow,
+											captureArea: this.options.captureArea
 										}
 									}).catch(cursorError => {
 										console.warn('Cursor tracking failed to start:', cursorError.message);
@@ -715,17 +717,31 @@ class MacRecorder extends EventEmitter {
 
 		// Koordinat sistemi belirle: window-relative, display-relative veya global
 		if (options.windowRelative && options.windowInfo) {
-			// Window-relative koordinatlar için pencere bilgilerini kullan
-			// Cursor pozisyonu için Y dönüşümü YAPMA - sadece window offset'ini çıkar
-			this.cursorDisplayInfo = {
-				displayId: options.windowInfo.displayId || null,
-				x: options.windowInfo.x || 0,
-				y: options.windowInfo.y || 0,
-				width: options.windowInfo.width,
-				height: options.windowInfo.height,
-				windowRelative: true,
-				windowInfo: options.windowInfo
-			};
+			// Window recording için display'e relative captureArea koordinatlarını kullan
+			const captureArea = options.windowInfo.captureArea;
+			if (captureArea) {
+				// captureArea zaten display-relative koordinatlar
+				this.cursorDisplayInfo = {
+					displayId: options.windowInfo.displayId || null,
+					x: captureArea.x,  // Display-relative X
+					y: captureArea.y,  // Display-relative Y
+					width: captureArea.width,
+					height: captureArea.height,
+					windowRelative: true,
+					windowInfo: options.windowInfo
+				};
+			} else {
+				// Fallback: orijinal window koordinatları
+				this.cursorDisplayInfo = {
+					displayId: options.windowInfo.displayId || null,
+					x: options.windowInfo.x || 0,
+					y: options.windowInfo.y || 0,
+					width: options.windowInfo.width,
+					height: options.windowInfo.height,
+					windowRelative: true,
+					windowInfo: options.windowInfo
+				};
+			}
 		} else if (this.recordingDisplayInfo) {
 			// Recording başlatılmışsa o display'i kullan
 			this.cursorDisplayInfo = this.recordingDisplayInfo;
@@ -772,9 +788,27 @@ class MacRecorder extends EventEmitter {
 						let coordinateSystem = "global";
 
 						if (this.cursorDisplayInfo) {
-							// Offset'leri çıkar (display veya window)
-							x = position.x - this.cursorDisplayInfo.x;
-							y = position.y - this.cursorDisplayInfo.y;
+							if (this.cursorDisplayInfo.windowRelative) {
+								// Window recording: cursor'ı önce target display'e relative yap, sonra captureArea'ya relative yap
+								const targetDisplay = this.recordingDisplayInfo;
+								if (targetDisplay) {
+									// 1. Global -> Display-relative
+									const displayRelativeX = position.x - targetDisplay.x;
+									const displayRelativeY = position.y - targetDisplay.y;
+
+									// 2. Display-relative -> CaptureArea-relative (window-relative)
+									x = displayRelativeX - this.cursorDisplayInfo.x;
+									y = displayRelativeY - this.cursorDisplayInfo.y;
+								} else {
+									// Fallback: doğrudan offset çıkar
+									x = position.x - this.cursorDisplayInfo.x;
+									y = position.y - this.cursorDisplayInfo.y;
+								}
+							} else {
+								// Display recording: doğrudan offset çıkar
+								x = position.x - this.cursorDisplayInfo.x;
+								y = position.y - this.cursorDisplayInfo.y;
+							}
 
 							if (this.cursorDisplayInfo.windowRelative) {
 								// Window-relative koordinatlar

package/package.json

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

package/src/cursor_tracker.mm

@@ -70,16 +70,69 @@ NSString* getCursorType() {
                 (hotSpot.x >= 12 && hotSpot.x <= 14 && hotSpot.y >= 7 && hotSpot.y <= 9)) {
                 return @"pointer";
             } else if ([currentCursor isEqual:[NSCursor IBeamCursor]] ||
-                      (hotSpot.x >= 3 && hotSpot.x <= 5 && hotSpot.y >= 8 && hotSpot.y <= 10 && 
+                      (hotSpot.x >= 3 && hotSpot.x <= 5 && hotSpot.y >= 8 && hotSpot.y <= 10 &&
                        imageSize.width <= 10 && imageSize.height >= 16)) {
                 return @"text";
             } else if ([currentCursor isEqual:[NSCursor resizeLeftRightCursor]]) {
-                return @"ew-resize";
+                return @"col-resize";
             } else if ([currentCursor isEqual:[NSCursor resizeUpDownCursor]]) {
-                return @"ns-resize";
-            } else if ([currentCursor isEqual:[NSCursor openHandCursor]] || 
-                      [currentCursor isEqual:[NSCursor closedHandCursor]]) {
+                return @"row-resize";
+            } else if ([currentCursor isEqual:[NSCursor openHandCursor]]) {
+                return @"grab";
+            } else if ([currentCursor isEqual:[NSCursor closedHandCursor]]) {
                 return @"grabbing";
+            } else if ([currentCursor isEqual:[NSCursor crosshairCursor]]) {
+                return @"crosshair";
+            } else if ([currentCursor isEqual:[NSCursor disappearingItemCursor]]) {
+                return @"alias";
+            } else if ([currentCursor isEqual:[NSCursor dragCopyCursor]]) {
+                return @"copy";
+            } else if ([currentCursor isEqual:[NSCursor operationNotAllowedCursor]]) {
+                return @"not-allowed";
+            } else if ([currentCursor isEqual:[NSCursor contextualMenuCursor]]) {
+                return @"help";
+            }
+
+            // Additional cursor type detection by image characteristics
+            if (imageSize.width > 0 && imageSize.height > 0) {
+                // Progress cursor (spinning wheel or hourglass)
+                if (imageSize.width >= 16 && imageSize.height >= 16 &&
+                    imageSize.width <= 32 && imageSize.height <= 32 &&
+                    hotSpot.x >= imageSize.width/2 - 4 && hotSpot.x <= imageSize.width/2 + 4 &&
+                    hotSpot.y >= imageSize.height/2 - 4 && hotSpot.y <= imageSize.height/2 + 4) {
+                    return @"progress";
+                }
+
+                // Zoom cursors (magnifying glass)
+                if ((imageSize.width >= 20 && imageSize.width <= 28) &&
+                    (imageSize.height >= 20 && imageSize.height <= 28)) {
+                    // Try to differentiate zoom-in vs zoom-out by hotspot position
+                    if (hotSpot.x < imageSize.width/2) {
+                        return @"zoom-out";
+                    } else {
+                        return @"zoom-in";
+                    }
+                }
+
+                // All-scroll cursor (four arrows)
+                if (imageSize.width >= 16 && imageSize.height >= 16 &&
+                    hotSpot.x >= imageSize.width/2 - 2 && hotSpot.x <= imageSize.width/2 + 2 &&
+                    hotSpot.y >= imageSize.height/2 - 2 && hotSpot.y <= imageSize.height/2 + 2) {
+                    return @"all-scroll";
+                }
+
+                // Diagonal resize cursors
+                if (imageSize.width >= 14 && imageSize.width <= 20 &&
+                    imageSize.height >= 14 && imageSize.height <= 20) {
+                    // NW-SE resize (top-left to bottom-right)
+                    if (hotSpot.x >= 7 && hotSpot.x <= 13 && hotSpot.y >= 7 && hotSpot.y <= 13) {
+                        return @"nwse-resize";
+                    }
+                    // NE-SW resize (top-right to bottom-left)
+                    if (hotSpot.x >= 7 && hotSpot.x <= 13 && hotSpot.y >= 7 && hotSpot.y <= 13) {
+                        return @"nesw-resize";
+                    }
+                }
             }
             
             // Check if we're in a drag operation