/*****************************************************************************
* embeddedwindow.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2005-2006 the VideoLAN team
+ * Copyright (C) 2005-2008 the VideoLAN team
* $Id$
*
* Authors: Benjamin Pracht <bigben at videolan dot org>
+ * Felix Paul Kühne <fkuehne at videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
[o_slider setToolTip: _NS("Position")];
o_img_play = [NSImage imageNamed: @"play_embedded"];
- o_img_play_pressed = [NSImage imageNamed: @"play_embedded_blue"];
o_img_pause = [NSImage imageNamed: @"pause_embedded"];
- o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_blue"];
-
- o_saved_frame = NSMakeRect( 0.0f, 0.0f, 0.0f, 0.0f );
+ [self controlTintChanged];
+ [[NSNotificationCenter defaultCenter] addObserver: self
+ selector: @selector( controlTintChanged )
+ name: NSControlTintDidChangeNotification
+ object: nil];
/* Useful to save o_view frame in fullscreen mode */
o_temp_view = [[NSView alloc] init];
/* Not fullscreen when we wake up */
[o_btn_fullscreen setState: NO];
+ b_fullscreen = NO;
+}
+
+- (void)controlTintChanged
+{
+ BOOL b_playing = NO;
+ if( [o_btn_play alternateImage] == o_img_play_pressed )
+ b_playing = YES;
+
+ if( [NSColor currentControlTint] == NSGraphiteControlTint )
+ {
+ o_img_play_pressed = [NSImage imageNamed: @"play_embedded_graphite"];
+ o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_graphite"];
+ [o_btn_backward setAlternateImage: [NSImage imageNamed: @"skip_previous_embedded_graphite"]];
+ [o_btn_forward setAlternateImage: [NSImage imageNamed: @"skip_forward_embedded_graphite"]];
+ [o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_graphite"]];
+ }
+ else
+ {
+ o_img_play_pressed = [NSImage imageNamed: @"play_embedded_blue"];
+ o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_blue"];
+ [o_btn_backward setAlternateImage: [NSImage imageNamed: @"skip_previous_embedded_blue"]];
+ [o_btn_forward setAlternateImage: [NSImage imageNamed: @"skip_forward_embedded_blue"]];
+ [o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_blue"]];
+ }
+
+ if( b_playing )
+ [o_btn_play setAlternateImage: o_img_play_pressed];
+ else
+ [o_btn_play setAlternateImage: o_img_pause_pressed];
+}
+
+- (void)dealloc
+{
+ [[NSNotificationCenter defaultCenter] removeObserver: self];
+ [o_img_play release];
+ [o_img_play_pressed release];
+ [o_img_pause release];
+ [o_img_pause_pressed release];
+
+ [super dealloc];
}
- (void)setTime:(NSString *)o_arg_time position:(float)f_position
[o_slider setEnabled: b_seekable];
}
-- (void)zoom:(id)sender
+- (BOOL)windowShouldZoom:(NSWindow *)sender toFrame:(NSRect)newFrame
{
- if( ![self isZoomed] )
- {
- NSRect zoomRect = [[self screen] frame];
- o_saved_frame = [self frame];
- /* we don't have to take care of the eventual menu bar and dock
- as zoomRect will be cropped automatically by setFrame:display:
- to the right rectangle */
- [self setFrame: zoomRect display: YES animate: YES];
- }
- else
- {
- /* unzoom to the saved_frame if the o_saved_frame coords look sound
- (just in case) */
- if( o_saved_frame.size.width > 0 && o_saved_frame.size.height > 0 )
- [self setFrame: o_saved_frame display: YES animate: YES];
- }
+ [self setFrame: newFrame display: YES animate: YES];
+ return YES;
}
- (BOOL)windowShouldClose:(id)sender
return YES;
}
+- (NSView *)mainView
+{
+ if (o_fullscreen_window)
+ return o_temp_view;
+ else
+ return o_view;
+}
+
/*****************************************************************************
* Fullscreen support
*/
+
+- (BOOL)isFullscreen
+{
+ return b_fullscreen;
+}
+
+- (void)lockFullscreenAnimation
+{
+ [o_animation_lock lock];
+}
+
+- (void)unlockFullscreenAnimation
+{
+ [o_animation_lock unlock];
+}
+
- (void)enterFullscreen
{
NSMutableDictionary *dict1, *dict2;
NSRect screen_rect;
NSRect rect;
vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
- BOOL blackout_other_displays = var_GetBool( p_vout, "macosx-black" );
+ BOOL blackout_other_displays = config_GetInt( VLCIntf, "macosx-black" );
- /* We should get the screen pointed by var_GetInteger( p_vout, "video-device" ) */
- screen = [self screen];
+ screen = [NSScreen screenWithDisplayID:(CGDirectDisplayID)var_GetInteger( p_vout, "video-device" )];
+
+ [self lockFullscreenAnimation];
+ if (!screen)
+ {
+ msg_Dbg( p_vout, "chosen screen isn't present, using current screen for fullscreen mode" );
+ screen = [self screen];
+ }
+
vlc_object_release( p_vout );
screen_rect = [screen frame];
[o_btn_fullscreen setState: YES];
[NSCursor setHiddenUntilMouseMoves: YES];
-
- if (blackout_other_displays)
- ; /* We should do something like [screen blackoutOtherScreens]; */
+
+ if( blackout_other_displays )
+ [screen blackoutOtherScreens];
/* Only create the o_fullscreen_window if we are not in the middle of the zooming animation */
if (!o_fullscreen_window)
* Mac OS X <10.4 which doesn't support NSAnimation, instead we
* simply fade the display */
CGDisplayFadeReservationToken token;
-
+
[o_fullscreen_window setFrame:screen_rect display:NO];
-
+
CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token);
CGDisplayFade( token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES );
-
- if (screen == [NSScreen mainScreen])
+
+ if ([screen isMainScreen])
SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
-
+
[[self contentView] replaceSubview:o_view with:o_temp_view];
[o_temp_view setFrame:[o_view frame]];
[o_fullscreen_window setContentView:o_view];
CGDisplayFade( token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, NO );
CGReleaseDisplayFadeReservation( token);
+
+ /* Will release the lock */
[self hasBecomeFullscreen];
+
return;
}
-
+
/* Make sure we don't see the o_view disappearing of the screen during this operation */
DisableScreenUpdates();
[[self contentView] replaceSubview:o_view with:o_temp_view];
{
/* We were already fullscreen nothing to do when NSAnimation
* is not supported */
+ [self unlockFullscreenAnimation];
+ return;
+ }
+
+ /* We are in fullscreen (and no animation is running) */
+ if (b_fullscreen)
+ {
+ /* Make sure we are hidden */
+ [super orderOut: self];
+ [self unlockFullscreenAnimation];
return;
}
[o_fullscreen_anim2 release];
}
- if (screen == [NSScreen mainScreen])
+ if ([screen isMainScreen])
SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
dict1 = [[NSMutableDictionary alloc] initWithCapacity:2];
[o_fullscreen_anim2 startWhenAnimation: o_fullscreen_anim1 reachesProgress: 1.0];
[o_fullscreen_anim1 startAnimation];
+ /* fullscreenAnimation will be unlocked when animation ends */
}
- (void)hasBecomeFullscreen
[o_fullscreen_window setAcceptsMouseMovedEvents: TRUE];
/* tell the fspanel to move itself to front next time it's triggered */
- [[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: 0 /* Get this right */];
-
+ [[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: (int)[[o_fullscreen_window screen] displayID]];
+
+ [super orderOut: self];
+
[[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil];
+ b_fullscreen = YES;
+ [self unlockFullscreenAnimation];
}
- (void)leaveFullscreen
+{
+ [self leaveFullscreenAndFadeOut: NO];
+}
+
+- (void)leaveFullscreenAndFadeOut: (BOOL)fadeout
{
NSMutableDictionary *dict1, *dict2;
NSRect frame;
-
+
+ [self lockFullscreenAnimation];
+
+ b_fullscreen = NO;
[o_btn_fullscreen setState: NO];
+ /* We always try to do so */
+ [NSScreen unblackoutScreens];
+
/* Don't do anything if o_fullscreen_window is already closed */
if (!o_fullscreen_window)
+ {
+ [self unlockFullscreenAnimation];
return;
+ }
- if (MACOS_VERSION < 10.4f)
+ if (fadeout || MACOS_VERSION < 10.4f)
{
/* We don't animate if we are not visible or if we are running on
* Mac OS X <10.4 which doesn't support NSAnimation, instead we
[[[[VLCMain sharedInstance] getControls] getFSPanel] setNonActive: nil];
SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar);
- [self makeKeyAndOrderFront:self];
+ /* Will release the lock */
[self hasEndedFullscreen];
CGDisplayFade( token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, NO );
return;
}
+ [self setAlphaValue: 0.0];
+ [self orderFront: self];
+
[[[[VLCMain sharedInstance] getControls] getFSPanel] setNonActive: nil];
SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar);
}
frame = [[o_temp_view superview] convertRect: [o_temp_view frame] toView: nil]; /* Convert to Window base coord */
- frame.origin.x += [self frame].origin.x;
+ frame.origin.x += [self frame].origin.x;
frame.origin.y += [self frame].origin.y;
dict2 = [[NSMutableDictionary alloc] initWithCapacity:2];
[o_fullscreen_anim1 setDuration: 0.2];
[o_fullscreen_anim1 setFrameRate: 30];
[o_fullscreen_anim2 startWhenAnimation: o_fullscreen_anim1 reachesProgress: 1.0];
+
+ /* Make sure o_fullscreen_window is the frontmost window */
+ [o_fullscreen_window orderFront: self];
+
[o_fullscreen_anim1 startAnimation];
+ /* fullscreenAnimation will be unlocked when animation ends */
}
- (void)hasEndedFullscreen
[[self contentView] replaceSubview:o_temp_view with:o_view];
[o_view release];
[o_view setFrame:[o_temp_view frame]];
- [self makeKeyAndOrderFront:self];
+ [self makeFirstResponder: o_view];
+ if ([self isVisible])
+ [self makeKeyAndOrderFront:self];
[o_fullscreen_window orderOut: self];
EnableScreenUpdates();
[o_fullscreen_window release];
o_fullscreen_window = nil;
+ [self unlockFullscreenAnimation];
}
- (void)animationDidEnd:(NSAnimation*)animation
}
}
+- (void)orderOut: (id)sender
+{
+ [super orderOut: sender];
+
+ /* Make sure we leave fullscreen */
+ [self leaveFullscreenAndFadeOut: YES];
+}
+
+/* Make sure setFrame gets executed on main thread especially if we are animating.
+ * (Thus we won't block the video output thread) */
+- (void)setFrame:(NSRect)frame display:(BOOL)display animate:(BOOL)animate
+{
+ struct { NSRect frame; BOOL display; BOOL animate;} args;
+ NSData *packedargs;
+
+ args.frame = frame;
+ args.display = display;
+ args.animate = animate;
+
+ packedargs = [NSData dataWithBytes:&args length:sizeof(args)];
+
+ [self performSelectorOnMainThread:@selector(setFrameOnMainThread:)
+ withObject: packedargs waitUntilDone: YES];
+}
+
+- (void)setFrameOnMainThread:(NSData*)packedargs
+{
+ struct args { NSRect frame; BOOL display; BOOL animate; } * args = (struct args*)[packedargs bytes];
+
+ [super setFrame: args->frame display: args->display animate:args->animate];
+}
@end
projects / vlc / blobdiff