/*****************************************************************************\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
backing:(NSBackingStoreType)bufferingType \r
defer:(BOOL)flag\r
{\r
- id win=[super initWithContentRect:contentRect styleMask:NSBorderlessWindowMask backing:bufferingType defer:flag];\r
+ id win = [super initWithContentRect:contentRect styleMask:NSTexturedBackgroundWindowMask backing:bufferingType defer:flag];\r
[win setOpaque:NO];\r
[win setHasShadow: NO];\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
+ [win center];\r
+ [self setNonActive:nil];\r
+\r
return win;\r
}\r
\r
- (void)awakeFromNib\r
{\r
[self setContentView:[[VLCFSPanelView alloc] initWithFrame: [self frame]]];\r
- BOOL isInside=(NSPointInRect([NSEvent mouseLocation],[self frame]));\r
+ BOOL isInside = (NSPointInRect([NSEvent mouseLocation],[self frame]));\r
[[self contentView] addTrackingRect:[[self contentView] bounds] owner:self userData:nil assumeInside:isInside];\r
if (isInside)\r
- [self mouseEntered:NULL];\r
+ [self mouseEntered:NULL];\r
if (!isInside)\r
- [self mouseExited:NULL];\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
[super dealloc];\r
}\r
\r
+-(void)center\r
+{\r
+ /* centre the panel in the lower third of the screen */\r
+ NSPoint theCoordinate;\r
+ NSRect theScreensFrame;\r
+ NSRect theWindowsFrame;\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
+ screen = [NSScreen mainScreen];\r
+ }\r
+\r
+ theScreensFrame = [screen frame];\r
+\r
+ theWindowsFrame = [self frame];\r
+ \r
+ theCoordinate.x = (theScreensFrame.size.width - theWindowsFrame.size.width) / 2 + theScreensFrame.origin.x;\r
+ theCoordinate.y = (theScreensFrame.size.height / 3) - theWindowsFrame.size.height + theScreensFrame.origin.y;\r
+ [self setFrameTopLeftPoint: theCoordinate];\r
+}\r
+\r
- (void)setPlay\r
{\r
[[self contentView] setPlay];\r
[[self contentView] setStreamPos:f_pos andTime: o_time];\r
}\r
\r
-- (void)setSeekable:(BOOL) b_seekable;\r
+- (void)setSeekable:(BOOL) b_seekable\r
{\r
[[self contentView] setSeekable: b_seekable];\r
}\r
\r
-/* This routine is called repeatedly when the mouse enters the window from outside it. */\r
+- (void)setVolumeLevel: (float)f_volumeLevel\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
+ /* we need to push ourselves to front if the vout window was closed since our last display */\r
+ if( b_voutWasUpdated )\r
+ {\r
+ [self orderFront: self];\r
+ b_voutWasUpdated = NO;\r
+ }\r
+\r
if( [self alphaValue] < 1.0 )\r
[self setAlphaValue:[self alphaValue]+0.1];\r
if( [self alphaValue] >= 1.0 )\r
{\r
+ b_displayed = YES;\r
[self setAlphaValue: 1.0];\r
[self setFadeTimer:nil];\r
if( b_fadeQueued )\r
}\r
}\r
\r
-/* This routine is called repeatedly when the mouse exits the window from inside it */\r
+/* This routine is called repeatedly to hide the window */\r
- (void)unfocus:(NSTimer *)timer\r
{\r
+ if( b_keptVisible )\r
+ {\r
+ b_keptVisible = NO;\r
+ b_fadeQueued = NO;\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
[self setFadeTimer:nil];\r
if( b_fadeQueued )\r
}\r
}\r
\r
-/* If the mouse enters a window, go make sure we fade in */\r
-- (void)mouseEntered:(NSEvent *)theEvent\r
-{\r
- [self fadeIn];\r
-}\r
-\r
-/* If the mouse exits a window, go make sure we fade out */\r
- (void)mouseExited:(NSEvent *)theEvent\r
{\r
- /* the user left the window, fade out immediatelly and prevent any timer action */\r
- if( b_alreadyCounting )\r
- {\r
- [hideAgainTimer invalidate];\r
- [hideAgainTimer release];\r
- b_alreadyCounting = NO;\r
- hideAgainTimer = NULL;\r
- }\r
-\r
/* give up our focus, so the vout may show us again without letting the user clicking it */\r
if( [[[[VLCMain sharedInstance] getControls] getVoutView] isFullscreen] )\r
[[[[[VLCMain sharedInstance] getControls] getVoutView] window] makeKeyWindow];\r
-\r
- [self fadeOut];\r
}\r
\r
- (void)fadeIn\r
{\r
- if( [self alphaValue] < 1.0 )\r
+ /* in case that the user don't want us to appear, just return here */\r
+ if(! config_GetInt( VLCIntf, "macosx-fspanel" ) || b_nonActive )\r
+ return;\r
+ \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.1 target:self selector:@selector(focus:) userInfo:[NSNumber numberWithShort:1] repeats:YES]];\r
+ [self setFadeTimer:[NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(focus:) userInfo:[NSNumber numberWithShort:1] repeats:YES]];\r
else if ([[[self fadeTimer] userInfo] shortValue]==0)\r
b_fadeQueued=YES;\r
}\r
\r
- (void)fadeOut\r
{\r
- if( ( [self alphaValue] > 0.0 ) && !NSPointInRect( [NSEvent mouseLocation], [self frame] ) )\r
+ if( NSPointInRect([NSEvent mouseLocation],[self frame]))\r
+ return;\r
+\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
point.y -= mouseClic.y;\r
[self setFrameOrigin:point];\r
}\r
+\r
+- (BOOL)isDisplayed\r
+{\r
+ return b_displayed;\r
+}\r
+\r
+- (void)setVoutWasUpdated: (int)i_newdevice;\r
+{\r
+ b_voutWasUpdated = YES;\r
+ if( i_newdevice != i_device )\r
+ {\r
+ i_device = i_newdevice;\r
+ [self center];\r
+ }\r
+}\r
@end\r
\r
/*****************************************************************************\r
[o_button setBezelStyle: NSRegularSquareBezelStyle]; \\r
[o_button setBordered: NO]; \\r
[o_button setFont:[NSFont systemFontOfSize:0]]; \\r
- image = [[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:imageOff]]; \\r
- [o_button setImage:image]; \\r
- image = [[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:imageOn]]; \\r
- [o_button setAlternateImage:image]; \\r
+ [o_button setImage:[NSImage imageNamed:imageOff]]; \\r
+ [o_button setAlternateImage:[NSImage imageNamed:imageOn]]; \\r
[o_button sizeToFit]; \\r
[o_button setTarget: self]; \\r
[o_button setAction: @selector(action:)]; \\r
\r
- (id)initWithFrame:(NSRect)frameRect\r
{\r
- NSBundle * bundle = [NSBundle mainBundle];\r
id view = [super initWithFrame:frameRect];\r
fillColor = [[NSColor clearColor] retain];\r
NSRect s_rc = [self frame];\r
- NSImage * image;\r
- addButton( o_prev, @"fs_skip_previous.png" , @"fs_skip_previous_highlight.png", 174, 15, prev );\r
- addButton( o_slow, @"fs_rewind.png" , @"fs_rewind_highlight.png" , 211, 14, slower );\r
- addButton( o_play, @"fs_play.png" , @"fs_play_highlight.png" , 269, 10, play );\r
- addButton( o_fast, @"fs_forward.png" , @"fs_forward_highlight.png" , 313, 14, faster );\r
- addButton( o_next, @"fs_skip_next.png" , @"fs_skip_next_highlight.png" , 365, 15, next );\r
- addButton( o_fullscreen, @"fs_exit_fullscreen.png", @"fs_exit_fullscreen_hightlight.png", 507, 13, windowAction );\r
+ addButton( o_prev, @"fs_skip_previous" , @"fs_skip_previous_highlight", 174, 15, prev );\r
+ addButton( o_bwd, @"fs_rewind" , @"fs_rewind_highlight" , 211, 14, backward );\r
+ addButton( o_play, @"fs_play" , @"fs_play_highlight" , 267, 10, play );\r
+ addButton( o_fwd, @"fs_forward" , @"fs_forward_highlight" , 313, 14, forward );\r
+ addButton( o_next, @"fs_skip_next" , @"fs_skip_next_highlight" , 365, 15, next );\r
+ addButton( o_fullscreen, @"fs_exit_fullscreen", @"fs_exit_fullscreen_hightlight", 507, 13, windowAction );\r
/*\r
- addButton( o_button, @"FSVolumeThumbOff.tif" , @"FSVolumeThumbOn.tif" , 38, 51, something );\r
+ addButton( o_button, @"image (off state)", @"image (on state)", 38, 51, something );\r
*/\r
\r
+ /* time slider */\r
s_rc = [self frame];\r
s_rc.origin.x = 15;\r
s_rc.origin.y = 53;\r
[o_fs_timeSlider setTarget: self];\r
[o_fs_timeSlider setAction: @selector(fsTimeSliderUpdate:)];\r
[self addSubview: o_fs_timeSlider];\r
+\r
+ /* volume slider */\r
+ s_rc = [self frame];\r
+ s_rc.origin.x = 26;\r
+ s_rc.origin.y = 17.5;\r
+ s_rc.size.width = 95;\r
+ s_rc.size.height = 10;\r
+ o_fs_volumeSlider = [[VLCFSVolumeSlider alloc] initWithFrame: s_rc];\r
+ [o_fs_volumeSlider setMinValue:0];\r
+ [o_fs_volumeSlider setMaxValue:32];\r
+ [o_fs_volumeSlider setFloatValue: 0];\r
+ [o_fs_volumeSlider setContinuous: YES];\r
+ [o_fs_volumeSlider setTarget: self];\r
+ [o_fs_volumeSlider setAction: @selector(fsVolumeSliderUpdate:)];\r
+ [self addSubview: o_fs_volumeSlider];\r
\r
+ /* time counter and stream title output fields */\r
s_rc = [self frame];\r
s_rc.origin.x = 98;\r
s_rc.origin.y = 64;\r
s_rc.size.width = 352;\r
s_rc.size.height = 14;\r
- addTextfield( o_textfield, NSCenterTextAlignment, systemFontOfSize, whiteColor, 0 );\r
+ addTextfield( o_streamTitle_txt, NSCenterTextAlignment, systemFontOfSize, whiteColor, 0 );\r
s_rc.origin.x = 486;\r
s_rc.origin.y = 64;\r
s_rc.size.width = 50;\r
- addTextfield( o_textPos, NSRightTextAlignment, systemFontOfSize, whiteColor, 0 );\r
+ addTextfield( o_streamPosition_txt, NSRightTextAlignment, systemFontOfSize, whiteColor, 0 );\r
\r
return view;\r
}\r
- (void)dealloc\r
{\r
[o_fs_timeSlider release];\r
+ [o_fs_volumeSlider release];\r
+ [o_prev release];\r
+ [o_next release];\r
+ [o_bwd release];\r
+ [o_play release];\r
+ [o_fwd release];\r
+ [o_fullscreen release];\r
+ [o_streamTitle_txt release];\r
+ [o_streamPosition_txt release];\r
[super dealloc];\r
}\r
\r
- (void)setPlay\r
{\r
- NSBundle *bundle = [NSBundle mainBundle];\r
- NSImage *image;\r
- [[o_play image] release];\r
- [[o_play alternateImage] release];\r
- image = [[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:@"fs_play.png"]];\r
- [o_play setImage:image];\r
- image = [[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:@"fs_play_highlight.png"]];\r
- [o_play setAlternateImage:image];\r
+ [o_play setImage:[NSImage imageNamed:@"fs_play"]];\r
+ [o_play setAlternateImage: [NSImage imageNamed:@"fs_play_highlight"]];\r
}\r
\r
- (void)setPause\r
{\r
- NSBundle *bundle = [NSBundle mainBundle];\r
- NSImage *image;\r
- [[o_play image] release];\r
- [[o_play alternateImage] release];\r
- image = [[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:@"fs_pause.png"]];\r
- [o_play setImage:image];\r
- image = [[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:@"fs_pause_highlight.png"]];\r
- [o_play setAlternateImage:image];\r
+ [o_play setImage: [NSImage imageNamed:@"fs_pause"]];\r
+ [o_play setAlternateImage: [NSImage imageNamed:@"fs_pause_highlight"]];\r
}\r
\r
- (void)setStreamTitle:(NSString *)o_title\r
{\r
- [o_textfield setStringValue: o_title];\r
+ [o_streamTitle_txt setStringValue: o_title];\r
}\r
\r
- (void)setStreamPos:(float) f_pos andTime:(NSString *)o_time\r
{\r
- [o_textPos setStringValue: o_time];\r
+ [o_streamPosition_txt setStringValue: o_time];\r
[o_fs_timeSlider setFloatValue: f_pos];\r
}\r
\r
- (void)setSeekable:(BOOL)b_seekable\r
{\r
- [o_slow setEnabled: b_seekable];\r
- [o_fast setEnabled: b_seekable];\r
+ [o_bwd setEnabled: b_seekable];\r
+ [o_fwd setEnabled: b_seekable];\r
[o_fs_timeSlider setEnabled: b_seekable];\r
}\r
\r
+- (void)setVolumeLevel: (float)f_volumeLevel\r
+{\r
+ [o_fs_volumeSlider setFloatValue: f_volumeLevel];\r
+}\r
+\r
- (IBAction)play:(id)sender\r
{\r
[[[VLCMain sharedInstance] getControls] play: sender];\r
}\r
\r
-- (IBAction)faster:(id)sender\r
+- (IBAction)forward:(id)sender\r
{\r
- [[[VLCMain sharedInstance] getControls] faster: sender];\r
+ [[[VLCMain sharedInstance] getControls] forward: sender];\r
}\r
\r
-- (IBAction)slower:(id)sender\r
+- (IBAction)backward:(id)sender\r
{\r
- [[[VLCMain sharedInstance] getControls] slower: sender];\r
+ [[[VLCMain sharedInstance] getControls] backward: sender];\r
}\r
\r
- (IBAction)prev:(id)sender\r
[[VLCMain sharedInstance] timesliderUpdate: sender];\r
}\r
\r
+- (IBAction)fsVolumeSliderUpdate:(id)sender\r
+{\r
+ [[[VLCMain sharedInstance] getControls] volumeSliderUpdated: sender];\r
+}\r
+\r
#define addImage(image, _x, _y, mode, _width) \\r
- img = [[[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:image]] autorelease]; \\r
+ img = [NSImage imageNamed:image]; \\r
image_rect.size = [img size]; \\r
image_rect.origin.x = 0; \\r
image_rect.origin.y = 0; \\r
\r
- (void)drawRect:(NSRect)rect\r
{\r
- NSBundle *bundle = [NSBundle mainBundle];\r
- NSRect frame = [self frame];\r
+ NSRect frame = [self frame];\r
NSRect image_rect;\r
NSImage *img;\r
- addImage( @"fs_background.png", 0, 0, NSCompositeCopy, 0 );\r
- addImage( @"fs_volume_slider_bar.png" , 26, 22, NSCompositeSourceOver, 0 );\r
- addImage( @"fs_volume_mute.png", 16, 18, NSCompositeSourceOver, 0 );\r
- addImage( @"fs_volume_max.png", 124, 17, NSCompositeSourceOver, 0 );\r
- addImage(@"fs_time_slider.png" , 15, 53, NSCompositeSourceOver, 0);\r
+ addImage( @"fs_background", 0, 0, NSCompositeCopy, 0 );\r
+ addImage( @"fs_volume_slider_bar", 26, 22, NSCompositeSourceOver, 0 );\r
+ addImage( @"fs_volume_mute", 16, 18, NSCompositeSourceOver, 0 );\r
+ addImage( @"fs_volume_max", 124, 17, NSCompositeSourceOver, 0 );\r
+ addImage( @"fs_time_slider", 15, 53, NSCompositeSourceOver, 0);\r
}\r
\r
@end\r
* VLCFSTimeSlider\r
*****************************************************************************/\r
@implementation VLCFSTimeSlider\r
-void drawKnobInRect(NSRect knobRect)\r
+- (void)drawKnobInRect:(NSRect)knobRect\r
{\r
- NSBundle *bundle = [NSBundle mainBundle];\r
NSRect image_rect;\r
- NSImage *img = [[NSImage alloc] initWithContentsOfFile:[bundle pathForImageResource:@"fs_time_slider_knob.png"]];\r
+ NSImage *img = [NSImage imageNamed:@"fs_time_slider_knob_highlight"];\r
image_rect.size = [img size];\r
image_rect.origin.x = 0;\r
image_rect.origin.y = 0;\r
[img drawInRect:knobRect fromRect:image_rect operation:NSCompositeSourceOver fraction:1];\r
}\r
\r
-void drawFrameInRect(NSRect frameRect) \r
+- (void)drawRect:(NSRect)rect\r
+{\r
+ /* Draw default to make sure the slider behaves correctly */\r
+ [[NSGraphicsContext currentContext] saveGraphicsState];\r
+ NSRectClip(NSZeroRect);\r
+ [super drawRect:rect];\r
+ [[NSGraphicsContext currentContext] restoreGraphicsState];\r
+ \r
+ NSRect knobRect = [[self cell] knobRectFlipped:NO];\r
+ knobRect.origin.y+=7.5;\r
+ [[[NSColor blackColor] colorWithAlphaComponent:0.6] set];\r
+ [self drawKnobInRect: knobRect];\r
+}\r
+\r
+@end\r
+\r
+/*****************************************************************************\r
+* VLCFSVolumeSlider\r
+*****************************************************************************/\r
+@implementation VLCFSVolumeSlider\r
+- (void)drawKnobInRect:(NSRect) knobRect\r
{\r
- /* we don't do anything here atm */\r
+ NSRect image_rect;\r
+ NSImage *img = [NSImage imageNamed:@"fs_volume_slider_knob"];\r
+ image_rect.size = [img size];\r
+ image_rect.origin.x = 0;\r
+ image_rect.origin.y = 0;\r
+ knobRect.origin.x += (knobRect.size.width - image_rect.size.width) / 2;\r
+ knobRect.size.width = image_rect.size.width;\r
+ knobRect.size.height = image_rect.size.height;\r
+ [img drawInRect:knobRect fromRect:image_rect operation:NSCompositeSourceOver fraction:1];\r
}\r
\r
- (void)drawRect:(NSRect)rect\r
[[NSGraphicsContext currentContext] restoreGraphicsState];\r
\r
NSRect knobRect = [[self cell] knobRectFlipped:NO];\r
- knobRect.origin.y+=7.5;\r
+ knobRect.origin.y+=6;\r
[[[NSColor blackColor] colorWithAlphaComponent:0.6] set];\r
- drawFrameInRect(rect);\r
- drawKnobInRect(knobRect);\r
+ [self drawKnobInRect: knobRect];\r
}\r
\r
@end\r
+\r
projects / vlc / blobdiff