node-mac-recorder 2.7.1 → 2.7.2

package/src/window_selector.mm

@@ -7,10 +7,14 @@
 #import <Accessibility/Accessibility.h>
 #import <QuartzCore/QuartzCore.h>
 
+// Forward declarations
+@class WindowSelectorOverlayView;
+
 // Global state for window selection
 static bool g_isWindowSelecting = false;
 static NSWindow *g_overlayWindow = nil;
 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;
@@ -54,6 +58,7 @@ void updateScreenOverlays();
 @interface WindowSelectorOverlayView : NSView
 @property (nonatomic, strong) NSDictionary *windowInfo;
 @property (nonatomic) BOOL isActiveWindow;
+@property (nonatomic) BOOL isSelectedWindow;
 @end
 
 @implementation WindowSelectorOverlayView
@@ -63,9 +68,10 @@ void updateScreenOverlays();
     if (self) {
         // Use layer for background instead of custom drawing
         self.wantsLayer = YES;
-        self.isActiveWindow = YES; // Default to active for current window under mouse
+        self.isActiveWindow = NO; // Default to inactive (no mouse highlighting)
+        self.isSelectedWindow = NO; // Default to not selected
         
-        // Set purple background with border using layer
+        // Set initial appearance
         [self updateAppearance];
         
         // Window selector overlay view created
@@ -74,19 +80,27 @@ void updateScreenOverlays();
 }
 
 - (void)updateAppearance {
-    if (self.isActiveWindow) {
-        // Active window: brighter background
+    if (self.isSelectedWindow) {
+        // Selected window: bright background with thick border
+        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
+        // Selected window appearance set
+    } else if (self.isActiveWindow) {
+        // Active window: brighter background with thin border
         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
         // Active window appearance set
     } else {
-        // Inactive window: dimmer background  
+        // Inactive window: dimmer background with 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
     }
     
-            // No border to match screen selector
-        self.layer.borderColor = [[NSColor clearColor] CGColor];
-        self.layer.borderWidth = 0.0;
+        // Common styling
         self.layer.cornerRadius = 8.0;
         self.layer.masksToBounds = YES;
         self.layer.shadowOpacity = 0.0;
@@ -101,6 +115,37 @@ void updateScreenOverlays();
     }
 }
 
+- (void)setIsSelectedWindow:(BOOL)isSelectedWindow {
+    if (_isSelectedWindow != isSelectedWindow) {
+        _isSelectedWindow = isSelectedWindow;
+        [self updateAppearance];
+    }
+}
+
+- (void)mouseDown:(NSEvent *)event {
+    // Handle mouse click to select this window
+    if (self.windowInfo) {
+        // Set this overlay as selected
+        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;
+        
+        // Update overlay appearance
+        [self updateAppearance];
+        
+        NSLog(@"🎯 WINDOW SELECTED VIA CLICK: %@ - \"%@\"", 
+              [self.windowInfo objectForKey:@"appName"] ?: @"Unknown",
+              [self.windowInfo objectForKey:@"title"] ?: @"Untitled");
+    }
+}
+
 // Layer-based approach, no custom drawing needed
 
 @end
@@ -219,9 +264,14 @@ void updateScreenOverlays();
 
 @implementation WindowSelectorDelegate
 - (void)selectButtonClicked:(id)sender {
-    if (g_currentWindowUnderCursor) {
-        g_selectedWindowInfo = [g_currentWindowUnderCursor retain];
+    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 selected - cannot start recording");
     }
 }
 
@@ -444,271 +494,278 @@ NSDictionary* getWindowUnderCursor(CGPoint point) {
     }
 }
 
-// Update overlay to highlight window under cursor
+// Update overlay to show selected window (no more mouse-based highlighting)
 void updateOverlay() {
     @autoreleasepool {
         if (!g_isWindowSelecting || !g_overlayWindow) return;
         
-        // Get current cursor position
-        NSPoint mouseLocation = [NSEvent mouseLocation];
-        // Convert from NSEvent coordinates (bottom-left) to CGWindow coordinates (top-left)
-        NSScreen *mainScreen = [NSScreen mainScreen];
-        CGFloat screenHeight = [mainScreen frame].size.height;
-        CGPoint globalPoint = CGPointMake(mouseLocation.x, screenHeight - mouseLocation.y);
+        // 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
+            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;
+        }
         
-        // Find window under cursor
-        NSDictionary *windowUnderCursor = getWindowUnderCursor(globalPoint);
+        // Update overlay position and size
+        int x = [[windowUnderCursor objectForKey:@"x"] intValue];
+        int y = [[windowUnderCursor objectForKey:@"y"] intValue];
+        int width = [[windowUnderCursor objectForKey:@"width"] intValue];
+        int height = [[windowUnderCursor objectForKey:@"height"] intValue];
         
-        if (windowUnderCursor && ![windowUnderCursor isEqualToDictionary:g_currentWindowUnderCursor]) {
-            // Update current window
-            [g_currentWindowUnderCursor release];
-            g_currentWindowUnderCursor = [windowUnderCursor retain];
-            
-            // Update overlay position and size
-            int x = [[windowUnderCursor objectForKey:@"x"] intValue];
-            int y = [[windowUnderCursor objectForKey:@"y"] intValue];
-            int width = [[windowUnderCursor objectForKey:@"width"] intValue];
-            int height = [[windowUnderCursor objectForKey:@"height"] intValue];
-            
-            // Find which screen contains the window center
-            NSArray *screens = [NSScreen screens];
-            NSScreen *windowScreen = nil;
-            CGFloat windowCenterX = x + width / 2;
-            CGFloat windowCenterY = y + height / 2;
-            
-            for (NSScreen *screen in screens) {
-                NSRect screenFrame = [screen frame];
-                // Convert screen frame to CGWindow coordinates
-                CGFloat screenTop = screenFrame.origin.y + screenFrame.size.height;
-                CGFloat screenBottom = screenFrame.origin.y;
-                CGFloat screenLeft = screenFrame.origin.x;
-                CGFloat screenRight = screenFrame.origin.x + screenFrame.size.width;
-                
-                if (windowCenterX >= screenLeft && windowCenterX <= screenRight &&
-                    windowCenterY >= screenBottom && windowCenterY <= screenTop) {
-                    windowScreen = screen;
-                    break;
-                }
-            }
-            
-            // Use main screen if no specific screen found
-            if (!windowScreen) windowScreen = [NSScreen mainScreen];
-            
-            // 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;
-            
-            // 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)
-            // Only convert Y from top-left to bottom-left coordinate system
-            NSRect overlayFrame = NSMakeRect(x, adjustedY, width, height);
-            
-            NSString *windowTitle = [windowUnderCursor objectForKey:@"title"] ?: @"Untitled";
-            NSString *appName = [windowUnderCursor objectForKey:@"appName"] ?: @"Unknown";
-            
-            NSLog(@"🎯 WINDOW DETECTED: %@ - \"%@\"", appName, windowTitle);
-            NSLog(@"   📍 Position: (%d, %d)  📏 Size: %d × %d", x, y, width, height);
-            NSLog(@"   🖥️  NSRect: (%.0f, %.0f, %.0f, %.0f)  🔝 Level: %ld", 
-                  overlayFrame.origin.x, overlayFrame.origin.y, 
-                  overlayFrame.size.width, overlayFrame.size.height,
-                  [g_overlayWindow level]);
-            
-            // Bring window to front if enabled
-            if (g_bringToFrontEnabled) {
-                int windowId = [[windowUnderCursor objectForKey:@"id"] intValue];
-                if (windowId > 0) {
-                    bool success = bringWindowToFront(windowId);
-                    if (!success) {
-                        NSLog(@"   ⚠️ Failed to bring window to front");
-                    }
-                }
+        // Find which screen contains the window center
+        NSArray *screens = [NSScreen screens];
+        NSScreen *windowScreen = nil;
+        CGFloat windowCenterX = x + width / 2;
+        CGFloat windowCenterY = y + height / 2;
+        
+        for (NSScreen *screen in screens) {
+            NSRect screenFrame = [screen frame];
+            // Convert screen frame to CGWindow coordinates
+            CGFloat screenTop = screenFrame.origin.y + screenFrame.size.height;
+            CGFloat screenBottom = screenFrame.origin.y;
+            CGFloat screenLeft = screenFrame.origin.x;
+            CGFloat screenRight = screenFrame.origin.x + screenFrame.size.width;
+            
+            if (windowCenterX >= screenLeft && windowCenterX <= screenRight &&
+                windowCenterY >= screenBottom && windowCenterY <= screenTop) {
+                windowScreen = screen;
+                break;
             }
-            
-            // Ensure overlay is on the correct screen
-            [g_overlayWindow setFrame:overlayFrame display:YES];
-            
-            // Update overlay view window info
-            [(WindowSelectorOverlayView *)g_overlayView setWindowInfo:windowUnderCursor];
-            
-            // 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;
+        }
+        
+        // Use main screen if no specific screen found
+        if (!windowScreen) windowScreen = [NSScreen mainScreen];
+        
+        // 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;
+        
+        // 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)
+        // Only convert Y from top-left to bottom-left coordinate system
+        NSRect overlayFrame = NSMakeRect(x, adjustedY, width, height);
+        
+        NSString *windowTitle = [windowUnderCursor objectForKey:@"title"] ?: @"Untitled";
+        NSString *appName = [windowUnderCursor objectForKey:@"appName"] ?: @"Unknown";
+        
+        NSLog(@"🎯 WINDOW DETECTED: %@ - \"%@\"", appName, windowTitle);
+        NSLog(@"   📍 Position: (%d, %d)  📏 Size: %d × %d", x, y, width, height);
+        NSLog(@"   🖥️  NSRect: (%.0f, %.0f, %.0f, %.0f)  🔝 Level: %ld", 
+              overlayFrame.origin.x, overlayFrame.origin.y, 
+              overlayFrame.size.width, overlayFrame.size.height,
+              [g_overlayWindow level]);
+        
+        // Bring window to front if enabled
+        if (g_bringToFrontEnabled) {
+            int windowId = [[windowUnderCursor objectForKey:@"id"] intValue];
+            if (windowId > 0) {
+                bool success = bringWindowToFront(windowId);
+                if (!success) {
+                    NSLog(@"   ⚠️ Failed to bring window to front");
                 }
             }
-            
-            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:18 weight:NSFontWeightMedium]];
-                [infoLabel setTextColor:[NSColor whiteColor]];
-                
-                // Force no borders on info label
-                [infoLabel setWantsLayer:YES];
-                infoLabel.layer.borderWidth = 0.0;
-                infoLabel.layer.borderColor = [[NSColor clearColor] CGColor];
-                infoLabel.layer.cornerRadius = 0.0;
-                infoLabel.layer.masksToBounds = YES;
-                
-                [g_overlayWindow.contentView addSubview:infoLabel];
+        }
+        
+        // Ensure overlay is on the correct screen
+        [g_overlayWindow setFrame:overlayFrame display:YES];
+        
+        // Update overlay view window info
+        [(WindowSelectorOverlayView *)g_overlayView setWindowInfo:windowUnderCursor];
+        
+        // Don't automatically mark as selected - wait for user click
+        [(WindowSelectorOverlayView *)g_overlayView setIsSelectedWindow:NO];
+        [(WindowSelectorOverlayView *)g_overlayView setIsActiveWindow:NO];
+        
+        // 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;
             }
-            
-            // 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 (!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:18 weight:NSFontWeightMedium]];
+            [infoLabel setTextColor:[NSColor whiteColor]];
+            
+            // Force no borders on info label
+            [infoLabel setWantsLayer:YES];
+            infoLabel.layer.borderWidth = 0.0;
+            infoLabel.layer.borderColor = [[NSColor clearColor] CGColor];
+            infoLabel.layer.cornerRadius = 0.0;
+            infoLabel.layer.masksToBounds = YES;
+            
+            [g_overlayWindow.contentView addSubview:infoLabel];
+        }
+        
+        // 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 = 0.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);
+        }
+        
+        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 = 0.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, Cancel below it
+        if (g_selectButton) {
+            NSSize buttonSize = [g_selectButton frame].size;
+            NSPoint buttonCenter = NSMakePoint(
+                (width - buttonSize.width) / 2,
+                (height - buttonSize.height) / 2 + 15  // Slightly above center
+            );
+            [g_selectButton setFrameOrigin:buttonCenter];
             
-            // Get app icon using NSWorkspace
-            NSString *iconAppName = [windowUnderCursor objectForKey:@"appName"] ?: @"Unknown";
-            NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
-            NSArray *runningApps = [workspace runningApplications];
-            NSImage *appIcon = nil;
+            // Position app icon above text label
+            NSPoint iconCenter = NSMakePoint(
+                (width - 96) / 2,  // Center horizontally (icon is 96px wide)
+                buttonCenter.y + buttonSize.height + 60 + 10  // Above label + text height + margin
+            );
+            [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 at overlay center, above button
+            NSPoint labelCenter = NSMakePoint(
+                (width - [infoLabel frame].size.width) / 2,  // Center horizontally
+                buttonCenter.y + buttonSize.height + 10  // 10px above button, below icon
+            );
+            [infoLabel setFrameOrigin:labelCenter];
             
-            for (NSRunningApplication *app in runningApps) {
-                if ([[app localizedName] isEqualToString:iconAppName] || [[app bundleIdentifier] containsString:iconAppName]) {
-                    appIcon = [app icon];
+            // 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;
                 }
             }
             
-            // 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, Cancel below it
-            if (g_selectButton) {
-                NSSize buttonSize = [g_selectButton frame].size;
-                NSPoint buttonCenter = NSMakePoint(
-                    (width - buttonSize.width) / 2,
-                    (height - buttonSize.height) / 2 + 15  // Slightly above center
+            if (cancelButton) {
+                NSSize cancelButtonSize = [cancelButton frame].size;
+                NSPoint cancelButtonCenter = NSMakePoint(
+                    (width - cancelButtonSize.width) / 2,
+                    buttonCenter.y - buttonSize.height - 20  // 20px below main button
                 );
-                [g_selectButton setFrameOrigin:buttonCenter];
-                
-                // Position app icon above text label
-                NSPoint iconCenter = NSMakePoint(
-                    (width - 96) / 2,  // Center horizontally (icon is 96px wide)
-                    buttonCenter.y + buttonSize.height + 60 + 10  // Above label + text height + margin
-                );
-                [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 at overlay center, above button
-                NSPoint labelCenter = NSMakePoint(
-                    (width - [infoLabel frame].size.width) / 2,  // Center horizontally
-                    buttonCenter.y + buttonSize.height + 10  // 10px above button, 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(
-                        (width - cancelButtonSize.width) / 2,
-                        buttonCenter.y - buttonSize.height - 20  // 20px below main button
-                    );
-                    [cancelButton setFrameOrigin:cancelButtonCenter];
-                }
+                [cancelButton setFrameOrigin:cancelButtonCenter];
             }
-            
-            [g_overlayWindow orderFront:nil];
-            [g_overlayWindow makeKeyAndOrderFront:nil];
-            
-            // Ensure all subviews have no borders after positioning, but preserve corner radius for buttons and icons
-            for (NSView *subview in [g_overlayWindow.contentView subviews]) {
-                if ([subview respondsToSelector:@selector(setWantsLayer:)]) {
-                    [subview setWantsLayer:YES];
-                    if (subview.layer) {
-                        subview.layer.borderWidth = 0.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);
-                    }
+        }
+        
+        // Show overlay for the current window (will be selected when clicked)
+        [g_overlayWindow orderFront:nil];
+        [g_overlayWindow makeKeyAndOrderFront:nil];
+        
+        // Ensure all subviews have no borders after positioning, but preserve corner radius for buttons and icons
+        for (NSView *subview in [g_overlayWindow.contentView subviews]) {
+            if ([subview respondsToSelector:@selector(setWantsLayer:)]) {
+                [subview setWantsLayer:YES];
+                if (subview.layer) {
+                    subview.layer.borderWidth = 0.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");
+        
+        // Update overlay view states - check if this window is selected
+        if (g_overlayView && [g_overlayView isKindOfClass:[WindowSelectorOverlayView class]]) {
+            WindowSelectorOverlayView *overlayView = (WindowSelectorOverlayView *)g_overlayView;
             
-            NSLog(@"   ✅ Overlay Status: Level=%ld, Alpha=%.1f, Visible=%s, Frame Set=YES", 
-                  [g_overlayWindow level], [g_overlayWindow alphaValue], 
-                  [g_overlayWindow isVisible] ? "YES" : "NO");
-        } else if (!windowUnderCursor && g_currentWindowUnderCursor) {
-            // No window under cursor, hide overlay
-            NSString *leftWindowTitle = [g_currentWindowUnderCursor objectForKey:@"title"] ?: @"Untitled";
-            NSString *leftAppName = [g_currentWindowUnderCursor objectForKey:@"appName"] ?: @"Unknown";
+            // Check if this is the selected window (true if we have selected window info)
+            BOOL isSelected = (g_selectedWindowInfo != nil);
             
-            NSLog(@"🚪 WINDOW LEFT: %@ - \"%@\"", leftAppName, leftWindowTitle);
+            // Update states
+            overlayView.isActiveWindow = NO; // No more mouse-based highlighting
+            overlayView.isSelectedWindow = isSelected;
             
-            [g_overlayWindow orderOut:nil];
-            [g_currentWindowUnderCursor release];
-            g_currentWindowUnderCursor = nil;
+            NSLog(@"🎯 Overlay State Updated: Active=NO, Selected=%s", isSelected ? "YES" : "NO");
         }
     }
 }
@@ -749,9 +806,10 @@ void cleanupWindowSelector() {
         g_allWindows = nil;
     }
     
-    if (g_currentWindowUnderCursor) {
-        [g_currentWindowUnderCursor release];
-        g_currentWindowUnderCursor = nil;
+    // Clean up selected overlay
+    if (g_selectedOverlayView) {
+        g_selectedOverlayView.isSelectedWindow = NO;
+        g_selectedOverlayView = nil;
     }
 }
 
@@ -1423,13 +1481,27 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
     
     @try {
         // Get all windows
-        g_allWindows = [getAllSelectableWindows() retain];
+        g_allWindows = [[getAllSelectableWindows() mutableCopy] retain];
         
         if (!g_allWindows || [g_allWindows count] == 0) {
             Napi::Error::New(env, "No selectable windows found").ThrowAsJavaScriptException();
             return env.Null();
         }
         
+        // Clear any previous selection
+        if (g_selectedWindowInfo) {
+            [g_selectedWindowInfo release];
+            g_selectedWindowInfo = nil;
+        }
+        if (g_selectedOverlayView) {
+            g_selectedOverlayView.isSelectedWindow = NO;
+            g_selectedOverlayView = nil;
+        }
+        if (g_currentWindowUnderCursor) {
+            [g_currentWindowUnderCursor release];
+            g_currentWindowUnderCursor = nil;
+        }
+        
         // Create overlay window (initially hidden)
         NSRect initialFrame = NSMakeRect(0, 0, 100, 100);
         g_overlayWindow = [[NSWindow alloc] initWithContentRect:initialFrame
@@ -1464,6 +1536,10 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
         g_overlayView = [[WindowSelectorOverlayView alloc] initWithFrame:initialFrame];
         [g_overlayWindow setContentView:g_overlayView];
         
+        // Initialize overlay view properties
+        [(WindowSelectorOverlayView *)g_overlayView setIsActiveWindow:NO];
+        [(WindowSelectorOverlayView *)g_overlayView setIsSelectedWindow:NO];
+        
         // Note: NSWindow doesn't have setWantsLayer method, only NSView does
         
         // Force content view to have no borders