node-mac-recorder 2.9.2 → 2.10.0

package/package.json

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

package/src/window_selector.mm

@@ -17,8 +17,7 @@ static NSView *g_overlayView = nil;
 static WindowSelectorOverlayView *g_selectedOverlayView = nil; // Track selected overlay
 static NSButton *g_selectButton = nil;
 static NSTimer *g_trackingTimer = nil;
-static NSDictionary *g_selectedWindowInfo = nil; // Window info for recording
-static NSDictionary *g_clickedWindowInfo = nil; // Separate state for clicked selection (NOT for recording)
+static NSDictionary *g_selectedWindowInfo = nil;
 static NSMutableArray *g_allWindows = nil;
 static NSDictionary *g_currentWindowUnderCursor = nil;
 static bool g_bringToFrontEnabled = true; // Default enabled
@@ -81,25 +80,25 @@ void updateScreenOverlays();
 }
 
 - (void)updateAppearance {
-            if (self.isSelectedWindow) {
-            // Selected window: same background but medium border (2px)
-            self.layer.backgroundColor = [[NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.4] CGColor]; // Same as highlight
-            self.layer.borderColor = [[NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:1.0] CGColor];
-            self.layer.borderWidth = 2.0; // Medium border for selected window
-            // Selected window appearance set
-        } else if (self.isActiveWindow) {
-            // Active window (highlighted): thin border (1px)
-            self.layer.backgroundColor = [[NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.4] CGColor];
-            self.layer.borderColor = [[NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.8] CGColor];
-            self.layer.borderWidth = 1.0; // Thin border for highlighted window
-            // Active window appearance set
-        } else {
-            // Inactive window: no border
-            self.layer.backgroundColor = [[NSColor colorWithRed:0.4 green:0.2 blue:0.6 alpha:0.25] CGColor];
-            self.layer.borderColor = [[NSColor clearColor] CGColor];
-            self.layer.borderWidth = 0.0; // No border for inactive window
-            // Inactive window appearance set
-        }
+    if (self.isSelectedWindow) {
+        // Selected window: same background but thick border (3px)
+        self.layer.backgroundColor = [[NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.4] CGColor]; // Same as highlight
+        self.layer.borderColor = [[NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:1.0] CGColor];
+        self.layer.borderWidth = 3.0; // Thick border for selected window
+        // Selected window appearance set
+    } else if (self.isActiveWindow) {
+        // Active window (highlighted): thin border (1px)
+        self.layer.backgroundColor = [[NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.4] CGColor];
+        self.layer.borderColor = [[NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.8] CGColor];
+        self.layer.borderWidth = 1.0; // Thin border for highlighted window
+        // Active window appearance set
+    } else {
+        // Inactive window: no border
+        self.layer.backgroundColor = [[NSColor colorWithRed:0.4 green:0.2 blue:0.6 alpha:0.25] CGColor];
+        self.layer.borderColor = [[NSColor clearColor] CGColor];
+        self.layer.borderWidth = 0.0; // No border for inactive window
+        // Inactive window appearance set
+    }
     
         // Common styling
         self.layer.cornerRadius = 8.0;
@@ -127,17 +126,17 @@ void updateScreenOverlays();
     // Handle mouse click to toggle window selection (ONLY selection, no recording start)
     if (self.windowInfo) {
         // Check if this window is already selected
-        BOOL wasSelected = (g_clickedWindowInfo && 
-                           [g_clickedWindowInfo isEqualToDictionary:self.windowInfo]);
+        BOOL wasSelected = (g_selectedWindowInfo && 
+                           [g_selectedWindowInfo isEqualToDictionary:self.windowInfo]);
         
         if (wasSelected) {
             // Deselect this window - return to normal highlight behavior
             self.isSelectedWindow = NO;
             
-            // Clear global clicked selection (NOT recording selection)
-            if (g_clickedWindowInfo) {
-                [g_clickedWindowInfo release];
-                g_clickedWindowInfo = nil;
+            // Clear global selection
+            if (g_selectedWindowInfo) {
+                [g_selectedWindowInfo release];
+                g_selectedWindowInfo = nil;
             }
             g_selectedOverlayView = nil;
             
@@ -151,19 +150,19 @@ void updateScreenOverlays();
                 [g_selectedOverlayView updateAppearance];
             }
             
-            // Select this window (for visual selection only, NOT for recording)
+            // Select this window
             self.isSelectedWindow = YES;
             
-            // Update global clicked window info (separate from recording selection)
-            if (g_clickedWindowInfo) {
-                [g_clickedWindowInfo release];
+            // Update global selected window info
+            if (g_selectedWindowInfo) {
+                [g_selectedWindowInfo release];
             }
-            g_clickedWindowInfo = [self.windowInfo retain];
+            g_selectedWindowInfo = [self.windowInfo retain];
             
             // Update global selected overlay reference
             g_selectedOverlayView = self;
             
-            NSLog(@"🎯 WINDOW CLICKED - Visual selection only (NOT recording): %@ - \"%@\"", 
+            NSLog(@"🎯 WINDOW SELECTED - Highlight blocked on this window: %@ - \"%@\"", 
                   [self.windowInfo objectForKey:@"appName"] ?: @"Unknown",
                   [self.windowInfo objectForKey:@"title"] ?: @"Untitled");
         }
@@ -172,12 +171,6 @@ void updateScreenOverlays();
         [self updateAppearance];
         
         // DON'T start recording here - that's only for the "Start Record" button
-        // Consume the event completely to prevent any propagation
-        NSLog(@"🛑 MOUSE EVENT CONSUMED - No recording started");
-        
-        // IMPORTANT: Return YES to indicate we handled the event
-        // This prevents the event from propagating to other handlers
-        return;
     }
 }
 
@@ -299,19 +292,14 @@ void updateScreenOverlays();
 
 @implementation WindowSelectorDelegate
 - (void)selectButtonClicked:(id)sender {
-    if (g_clickedWindowInfo) {
-        // Copy clicked window info to recording selection
-        if (g_selectedWindowInfo) {
-            [g_selectedWindowInfo release];
-        }
-        g_selectedWindowInfo = [g_clickedWindowInfo retain];
-        
-        NSLog(@"🎯 START RECORDING: Clicked window confirmed for recording - %@ - \"%@\"", 
+    if (g_selectedWindowInfo) {
+        // Use the selected window info (from click) instead of cursor position
+        NSLog(@"🎯 START RECORDING: Selected window confirmed - %@ - \"%@\"", 
               [g_selectedWindowInfo objectForKey:@"appName"] ?: @"Unknown",
               [g_selectedWindowInfo objectForKey:@"title"] ?: @"Untitled");
         cleanupWindowSelector();
     } else {
-        NSLog(@"⚠️ No window clicked - cannot start recording");
+        NSLog(@"⚠️ No window selected - cannot start recording");
     }
 }
 
@@ -812,9 +800,9 @@ void updateOverlay() {
             BOOL isUnderCursor = (windowUnderCursor && 
                                 [g_currentWindowUnderCursor isEqualToDictionary:windowUnderCursor]);
             
-                                // Check if this is the clicked window (visual selection)
-                    BOOL isSelected = (g_clickedWindowInfo &&
-                                     [g_clickedWindowInfo isEqualToDictionary:windowUnderCursor]);
+            // Check if this is the selected window
+            BOOL isSelected = (g_selectedWindowInfo && 
+                             [g_selectedWindowInfo isEqualToDictionary:windowUnderCursor]);
             
             // Allow highlighting on all windows (including selected) but keep selection state
             overlayView.isActiveWindow = isUnderCursor; // Highlight if under cursor
@@ -867,18 +855,6 @@ void cleanupWindowSelector() {
         g_selectedOverlayView.isSelectedWindow = NO;
         g_selectedOverlayView = nil;
     }
-    
-    // Clear clicked window info (visual selection)
-    if (g_clickedWindowInfo) {
-        [g_clickedWindowInfo release];
-        g_clickedWindowInfo = nil;
-    }
-    
-    // Clear selected window info (recording selection)
-    if (g_selectedWindowInfo) {
-        [g_selectedWindowInfo release];
-        g_selectedWindowInfo = nil;
-    }
 }
 
 // Recording preview functions
@@ -1561,10 +1537,6 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
             [g_selectedWindowInfo release];
             g_selectedWindowInfo = nil;
         }
-        if (g_clickedWindowInfo) {
-            [g_clickedWindowInfo release];
-            g_clickedWindowInfo = nil;
-        }
         if (g_selectedOverlayView) {
             g_selectedOverlayView.isSelectedWindow = NO;
             g_selectedOverlayView = nil;
@@ -1839,8 +1811,9 @@ Napi::Value GetSelectedWindowInfo(const Napi::CallbackInfo& info) {
         result.Set("screenWidth", Napi::Number::New(env, (int)screenFrame.size.width));
         result.Set("screenHeight", Napi::Number::New(env, (int)screenFrame.size.height));
         
-        // Don't clear selected window info - just read it
-        // The info will be cleared when recording actually starts
+        // Clear selected window info after reading
+        [g_selectedWindowInfo release];
+        g_selectedWindowInfo = nil;
         
         return result;