node-mac-recorder 2.16.17 → 2.16.19

package/.claude/settings.local.json

@@ -1,7 +1,7 @@
 {
   "permissions": {
     "allow": [
-      "Bash(FORCE_AVFOUNDATION=1 node -e \"\nconsole.log(''🧪 Testing per-screen window selector overlay system...'');\nconst WindowSelector = require(''./window-selector.js'');\nconst selector = new WindowSelector();\n\n// Test permission check first\nselector.checkPermissions().then(perms => {\n  console.log(''Permissions:'', perms);\n  \n  // Start window selection to test per-screen overlays\n  return selector.startSelection();\n}).then(() => {\n  console.log(''✅ Window selection started - testing per-screen overlays'');\n  console.log(''➡️ Move cursor over windows on different displays to test overlay positioning'');\n  \n  // Auto-stop after 10 seconds for testing\n  setTimeout(() => {\n    selector.stopSelection().then(() => {\n      console.log(''✅ Window selection stopped - test complete'');\n    });\n  }, 10000);\n}).catch(console.error);\n\")"
+      "Bash(FORCE_AVFOUNDATION=1 node -e \"\nconsole.log(''🧪 Testing UI elements on ALL screens...'');\nconst WindowSelector = require(''./window-selector.js'');\nconst selector = new WindowSelector();\n\nselector.checkPermissions().then(perms => {\n  console.log(''Permissions:'', perms);\n  return selector.startSelection();\n}).then(() => {\n  console.log(''✅ Window selection started - TEST UI elements on BOTH screens'');\n  console.log(''🖥️ Primary display: Move cursor over windows'');\n  console.log(''🖥️ External display: Move cursor over windows'');\n  console.log(''➡️ Check if Record/Cancel buttons + logo + title appear on BOTH displays'');\n  \n  setTimeout(() => {\n    selector.stopSelection().then(() => {\n      console.log(''✅ Test complete'');\n    });\n  }, 20000);\n}).catch(console.error);\n\")"
     ],
     "deny": [],
     "ask": []

package/package.json

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

package/src/window_selector.mm

@@ -21,6 +21,10 @@ static NSMutableArray *g_perScreenOverlays = nil;
 static NSMutableArray *g_perScreenOverlayViews = nil;
 static NSInteger g_activeScreenIndex = -1;
 
+// Forward declaration for delegate
+@class WindowSelectorDelegate;
+static WindowSelectorDelegate *g_delegate = nil;
+
 // Functions to hide/show main overlay window during recording
 void hideAllOverlayWindows() {
     if (g_overlayWindow && [g_overlayWindow isVisible]) {
@@ -73,6 +77,9 @@ bool showScreenRecordingPreview(NSDictionary *screenInfo);
 bool hideScreenRecordingPreview();
 void updateScreenOverlays();
 
+// Forward declarations
+@class HoverButton;
+
 // Custom overlay view class
 @interface WindowSelectorOverlayView : NSView
 @property (nonatomic, strong) NSDictionary *windowInfo;
@@ -80,7 +87,14 @@ void updateScreenOverlays();
 @property (nonatomic) BOOL isToggled;
 @property (nonatomic) NSRect highlightFrame;
 @property (nonatomic, strong) NSValue *globalOriginOffset; // Store global coordinate offset
+@property (nonatomic, strong) HoverButton *recordButton;
+@property (nonatomic, strong) HoverButton *cancelButton;
+@property (nonatomic, strong) NSImageView *appIconView;
+@property (nonatomic, strong) NSTextField *infoLabel;
 - (void)setHighlightFrame:(NSRect)frame;
+- (void)setupUIElements;
+- (void)updateUIElements;
+- (void)positionUIElements;
 @end
 
 // Custom button with hover effects
@@ -115,15 +129,14 @@ void updateScreenOverlays();
         // Disable focus ring completely
         [self setFocusRingType:NSFocusRingTypeNone];
         
-        // Window selector overlay view created
+        // Setup UI elements (button, icon, label)
+        [self setupUIElements];
+        
+        NSLog(@"🎯 WindowSelectorOverlayView created with UI elements integrated");
     }
     return self;
 }
 
-- (void)setHighlightFrame:(NSRect)frame {
-    _highlightFrame = frame;
-    [self setNeedsDisplay:YES]; // Trigger redraw
-}
 
 - (void)drawRect:(NSRect)dirtyRect {
     [super drawRect:dirtyRect];
@@ -218,6 +231,178 @@ void updateScreenOverlays();
     NSLog(@"🎯 Global toggle state: %s", g_hasToggledWindow ? "HAS_TOGGLED" : "NO_TOGGLE");
 }
 
+- (void)setupUIElements {
+    NSLog(@"🔧 Setting up integrated UI elements");
+    
+    // Ensure delegate exists
+    if (!g_delegate) {
+        NSLog(@"⚠️ No delegate found in setupUIElements, this may cause button click issues");
+    }
+    
+    // Create record button
+    self.recordButton = [[HoverButton alloc] initWithFrame:NSMakeRect(0, 0, 200, 60)];
+    [self.recordButton setTitle:@"Start Recording"];
+    [self.recordButton setFont:[NSFont systemFontOfSize:18.0 weight:NSFontWeightMedium]];
+    [self.recordButton setBezelStyle:NSBezelStyleRounded];
+    [self.recordButton setTarget:g_delegate];
+    [self.recordButton setAction:@selector(selectButtonClicked:)];
+    
+    // Style the button
+    self.recordButton.wantsLayer = YES;
+    self.recordButton.layer.backgroundColor = [[NSColor colorWithRed:0.2 green:0.6 blue:1.0 alpha:0.9] CGColor];
+    self.recordButton.layer.cornerRadius = 8.0;
+    self.recordButton.layer.borderWidth = 0.0;
+    
+    [self addSubview:self.recordButton];
+    
+    // Create cancel button
+    self.cancelButton = [[HoverButton alloc] initWithFrame:NSMakeRect(0, 0, 120, 40)];
+    [self.cancelButton setTitle:@"Cancel"];
+    [self.cancelButton setFont:[NSFont systemFontOfSize:14.0 weight:NSFontWeightMedium]];
+    [self.cancelButton setBezelStyle:NSBezelStyleRounded];
+    [self.cancelButton setTarget:g_delegate];
+    [self.cancelButton setAction:@selector(cancelButtonClicked:)];
+    
+    // Style the cancel button
+    self.cancelButton.wantsLayer = YES;
+    self.cancelButton.layer.backgroundColor = [[NSColor colorWithRed:0.6 green:0.6 blue:0.6 alpha:0.9] CGColor];
+    self.cancelButton.layer.cornerRadius = 6.0;
+    self.cancelButton.layer.borderWidth = 0.0;
+    
+    [self addSubview:self.cancelButton];
+    
+    // Create app icon view
+    self.appIconView = [[NSImageView alloc] initWithFrame:NSMakeRect(0, 0, 96, 96)];
+    [self.appIconView setImageScaling:NSImageScaleProportionallyUpOrDown];
+    [self.appIconView setWantsLayer:YES];
+    [self.appIconView.layer setCornerRadius:8.0];
+    [self.appIconView.layer setMasksToBounds:YES];
+    [self addSubview:self.appIconView];
+    
+    // Create info label
+    self.infoLabel = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 400, 60)];
+    [self.infoLabel setEditable:NO];
+    [self.infoLabel setSelectable:NO];
+    [self.infoLabel setBezeled:NO];
+    [self.infoLabel setDrawsBackground:NO];
+    [self.infoLabel setAlignment:NSTextAlignmentCenter];
+    [self.infoLabel setFont:[NSFont systemFontOfSize:23.4 weight:NSFontWeightMedium]];
+    [self.infoLabel setTextColor:[NSColor whiteColor]];
+    [self addSubview:self.infoLabel];
+    
+    NSLog(@"✅ UI elements created and added to overlay view");
+}
+
+- (void)updateUIElements {
+    if (!self.windowInfo) return;
+    
+    NSLog(@"🔄 Updating UI elements for window: %@", [self.windowInfo objectForKey:@"title"]);
+    
+    // Update info label
+    NSString *windowTitle = [self.windowInfo objectForKey:@"title"] ?: @"Unknown Window";
+    NSString *appName = [self.windowInfo objectForKey:@"appName"] ?: @"Unknown App";
+    [self.infoLabel setStringValue:[NSString stringWithFormat:@"%@\n%@", appName, windowTitle]];
+    
+    // Update app icon
+    NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
+    NSArray *runningApps = [workspace runningApplications];
+    NSImage *appIcon = nil;
+    
+    for (NSRunningApplication *app in runningApps) {
+        if ([[app localizedName] isEqualToString:appName] || [[app bundleIdentifier] containsString:appName]) {
+            appIcon = [app icon];
+            break;
+        }
+    }
+    
+    if (!appIcon) {
+        appIcon = [workspace iconForFileType:NSFileTypeForHFSTypeCode(kGenericApplicationIcon)];
+    }
+    
+    [self.appIconView setImage:appIcon];
+    
+    // Position elements
+    [self positionUIElements];
+}
+
+- (void)positionUIElements {
+    if (NSEqualRects(self.highlightFrame, NSZeroRect)) {
+        // Hide elements when no window is highlighted
+        [self.recordButton setHidden:YES];
+        [self.cancelButton setHidden:YES];
+        [self.appIconView setHidden:YES];
+        [self.infoLabel setHidden:YES];
+        return;
+    }
+    
+    // Show elements
+    [self.recordButton setHidden:NO];
+    [self.cancelButton setHidden:NO];
+    [self.appIconView setHidden:NO];
+    [self.infoLabel setHidden:NO];
+    
+    // Calculate window center
+    CGFloat windowCenterX = self.highlightFrame.origin.x + (self.highlightFrame.size.width / 2);
+    CGFloat windowCenterY = self.highlightFrame.origin.y + (self.highlightFrame.size.height / 2);
+    
+    // Position record button at window center
+    NSSize buttonSize = self.recordButton.frame.size;
+    [self.recordButton setFrameOrigin:NSMakePoint(
+        windowCenterX - (buttonSize.width / 2),
+        windowCenterY - (buttonSize.height / 2)
+    )];
+    
+    // Position app icon above window center
+    [self.appIconView setFrameOrigin:NSMakePoint(
+        windowCenterX - 48,  // Center horizontally (96/2 = 48)
+        windowCenterY + 120  // 120px above window center
+    )];
+    
+    // Add floating animation to app icon
+    [self.appIconView.layer removeAnimationForKey:@"floatAnimationX"];
+    CABasicAnimation *floatAnimationX = [CABasicAnimation animationWithKeyPath:@"transform.translation.x"];
+    floatAnimationX.fromValue = @(-4.0);
+    floatAnimationX.toValue = @(4.0);
+    floatAnimationX.duration = 1.0;
+    floatAnimationX.repeatCount = HUGE_VALF;
+    floatAnimationX.autoreverses = YES;
+    floatAnimationX.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+    [self.appIconView.layer addAnimation:floatAnimationX forKey:@"floatAnimationX"];
+    
+    // Position info label between icon and button
+    NSSize labelSize = self.infoLabel.frame.size;
+    [self.infoLabel setFrameOrigin:NSMakePoint(
+        windowCenterX - (labelSize.width / 2),
+        windowCenterY + 50  // 50px above window center
+    )];
+    
+    // Position cancel button below record button
+    NSSize cancelButtonSize = self.cancelButton.frame.size;
+    [self.cancelButton setFrameOrigin:NSMakePoint(
+        windowCenterX - (cancelButtonSize.width / 2),
+        windowCenterY - 80  // 80px below window center
+    )];
+    
+    NSLog(@"📍 UI elements positioned - Button:(%.0f,%.0f) Cancel:(%.0f,%.0f) Icon:(%.0f,%.0f) Label:(%.0f,%.0f)",
+          self.recordButton.frame.origin.x, self.recordButton.frame.origin.y,
+          self.cancelButton.frame.origin.x, self.cancelButton.frame.origin.y,
+          self.appIconView.frame.origin.x, self.appIconView.frame.origin.y,
+          self.infoLabel.frame.origin.x, self.infoLabel.frame.origin.y);
+}
+
+// Override setHighlightFrame to trigger UI updates
+- (void)setHighlightFrame:(NSRect)frame {
+    _highlightFrame = frame;
+    [self positionUIElements];  // Position UI elements when highlight changes
+    [self setNeedsDisplay:YES]; // Trigger redraw
+}
+
+// Override setWindowInfo to trigger UI updates
+- (void)setWindowInfo:(NSDictionary *)windowInfo {
+    _windowInfo = windowInfo;
+    [self updateUIElements];  // Update UI elements when window info changes
+}
+
 // Layer-based approach, no custom drawing needed
 
 @end
@@ -513,8 +698,6 @@ void updateScreenOverlays();
 }
 @end
 
-static WindowSelectorDelegate *g_delegate = nil;
-
 // Bring window to front using Accessibility API
 bool bringWindowToFront(int windowId) {
     @autoreleasepool {
@@ -926,191 +1109,19 @@ void updateOverlay() {
             
             // Only reset toggle state when switching to different window (not for position updates)
             if (!g_hasToggledWindow) {
-                [(WindowSelectorOverlayView *)g_overlayView setIsToggled:NO];
+                [targetOverlayView setIsToggled:NO];
             } else {
                 // Keep toggle state for locked window
-                [(WindowSelectorOverlayView *)g_overlayView setIsToggled:YES];
-            }
-            
-            // Add/update info label above button
-            NSTextField *infoLabel = nil;
-            for (NSView *subview in [g_overlayWindow.contentView subviews]) {
-                if ([subview isKindOfClass:[NSTextField class]]) {
-                    infoLabel = (NSTextField*)subview;
-                    break;
-                }
-            }
-            
-            if (!infoLabel) {
-                infoLabel = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, width - 40, 60)];
-                [infoLabel setEditable:NO];
-                [infoLabel setSelectable:NO];
-                [infoLabel setBezeled:NO];
-                [infoLabel setDrawsBackground:NO];
-                [infoLabel setAlignment:NSTextAlignmentCenter];
-                [infoLabel setFont:[NSFont systemFontOfSize:23.4 weight:NSFontWeightMedium]];  // 18 * 1.3 = 23.4
-                [infoLabel setTextColor:[NSColor whiteColor]];
-                
-                // Force no borders on info label
-                [infoLabel setWantsLayer:YES];
-                infoLabel.layer.borderWidth = 1.0;
-                infoLabel.layer.borderColor = [[NSColor clearColor] CGColor];
-                infoLabel.layer.cornerRadius = 0.0;
-                infoLabel.layer.masksToBounds = YES;
-                
-                [g_overlayWindow.contentView addSubview:infoLabel];
+                [targetOverlayView setIsToggled:YES];
             }
             
-            // Add/update app icon
-            NSImageView *appIconView = nil;
-            for (NSView *subview in [g_overlayWindow.contentView subviews]) {
-                if ([subview isKindOfClass:[NSImageView class]]) {
-                    appIconView = (NSImageView*)subview;
-                    break;
-                }
-            }
-            
-            if (!appIconView) {
-                appIconView = [[NSImageView alloc] initWithFrame:NSMakeRect(0, 0, 96, 96)];
-                [appIconView setImageScaling:NSImageScaleProportionallyUpOrDown];
-                [appIconView setWantsLayer:YES];
-                [appIconView.layer setCornerRadius:8.0];
-                [appIconView.layer setMasksToBounds:YES];
-                [appIconView.layer setBackgroundColor:[[NSColor colorWithRed:0.2 green:0.2 blue:0.2 alpha:0.3] CGColor]]; // Debug background
-                
-                // Force no borders on app icon view
-                appIconView.layer.borderWidth = 1.0;
-                appIconView.layer.borderColor = [[NSColor clearColor] CGColor];
-                appIconView.layer.shadowOpacity = 0.0;
-                appIconView.layer.shadowRadius = 0.0;
-                appIconView.layer.shadowOffset = NSMakeSize(0, 0);
-                
-                [g_overlayWindow.contentView addSubview:appIconView];
-                NSLog(@"🖼️ Created app icon view at frame: (%.0f, %.0f, %.0f, %.0f)", 
-                      appIconView.frame.origin.x, appIconView.frame.origin.y, 
-                      appIconView.frame.size.width, appIconView.frame.size.height);
-            }
-            
-            // Get app icon using NSWorkspace
-            NSString *iconAppName = [windowUnderCursor objectForKey:@"appName"] ?: @"Unknown";
-            NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
-            NSArray *runningApps = [workspace runningApplications];
-            NSImage *appIcon = nil;
-            
-            for (NSRunningApplication *app in runningApps) {
-                if ([[app localizedName] isEqualToString:iconAppName] || [[app bundleIdentifier] containsString:iconAppName]) {
-                    appIcon = [app icon];
-                    break;
-                }
-            }
-            
-            // Fallback to generic app icon if not found
-            if (!appIcon) {
-                appIcon = [workspace iconForFileType:NSFileTypeForHFSTypeCode(kGenericApplicationIcon)];
-                NSLog(@"⚠️ Using fallback icon for app: %@", iconAppName);
-            } else {
-                NSLog(@"✅ Found app icon for: %@", iconAppName);
-            }
-            
-            [appIconView setImage:appIcon];
-            NSLog(@"🖼️ Set icon image, size: %.0fx%.0f", [appIcon size].width, [appIcon size].height);
-            
-            // Update label text
-            NSString *labelWindowTitle = [windowUnderCursor objectForKey:@"title"] ?: @"Unknown Window";
-            NSString *labelAppName = [windowUnderCursor objectForKey:@"appName"] ?: @"Unknown App";
-            [infoLabel setStringValue:[NSString stringWithFormat:@"%@\n%@", labelAppName, labelWindowTitle]];
-            
-            // Position buttons - Start Record in center of selected window
-            if (g_selectButton) {
-                NSSize buttonSize = [g_selectButton frame].size;
-                // Use local window center for positioning
-                CGFloat localWindowCenterX = localX + (width / 2);
-                CGFloat localWindowCenterY = localY + (height / 2);
-                NSPoint buttonCenter = NSMakePoint(
-                    localWindowCenterX - (buttonSize.width / 2),
-                    localWindowCenterY - (buttonSize.height / 2)  // Perfect center of window
-                );
-                
-                NSLog(@"   ButtonCalc: WindowCenter(%.0f, %.0f) -> Button(%.0f, %.0f)", 
-                      localWindowCenterX, localWindowCenterY, buttonCenter.x, buttonCenter.y);
-                      
-                [g_selectButton setFrameOrigin:buttonCenter];
-                
-                // Position app icon above window center
-                NSPoint iconCenter = NSMakePoint(
-                    localWindowCenterX - (96 / 2),  // Center horizontally on window
-                    localWindowCenterY + 120  // 120px above window center
-                );
-                [appIconView setFrameOrigin:iconCenter];
-                NSLog(@"🎯 Positioning app icon at: (%.0f, %.0f) for window size: (%.0f, %.0f)", 
-                      iconCenter.x, iconCenter.y, (float)width, (float)height);
-                
-                // Add fast horizontal floating animation after positioning
-                [appIconView.layer removeAnimationForKey:@"floatAnimationX"];
-                [appIconView.layer removeAnimationForKey:@"floatAnimationY"];
-                
-                // Faster horizontal float animation only
-                CABasicAnimation *floatAnimationX = [CABasicAnimation animationWithKeyPath:@"transform.translation.x"];
-                floatAnimationX.fromValue = @(-4.0);
-                floatAnimationX.toValue = @(4.0);
-                floatAnimationX.duration = 1.0; // Much faster animation
-                floatAnimationX.repeatCount = HUGE_VALF;
-                floatAnimationX.autoreverses = YES;
-                floatAnimationX.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
-                [appIconView.layer addAnimation:floatAnimationX forKey:@"floatAnimationX"];
-                
-                // Position info label between icon and button relative to window center
-                NSPoint labelCenter = NSMakePoint(
-                    localWindowCenterX - ([infoLabel frame].size.width / 2),  // Center horizontally on window
-                    localWindowCenterY + 50  // 50px above window center, below icon
-                );
-                [infoLabel setFrameOrigin:labelCenter];
-                
-                // Position cancel button below the main button
-                NSButton *cancelButton = nil;
-                for (NSView *subview in [g_overlayWindow.contentView subviews]) {
-                    if ([subview isKindOfClass:[NSButton class]] && 
-                        [[(NSButton*)subview title] isEqualToString:@"Cancel"]) {
-                        cancelButton = (NSButton*)subview;
-                        break;
-                    }
-                }
-                
-                if (cancelButton) {
-                    NSSize cancelButtonSize = [cancelButton frame].size;
-                    NSPoint cancelButtonCenter = NSMakePoint(
-                        localWindowCenterX - (cancelButtonSize.width / 2),  // Center horizontally on window
-                        localWindowCenterY - 80  // 80px below window center
-                    );
-                    [cancelButton setFrameOrigin:cancelButtonCenter];
-                }
-            }
+            NSLog(@"✅ Updated overlay view with integrated UI elements");
             
-            [g_overlayWindow orderFront:nil];
-            // DON'T make key - prevents focus ring
-            // [g_overlayWindow makeKeyAndOrderFront:nil];
+            [targetOverlay orderFront:nil];
             
-            // Ensure subviews (except overlay view itself) have no borders after positioning
-            for (NSView *subview in [g_overlayWindow.contentView subviews]) {
-                // Skip the main overlay view - it handles its own borders
-                if ([subview isKindOfClass:[WindowSelectorOverlayView class]]) continue;
-                
-                if ([subview respondsToSelector:@selector(setWantsLayer:)]) {
-                    [subview setWantsLayer:YES];
-                    if (subview.layer) {
-                        subview.layer.borderWidth = 1.0;
-                        subview.layer.borderColor = [[NSColor clearColor] CGColor];
-                        subview.layer.masksToBounds = YES;
-                        subview.layer.shadowOpacity = 0.0;
-                        subview.layer.shadowRadius = 0.0;
-                        subview.layer.shadowOffset = NSMakeSize(0, 0);
-                    }
-                }
-            }
-            
-            NSLog(@"   ✅ Overlay Status: Level=%ld, Alpha=%.1f, Visible=%s, Frame Set=YES", 
-                  [g_overlayWindow level], [g_overlayWindow alphaValue], 
-                  [g_overlayWindow isVisible] ? "YES" : "NO");
+            NSLog(@"   ✅ Overlay Status: Level=%ld, Alpha=%.1f, Visible=%s", 
+                  [targetOverlay level], [targetOverlay alphaValue], 
+                  [targetOverlay isVisible] ? "YES" : "NO");
         } else if (!windowUnderCursor && g_currentWindowUnderCursor) {
             // No window under cursor and no toggle active, hide overlay
             NSString *leftWindowTitle = [g_currentWindowUnderCursor objectForKey:@"title"] ?: @"Untitled";
@@ -1889,6 +1900,12 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
         
         NSLog(@"🖥️ Creating per-screen overlays for %lu displays", [allScreens count]);
         
+        // Ensure delegate exists for all overlays
+        if (!g_delegate) {
+            g_delegate = [[WindowSelectorDelegate alloc] init];
+            NSLog(@"🎛️ Created global delegate for all overlays");
+        }
+        
         // Create overlay for each screen
         for (NSInteger i = 0; i < [allScreens count]; i++) {
             NSScreen *screen = [allScreens objectAtIndex:i];