node-mac-recorder 2.9.2 → 2.10.1

package/src/window_selector.mm

@@ -7,18 +7,13 @@
 #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; // Window info for recording
-static NSDictionary *g_clickedWindowInfo = nil; // Separate state for clicked selection (NOT for recording)
+static NSDictionary *g_selectedWindowInfo = nil;
 static NSMutableArray *g_allWindows = nil;
 static NSDictionary *g_currentWindowUnderCursor = nil;
 static bool g_bringToFrontEnabled = true; // Default enabled
@@ -59,7 +54,6 @@ void updateScreenOverlays();
 @interface WindowSelectorOverlayView : NSView
 @property (nonatomic, strong) NSDictionary *windowInfo;
 @property (nonatomic) BOOL isActiveWindow;
-@property (nonatomic) BOOL isSelectedWindow;
 @end
 
 @implementation WindowSelectorOverlayView
@@ -69,10 +63,9 @@ void updateScreenOverlays();
     if (self) {
         // Use layer for background instead of custom drawing
         self.wantsLayer = YES;
-        self.isActiveWindow = NO; // Default to inactive (will be set by updateOverlay)
-        self.isSelectedWindow = NO; // Default to not selected
+        self.isActiveWindow = YES; // Default to active for current window under mouse
         
-        // Set initial appearance
+        // Set purple background with border using layer
         [self updateAppearance];
         
         // Window selector overlay view created
@@ -81,27 +74,19 @@ void updateScreenOverlays();
 }
 
 - (void)updateAppearance {
-            if (self.isSelectedWindow) {
-            // Selected window: same background but medium border (2px)
-            self.layer.backgroundColor = [[NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.4] CGColor]; // Same as highlight
-            self.layer.borderColor = [[NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:1.0] CGColor];
-            self.layer.borderWidth = 2.0; // Medium border for selected window
-            // Selected window appearance set
-        } else if (self.isActiveWindow) {
-            // Active window (highlighted): thin border (1px)
-            self.layer.backgroundColor = [[NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.4] CGColor];
-            self.layer.borderColor = [[NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.8] CGColor];
-            self.layer.borderWidth = 1.0; // Thin border for highlighted window
-            // Active window appearance set
-        } else {
-            // Inactive window: no border
-            self.layer.backgroundColor = [[NSColor colorWithRed:0.4 green:0.2 blue:0.6 alpha:0.25] CGColor];
-            self.layer.borderColor = [[NSColor clearColor] CGColor];
-            self.layer.borderWidth = 0.0; // No border for inactive window
-            // Inactive window appearance set
-        }
+    if (self.isActiveWindow) {
+        // Active window: brighter background
+        self.layer.backgroundColor = [[NSColor colorWithRed:0.6 green:0.4 blue:0.9 alpha:0.4] CGColor];
+        // Active window appearance set
+    } else {
+        // Inactive window: dimmer background  
+        self.layer.backgroundColor = [[NSColor colorWithRed:0.4 green:0.2 blue:0.6 alpha:0.25] CGColor];
+        // Inactive window appearance set
+    }
     
-        // Common styling
+            // No border to match screen selector
+        self.layer.borderColor = [[NSColor clearColor] CGColor];
+        self.layer.borderWidth = 0.0;
         self.layer.cornerRadius = 8.0;
         self.layer.masksToBounds = YES;
         self.layer.shadowOpacity = 0.0;
@@ -116,71 +101,6 @@ void updateScreenOverlays();
     }
 }
 
-- (void)setIsSelectedWindow:(BOOL)isSelectedWindow {
-    if (_isSelectedWindow != isSelectedWindow) {
-        _isSelectedWindow = isSelectedWindow;
-        [self updateAppearance];
-    }
-}
-
-- (void)mouseDown:(NSEvent *)event {
-    // Handle mouse click to toggle window selection (ONLY selection, no recording start)
-    if (self.windowInfo) {
-        // Check if this window is already selected
-        BOOL wasSelected = (g_clickedWindowInfo && 
-                           [g_clickedWindowInfo isEqualToDictionary:self.windowInfo]);
-        
-        if (wasSelected) {
-            // Deselect this window - return to normal highlight behavior
-            self.isSelectedWindow = NO;
-            
-            // Clear global clicked selection (NOT recording selection)
-            if (g_clickedWindowInfo) {
-                [g_clickedWindowInfo release];
-                g_clickedWindowInfo = nil;
-            }
-            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 (for visual selection only, NOT for recording)
-            self.isSelectedWindow = YES;
-            
-            // Update global clicked window info (separate from recording selection)
-            if (g_clickedWindowInfo) {
-                [g_clickedWindowInfo release];
-            }
-            g_clickedWindowInfo = [self.windowInfo retain];
-            
-            // Update global selected overlay reference
-            g_selectedOverlayView = self;
-            
-            NSLog(@"🎯 WINDOW CLICKED - Visual selection only (NOT recording): %@ - \"%@\"", 
-                  [self.windowInfo objectForKey:@"appName"] ?: @"Unknown",
-                  [self.windowInfo objectForKey:@"title"] ?: @"Untitled");
-        }
-        
-        // Update appearance for this overlay
-        [self updateAppearance];
-        
-        // DON'T start recording here - that's only for the "Start Record" button
-        // Consume the event completely to prevent any propagation
-        NSLog(@"🛑 MOUSE EVENT CONSUMED - No recording started");
-        
-        // IMPORTANT: Return YES to indicate we handled the event
-        // This prevents the event from propagating to other handlers
-        return;
-    }
-}
-
 // Layer-based approach, no custom drawing needed
 
 @end
@@ -299,19 +219,9 @@ void updateScreenOverlays();
 
 @implementation WindowSelectorDelegate
 - (void)selectButtonClicked:(id)sender {
-    if (g_clickedWindowInfo) {
-        // Copy clicked window info to recording selection
-        if (g_selectedWindowInfo) {
-            [g_selectedWindowInfo release];
-        }
-        g_selectedWindowInfo = [g_clickedWindowInfo retain];
-        
-        NSLog(@"🎯 START RECORDING: Clicked window confirmed for recording - %@ - \"%@\"", 
-              [g_selectedWindowInfo objectForKey:@"appName"] ?: @"Unknown",
-              [g_selectedWindowInfo objectForKey:@"title"] ?: @"Untitled");
+    if (g_currentWindowUnderCursor) {
+        g_selectedWindowInfo = [g_currentWindowUnderCursor retain];
         cleanupWindowSelector();
-    } else {
-        NSLog(@"⚠️ No window clicked - cannot start recording");
     }
 }
 
@@ -534,294 +444,271 @@ NSDictionary* getWindowUnderCursor(CGPoint point) {
     }
 }
 
-// Update overlay to show window under cursor with highlighting (but no auto-bring-to-front)
+// Update overlay to highlight window under cursor
 void updateOverlay() {
     @autoreleasepool {
         if (!g_isWindowSelecting || !g_overlayWindow) return;
         
-        // Get current cursor position for highlighting
+        // 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);
         
-        // Find window under cursor for highlighting
+        // Find window under cursor
         NSDictionary *windowUnderCursor = getWindowUnderCursor(globalPoint);
         
-        // Update current window under cursor for highlighting
         if (windowUnderCursor && ![windowUnderCursor isEqualToDictionary:g_currentWindowUnderCursor]) {
+            // Update current window
             [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
+            
+            // 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;
+                }
             }
-        }
-        
-        // 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");
+                    }
+                }
             }
-        }
-        
-        // 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 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)
-        // 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");
+            
+            // 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;
                 }
             }
-        }
-        
-        // 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;
+            
+            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];
             }
-        }
-        
-        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;
+            
+            // 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);
-        }
-        
-        // 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;
+            
+            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);
             }
-        }
-        
-        // 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];
             
-            // 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];
+            // Get app icon using NSWorkspace
+            NSString *iconAppName = [windowUnderCursor objectForKey:@"appName"] ?: @"Unknown";
+            NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
+            NSArray *runningApps = [workspace runningApplications];
+            NSImage *appIcon = nil;
             
-            // 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;
+            for (NSRunningApplication *app in runningApps) {
+                if ([[app localizedName] isEqualToString:iconAppName] || [[app bundleIdentifier] containsString:iconAppName]) {
+                    appIcon = [app icon];
                     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];
+            // 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);
             }
-        }
-        
-        // 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);
+            
+            [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];
+                
+                // 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];
                 }
             }
-        }
-        
-        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 - highlight window under cursor and check selection
-        if (g_overlayView && [g_overlayView isKindOfClass:[WindowSelectorOverlayView class]]) {
-            WindowSelectorOverlayView *overlayView = (WindowSelectorOverlayView *)g_overlayView;
             
-            // Check if this window is under cursor (highlight)
-            BOOL isUnderCursor = (windowUnderCursor && 
-                                [g_currentWindowUnderCursor isEqualToDictionary:windowUnderCursor]);
+            [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);
+                    }
+                }
+            }
             
-                                // Check if this is the clicked window (visual selection)
-                    BOOL isSelected = (g_clickedWindowInfo &&
-                                     [g_clickedWindowInfo isEqualToDictionary:windowUnderCursor]);
+            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";
             
-            // Allow highlighting on all windows (including selected) but keep selection state
-            overlayView.isActiveWindow = isUnderCursor; // Highlight if under cursor
-            overlayView.isSelectedWindow = isSelected; // Keep selection state
+            NSLog(@"🚪 WINDOW LEFT: %@ - \"%@\"", leftAppName, leftWindowTitle);
             
-            NSLog(@"🎯 Overlay State Updated: Active=%s, Selected=%s", 
-                  isUnderCursor ? "YES" : "NO", isSelected ? "YES" : "NO");
+            [g_overlayWindow orderOut:nil];
+            [g_currentWindowUnderCursor release];
+            g_currentWindowUnderCursor = nil;
         }
     }
 }
@@ -862,22 +749,9 @@ void cleanupWindowSelector() {
         g_allWindows = nil;
     }
     
-    // Clean up selected overlay
-    if (g_selectedOverlayView) {
-        g_selectedOverlayView.isSelectedWindow = NO;
-        g_selectedOverlayView = nil;
-    }
-    
-    // Clear clicked window info (visual selection)
-    if (g_clickedWindowInfo) {
-        [g_clickedWindowInfo release];
-        g_clickedWindowInfo = nil;
-    }
-    
-    // Clear selected window info (recording selection)
-    if (g_selectedWindowInfo) {
-        [g_selectedWindowInfo release];
-        g_selectedWindowInfo = nil;
+    if (g_currentWindowUnderCursor) {
+        [g_currentWindowUnderCursor release];
+        g_currentWindowUnderCursor = nil;
     }
 }
 
@@ -1549,31 +1423,13 @@ Napi::Value StartWindowSelection(const Napi::CallbackInfo& info) {
     
     @try {
         // Get all windows
-        g_allWindows = [[getAllSelectableWindows() mutableCopy] retain];
+        g_allWindows = [getAllSelectableWindows() 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_clickedWindowInfo) {
-            [g_clickedWindowInfo release];
-            g_clickedWindowInfo = 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
@@ -1608,15 +1464,6 @@ 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];
-        
-        // 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
@@ -1839,8 +1686,9 @@ Napi::Value GetSelectedWindowInfo(const Napi::CallbackInfo& info) {
         result.Set("screenWidth", Napi::Number::New(env, (int)screenFrame.size.width));
         result.Set("screenHeight", Napi::Number::New(env, (int)screenFrame.size.height));
         
-        // Don't clear selected window info - just read it
-        // The info will be cleared when recording actually starts
+        // Clear selected window info after reading
+        [g_selectedWindowInfo release];
+        g_selectedWindowInfo = nil;
         
         return result;