node-mac-recorder 2.7.2 → 2.7.4

package/package.json

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

package/src/window_selector.mm

@@ -68,7 +68,7 @@ void updateScreenOverlays();
     if (self) {
         // Use layer for background instead of custom drawing
         self.wantsLayer = YES;
-        self.isActiveWindow = NO; // Default to inactive (no mouse highlighting)
+        self.isActiveWindow = NO; // Default to inactive (will be set by updateOverlay)
         self.isSelectedWindow = NO; // Default to not selected
         
         // Set initial appearance
@@ -81,19 +81,19 @@ void updateScreenOverlays();
 
 - (void)updateAppearance {
     if (self.isSelectedWindow) {
-        // Selected window: bright background with thick border
+        // Selected window: bright background with thick border (2-3px)
         self.layer.backgroundColor = [[NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.6] CGColor];
         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
+        self.layer.borderWidth = 2.5; // Thick border for selected window
         // Selected window appearance set
     } else if (self.isActiveWindow) {
-        // Active window: brighter background with thin border
+        // 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 active window
+        self.layer.borderWidth = 1.0; // Thin border for highlighted window
         // Active window appearance set
     } else {
-        // Inactive window: dimmer background with no border
+        // 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
@@ -123,26 +123,57 @@ void updateScreenOverlays();
 }
 
 - (void)mouseDown:(NSEvent *)event {
-    // Handle mouse click to select this window
+    // Handle mouse click to toggle window selection (ONLY selection, no recording start)
     if (self.windowInfo) {
-        // Set this overlay as selected
-        self.isSelectedWindow = YES;
-        
-        // Update global selected window info
-        if (g_selectedWindowInfo) {
-            [g_selectedWindowInfo release];
+        // Check if this window is already selected
+        BOOL wasSelected = (g_selectedWindowInfo && 
+                           [g_selectedWindowInfo isEqualToDictionary:self.windowInfo]);
+        
+        if (wasSelected) {
+            // Deselect this window - return to normal highlight behavior
+            if (g_selectedOverlayView) {
+                g_selectedOverlayView.isSelectedWindow = NO;
+                [g_selectedOverlayView updateAppearance];
+            }
+            
+            // Clear global selection
+            if (g_selectedWindowInfo) {
+                [g_selectedWindowInfo release];
+                g_selectedWindowInfo = nil;
+            }
+            g_selectedOverlayView = nil;
+            
+            NSLog(@"🚫 WINDOW DESELECTED - Back to normal highlight mode: %@ - \"%@\"", 
+                  [self.windowInfo objectForKey:@"appName"] ?: @"Unknown",
+                  [self.windowInfo objectForKey:@"title"] ?: @"Untitled");
+        } else {
+            // Deselect previous window if any
+            if (g_selectedOverlayView && g_selectedOverlayView != self) {
+                g_selectedOverlayView.isSelectedWindow = NO;
+                [g_selectedOverlayView updateAppearance];
+            }
+            
+            // Select this window
+            self.isSelectedWindow = YES;
+            
+            // Update global selected window info
+            if (g_selectedWindowInfo) {
+                [g_selectedWindowInfo release];
+            }
+            g_selectedWindowInfo = [self.windowInfo retain];
+            
+            // Update global selected overlay reference
+            g_selectedOverlayView = self;
+            
+            NSLog(@"🎯 WINDOW SELECTED - Highlight blocked on this window: %@ - \"%@\"", 
+                  [self.windowInfo objectForKey:@"appName"] ?: @"Unknown",
+                  [self.windowInfo objectForKey:@"title"] ?: @"Untitled");
         }
-        g_selectedWindowInfo = [self.windowInfo retain];
         
-        // Update global selected overlay reference
-        g_selectedOverlayView = self;
-        
-        // Update overlay appearance
+        // Update appearance for this overlay
         [self updateAppearance];
         
-        NSLog(@"🎯 WINDOW SELECTED VIA CLICK: %@ - \"%@\"", 
-              [self.windowInfo objectForKey:@"appName"] ?: @"Unknown",
-              [self.windowInfo objectForKey:@"title"] ?: @"Untitled");
+        // DON'T start recording here - that's only for the "Start Record" button
     }
 }
 
@@ -494,23 +525,33 @@ NSDictionary* getWindowUnderCursor(CGPoint point) {
     }
 }
 
-// Update overlay to show selected window (no more mouse-based highlighting)
+// Update overlay to show window under cursor with highlighting (but no auto-bring-to-front)
 void updateOverlay() {
     @autoreleasepool {
         if (!g_isWindowSelecting || !g_overlayWindow) return;
         
-        // Check if we have a selected window or if we should show overlay for selection
-        NSDictionary *windowUnderCursor = nil;
-        if (!g_selectedWindowInfo) {
-            // No window selected yet - show overlay for the first available window
+        // Get current cursor position for highlighting
+        NSPoint mouseLocation = [NSEvent mouseLocation];
+        NSScreen *mainScreen = [NSScreen mainScreen];
+        CGFloat screenHeight = [mainScreen frame].size.height;
+        CGPoint globalPoint = CGPointMake(mouseLocation.x, screenHeight - mouseLocation.y);
+        
+        // Find window under cursor for highlighting
+        NSDictionary *windowUnderCursor = getWindowUnderCursor(globalPoint);
+        
+        // Update current window under cursor for highlighting
+        if (windowUnderCursor && ![windowUnderCursor isEqualToDictionary:g_currentWindowUnderCursor]) {
+            [g_currentWindowUnderCursor release];
+            g_currentWindowUnderCursor = [windowUnderCursor retain];
+        }
+        
+        // If no window under cursor, show first available window
+        if (!windowUnderCursor) {
             if (g_allWindows && [g_allWindows count] > 0) {
                 windowUnderCursor = [g_allWindows objectAtIndex:0];
             } else {
                 return; // No windows available
             }
-        } else {
-            // Use selected window info
-            windowUnderCursor = g_selectedWindowInfo;
         }
         
         // Update overlay position and size
@@ -545,8 +586,8 @@ void updateOverlay() {
         
         // Convert coordinates from CGWindow (top-left) to NSWindow (bottom-left) for the specific screen
         NSRect screenFrame = [windowScreen frame];
-        CGFloat screenHeight = screenFrame.size.height;
-        CGFloat adjustedY = screenHeight - y - height;
+        CGFloat windowScreenHeight = screenFrame.size.height;
+        CGFloat adjustedY = windowScreenHeight - y - height;
         
         // Window coordinates are in global space, overlay frame should be screen-relative
         // Keep X coordinate as-is (already in global space which is what we want)
@@ -754,18 +795,28 @@ void updateOverlay() {
               [g_overlayWindow level], [g_overlayWindow alphaValue], 
               [g_overlayWindow isVisible] ? "YES" : "NO");
         
-        // Update overlay view states - check if this window is selected
+        // Update overlay view states - highlight window under cursor and check selection
         if (g_overlayView && [g_overlayView isKindOfClass:[WindowSelectorOverlayView class]]) {
             WindowSelectorOverlayView *overlayView = (WindowSelectorOverlayView *)g_overlayView;
             
-            // Check if this is the selected window (true if we have selected window info)
-            BOOL isSelected = (g_selectedWindowInfo != nil);
+            // Check if this window is under cursor (highlight)
+            BOOL isUnderCursor = (windowUnderCursor && 
+                                [g_currentWindowUnderCursor isEqualToDictionary:windowUnderCursor]);
             
-            // Update states
-            overlayView.isActiveWindow = NO; // No more mouse-based highlighting
+            // Check if this is the selected window
+            BOOL isSelected = (g_selectedWindowInfo && 
+                             [g_selectedWindowInfo isEqualToDictionary:windowUnderCursor]);
+            
+            // If window is selected, don't allow highlighting on it
+            if (isSelected) {
+                overlayView.isActiveWindow = NO; // No highlight on selected window
+            } else {
+                overlayView.isActiveWindow = isUnderCursor; // Highlight if under cursor and not selected
+            }
             overlayView.isSelectedWindow = isSelected;
             
-            NSLog(@"🎯 Overlay State Updated: Active=NO, Selected=%s", isSelected ? "YES" : "NO");
+            NSLog(@"🎯 Overlay State Updated: Active=%s, Selected=%s", 
+                  overlayView.isActiveWindow ? "YES" : "NO", isSelected ? "YES" : "NO");
         }
     }
 }
@@ -1540,6 +1591,11 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
         [(WindowSelectorOverlayView *)g_overlayView setIsActiveWindow:NO];
         [(WindowSelectorOverlayView *)g_overlayView setIsSelectedWindow:NO];
         
+        // Set initial window under cursor for highlighting
+        if (g_allWindows && [g_allWindows count] > 0) {
+            g_currentWindowUnderCursor = [[g_allWindows objectAtIndex:0] retain];
+        }
+        
         // Note: NSWindow doesn't have setWantsLayer method, only NSView does
         
         // Force content view to have no borders