/*****************************************************************************
* Windows.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2012 VLC authors and VideoLAN
+ * Copyright (C) 2012-2014 VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
#import "CoreInteraction.h"
#import "ControlsBar.h"
#import "VideoView.h"
+#import "CompatibilityFixes.h"
/*****************************************************************************
* VLCWindow
*****************************************************************************/
@implementation VLCWindow
+
+@synthesize hasActiveVideo=b_has_active_video;
+@synthesize fullscreen=b_fullscreen;
+
- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask
backing:(NSBackingStoreType)backingType defer:(BOOL)flag
{
return;
}
- invoc = [NSInvocation invocationWithMethodSignature:[super methodSignatureForSelector:@selector(close)]];
+ // TODO this callback stuff does not work and is not needed
+ invoc = [[[NSInvocation alloc] init] autorelease];
+ [invoc setSelector:@selector(close)];
[invoc setTarget: self];
if (![self isVisible] || [self alphaValue] == 0.0) {
- (void)orderOut: (id)sender animate: (BOOL)animate
{
- NSInvocation *invoc = [NSInvocation invocationWithMethodSignature:[super methodSignatureForSelector:@selector(orderOut:)]];
+ NSInvocation *invoc = [[[NSInvocation alloc] init] autorelease];
+ [invoc setSelector:@selector(orderOut:)];
[invoc setTarget: self];
- [invoc setArgument: sender atIndex: 0];
+ [invoc setArgument: sender atIndex: 2];
[self orderOut: sender animate: animate callback: invoc];
}
[dict setObject:self forKey:NSViewAnimationTargetKey];
[dict setObject:NSViewAnimationFadeOutEffect forKey:NSViewAnimationEffectKey];
- anim = [[NSViewAnimation alloc] initWithViewAnimations:[NSArray arrayWithObjects:dict, nil]];
+ anim = [[NSViewAnimation alloc] initWithViewAnimations:[NSArray arrayWithObject:dict]];
[dict release];
[anim setAnimationBlockingMode:NSAnimationNonblocking];
[anim setDuration:0.9];
[anim setFrameRate:30];
- [anim setUserInfo: callback];
+ [anim setUserInfo:callback];
+ [anim setDelegate:self];
@synchronized(self) {
current_anim = self->o_current_animation;
[dict setObject:self forKey:NSViewAnimationTargetKey];
[dict setObject:NSViewAnimationFadeInEffect forKey:NSViewAnimationEffectKey];
- anim = [[NSViewAnimation alloc] initWithViewAnimations:[NSArray arrayWithObjects:dict, nil]];
+ anim = [[NSViewAnimation alloc] initWithViewAnimations:[NSArray arrayWithObject:dict]];
[dict release];
[anim setAnimationBlockingMode:NSAnimationNonblocking];
[anim setDuration:0.5];
[anim setFrameRate:30];
+ [anim setDelegate:self];
@synchronized(self) {
current_anim = self->o_current_animation;
NSInvocation * invoc;
[super orderOut: nil];
[self setAlphaValue: 1.0];
- if ((invoc = [anim userInfo]))
+ if ((invoc = [anim userInfo])) {
[invoc invoke];
+ }
}
}
- (VLCVoutView *)videoView
{
- if ([[self contentView] class] == [VLCVoutView class])
- return (VLCVoutView *)[self contentView];
+ NSArray *o_subViews = [[self contentView] subviews];
+ if ([o_subViews count] > 0) {
+ id o_vout_view = [o_subViews objectAtIndex:0];
+
+ if ([o_vout_view class] == [VLCVoutView class])
+ return (VLCVoutView *)o_vout_view;
+ }
return nil;
}
+- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen
+{
+ if (!screen)
+ screen = [self screen];
+ NSRect screenRect = [screen frame];
+ NSRect constrainedRect = [super constrainFrameRect:frameRect toScreen:screen];
+
+ /*
+ * Ugly workaround!
+ * With Mavericks, there is a nasty bug resulting in grey bars on top in fullscreen mode.
+ * It looks like this is enforced by the os because the window is in the way for the menu bar.
+ *
+ * According to the documentation, this constraining can be changed by overwriting this
+ * method. But in this situation, even the received frameRect is already contrained with the
+ * menu bars height substracted. This case is detected here, and the full height is
+ * enforced again.
+ *
+ * See #9469 and radar://15583566
+ */
+
+ BOOL b_inFullscreen = [self fullscreen] || ([self respondsToSelector:@selector(inFullscreenTransition)] && [(VLCVideoWindowCommon *)self inFullscreenTransition]);
+
+ if((OSX_MAVERICKS || OSX_YOSEMITE) && b_inFullscreen && constrainedRect.size.width == screenRect.size.width
+ && constrainedRect.size.height != screenRect.size.height
+ && abs(screenRect.size.height - constrainedRect.size.height) <= 25.) {
+
+ msg_Dbg(VLCIntf, "Contrain window height %.1f to screen height %.1f",
+ constrainedRect.size.height, screenRect.size.height);
+ constrainedRect.size.height = screenRect.size.height;
+ }
+
+ return constrainedRect;
+}
@end
* Common code for main window, detached window and extra video window
*****************************************************************************/
+@interface VLCVideoWindowCommon (Internal)
+- (void)customZoom:(id)sender;
+- (void)hasBecomeFullscreen;
+- (void)hasEndedFullscreen;
+@end
+
@implementation VLCVideoWindowCommon
@synthesize videoView=o_video_view;
@synthesize controlsBar=o_controls_bar;
+@synthesize inFullscreenTransition=b_in_fullscreen_transition;
+@synthesize windowShouldExitFullscreenWhenFinished=b_windowShouldExitFullscreenWhenFinished;
#pragma mark -
#pragma mark Init
[super dealloc];
}
+- (void)awakeFromNib
+{
+ BOOL b_nativeFullscreenMode = NO;
+#ifdef MAC_OS_X_VERSION_10_7
+ if (!OSX_SNOW_LEOPARD)
+ b_nativeFullscreenMode = var_InheritBool(VLCIntf, "macosx-nativefullscreenmode");
+#endif
+
+ if (b_nativeFullscreenMode) {
+ [self setCollectionBehavior: NSWindowCollectionBehaviorFullScreenPrimary];
+ }
+
+
+ [super awakeFromNib];
+}
+
- (void)setTitle:(NSString *)title
{
+ if (!title || [title length] < 1)
+ return;
+
if (b_dark_interface && o_titlebar_view)
[o_titlebar_view setWindowTitle: title];
if (!([self styleMask] & NSTitledWindowMask)) {
[[NSNotificationCenter defaultCenter] postNotificationName:NSWindowWillCloseNotification object:self];
- [self orderOut: sender];
+ [self close];
} else
[super performClose: sender];
}
- (NSRect) customConstrainFrameRect: (NSRect)frameRect toScreen: (NSScreen*)screen
{
NSRect screenRect = [screen visibleFrame];
- float difference;
+ CGFloat difference;
/* Move top edge of the window inside the screen */
difference = NSMaxY (frameRect) - NSMaxY (screenRect);
the window */
difference = NSMaxY (screenRect) - NSMaxY (frameRect);
if (_styleMask & NSResizableWindowMask) {
- float difference2;
+ CGFloat difference2;
difference2 = screenRect.origin.y - frameRect.origin.y;
difference2 -= difference;
#pragma mark -
#pragma mark Video window resizing logic
-- (void)resizeWindow
+- (void)setWindowLevel:(NSInteger)i_state
{
- if ([[VLCMainWindow sharedInstance] fullscreen])
+ if (var_InheritBool(VLCIntf, "video-wallpaper") || [self level] < NSNormalWindowLevel)
return;
+ if (!b_fullscreen && !b_in_fullscreen_transition)
+ [self setLevel: i_state];
+
+ // save it for restore if window is currently minimized or in fullscreen
+ i_originalLevel = i_state;
+}
+
+- (NSRect)getWindowRectForProposedVideoViewSize:(NSSize)size
+{
NSSize windowMinSize = [self minSize];
NSRect screenFrame = [[self screen] visibleFrame];
NSPoint topleftbase = NSMakePoint(0, [self frame].size.height);
NSPoint topleftscreen = [self convertBaseToScreen: topleftbase];
- unsigned int i_width = nativeVideoSize.width;
- unsigned int i_height = nativeVideoSize.height;
- if (i_width < windowMinSize.width)
- i_width = windowMinSize.width;
- if (i_height < f_min_video_height)
- i_height = f_min_video_height;
+ CGFloat f_width = size.width;
+ CGFloat f_height = size.height;
+ if (f_width < windowMinSize.width)
+ f_width = windowMinSize.width;
+ if (f_height < f_min_video_height)
+ f_height = f_min_video_height;
/* Calculate the window's new size */
NSRect new_frame;
- new_frame.size.width = [self frame].size.width - [o_video_view frame].size.width + i_width;
- new_frame.size.height = [self frame].size.height - [o_video_view frame].size.height + i_height;
+ new_frame.size.width = [self frame].size.width - [o_video_view frame].size.width + f_width;
+ new_frame.size.height = [self frame].size.height - [o_video_view frame].size.height + f_height;
new_frame.origin.x = topleftscreen.x;
new_frame.origin.y = topleftscreen.y - new_frame.size.height;
if (right_window_point > right_screen_point)
new_frame.origin.x -= (right_window_point - right_screen_point);
- [[self animator] setFrame:new_frame display:YES];
+ return new_frame;
+}
+
+- (void)resizeWindow
+{
+ // VOUT_WINDOW_SET_SIZE is triggered when exiting fullscreen. This event is ignored here
+ // to avoid interference with the animation.
+ if ([self fullscreen] || b_in_fullscreen_transition)
+ return;
+
+ NSRect window_rect = [self getWindowRectForProposedVideoViewSize:nativeVideoSize];
+ [[self animator] setFrame:window_rect display:YES];
}
- (void)setNativeVideoSize:(NSSize)size
return proposedFrameSize;
// needed when entering lion fullscreen mode
- if ([[VLCMainWindow sharedInstance] fullscreen])
+ if (b_in_fullscreen_transition || [self fullscreen])
+ return proposedFrameSize;
+
+ if ([o_video_view isHidden])
return proposedFrameSize;
if ([[VLCCoreInteraction sharedInstance] aspectRatioIsLocked]) {
NSRect videoWindowFrame = [self frame];
NSRect viewRect = [o_video_view convertRect:[o_video_view bounds] toView: nil];
NSRect contentRect = [self contentRectForFrameRect:videoWindowFrame];
- float marginy = viewRect.origin.y + videoWindowFrame.size.height - contentRect.size.height;
- float marginx = contentRect.size.width - viewRect.size.width;
+ CGFloat marginy = viewRect.origin.y + videoWindowFrame.size.height - contentRect.size.height;
+ CGFloat marginx = contentRect.size.width - viewRect.size.width;
if (o_titlebar_view && b_dark_interface)
marginy += [o_titlebar_view frame].size.height;
return proposedFrameSize;
}
+- (void)windowWillMiniaturize:(NSNotification *)notification
+{
+ // Set level to normal as a workaround for Mavericks bug causing window
+ // to vanish from screen, see radar://15473716
+ i_originalLevel = [self level];
+ [self setLevel: NSNormalWindowLevel];
+}
+
+- (void)windowDidDeminiaturize:(NSNotification *)notification
+{
+ [self setLevel: i_originalLevel];
+}
+
#pragma mark -
-#pragma mark Fullscreen Logic
+#pragma mark Mouse cursor handling
-- (void)lockFullscreenAnimation
+// NSTimer selectors require this function signature as per Apple's docs
+- (void)hideMouseCursor:(NSTimer *)timer
{
- [o_animation_lock lock];
+ [NSCursor setHiddenUntilMouseMoves: YES];
}
-- (void)unlockFullscreenAnimation
+- (void)recreateHideMouseTimer
{
- [o_animation_lock unlock];
+ if (t_hide_mouse_timer != nil) {
+ [t_hide_mouse_timer invalidate];
+ [t_hide_mouse_timer release];
+ }
+
+ t_hide_mouse_timer = [NSTimer scheduledTimerWithTimeInterval:2
+ target:self
+ selector:@selector(hideMouseCursor:)
+ userInfo:nil
+ repeats:NO];
+ [t_hide_mouse_timer retain];
}
-- (void)enterFullscreen
+// Called automatically if window's acceptsMouseMovedEvents property is true
+- (void)mouseMoved:(NSEvent *)theEvent
+{
+ if (b_fullscreen)
+ [self recreateHideMouseTimer];
+
+ [super mouseMoved: theEvent];
+}
+
+#pragma mark -
+#pragma mark Key events
+
+- (void)flagsChanged:(NSEvent *)theEvent
+{
+ BOOL b_alt_pressed = ([theEvent modifierFlags] & NSAlternateKeyMask) != 0;
+ [o_titlebar_view informModifierPressed: b_alt_pressed];
+
+ [super flagsChanged:theEvent];
+}
+
+#pragma mark -
+#pragma mark Lion native fullscreen handling
+
+- (void)becomeKeyWindow
+{
+ [super becomeKeyWindow];
+
+ // change fspanel state for the case when multiple windows are in fullscreen
+ if ([self hasActiveVideo] && [self fullscreen])
+ [[[VLCMainWindow sharedInstance] fsPanel] setActive:nil];
+ else
+ [[[VLCMainWindow sharedInstance] fsPanel] setNonActive:nil];
+}
+
+- (void)resignKeyWindow
+{
+ [super resignKeyWindow];
+
+ [[[VLCMainWindow sharedInstance] fsPanel] setNonActive:nil];
+}
+
+-(NSArray*)customWindowsToEnterFullScreenForWindow:(NSWindow *)window
+{
+ if (window == self) {
+ return [NSArray arrayWithObject:window];
+ }
+
+ return nil;
+}
+
+- (NSArray*)customWindowsToExitFullScreenForWindow:(NSWindow*)window
+{
+ if (window == self) {
+ return [NSArray arrayWithObject:window];
+ }
+
+ return nil;
+}
+
+- (void)window:window startCustomAnimationToEnterFullScreenWithDuration:(NSTimeInterval)duration
+{
+ [window setStyleMask:([window styleMask] | NSFullScreenWindowMask)];
+
+ NSScreen *screen = [window screen];
+ NSRect screenFrame = [screen frame];
+
+ [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context) {
+ [context setDuration:0.5 * duration];
+ [[window animator] setFrame:screenFrame display:YES];
+ } completionHandler:nil];
+}
+
+- (void)window:window startCustomAnimationToExitFullScreenWithDuration:(NSTimeInterval)duration
+{
+ [window setStyleMask:([window styleMask] & ~NSFullScreenWindowMask)];
+ [[window animator] setFrame:frameBeforeLionFullscreen display:YES animate:YES];
+
+ [NSAnimationContext runAnimationGroup:^(NSAnimationContext *context) {
+ [context setDuration:0.5 * duration];
+ [[window animator] setFrame:frameBeforeLionFullscreen display:YES animate:YES];
+ } completionHandler:nil];
+}
+
+- (void)windowWillEnterFullScreen:(NSNotification *)notification
+{
+ i_originalLevel = [self level];
+ b_windowShouldExitFullscreenWhenFinished = [[VLCMain sharedInstance] activeVideoPlayback];
+
+ // b_fullscreen and b_in_fullscreen_transition must not be true yet
+ [[[VLCMain sharedInstance] voutController] updateWindowLevelForHelperWindows: NSNormalWindowLevel];
+ [self setLevel:NSNormalWindowLevel];
+
+ b_in_fullscreen_transition = YES;
+
+ var_SetBool(pl_Get(VLCIntf), "fullscreen", true);
+
+ frameBeforeLionFullscreen = [self frame];
+
+ if ([self hasActiveVideo]) {
+ vout_thread_t *p_vout = getVoutForActiveWindow();
+ if (p_vout) {
+ var_SetBool(p_vout, "fullscreen", true);
+ vlc_object_release(p_vout);
+ }
+ }
+
+ if ([self hasActiveVideo])
+ [[VLCMainWindow sharedInstance] recreateHideMouseTimer];
+
+ if (b_dark_interface) {
+ [o_titlebar_view removeFromSuperviewWithoutNeedingDisplay];
+
+ NSRect winrect;
+ CGFloat f_titleBarHeight = [o_titlebar_view frame].size.height;
+ winrect = [self frame];
+
+ winrect.size.height = winrect.size.height - f_titleBarHeight;
+ [self setFrame: winrect display:NO animate:NO];
+ }
+
+ [o_video_view setFrame: [[self contentView] frame]];
+ if (![o_video_view isHidden]) {
+ [[o_controls_bar bottomBarView] setHidden: YES];
+ }
+
+ [self setMovableByWindowBackground: NO];
+}
+
+- (void)windowDidEnterFullScreen:(NSNotification *)notification
+{
+ // Indeed, we somehow can have an "inactive" fullscreen (but a visible window!).
+ // But this creates some problems when leaving fs over remote intfs, so activate app here.
+ [NSApp activateIgnoringOtherApps:YES];
+
+ [self setFullscreen: YES];
+ b_in_fullscreen_transition = NO;
+
+ if ([self hasActiveVideo]) {
+ [[[VLCMainWindow sharedInstance] fsPanel] setVoutWasUpdated: self];
+ if (![o_video_view isHidden])
+ [[[VLCMainWindow sharedInstance] fsPanel] setActive: nil];
+ }
+
+ NSArray *subviews = [[self videoView] subviews];
+ NSUInteger count = [subviews count];
+
+ for (NSUInteger x = 0; x < count; x++) {
+ if ([[subviews objectAtIndex:x] respondsToSelector:@selector(reshape)])
+ [[subviews objectAtIndex:x] reshape];
+ }
+}
+
+- (void)windowWillExitFullScreen:(NSNotification *)notification
+{
+ b_in_fullscreen_transition = YES;
+ [self setFullscreen: NO];
+
+ if ([self hasActiveVideo]) {
+ var_SetBool(pl_Get(VLCIntf), "fullscreen", false);
+
+ vout_thread_t *p_vout = getVoutForActiveWindow();
+ if (p_vout) {
+ var_SetBool(p_vout, "fullscreen", false);
+ vlc_object_release(p_vout);
+ }
+ }
+
+ [NSCursor setHiddenUntilMouseMoves: NO];
+ [[[VLCMainWindow sharedInstance] fsPanel] setNonActive: nil];
+
+
+ if (b_dark_interface) {
+ NSRect winrect;
+ CGFloat f_titleBarHeight = [o_titlebar_view frame].size.height;
+
+ winrect = [o_video_view frame];
+ winrect.size.height -= f_titleBarHeight;
+ [o_video_view setFrame: winrect];
+
+ winrect = [self frame];
+ [o_titlebar_view setFrame: NSMakeRect(0, winrect.size.height - f_titleBarHeight,
+ winrect.size.width, f_titleBarHeight)];
+ [[self contentView] addSubview: o_titlebar_view];
+
+ winrect.size.height = winrect.size.height + f_titleBarHeight;
+ [self setFrame: winrect display:NO animate:NO];
+ }
+
+ NSRect videoViewFrame = [o_video_view frame];
+ videoViewFrame.origin.y += [o_controls_bar height];
+ videoViewFrame.size.height -= [o_controls_bar height];
+ [o_video_view setFrame: videoViewFrame];
+
+ if (![o_video_view isHidden]) {
+ [[o_controls_bar bottomBarView] setHidden: NO];
+ }
+
+ [self setMovableByWindowBackground: YES];
+}
+
+- (void)windowDidExitFullScreen:(NSNotification *)notification
+{
+ b_in_fullscreen_transition = NO;
+
+ [[[VLCMain sharedInstance] voutController] updateWindowLevelForHelperWindows: i_originalLevel];
+ [self setLevel:i_originalLevel];
+}
+
+#pragma mark -
+#pragma mark Fullscreen Logic
+
+- (void)enterFullscreenWithAnimation:(BOOL)b_animation
{
NSMutableDictionary *dict1, *dict2;
NSScreen *screen;
BOOL blackout_other_displays = var_InheritBool(VLCIntf, "macosx-black");
screen = [NSScreen screenWithDisplayID:(CGDirectDisplayID)var_InheritInteger(VLCIntf, "macosx-vdev")];
- [self lockFullscreenAnimation];
if (!screen) {
msg_Dbg(VLCIntf, "chosen screen isn't present, using current screen for fullscreen mode");
if (o_controls_bar)
[o_controls_bar setFullscreenState:YES];
+ [[[VLCMainWindow sharedInstance] controlsBar] setFullscreenState:YES];
[[VLCMainWindow sharedInstance] recreateHideMouseTimer];
/* Make sure we don't see the window flashes in float-on-top mode */
i_originalLevel = [self level];
+ // b_fullscreen must not be true yet
+ [[[VLCMain sharedInstance] voutController] updateWindowLevelForHelperWindows: NSNormalWindowLevel];
[self setLevel:NSNormalWindowLevel];
/* Only create the o_fullscreen_window if we are not in the middle of the zooming animation */
[o_fullscreen_window setBackgroundColor: [NSColor blackColor]];
[o_fullscreen_window setCanBecomeKeyWindow: YES];
[o_fullscreen_window setCanBecomeMainWindow: YES];
+ [o_fullscreen_window setHasActiveVideo: YES];
+ [o_fullscreen_window setFullscreen: YES];
- if (![self isVisible] || [self alphaValue] == 0.0) {
+ /* Make sure video view gets visible in case the playlist was visible before */
+ b_video_view_was_hidden = [o_video_view isHidden];
+ [o_video_view setHidden: NO];
+
+ if (!b_animation) {
/* We don't animate if we are not visible, instead we
* simply fade the display */
CGDisplayFadeReservationToken token;
CGDisplayFade(token, 0.5, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES);
}
- if ([screen mainScreen])
- [NSApp setPresentationOptions:(NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)];
-
+ NSDisableScreenUpdates();
+ [o_video_view retain];
[[o_video_view superview] replaceSubview:o_video_view with:o_temp_view];
[o_temp_view setFrame:[o_video_view frame]];
- [o_fullscreen_window setContentView:o_video_view];
+ [[o_fullscreen_window contentView] addSubview:o_video_view];
+ [o_video_view setFrame: [[o_fullscreen_window contentView] frame]];
+ [o_video_view release];
+ NSEnableScreenUpdates();
+
+ [screen setFullscreenPresentationOptions];
+
+ [o_fullscreen_window setFrame:screen_rect display:YES animate:NO];
- [o_fullscreen_window makeKeyAndOrderFront:self];
[o_fullscreen_window orderFront:self animate:YES];
- [o_fullscreen_window setFrame:screen_rect display:YES animate:YES];
[o_fullscreen_window setLevel:NSNormalWindowLevel];
if (blackout_other_displays) {
/* Make sure we don't see the o_video_view disappearing of the screen during this operation */
NSDisableScreenUpdates();
+ [o_video_view retain];
[[o_video_view superview] replaceSubview:o_video_view with:o_temp_view];
[o_temp_view setFrame:[o_video_view frame]];
- [o_fullscreen_window setContentView:o_video_view];
+ [[o_fullscreen_window contentView] addSubview:o_video_view];
+ [o_video_view setFrame: [[o_fullscreen_window contentView] frame]];
+ [o_video_view release];
[o_fullscreen_window makeKeyAndOrderFront:self];
NSEnableScreenUpdates();
}
/* We are in fullscreen (and no animation is running) */
- if ([[VLCMainWindow sharedInstance] fullscreen]) {
+ if ([self fullscreen]) {
/* Make sure we are hidden */
[self orderOut: self];
- [self unlockFullscreenAnimation];
return;
}
[o_fullscreen_anim2 release];
}
- if ([screen mainScreen])
- [NSApp setPresentationOptions:(NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)];
+ [screen setFullscreenPresentationOptions];
dict1 = [[NSMutableDictionary alloc] initWithCapacity:2];
dict2 = [[NSMutableDictionary alloc] initWithCapacity:3];
[o_fullscreen_anim1 startAnimation];
/* fullscreenAnimation will be unlocked when animation ends */
+
+ b_in_fullscreen_transition = YES;
}
- (void)hasBecomeFullscreen
if ([self isVisible])
[self orderOut: self];
- [[VLCMainWindow sharedInstance] setFullscreen:YES];
- [self unlockFullscreenAnimation];
-}
-
-- (void)leaveFullscreen
-{
- [self leaveFullscreenAndFadeOut: NO];
+ b_in_fullscreen_transition = NO;
+ [self setFullscreen:YES];
}
-- (void)leaveFullscreenAndFadeOut: (BOOL)fadeout
+- (void)leaveFullscreenWithAnimation:(BOOL)b_animation
{
NSMutableDictionary *dict1, *dict2;
NSRect frame;
BOOL blackout_other_displays = var_InheritBool(VLCIntf, "macosx-black");
- [self lockFullscreenAnimation];
-
if (o_controls_bar)
[o_controls_bar setFullscreenState:NO];
+ [[[VLCMainWindow sharedInstance] controlsBar] setFullscreenState:NO];
/* We always try to do so */
[NSScreen unblackoutScreens];
- vout_thread_t *p_vout = getVoutForActiveWindow();
- if (p_vout) {
- if (var_GetBool(p_vout, "video-on-top"))
- [[o_video_view window] setLevel: NSStatusWindowLevel];
- else
- [[o_video_view window] setLevel: NSNormalWindowLevel];
- vlc_object_release(p_vout);
- }
[[o_video_view window] makeKeyAndOrderFront: nil];
/* Don't do anything if o_fullscreen_window is already closed */
if (!o_fullscreen_window) {
- [self unlockFullscreenAnimation];
return;
}
- if (fadeout) {
+ [[[VLCMainWindow sharedInstance] fsPanel] setNonActive: nil];
+ [[o_fullscreen_window screen] setNonFullscreenPresentationOptions];
+
+ if (o_fullscreen_anim1) {
+ [o_fullscreen_anim1 stopAnimation];
+ [o_fullscreen_anim1 release];
+ o_fullscreen_anim1 = nil;
+ }
+ if (o_fullscreen_anim2) {
+ [o_fullscreen_anim2 stopAnimation];
+ [o_fullscreen_anim2 release];
+ o_fullscreen_anim2 = nil;
+ }
+
+ b_in_fullscreen_transition = YES;
+ [self setFullscreen:NO];
+
+ if (!b_animation) {
/* We don't animate if we are not visible, instead we
* simply fade the display */
CGDisplayFadeReservationToken token;
CGDisplayFade(token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES);
}
- [[[VLCMainWindow sharedInstance] fsPanel] setNonActive: nil];
- [NSApp setPresentationOptions: NSApplicationPresentationDefault];
+ [self setAlphaValue:1.0];
+ [self orderFront: self];
/* Will release the lock */
[self hasEndedFullscreen];
- /* Our window is hidden, and might be faded. We need to workaround that, so note it
- * here */
- b_window_is_invisible = YES;
-
if (blackout_other_displays) {
CGDisplayFade(token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, NO);
CGReleaseDisplayFadeReservation(token);
[self orderFront: self];
[[o_video_view window] orderFront: self];
- [[[VLCMainWindow sharedInstance] fsPanel] setNonActive: nil];
- [NSApp setPresentationOptions:(NSApplicationPresentationDefault)];
-
- if (o_fullscreen_anim1) {
- [o_fullscreen_anim1 stopAnimation];
- [o_fullscreen_anim1 release];
- }
- if (o_fullscreen_anim2) {
- [o_fullscreen_anim2 stopAnimation];
- [o_fullscreen_anim2 release];
- }
-
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.y += [self frame].origin.y;
[dict2 setObject:self forKey:NSViewAnimationTargetKey];
[dict2 setObject:NSViewAnimationFadeInEffect forKey:NSViewAnimationEffectKey];
- o_fullscreen_anim2 = [[NSViewAnimation alloc] initWithViewAnimations:[NSArray arrayWithObjects:dict2, nil]];
+ o_fullscreen_anim2 = [[NSViewAnimation alloc] initWithViewAnimations:[NSArray arrayWithObject:dict2]];
[dict2 release];
[o_fullscreen_anim2 setAnimationBlockingMode: NSAnimationNonblocking];
[dict1 setObject:[NSValue valueWithRect:[o_fullscreen_window frame]] forKey:NSViewAnimationStartFrameKey];
[dict1 setObject:[NSValue valueWithRect:frame] forKey:NSViewAnimationEndFrameKey];
- o_fullscreen_anim1 = [[NSViewAnimation alloc] initWithViewAnimations:[NSArray arrayWithObjects:dict1, nil]];
+ o_fullscreen_anim1 = [[NSViewAnimation alloc] initWithViewAnimations:[NSArray arrayWithObject:dict1]];
[dict1 release];
[o_fullscreen_anim1 setAnimationBlockingMode: NSAnimationNonblocking];
- (void)hasEndedFullscreen
{
- [[VLCMainWindow sharedInstance] setFullscreen:NO];
-
+ b_in_fullscreen_transition = NO;
+
/* This function is private and should be only triggered at the end of the fullscreen change animation */
/* Make sure we don't see the o_video_view disappearing of the screen during this operation */
NSDisableScreenUpdates();
if ([[o_video_view subviews] count] > 0)
[self makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]];
- [super makeKeyAndOrderFront:self]; /* our version (in main window) contains a workaround */
+ [o_video_view setHidden: b_video_view_was_hidden];
+
+ [self makeKeyAndOrderFront:self];
[o_fullscreen_window orderOut: self];
NSEnableScreenUpdates();
[o_fullscreen_window release];
o_fullscreen_window = nil;
- [self setLevel:i_originalLevel];
- [self setAlphaValue: config_GetFloat(VLCIntf, "macosx-opaqueness")];
- // if we quit fullscreen because there is no video anymore, make sure non-embedded window is not visible
- if (![[VLCMain sharedInstance] activeVideoPlayback] && [self class] != [VLCMainWindow class])
- [self orderOut: self];
+ [[[VLCMain sharedInstance] voutController] updateWindowLevelForHelperWindows: i_originalLevel];
+ [self setLevel:i_originalLevel];
- [self unlockFullscreenAnimation];
+ [self setAlphaValue: config_GetFloat(VLCIntf, "macosx-opaqueness")];
}
- (void)animationDidEnd:(NSAnimation*)animation
{
NSArray *viewAnimations;
- if (o_makekey_anim == animation) {
- [o_makekey_anim release];
- return;
- }
if ([animation currentValue] < 1.0)
return;
/* Fullscreen ended or started (we are a delegate only for leaveFullscreen's/enterFullscren's anim2) */
viewAnimations = [o_fullscreen_anim2 viewAnimations];
if ([viewAnimations count] >=1 &&
- [[[viewAnimations objectAtIndex: 0] objectForKey: NSViewAnimationEffectKey] isEqualToString:NSViewAnimationFadeInEffect]) {
+ [[[viewAnimations objectAtIndex:0] objectForKey: NSViewAnimationEffectKey] isEqualToString:NSViewAnimationFadeInEffect]) {
/* Fullscreen ended */
[self hasEndedFullscreen];
} else
static NSMutableArray *attributes = nil;
if (attributes == nil) {
attributes = [[super accessibilityAttributeNames] mutableCopy];
- NSArray *appendAttributes = [NSArray arrayWithObjects: NSAccessibilitySubroleAttribute,
+ NSArray *appendAttributes = [NSArray arrayWithObjects:NSAccessibilitySubroleAttribute,
NSAccessibilityCloseButtonAttribute,
NSAccessibilityMinimizeButtonAttribute,
- NSAccessibilityZoomButtonAttribute,
- nil];
+ NSAccessibilityZoomButtonAttribute, nil];
for(NSString *attribute in appendAttributes) {
if (![attributes containsObject:attribute])
projects / vlc / blobdiff