node-mac-recorder 2.16.16 → 2.16.18

package/.claude/settings.local.json

@@ -1,7 +1,7 @@
 {
   "permissions": {
     "allow": [
-      "Bash(FORCE_AVFOUNDATION=1 node -e \"\nconsole.log(''🧪 Testing CRITICAL AVFoundation scaling fix...'');\nconst MacRecorder = require(''./index.js'');\nconst recorder = new MacRecorder();\n\nrecorder.startRecording(''/tmp/critical-scaling-test.mov'')\n  .then(success => {\n    console.log(''Start:'', success ? ''✅ SUCCESS'' : ''❌ FAILED'');\n    if (success) {\n      setTimeout(() => {\n        recorder.stopRecording().then(() => {\n          console.log(''✅ Test complete'');\n          const fs = require(''fs'');\n          if (fs.existsSync(''/tmp/critical-scaling-test.mov'')) {\n            const size = Math.round(fs.statSync(''/tmp/critical-scaling-test.mov'').size/1024);\n            console.log(''📹 File size:'', size + ''KB'');\n          }\n        });\n      }, 3000);\n    }\n  })\n  .catch(console.error);\n\")"
+      "Bash(FORCE_AVFOUNDATION=1 node -e \"\nconsole.log(''🧪 Testing integrated overlay UI elements...'');\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 integrated overlay elements\n  return selector.startSelection();\n}).then(() => {\n  console.log(''✅ Window selection started - UI elements should be integrated into overlay'');\n  console.log(''➡️ Move cursor over windows to test integrated button, logo, and title'');\n  \n  // Auto-stop after 15 seconds for testing\n  setTimeout(() => {\n    selector.stopSelection().then(() => {\n      console.log(''✅ Window selection stopped - test complete'');\n    });\n  }, 15000);\n}).catch(console.error);\n\")"
     ],
     "deny": [],
     "ask": []

package/package.json

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

package/src/window_selector.mm

@@ -16,6 +16,15 @@ static NSTimer *g_trackingTimer = nil;
 static NSDictionary *g_selectedWindowInfo = nil;
 static NSMutableArray *g_allWindows = nil;
 
+// Per-screen overlay system
+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]) {
@@ -68,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;
@@ -75,7 +87,13 @@ 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) NSImageView *appIconView;
+@property (nonatomic, strong) NSTextField *infoLabel;
 - (void)setHighlightFrame:(NSRect)frame;
+- (void)setupUIElements;
+- (void)updateUIElements;
+- (void)positionUIElements;
 @end
 
 // Custom button with hover effects
@@ -110,15 +128,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];
@@ -213,6 +230,147 @@ void updateScreenOverlays();
     NSLog(@"🎯 Global toggle state: %s", g_hasToggledWindow ? "HAS_TOGGLED" : "NO_TOGGLE");
 }
 
+- (void)setupUIElements {
+    NSLog(@"🔧 Setting up integrated UI elements");
+    
+    // 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 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.appIconView setHidden:YES];
+        [self.infoLabel setHidden:YES];
+        return;
+    }
+    
+    // Show elements
+    [self.recordButton 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
+    )];
+    
+    NSLog(@"📍 UI elements positioned - Button:(%.0f,%.0f) Icon:(%.0f,%.0f) Label:(%.0f,%.0f)",
+          self.recordButton.frame.origin.x, self.recordButton.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
@@ -508,8 +666,6 @@ void updateScreenOverlays();
 }
 @end
 
-static WindowSelectorDelegate *g_delegate = nil;
-
 // Bring window to front using Accessibility API
 bool bringWindowToFront(int windowId) {
     @autoreleasepool {
@@ -866,242 +1022,74 @@ void updateOverlay() {
                 }
             }
             
-            // Convert global window coordinates to local view coordinates
-            // Account for multi-display offset from global origin
-            WindowSelectorOverlayView *overlayView = (WindowSelectorOverlayView *)g_overlayView;
-            NSPoint globalOffset = NSZeroPoint;
-            if (overlayView.globalOriginOffset) {
-                globalOffset = [overlayView.globalOriginOffset pointValue];
-            }
-            
-            // Determine if this is a primary display window
+            // NEW PER-SCREEN SYSTEM: Find which screen this window belongs to
             NSArray *allScreens = [NSScreen screens];
-            NSScreen *primaryScreen = [allScreens objectAtIndex:0]; // Primary screen
-            NSRect primaryFrame = [primaryScreen frame];
-            BOOL isPrimaryDisplayWindow = (x >= primaryFrame.origin.x && 
-                                         x <= primaryFrame.origin.x + primaryFrame.size.width &&
-                                         y >= primaryFrame.origin.y &&
-                                         y <= primaryFrame.origin.y + primaryFrame.size.height);
-            
-            CGFloat localX, localY;
-            if (isPrimaryDisplayWindow) {
-                // Primary display windows: Calculate dynamic offset from combined frame
-                NSRect combinedFrame = [g_overlayWindow frame];
-                
-                // Calculate primary screen offset within combined frame
-                CGFloat primaryOffsetX = primaryFrame.origin.x - combinedFrame.origin.x;
-                CGFloat primaryOffsetY = primaryFrame.origin.y - combinedFrame.origin.y;
-                
-                NSLog(@"🔧 PRIMARY DEBUG:");
-                NSLog(@"   Primary frame: (%.0f,%.0f) %.0fx%.0f", primaryFrame.origin.x, primaryFrame.origin.y, primaryFrame.size.width, primaryFrame.size.height);
-                NSLog(@"   Combined frame: (%.0f,%.0f) %.0fx%.0f", combinedFrame.origin.x, combinedFrame.origin.y, combinedFrame.size.width, combinedFrame.size.height);
-                NSLog(@"   Primary offset: (%.0f,%.0f)", primaryOffsetX, primaryOffsetY);
-                NSLog(@"   Window coords: (%.0f,%.0f) → Local: (%.0f,%.0f)", (CGFloat)x, (CGFloat)y, x + primaryOffsetX, ([g_overlayView frame].size.height - (y + primaryOffsetY)) - height);
-                
-                localX = x + primaryOffsetX;
-                localY = ([g_overlayView frame].size.height - (y + primaryOffsetY)) - height;
+            NSInteger targetScreenIndex = -1;
+            NSScreen *targetScreen = nil;
+            
+            // Find screen containing this window
+            for (NSInteger i = 0; i < [allScreens count]; i++) {
+                NSScreen *screen = [allScreens objectAtIndex:i];
+                NSRect screenFrame = [screen frame];
                 
-            } else {
-                // Secondary display windows: Apply standard coordinate transformation
-                NSLog(@"🔧 SECONDARY DEBUG:");
-                NSLog(@"   GlobalOffset: (%.0f,%.0f)", globalOffset.x, globalOffset.y);
-                NSLog(@"   Window coords: (%.0f,%.0f) → Local: (%.0f,%.0f)", (CGFloat)x, (CGFloat)y, x - globalOffset.x, ([g_overlayView frame].size.height - (y - globalOffset.y)) - height);
+                // Check if window center is within this screen bounds
+                CGFloat windowCenterX = x + width/2;
+                CGFloat windowCenterY = y + height/2;
                 
-                localX = x - globalOffset.x;
-                localY = ([g_overlayView frame].size.height - (y - globalOffset.y)) - height;
-            }
-            
-            // Update overlay view window info for highlighting
-            [overlayView setWindowInfo:targetWindow];
-            [overlayView setHighlightFrame:NSMakeRect(localX, localY, width, height)];
-            
-            // Only reset toggle state when switching to different window (not for position updates)
-            if (!g_hasToggledWindow) {
-                [(WindowSelectorOverlayView *)g_overlayView 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;
+                if (windowCenterX >= screenFrame.origin.x && 
+                    windowCenterX <= screenFrame.origin.x + screenFrame.size.width &&
+                    windowCenterY >= screenFrame.origin.y && 
+                    windowCenterY <= screenFrame.origin.y + screenFrame.size.height) {
+                    targetScreenIndex = i;
+                    targetScreen = screen;
                     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];
+            if (targetScreenIndex == -1) {
+                NSLog(@"⚠️ Window not found on any screen: (%.0f,%.0f)", (CGFloat)x, (CGFloat)y);
+                return;
             }
             
-            // Add/update app icon
-            NSImageView *appIconView = nil;
-            for (NSView *subview in [g_overlayWindow.contentView subviews]) {
-                if ([subview isKindOfClass:[NSImageView class]]) {
-                    appIconView = (NSImageView*)subview;
-                    break;
-                }
-            }
+            // Get the overlay for target screen
+            NSWindow *targetOverlay = [g_perScreenOverlays objectAtIndex:targetScreenIndex];
+            WindowSelectorOverlayView *targetOverlayView = [g_perScreenOverlayViews objectAtIndex:targetScreenIndex];
+            NSRect targetScreenFrame = [targetScreen frame];
             
-            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);
-            }
+            // Calculate LOCAL coordinates within target screen (much simpler!)
+            CGFloat localX = x - targetScreenFrame.origin.x;
+            CGFloat localY = (targetScreenFrame.size.height - (y - targetScreenFrame.origin.y)) - height;
             
-            // Get app icon using NSWorkspace
-            NSString *iconAppName = [windowUnderCursor objectForKey:@"appName"] ?: @"Unknown";
-            NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
-            NSArray *runningApps = [workspace runningApplications];
-            NSImage *appIcon = nil;
+            NSLog(@"🎯 Window on Screen %ld: Global(%.0f,%.0f) → Local(%.0f,%.0f)", 
+                  targetScreenIndex, (CGFloat)x, (CGFloat)y, localX, localY);
             
-            for (NSRunningApplication *app in runningApps) {
-                if ([[app localizedName] isEqualToString:iconAppName] || [[app bundleIdentifier] containsString:iconAppName]) {
-                    appIcon = [app icon];
-                    break;
-                }
+            // Update active screen if changed
+            if (g_activeScreenIndex != targetScreenIndex) {
+                NSLog(@"🔄 Switching to Screen %ld overlay", targetScreenIndex);
+                g_activeScreenIndex = targetScreenIndex;
+                g_overlayWindow = targetOverlay;
+                g_overlayView = targetOverlayView;
             }
             
-            // 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);
-            }
+            // Update TARGET overlay view window info for highlighting
+            [targetOverlayView setWindowInfo:targetWindow];
+            [targetOverlayView setHighlightFrame:NSMakeRect(localX, localY, width, height)];
             
-            [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];
-                }
+            // Only reset toggle state when switching to different window (not for position updates)
+            if (!g_hasToggledWindow) {
+                [targetOverlayView setIsToggled:NO];
+            } else {
+                // Keep toggle state for locked window
+                [targetOverlayView setIsToggled:YES];
             }
             
-            [g_overlayWindow orderFront:nil];
-            // DON'T make key - prevents focus ring
-            // [g_overlayWindow makeKeyAndOrderFront:nil];
+            NSLog(@"✅ Updated overlay view with integrated UI elements");
             
-            // 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);
-                    }
-                }
-            }
+            [targetOverlay orderFront:nil];
             
-            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";
@@ -1133,7 +1121,27 @@ void cleanupWindowSelector() {
         g_windowKeyEventMonitor = nil;
     }
     
-    // Close overlay window
+    // NEW PER-SCREEN CLEANUP: Close all per-screen overlays
+    if (g_perScreenOverlays) {
+        NSLog(@"🧹 Cleaning up %lu per-screen overlays", [g_perScreenOverlays count]);
+        for (NSWindow *overlay in g_perScreenOverlays) {
+            if (overlay) {
+                [overlay close];
+            }
+        }
+        [g_perScreenOverlays release];
+        g_perScreenOverlays = nil;
+    }
+    
+    if (g_perScreenOverlayViews) {
+        [g_perScreenOverlayViews release];
+        g_perScreenOverlayViews = nil;
+    }
+    
+    // Reset per-screen state
+    g_activeScreenIndex = -1;
+    
+    // Close legacy overlay window (fallback cleanup)
     if (g_overlayWindow) {
         [g_overlayWindow close];
         g_overlayWindow = nil;
@@ -1846,32 +1854,55 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
         }
         
         // Get all windows
-        g_allWindows = [getAllSelectableWindows() retain];
+        g_allWindows = [[NSMutableArray alloc] initWithArray:getAllSelectableWindows()];
         
         if (!g_allWindows || [g_allWindows count] == 0) {
             Napi::Error::New(env, "No selectable windows found").ThrowAsJavaScriptException();
             return env.Null();
         }
         
-        // Create multi-display overlay window to prevent window dragging
+        // Create PER-SCREEN overlay windows (much simpler than combined overlay)
         NSArray *allScreens = [NSScreen screens];
-        NSRect combinedFrame = NSZeroRect;
+        g_perScreenOverlays = [[NSMutableArray alloc] init];
+        g_perScreenOverlayViews = [[NSMutableArray alloc] init];
+        
+        NSLog(@"🖥️ Creating per-screen overlays for %lu displays", [allScreens count]);
         
-        // Calculate combined frame that covers all displays
-        for (NSScreen *screen in allScreens) {
+        // Create overlay for each screen
+        for (NSInteger i = 0; i < [allScreens count]; i++) {
+            NSScreen *screen = [allScreens objectAtIndex:i];
             NSRect screenFrame = [screen frame];
-            if (NSEqualRects(combinedFrame, NSZeroRect)) {
-                combinedFrame = screenFrame;
-            } else {
-                combinedFrame = NSUnionRect(combinedFrame, screenFrame);
-            }
+            
+            // Create per-screen overlay window
+            NSWindow *screenOverlay = [[NoFocusWindow alloc] initWithContentRect:screenFrame
+                                                                        styleMask:NSWindowStyleMaskBorderless
+                                                                          backing:NSBackingStoreBuffered
+                                                                            defer:NO
+                                                                           screen:screen];
+            
+            // Create per-screen overlay view
+            WindowSelectorOverlayView *overlayView = [[WindowSelectorOverlayView alloc] initWithFrame:NSMakeRect(0, 0, screenFrame.size.width, screenFrame.size.height)];
+            [screenOverlay setContentView:overlayView];
+            
+            // Configure overlay window
+            [screenOverlay setStyleMask:NSWindowStyleMaskBorderless];
+            [screenOverlay setBackgroundColor:[NSColor clearColor]];
+            [screenOverlay setOpaque:NO];
+            [screenOverlay setIgnoresMouseEvents:NO];
+            [screenOverlay setAcceptsMouseMovedEvents:YES];
+            [screenOverlay setLevel:NSScreenSaverWindowLevel];
+            [screenOverlay setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorStationary];
+            
+            NSLog(@"   Screen %ld: (%.0f,%.0f) %.0fx%.0f → Overlay created", i, screenFrame.origin.x, screenFrame.origin.y, screenFrame.size.width, screenFrame.size.height);
+            
+            [g_perScreenOverlays addObject:screenOverlay];
+            [g_perScreenOverlayViews addObject:overlayView];
         }
         
-        NSRect fullScreenFrame = combinedFrame;
-        g_overlayWindow = [[NoFocusWindow alloc] initWithContentRect:fullScreenFrame
-                                                           styleMask:NSWindowStyleMaskBorderless
-                                                             backing:NSBackingStoreBuffered
-                                                               defer:NO];
+        // For compatibility, keep first screen as main overlay
+        g_overlayWindow = [g_perScreenOverlays objectAtIndex:0];
+        g_overlayView = [g_perScreenOverlayViews objectAtIndex:0];
+        g_activeScreenIndex = 0;
         
         // Force completely borderless appearance
         [g_overlayWindow setStyleMask:NSWindowStyleMaskBorderless];
@@ -1896,17 +1927,7 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
         [g_overlayWindow setOpaque:NO];
         [g_overlayWindow setBackgroundColor:[NSColor clearColor]];
         
-        // Create overlay view covering all displays
-        // Convert global coordinates to local view coordinates (offset by origin)
-        NSRect localViewFrame = NSMakeRect(0, 0, fullScreenFrame.size.width, fullScreenFrame.size.height);
-        g_overlayView = [[WindowSelectorOverlayView alloc] initWithFrame:localViewFrame];
-        
-        // Store the global origin offset for coordinate conversion
-        WindowSelectorOverlayView *overlayView = (WindowSelectorOverlayView *)g_overlayView;
-        overlayView.globalOriginOffset = [NSValue valueWithPoint:fullScreenFrame.origin];
-        
-        NSLog(@"🔧 SET GlobalOriginOffset: (%.0f, %.0f)", fullScreenFrame.origin.x, fullScreenFrame.origin.y);
-        [g_overlayWindow setContentView:g_overlayView];
+        NSLog(@"✅ Per-screen overlay system initialized with %lu screens", [allScreens count]);
         
         // Note: NSWindow doesn't have setWantsLayer method, only NSView does