/*****************************************************************************\r
* fspanel.m: MacOS X full screen panel\r
*****************************************************************************\r
- * Copyright (C) 2006 the VideoLAN team\r
+ * Copyright (C) 2006-2007 the VideoLAN team\r
* $Id$\r
*\r
* Authors: J\8er\99me Decoodt <djc at videolan dot org>\r
#import "intf.h"\r
#import "controls.h"\r
#import "vout.h"\r
+#import "misc.h"\r
#import "fspanel.h"\r
\r
-#define KEEP_VISIBLE_AFTER_ACTION 4 /* time in half-sec until this panel will hide again after an user's action */\r
+#define KEEP_VISIBLE_AFTER_ACTION 4 /* time in half-sec until this panel will hide again after a user's action */\r
\r
/*****************************************************************************\r
* VLCFSPanel\r
[win setBackgroundColor:[NSColor clearColor]];\r
\r
/* let the window sit on top of everything else and start out completely transparent */\r
- [win setLevel:NSFloatingWindowLevel];\r
- [win setAlphaValue:0.0];\r
+ [win setLevel:NSModalPanelWindowLevel];\r
i_device = 0;\r
-\r
[win center];\r
+ [self setNonActive:nil];\r
+\r
return win;\r
}\r
\r
[self mouseEntered:NULL];\r
if (!isInside)\r
[self mouseExited:NULL];\r
+ \r
+ /* get a notification if VLC isn't the active app anymore */\r
+ [[NSNotificationCenter defaultCenter]\r
+ addObserver: self\r
+ selector: @selector(setNonActive:)\r
+ name: NSApplicationDidResignActiveNotification\r
+ object: NSApp];\r
+ \r
+ /* get a notification if VLC is the active app again */\r
+ [[NSNotificationCenter defaultCenter]\r
+ addObserver: self\r
+ selector: @selector(setActive:)\r
+ name: NSApplicationDidBecomeActiveNotification\r
+ object: NSApp];\r
}\r
\r
/* Windows created with NSBorderlessWindowMask normally can't be key, but we want ours to be */\r
return YES;\r
}\r
\r
+#if GC_ENABLED\r
+- (void)finalize\r
+{\r
+ /* dealloc isn't called on 10.5 in case that GC is enabled, so we need to provide the functionality here */\r
+ [[NSNotificationCenter defaultCenter] removeObserver: self];\r
+ [self setFadeTimer:nil];\r
+ \r
+ [super finalize];\r
+}\r
+#endif\r
+\r
-(void)dealloc\r
{\r
+ [[NSNotificationCenter defaultCenter] removeObserver: self];\r
+ \r
if( hideAgainTimer )\r
[hideAgainTimer release];\r
[self setFadeTimer:nil];\r
NSPoint theCoordinate;\r
NSRect theScreensFrame;\r
NSRect theWindowsFrame;\r
-\r
- if( i_device < 0 || i_device >= (signed int)[[NSScreen screens] count] )\r
+ NSScreen *screen;\r
+ \r
+ /* user-defined screen */\r
+ screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)i_device];\r
+ \r
+ if (!screen)\r
+ {\r
/* invalid preferences or none specified, using main screen */\r
- theScreensFrame = [[NSScreen mainScreen] frame];\r
- else\r
- /* user-defined screen */\r
- theScreensFrame = [[[NSScreen screens] objectAtIndex: i_device] frame];\r
+ screen = [NSScreen mainScreen];\r
+ }\r
+\r
+ theScreensFrame = [screen frame];\r
\r
theWindowsFrame = [self frame];\r
\r
[[self contentView] setVolumeLevel: f_volumeLevel];\r
}\r
\r
+- (void)setNonActive:(id)noData\r
+{\r
+ b_nonActive = YES;\r
+ [self orderOut: self];\r
+ \r
+ /* here's fadeOut, just without visibly fading */\r
+ b_displayed = NO;\r
+ [self setAlphaValue:0.0];\r
+ [self setFadeTimer:nil];\r
+ b_fadeQueued = NO;\r
+}\r
+\r
+- (void)setActive:(id)noData\r
+{\r
+ if( [[[[VLCMain sharedInstance] getControls] getVoutView] isFullscreen] )\r
+ {\r
+ b_nonActive = NO;\r
+ [self fadeIn];\r
+ }\r
+}\r
+\r
/* This routine is called repeatedly to fade in the window */\r
- (void)focus:(NSTimer *)timer\r
{\r
{\r
b_keptVisible = NO;\r
b_fadeQueued = NO;\r
- [[self fadeTimer] release];\r
[self setFadeTimer: NULL];\r
[self fadeIn];\r
return;\r
}\r
if( [self alphaValue] > 0.0 )\r
- [self setAlphaValue:[self alphaValue]-0.1];\r
- if( [self alphaValue] <= 0.1 )\r
+ [self setAlphaValue:[self alphaValue]-0.05];\r
+ if( [self alphaValue] <= 0.05 )\r
{\r
b_displayed = NO;\r
[self setAlphaValue:0.0];\r
- (void)fadeIn\r
{\r
/* in case that the user don't want us to appear, just return here */\r
- if(! config_GetInt( VLCIntf, "macosx-fspanel" ) )\r
+ if(! config_GetInt( VLCIntf, "macosx-fspanel" ) || b_nonActive )\r
return;\r
\r
- if( [self alphaValue] < 1.0 )\r
+ [self orderFront: nil];\r
+ \r
+ if( [self alphaValue] < 1.0 || b_displayed != YES )\r
{\r
if (![self fadeTimer])\r
[self setFadeTimer:[NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(focus:) userInfo:[NSNumber numberWithShort:1] repeats:YES]];\r
if( ( [self alphaValue] > 0.0 ) )\r
{\r
if (![self fadeTimer])\r
- [self setFadeTimer:[NSTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(unfocus:) userInfo:[NSNumber numberWithShort:0] repeats:YES]];\r
+ [self setFadeTimer:[NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(unfocus:) userInfo:[NSNumber numberWithShort:0] repeats:YES]];\r
else if ([[[self fadeTimer] userInfo] shortValue]==1)\r
b_fadeQueued=YES;\r
}\r
i_timeToKeepVisibleInSec -= 1;\r
if( i_timeToKeepVisibleInSec < 1 )\r
{\r
+ [NSCursor setHiddenUntilMouseMoves: YES];\r
[self fadeOut];\r
[timer invalidate];\r
[timer release];\r
\r
- (void)drawRect:(NSRect)rect\r
{\r
- NSRect frame = [self frame];\r
+ NSRect frame = [self frame];\r
NSRect image_rect;\r
NSImage *img;\r
addImage( @"fs_background", 0, 0, NSCompositeCopy, 0 );\r
projects / vlc / blobdiff