node-mac-recorder 1.6.0 → 1.8.0

package/WINDOW_SELECTOR_README.md

@@ -8,15 +8,16 @@ Bu modül, macOS'ta sistem imleci ile pencere seçimi yapabilmenizi sağlayan g
 
 - **Real-time Window Detection**: İmleç hangi pencereye gelirse otomatik olarak tespit eder
 - **Visual Overlay**: Seçilebilir pencereleri mavi transparant kapsayıcı ile highlight eder
-- **Interactive Selection**: Merkeze yerleştirilen "Select Window" butonu ile kolay seçim
+- **Interactive Selection**: Merkeze yerleştirilen "Start Record" butonu ile kolay seçim
 - **Multi-display Support**: Çoklu ekran kurulumlarında çalışır
 - **Detailed Window Info**: Pencere pozisyonu, boyutu ve hangi ekranda olduğunu döndürür
 - **Event-driven API**: Pencere hover, seçim ve hata durumları için event'ler
 - **Window Focus Control**: Detect edilen pencereyi otomatik olarak en öne getirir
 - **Auto Bring-to-Front**: Cursor hangi pencereye gelirse otomatik focus yapar
 - **Recording Preview Overlay**: Kayıt alanını görselleştiren tam ekran overlay sistemi
-- **Screen Selection**: Tam ekran overlay ile ekran seçimi (menu bar dahil)
+- **Screen Selection**: Tam ekran overlay ile ekran seçimi (menu bar dahil, ESC ile iptal)
 - **Screen Recording Preview**: Seçilen ekran için kayıt önizleme sistemi
+- **ESC Key Support**: Tüm seçim modlarında ESC tuşu ile iptal
 - **Permission Management**: macOS izin kontrolü ve yönetimi
 
 ## 🚀 Kurulum
@@ -59,7 +60,7 @@ async function selectWindow() {
     const selector = new WindowSelector();
     
     try {
-        console.log('Bir pencere seçin...');
+        console.log('Bir pencere seçin (ESC ile iptal)...');
         const selectedWindow = await selector.selectWindow();
         
         console.log('Seçilen pencere:', {
@@ -594,7 +595,7 @@ async function selectScreen() {
     const selector = new WindowSelector();
     
     try {
-        console.log('Bir ekran seçin...');
+        console.log('Bir ekran seçin (ESC ile iptal)...');
         const selectedScreen = await selector.selectScreen();
         
         console.log('Seçilen ekran:', {
@@ -607,7 +608,11 @@ async function selectScreen() {
         return selectedScreen;
         
     } catch (error) {
-        console.error('Hata:', error.message);
+        if (error.message.includes('cancelled')) {
+            console.log('❌ Seçim iptal edildi');
+        } else {
+            console.error('Hata:', error.message);
+        }
     } finally {
         await selector.cleanup();
     }
@@ -624,7 +629,7 @@ async function manualScreenSelection() {
     try {
         // Ekran seçimini başlat
         await selector.startScreenSelection();
-        console.log('🖥️ Screen overlays shown - click Select Screen button');
+        console.log('🖥️ Screen overlays shown - click Start Record button (ESC to cancel)');
         
         // Polling ile seçim bekle
         const checkSelection = () => {

package/index.js

@@ -167,7 +167,13 @@ class MacRecorder extends EventEmitter {
 							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;
+							
+							// 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;
 							break;
 						}
 					}

package/package.json

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

package/src/window_selector.mm

@@ -27,6 +27,7 @@ static bool g_isScreenSelecting = false;
 static NSMutableArray *g_screenOverlayWindows = nil;
 static NSDictionary *g_selectedScreenInfo = nil;
 static NSArray *g_allScreens = nil;
+static id g_screenKeyEventMonitor = nil;
 
 // Forward declarations
 void cleanupWindowSelector();
@@ -139,13 +140,15 @@ bool hideScreenRecordingPreview();
     
     NSRect windowRect = NSMakeRect(windowX, convertedY, windowWidth, windowHeight);
     
-    // Fill entire view with semi-transparent black
-    [[NSColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:0.5] setFill];
-    NSRectFill(self.bounds);
+    // Create a path that covers the entire view but excludes the window area
+    NSBezierPath *maskPath = [NSBezierPath bezierPathWithRect:self.bounds];
+    NSBezierPath *windowPath = [NSBezierPath bezierPathWithRect:windowRect];
+    [maskPath appendBezierPath:windowPath];
+    [maskPath setWindingRule:NSWindingRuleEvenOdd]; // Creates hole effect
     
-    // Cut out the window area (make it transparent)
-    [[NSColor clearColor] setFill];
-    NSRectFill(windowRect);
+    // Fill with semi-transparent black, excluding window area
+    [[NSColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:0.5] setFill];
+    [maskPath fill];
 }
 
 @end
@@ -222,14 +225,19 @@ bool hideScreenRecordingPreview();
 }
 
 - (void)screenSelectButtonClicked:(id)sender {
-    // Get the screen info from the button's superview
-    NSView *overlayView = [[sender superview] superview];
-    if ([overlayView isKindOfClass:[ScreenSelectorOverlayView class]]) {
-        ScreenSelectorOverlayView *screenView = (ScreenSelectorOverlayView *)overlayView;
-        if (screenView.screenInfo) {
-            g_selectedScreenInfo = [screenView.screenInfo retain];
-            cleanupScreenSelector();
-        }
+    NSButton *button = (NSButton *)sender;
+    NSInteger screenIndex = [button tag];
+    
+    // Get screen info from global array using button tag
+    if (g_allScreens && screenIndex >= 0 && screenIndex < [g_allScreens count]) {
+        NSDictionary *screenInfo = [g_allScreens objectAtIndex:screenIndex];
+        g_selectedScreenInfo = [screenInfo retain];
+        
+        NSLog(@"🖥️ SCREEN BUTTON CLICKED: %@ (%@)", 
+              [screenInfo objectForKey:@"name"],
+              [screenInfo objectForKey:@"resolution"]);
+        
+        cleanupScreenSelector();
     }
 }
 
@@ -637,6 +645,12 @@ bool hideRecordingPreview() {
 void cleanupScreenSelector() {
     g_isScreenSelecting = false;
     
+    // Remove key event monitor
+    if (g_screenKeyEventMonitor) {
+        [NSEvent removeMonitor:g_screenKeyEventMonitor];
+        g_screenKeyEventMonitor = nil;
+    }
+    
     // Close all screen overlay windows
     if (g_screenOverlayWindows) {
         for (NSWindow *overlayWindow in g_screenOverlayWindows) {
@@ -704,11 +718,26 @@ bool startScreenSelection() {
             
             // Create select button
             NSButton *selectButton = [[NSButton alloc] initWithFrame:NSMakeRect(0, 0, 180, 60)];
-            [selectButton setTitle:@"Select Screen"];
+            [selectButton setTitle:@"Start Record"];
             [selectButton setButtonType:NSButtonTypeMomentaryPushIn];
             [selectButton setBezelStyle:NSBezelStyleRounded];
             [selectButton setFont:[NSFont systemFontOfSize:16 weight:NSFontWeightSemibold]];
-            [selectButton setWantsLayer:NO]; // Use system default
+            [selectButton setTag:i]; // Set screen index as tag
+            
+            // Blue background with white text
+            [selectButton setWantsLayer:YES];
+            [selectButton.layer setBackgroundColor:[[NSColor colorWithRed:0.0 green:0.4 blue:0.8 alpha:0.9] CGColor]];
+            [selectButton.layer setCornerRadius:8.0];
+            [selectButton.layer setBorderColor:[[NSColor colorWithRed:0.0 green:0.3 blue:0.7 alpha:1.0] CGColor]];
+            [selectButton.layer setBorderWidth:2.0];
+            
+            // White text color
+            NSMutableAttributedString *titleString = [[NSMutableAttributedString alloc] 
+                initWithString:[selectButton title]];
+            [titleString addAttribute:NSForegroundColorAttributeName 
+                                value:[NSColor whiteColor] 
+                                range:NSMakeRange(0, [titleString length])];
+            [selectButton setAttributedTitle:titleString];
             
             // Add shadow for better visibility
             [selectButton.layer setShadowColor:[[NSColor blackColor] CGColor]];
@@ -716,9 +745,11 @@ bool startScreenSelection() {
             [selectButton.layer setShadowRadius:4.0];
             [selectButton.layer setShadowOpacity:0.3];
             
-            // Set button target and action
-            WindowSelectorDelegate *delegate = [[WindowSelectorDelegate alloc] init];
-            [selectButton setTarget:delegate];
+            // Set button target and action (reuse global delegate)
+            if (!g_delegate) {
+                g_delegate = [[WindowSelectorDelegate alloc] init];
+            }
+            [selectButton setTarget:g_delegate];
             [selectButton setAction:@selector(screenSelectButtonClicked:)];
             
             // Position button in center of screen
@@ -740,7 +771,16 @@ bool startScreenSelection() {
         [screenInfoArray release];
         g_isScreenSelecting = true;
         
-        NSLog(@"🖥️ SCREEN SELECTION: Started with %lu screens", (unsigned long)[screens count]);
+        // Add ESC key event monitor to cancel selection
+        g_screenKeyEventMonitor = [NSEvent addGlobalMonitorForEventsMatchingMask:NSEventMaskKeyDown
+                                                                          handler:^(NSEvent *event) {
+            if ([event keyCode] == 53) { // ESC key
+                NSLog(@"🖥️ SCREEN SELECTION: ESC pressed - cancelling selection");
+                cleanupScreenSelector();
+            }
+        }];
+        
+        NSLog(@"🖥️ SCREEN SELECTION: Started with %lu screens (ESC to cancel)", (unsigned long)[screens count]);
         
         return true;
         
@@ -875,13 +915,25 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
         
         // Create select button with blue theme
         g_selectButton = [[NSButton alloc] initWithFrame:NSMakeRect(0, 0, 160, 60)];
-        [g_selectButton setTitle:@"Select Window"];
+        [g_selectButton setTitle:@"Start Record"];
         [g_selectButton setButtonType:NSButtonTypeMomentaryPushIn];
         [g_selectButton setBezelStyle:NSBezelStyleRounded];
         [g_selectButton setFont:[NSFont systemFontOfSize:16 weight:NSFontWeightSemibold]];
         
-        // Remove custom button styling to use system default
-        [g_selectButton setWantsLayer:NO];
+        // Blue background with white text
+        [g_selectButton setWantsLayer:YES];
+        [g_selectButton.layer setBackgroundColor:[[NSColor colorWithRed:0.0 green:0.4 blue:0.8 alpha:0.9] CGColor]];
+        [g_selectButton.layer setCornerRadius:8.0];
+        [g_selectButton.layer setBorderColor:[[NSColor colorWithRed:0.0 green:0.3 blue:0.7 alpha:1.0] CGColor]];
+        [g_selectButton.layer setBorderWidth:2.0];
+        
+        // White text color
+        NSMutableAttributedString *titleString = [[NSMutableAttributedString alloc] 
+            initWithString:[g_selectButton title]];
+        [titleString addAttribute:NSForegroundColorAttributeName 
+                            value:[NSColor whiteColor] 
+                            range:NSMakeRange(0, [titleString length])];
+        [g_selectButton setAttributedTitle:titleString];
         
         // Add shadow for better visibility
         [g_selectButton.layer setShadowColor:[[NSColor blackColor] CGColor]];

package/window-selector.js

@@ -312,6 +312,9 @@ class WindowSelector extends EventEmitter {
 	async startScreenSelection() {
 		try {
 			const success = nativeBinding.startScreenSelection();
+			if (success) {
+				this._isScreenSelecting = true;
+			}
 			return success;
 		} catch (error) {
 			throw new Error(`Failed to start screen selection: ${error.message}`);
@@ -325,6 +328,7 @@ class WindowSelector extends EventEmitter {
 	async stopScreenSelection() {
 		try {
 			const success = nativeBinding.stopScreenSelection();
+			this._isScreenSelecting = false;
 			return success;
 		} catch (error) {
 			throw new Error(`Failed to stop screen selection: ${error.message}`);
@@ -337,13 +341,32 @@ class WindowSelector extends EventEmitter {
 	 */
 	getSelectedScreen() {
 		try {
-			return nativeBinding.getSelectedScreenInfo();
+			const selectedScreen = nativeBinding.getSelectedScreenInfo();
+			if (selectedScreen) {
+				// Screen selected, update status
+				this._isScreenSelecting = false;
+			}
+			return selectedScreen;
 		} catch (error) {
 			console.error(`Failed to get selected screen: ${error.message}`);
 			return null;
 		}
 	}
 
+	/**
+	 * Ekran seçim durumunu döndürür
+	 * @returns {boolean} Is selecting screens
+	 */
+	get isScreenSelecting() {
+		// Screen selection durum bilgisi için native taraftan status alalım
+		try {
+			// Bu fonksiyon henüz yok, eklemek gerekiyor
+			return this._isScreenSelecting || false;
+		} catch (error) {
+			return false;
+		}
+	}
+
 	/**
 	 * Promise tabanlı ekran seçimi
 	 * Kullanıcı bir ekran seçene kadar bekler
@@ -356,13 +379,22 @@ class WindowSelector extends EventEmitter {
 			
 			// Poll for selection completion
 			return new Promise((resolve, reject) => {
+				let isResolved = false;
+				
 				const checkSelection = () => {
+					if (isResolved) return; // Prevent multiple resolutions
+					
 					const selectedScreen = this.getSelectedScreen();
 					if (selectedScreen) {
+						isResolved = true;
 						resolve(selectedScreen);
-					} else {
-						// Check again in 100ms
+					} else if (this.isScreenSelecting) {
+						// Still selecting, check again
 						setTimeout(checkSelection, 100);
+					} else {
+						// Selection was cancelled (probably ESC key)
+						isResolved = true;
+						reject(new Error('Screen selection was cancelled'));
 					}
 				};
 				
@@ -371,8 +403,11 @@ class WindowSelector extends EventEmitter {
 				
 				// Timeout after 60 seconds
 				setTimeout(() => {
-					this.stopScreenSelection();
-					reject(new Error('Screen selection timed out'));
+					if (!isResolved) {
+						isResolved = true;
+						this.stopScreenSelection();
+						reject(new Error('Screen selection timed out'));
+					}
 				}, 60000);
 			});
 		} catch (error) {