X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fvout.m;h=2d9b3a1d04b9cc0bd651582cb2ed33d6bb7b7fd8;hb=afafeb19b897427835244a34607b7327cddff45d;hp=484f8cb63a0b328e60a6c6432e9aea98656aa084;hpb=699e4bb62df2e5b70a4f08c179686af1369a1a21;p=vlc diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m index 484f8cb63a..2d9b3a1d04 100644 --- a/modules/gui/macosx/vout.m +++ b/modules/gui/macosx/vout.m @@ -1,7 +1,7 @@ /***************************************************************************** * vout.m: MacOS X video output module ***************************************************************************** - * Copyright (C) 2001-2003 VideoLAN + * Copyright (C) 2001-2007 the VideoLAN team * $Id$ * * Authors: Colin Delacroix @@ -9,12 +9,14 @@ * Jon Lech Johansen * Derk-Jan Hartman * Eric Petit + * Benjamin Pracht + * Felix KŸhne * * 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 * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -22,7 +24,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -38,59 +40,170 @@ #include #include "intf.h" +#include "fspanel.h" #include "vout.h" +#import "controls.h" +#import "embeddedwindow.h" + +/***************************************************************************** + * DeviceCallback: Callback triggered when the video-device variable is changed + *****************************************************************************/ +int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, + vlc_value_t old_val, vlc_value_t new_val, void *param ) +{ + vlc_value_t val; + vout_thread_t *p_vout = (vout_thread_t *)p_this; + + msg_Dbg( p_vout, "set %d", new_val.i_int ); + var_Create( p_vout->p_libvlc, "video-device", VLC_VAR_INTEGER ); + var_Set( p_vout->p_libvlc, "video-device", new_val ); + + val.b_bool = VLC_TRUE; + var_Set( p_vout, "intf-change", val ); + return VLC_SUCCESS; +} + /***************************************************************************** - * VLCWindow implementation + * VLCEmbeddedList implementation *****************************************************************************/ -@implementation VLCWindow +@implementation VLCEmbeddedList -- (id)initWithVout:(vout_thread_t *)_p_vout frame:(NSRect *)s_frame +- (id)init { - [self setReleasedWhenClosed: YES]; + [super init]; + o_embedded_array = [NSMutableArray array]; + return self; +} - p_vout = _p_vout; +- (id)getEmbeddedVout +{ + unsigned int i; - /* p_real_vout: the vout we have to use to check for video-on-top - and a few other things. If we are the QuickTime output, it's us. - It we are the OpenGL provider, it is our parent. */ - if( p_vout->i_object_type == VLC_OBJECT_OPENGL ) + for( i = 0; i < [o_embedded_array count]; i++ ) + { + id o_vout_view = [o_embedded_array objectAtIndex: i]; + if( ![o_vout_view isUsed] ) + { + [o_vout_view setUsed: YES]; + return o_vout_view; + } + } + return nil; +} + +- (void)releaseEmbeddedVout: (id)o_vout_view +{ + if( [o_embedded_array containsObject: o_vout_view] ) { - p_real_vout = (vout_thread_t *) p_vout->p_parent; + [o_vout_view setUsed: NO]; } else { - p_real_vout = p_vout; + msg_Warn( VLCIntf, "cannot find Video Output"); } +} - p_fullscreen_state = NULL; - i_time_mouse_last_moved = mdate(); +- (void)addEmbeddedVout: (id)o_vout_view +{ + if( ![o_embedded_array containsObject: o_vout_view] ) + { + [o_embedded_array addObject: o_vout_view]; + } +} + +- (BOOL)windowContainsEmbedded: (id)o_window +{ +/* if( ![[o_window className] isEqualToString: @"VLCVoutWindow"] ) + { + NSLog( @"We were not given a VLCVoutWindow" ); + }*/ + return ([self getViewForWindow: o_window] == nil ? NO : YES ); +} - NSScreen * o_screen; - vlc_bool_t b_main_screen; +- (id)getViewForWindow: (id)o_window +{ + id o_enumerator = [o_embedded_array objectEnumerator]; + id o_current_embedded; - var_Create( p_vout, "macosx-vdev", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_vout, "macosx-fill", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_vout, "macosx-stretch", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - var_Create( p_vout, "macosx-opaqueness", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT ); + while( (o_current_embedded = [o_enumerator nextObject]) ) + { + if( [o_current_embedded getWindow] == o_window ) + { + return o_current_embedded; + } + } + return nil; +} + +@end + +/***************************************************************************** + * VLCVoutView implementation + *****************************************************************************/ +@implementation VLCVoutView + +- (id)initWithFrame:(NSRect)frameRect +{ + [super initWithFrame: frameRect]; + p_vout = NULL; + o_view = nil; + s_frame = &frameRect; + + p_real_vout = NULL; + o_window = nil; + return self; +} + +- (BOOL)setVout: (vout_thread_t *) vout subView: (NSView *) view + frame: (NSRect *) frame +{ + int i_device; + NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; + NSArray *o_screens = [NSScreen screens]; + + p_vout = vout; + o_view = view; + s_frame = frame; + + if( [o_screens count] <= 0 ) + { + msg_Err( p_vout, "no OSX screens available" ); + return NO; + } + + p_real_vout = [VLCVoutView getRealVout: p_vout]; + + /* Get the pref value when this is the first time, otherwise retrieve the device from the top level video-device var */ + if( var_Type( p_real_vout->p_libvlc, "video-device" ) == 0 ) + { + i_device = var_GetInteger( p_vout, "macosx-vdev" ); + } + else + { + i_device = var_GetInteger( p_real_vout->p_libvlc, "video-device" ); + } - /* Setup the menuitem for the multiple displays. Read the vlc preference (macosx-vdev) for the primary display */ - NSArray * o_screens = [NSScreen screens]; - if( [o_screens count] > 0 && var_Type( p_real_vout, "video-device" ) == 0 ) + /* Setup the menuitem for the multiple displays. */ + if( var_Type( p_real_vout, "video-device" ) == 0 ) { int i = 1; - vlc_value_t val, val2, text; + vlc_value_t val2, text; NSScreen * o_screen; - var_Get( p_real_vout, "macosx-vdev", &val ); - var_Create( p_real_vout, "video-device", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE ); - text.psz_string = _("Video device"); + text.psz_string = _("Video Device"); var_Change( p_real_vout, "video-device", VLC_VAR_SETTEXT, &text, NULL ); NSEnumerator * o_enumerator = [o_screens objectEnumerator]; + val2.i_int = 0; + text.psz_string = _("Default"); + var_Change( p_real_vout, "video-device", + VLC_VAR_ADDCHOICE, &val2, &text ); + var_Set( p_real_vout, "video-device", val2 ); + while( (o_screen = [o_enumerator nextObject]) != NULL ) { char psz_temp[255]; @@ -101,189 +214,144 @@ (int)s_rect.size.width, (int)s_rect.size.height ); text.psz_string = psz_temp; - val2.i_int = i; + val2.i_int = (int)[o_screen displayID]; var_Change( p_real_vout, "video-device", VLC_VAR_ADDCHOICE, &val2, &text ); - - if( ( i - 1 ) == val.i_int ) + if( (int)[o_screen displayID] == i_device ) { var_Set( p_real_vout, "video-device", val2 ); } i++; } - var_AddCallback( p_real_vout, "video-device", vout_VarCallback, + var_AddCallback( p_real_vout, "video-device", DeviceCallback, NULL ); val2.b_bool = VLC_TRUE; var_Set( p_real_vout, "intf-change", val2 ); } - /* Find out on which screen to open the window */ - int i_device = var_GetInteger( p_real_vout, "video-device" ); - if( i_device < 0 ) - { - /* No preference specified. Use the main screen */ - o_screen = [NSScreen mainScreen]; - b_main_screen = 1; - } - else - { - NSArray *o_screens = [NSScreen screens]; - - if( [o_screens count] < (unsigned) i_device ) - { - o_screen = [NSScreen mainScreen]; - b_main_screen = 1; - } - else - { - i_device--; - o_screen = [o_screens objectAtIndex: i_device]; - var_SetInteger( p_real_vout, "macosx-vdev", i_device ); - b_main_screen = ( i_device == 0 ); - } - } - - NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; - - if( p_vout->b_fullscreen ) - { - NSRect screen_rect = [o_screen frame]; - screen_rect.origin.x = screen_rect.origin.y = 0; - - /* Creates a window with size: screen_rect on o_screen */ - [self initWithContentRect: screen_rect - styleMask: NSBorderlessWindowMask - backing: NSBackingStoreBuffered - defer: YES screen: o_screen]; - - if( b_main_screen ) - { - BeginFullScreen( &p_fullscreen_state, NULL, 0, 0, - NULL, NULL, fullScreenAllowEvents ); - } - } - else - { - unsigned int i_stylemask = NSTitledWindowMask | - NSMiniaturizableWindowMask | - NSClosableWindowMask | - NSResizableWindowMask; - - NSRect s_rect; - if( !s_frame ) - { - s_rect.size.width = p_vout->i_window_width; - s_rect.size.height = p_vout->i_window_height; - } - else - { - s_rect = *s_frame; - } - - [self initWithContentRect: s_rect - styleMask: i_stylemask - backing: NSBackingStoreBuffered - defer: YES screen: o_screen]; - - [self setAlphaValue: var_GetFloat( p_vout, "macosx-opaqueness" )]; - - if( var_GetBool( p_real_vout, "video-on-top" ) ) - { - [self setLevel: NSStatusWindowLevel]; - } + /* Add the view. It's automatically resized to fit the window */ + [self addSubview: o_view]; + [self setAutoresizesSubviews: YES]; + [o_pool release]; - if( !s_frame ) - { - [self center]; - } - } + return YES; +} - [self updateTitle]; - [self makeKeyAndOrderFront: nil]; +- (void)resizeSubviewsWithOldSize:(NSSize)oldBoundsSize +{ + [super resizeSubviewsWithOldSize: oldBoundsSize]; + [o_view setFrameSize: [self frame].size]; +} - /* We'll catch mouse events */ - [self setAcceptsMouseMovedEvents: YES]; - [self makeFirstResponder: self]; - - [o_pool release]; - return self; +- (void)drawRect:(NSRect)rect +{ + /* When there is no subview we draw a black background */ + [self lockFocus]; + [[NSColor blackColor] set]; + NSRectFill(rect); + [self unlockFocus]; } -- (void)close +- (void)closeVout { - if( p_fullscreen_state ) - { - EndFullScreen( p_fullscreen_state, NULL ); - } - [super close]; + [[[[VLCMain sharedInstance] getControls] getFSPanel] fadeOut]; + + /* Make sure we don't see a white flash */ + [[self window] disableScreenUpdatesUntilFlush]; + [o_view removeFromSuperview]; + o_view = nil; + p_vout = NULL; + s_frame = nil; + o_window = nil; + p_real_vout = NULL; } -- (void)setOnTop:(BOOL)b_on_top +- (void)updateTitle { - if( b_on_top ) + NSMutableString * o_title = nil, * o_mrl = nil; + input_thread_t * p_input; + + if( p_vout == NULL ) { - [self setLevel: NSStatusWindowLevel]; + return; } - else + + p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, FIND_PARENT ); + + if( p_input == NULL ) { - [self setLevel: NSNormalWindowLevel]; + return; } -} -- (void)hideMouse:(BOOL)b_hide -{ - BOOL b_inside; - NSPoint ml; - NSView *o_contents = [self contentView]; - - ml = [self convertScreenToBase:[NSEvent mouseLocation]]; - ml = [o_contents convertPoint:ml fromView:nil]; - b_inside = [o_contents mouse: ml inRect: [o_contents bounds]]; - - if( b_hide && b_inside ) + if( input_GetItem(p_input)->psz_name != NULL ) + o_title = [NSMutableString stringWithUTF8String: + input_GetItem(p_input)->psz_name]; + if( input_GetItem(p_input)->psz_uri != NULL ) + o_mrl = [NSMutableString stringWithUTF8String: + input_GetItem(p_input)->psz_uri]; + if( o_title == nil ) + o_title = o_mrl; + + if( o_mrl != nil ) { - [NSCursor setHiddenUntilMouseMoves: YES]; + /* FIXME once psz_access is exported, we could check if we are + * reading from a file in a smarter way. */ + + NSRange prefix_range = [o_mrl rangeOfString: @"file:"]; + if( prefix_range.location != NSNotFound ) + [o_mrl deleteCharactersInRange: prefix_range]; + + if( [o_mrl characterAtIndex:0] == '/' ) + { + /* it's a local file */ + [o_window setRepresentedFilename: o_mrl]; + } + else + { + /* it's from the network or somewhere else, + * we clear the previous path */ + [o_window setRepresentedFilename: @""]; + } + [o_window setTitle: o_title]; } - else if( !b_hide ) + else { - [NSCursor setHiddenUntilMouseMoves: NO]; + [o_window setTitle: [NSString stringWithCString: VOUT_TITLE]]; } + vlc_object_release( p_input ); } -- (void)manage + +- (void)setOnTop:(BOOL)b_on_top { - if( p_fullscreen_state ) + if( b_on_top ) { - if( mdate() - i_time_mouse_last_moved > 3000000 ) - { - [self hideMouse: YES]; - } + [o_window setLevel: NSStatusWindowLevel]; } else { - [self hideMouse: NO]; + [o_window setLevel: NSNormalWindowLevel]; } - - /* Disable screensaver */ - UpdateSystemActivity( UsrActivity ); } -- (void)scaleWindowWithFactor: (float)factor +- (void)scaleWindowWithFactor: (float)factor animate: (BOOL)animate { NSSize newsize; int i_corrected_height, i_corrected_width; NSPoint topleftbase; NSPoint topleftscreen; - + if ( !p_vout->b_fullscreen ) { + NSView *mainView; + NSRect new_frame; topleftbase.x = 0; - topleftbase.y = [self frame].size.height; - topleftscreen = [self convertBaseToScreen: topleftbase]; - - if( p_vout->render.i_height * p_vout->render.i_aspect > + topleftbase.y = [o_window frame].size.height; + topleftscreen = [o_window convertBaseToScreen: topleftbase]; + + if( p_vout->render.i_height * p_vout->render.i_aspect > p_vout->render.i_width * VOUT_ASPECT_FACTOR ) { i_corrected_width = p_vout->render.i_height * p_vout->render.i_aspect / @@ -298,10 +366,25 @@ newsize.width = (int) ( p_vout->render.i_width * factor ); newsize.height = (int) ( i_corrected_height * factor ); } - - [self setContentSize: newsize]; - - [self setFrameTopLeftPoint: topleftscreen]; + + /* In fullscreen mode we need to use a view that is different from + * ourselves, with the VLCEmbeddedWindow */ + if([o_window isKindOfClass:[VLCEmbeddedWindow class]]) + mainView = [o_window mainView]; + else + mainView = self; + + /* Calculate the window's new size */ + new_frame.size.width = [o_window frame].size.width - + [mainView frame].size.width + newsize.width; + new_frame.size.height = [o_window frame].size.height - + [mainView frame].size.height + newsize.height; + + new_frame.origin.x = topleftscreen.x; + new_frame.origin.y = topleftscreen.y - new_frame.size.height; + + [o_window setFrame: new_frame display: animate animate: animate]; + p_vout->i_changes |= VOUT_SIZE_CHANGE; } } @@ -309,45 +392,51 @@ - (void)toggleFloatOnTop { vlc_value_t val; - if( var_Get( p_vout, "video-on-top", &val )>=0 && val.b_bool) + + if( !p_real_vout ) return; + if( var_Get( p_real_vout, "video-on-top", &val )>=0 && val.b_bool) { val.b_bool = VLC_FALSE; - var_Set( p_vout, "video-on-top", val ); } else { val.b_bool = VLC_TRUE; - var_Set( p_vout, "video-on-top", val ); } + var_Set( p_real_vout, "video-on-top", val ); } - (void)toggleFullscreen { vlc_value_t val; - val.b_bool = !p_real_vout->b_fullscreen; + if( !p_real_vout ) return; + var_Get( p_real_vout, "fullscreen", &val ); + val.b_bool = !val.b_bool; var_Set( p_real_vout, "fullscreen", val ); } - (BOOL)isFullscreen { - return( p_vout->b_fullscreen ); + vlc_value_t val; + var_Get( p_real_vout, "fullscreen", &val ); + return( val.b_bool ); } - (void)snapshot { - vout_Control( p_vout, VOUT_SNAPSHOT ); + vout_Control( p_real_vout, VOUT_SNAPSHOT ); } -- (BOOL)canBecomeKeyWindow +- (void)manage { - return YES; + /* Disable Screensaver, when we're playing something, but allow it on pause */ + if( VLCIntf->p_sys->i_play_status == PLAYING_S ) + UpdateSystemActivity( UsrActivity ); } -/* Sometimes crashes VLC.... -- (BOOL)performKeyEquivalent:(NSEvent *)o_event +- (id)getWindow { - return [[VLCMain sharedInstance] hasDefinedShortcutKey:o_event]; -}*/ + return o_window; +} - (void)keyDown:(NSEvent *)o_event { @@ -355,7 +444,7 @@ vlc_value_t val; unsigned int i_pressed_modifiers = 0; val.i_int = 0; - + i_pressed_modifiers = [o_event modifierFlags]; if( i_pressed_modifiers & NSShiftKeyMask ) @@ -374,7 +463,7 @@ /* Escape should always get you out of fullscreen */ if( key == (unichar) 0x1b ) { - if( [self isFullscreen] ) + if( p_real_vout && [self isFullscreen] ) { [self toggleFullscreen]; } @@ -383,12 +472,12 @@ { vlc_value_t val; val.i_int = config_GetInt( p_vout, "key-play-pause" ); - var_Set( p_vout->p_vlc, "key-pressed", val ); + var_Set( p_vout->p_libvlc, "key-pressed", val ); } else { val.i_int |= CocoaKeyToVLC( key ); - var_Set( p_vout->p_vlc, "key-pressed", val ); + var_Set( p_vout->p_libvlc, "key-pressed", val ); } } else @@ -397,61 +486,170 @@ } } -- (void)updateTitle +- (void)mouseDown:(NSEvent *)o_event { - NSMutableString * o_title; - playlist_t * p_playlist; - - if( p_vout == NULL ) - { - return; - } - - p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - - if( p_playlist == NULL ) - { - return; - } - - vlc_mutex_lock( &p_playlist->object_lock ); - o_title = [NSMutableString stringWithUTF8String: - p_playlist->status.p_item->input.psz_uri]; - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); + vlc_value_t val; - if( o_title != nil ) + if( p_vout ) { - NSRange prefix_range = [o_title rangeOfString: @"file:"]; - if( prefix_range.location != NSNotFound ) + if( ( [o_event type] == NSLeftMouseDown ) && + ( ! ( [o_event modifierFlags] & NSControlKeyMask ) ) ) { - [o_title deleteCharactersInRange: prefix_range]; + if( [o_event clickCount] <= 1 ) + { + /* single clicking */ + var_Get( p_vout, "mouse-button-down", &val ); + val.i_int |= 1; + var_Set( p_vout, "mouse-button-down", val ); + } + else + { + /* multiple clicking */ + [self toggleFullscreen]; + } + } + else if( ( [o_event type] == NSRightMouseDown ) || + ( ( [o_event type] == NSLeftMouseDown ) && + ( [o_event modifierFlags] & NSControlKeyMask ) ) ) + { + msg_Dbg( p_vout, "received NSRightMouseDown (generic method) or Ctrl clic" ); + [NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] getVoutView]]; } - - [self setTitleWithRepresentedFilename: o_title]; } - else + + [super mouseDown: o_event]; +} + +- (void)otherMouseDown:(NSEvent *)o_event +{ + vlc_value_t val; + + if( p_vout && [o_event type] == NSOtherMouseDown ) { - [self setTitle: [NSString stringWithCString: VOUT_TITLE]]; + var_Get( p_vout, "mouse-button-down", &val ); + val.i_int |= 2; + var_Set( p_vout, "mouse-button-down", val ); } + + [super mouseDown: o_event]; } -/* This is actually the same as VLCControls::stop. */ -- (BOOL)windowShouldClose:(id)sender +- (void)rightMouseDown:(NSEvent *)o_event { - playlist_t * p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) + if( p_vout && [o_event type] == NSRightMouseDown ) { - return NO; + msg_Dbg( p_vout, "received NSRightMouseDown (specific method)" ); + [NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] getVoutView]]; } - playlist_Stop( p_playlist ); - vlc_object_release( p_playlist ); + [super mouseDown: o_event]; +} - /* The window will be closed by the intf later. */ - return NO; +- (void)mouseUp:(NSEvent *)o_event +{ + vlc_value_t val; + + if( p_vout && [o_event type] == NSLeftMouseUp ) + { + vlc_value_t b_val; + b_val.b_bool = VLC_TRUE; + var_Set( p_vout, "mouse-clicked", b_val ); + + var_Get( p_vout, "mouse-button-down", &val ); + val.i_int &= ~1; + var_Set( p_vout, "mouse-button-down", val ); + } + + [super mouseUp: o_event]; +} + +- (void)otherMouseUp:(NSEvent *)o_event +{ + vlc_value_t val; + + if( p_vout && [o_event type] == NSOtherMouseUp ) + { + var_Get( p_vout, "mouse-button-down", &val ); + val.i_int &= ~2; + var_Set( p_vout, "mouse-button-down", val ); + } + + [super mouseUp: o_event]; +} + +- (void)rightMouseUp:(NSEvent *)o_event +{ + if( p_vout && [o_event type] == NSRightMouseUp ) + { + /* FIXME: this isn't the appropriate place, but we can't receive + * NSRightMouseDown some how */ + msg_Dbg( p_vout, "received NSRightMouseUp" ); + [NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] getVoutView]]; + } + + [super mouseUp: o_event]; +} + +- (void)mouseDragged:(NSEvent *)o_event +{ + [self mouseMoved: o_event]; +} + +- (void)otherMouseDragged:(NSEvent *)o_event +{ + [self mouseMoved: o_event]; +} + +- (void)rightMouseDragged:(NSEvent *)o_event +{ + [self mouseMoved: o_event]; +} + +- (void)mouseMoved:(NSEvent *)o_event +{ + NSPoint ml; + NSRect s_rect; + BOOL b_inside; + + if( p_vout ) + { + s_rect = [o_view bounds]; + ml = [o_view convertPoint: [o_event locationInWindow] fromView: nil]; + b_inside = [o_view mouse: ml inRect: s_rect]; + + if( b_inside ) + { + vlc_value_t val; + unsigned int i_width, i_height, i_x, i_y; + + vout_PlacePicture( p_vout, (unsigned int)s_rect.size.width, + (unsigned int)s_rect.size.height, + &i_x, &i_y, &i_width, &i_height ); + + val.i_int = ( ((int)ml.x) - i_x ) * + p_vout->render.i_width / i_width; + var_Set( p_vout, "mouse-x", val ); + + if( [[o_view className] isEqualToString: @"VLCGLView"] ) + { + val.i_int = ( ((int)(s_rect.size.height - ml.y)) - i_y ) * + p_vout->render.i_height / i_height; + } + else + { + val.i_int = ( ((int)ml.y) - i_y ) * + p_vout->render.i_height / i_height; + } + var_Set( p_vout, "mouse-y", val ); + + val.b_bool = VLC_TRUE; + var_Set( p_vout, "mouse-moved", val ); + } + if( [self isFullscreen] ) + [[[[VLCMain sharedInstance] getControls] getFSPanel] fadeIn]; + } + + [super mouseMoved: o_event]; } - (BOOL)acceptsFirstResponder @@ -471,189 +669,498 @@ return NO; } -- (void)mouseDown:(NSEvent *)o_event -{ - vlc_value_t val; +/* Class methods used by the different vout modules */ - switch( [o_event type] ) ++ (vout_thread_t *)getRealVout: (vout_thread_t *)p_vout +{ + /* p_real_vout: the vout we have to use to check for video-on-top + and a few other things. If we are the QuickTime output, it's us. + It we are the OpenGL provider, it is our parent. */ + if( p_vout->i_object_type == VLC_OBJECT_OPENGL ) { - case NSLeftMouseDown: - { - var_Get( p_vout, "mouse-button-down", &val ); - val.i_int |= 1; - var_Set( p_vout, "mouse-button-down", val ); - } - break; - - default: - [super mouseDown: o_event]; - break; + return (vout_thread_t *) p_vout->p_parent; + } + else + { + return p_vout; } + } -- (void)otherMouseDown:(NSEvent *)o_event ++ (id)getVoutView: (vout_thread_t *)p_vout subView: (NSView *)view + frame: (NSRect *)s_frame { - vlc_value_t val; + vlc_value_t value_drawable; + int i_timeout; + id o_return = nil; + + var_Get( p_vout->p_libvlc, "drawable", &value_drawable ); - switch( [o_event type] ) + var_Create( p_vout, "macosx-vdev", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_vout, "macosx-stretch", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_vout, "macosx-opaqueness", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT ); + var_Create( p_vout, "macosx-background", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_vout, "macosx-black", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_vout, "macosx-embedded", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + + + /* We only wait for NSApp to initialise if we're not embedded (as in the + * case of the Mozilla plugin). We can tell whether we're embedded or not + * by examining the "drawable" value: if it's zero, we're running in the + * main Mac intf; if it's non-zero, we're embedded. */ + if( value_drawable.i_int == 0 ) { - case NSOtherMouseDown: + /* Wait for a MacOS X interface to appear. Timeout is 2 seconds. */ + for( i_timeout = 20 ; i_timeout-- ; ) + { + if( NSApp == NULL ) + { + msleep( INTF_IDLE_SLEEP ); + } + } + + if( NSApp == NULL ) + { + /* No MacOS X intf, unable to communicate with MT */ + msg_Err( p_vout, "no MacOS X interface present" ); + return nil; + } + else { - var_Get( p_vout, "mouse-button-down", &val ); - val.i_int |= 2; - var_Set( p_vout, "mouse-button-down", val ); + if ( VLCIntf && !(p_vout->b_fullscreen) && + !(var_GetBool( p_vout, "macosx-background" )) && + var_GetBool( p_vout, "macosx-embedded") ) + { + o_return = [[[VLCMain sharedInstance] getEmbeddedList] + getEmbeddedVout]; + } } - break; + } - default: - [super mouseDown: o_event]; - break; + /* No embedded vout is available */ + if( o_return == nil ) + { + NSRect null_rect; + bzero( &null_rect, sizeof( NSRect ) ); + o_return = [[VLCDetachedVoutView alloc] initWithFrame: null_rect ]; } + [o_return setVout: p_vout subView: view frame: s_frame]; + return o_return; } -- (void)rightMouseDown:(NSEvent *)o_event +- (void)enterFullscreen { - vlc_value_t val; + [[o_view class] resetVout: p_vout]; + [[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil]; +} - switch( [o_event type] ) - { - case NSRightMouseDown: - { - var_Get( p_vout, "mouse-button-down", &val ); - val.i_int |= 4; - var_Set( p_vout, "mouse-button-down", val ); - } - break; +- (void)leaveFullscreen +{ + [[o_view class] resetVout: p_vout]; + [[[[VLCMain sharedInstance] getControls] getFSPanel] setNonActive: nil]; +} - default: - [super mouseDown: o_event]; - break; +@end + +/***************************************************************************** + * VLCDetachedVoutView implementation + *****************************************************************************/ +@implementation VLCDetachedVoutView + +- (id)initWithFrame: (NSRect)frameRect +{ + [super initWithFrame: frameRect]; + i_time_mouse_last_moved = 0; + return self; +} + +- (bool)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view + frame: (NSRect *) s_arg_frame +{ + BOOL b_return = [super setVout: p_arg_vout subView: view frame:s_arg_frame]; + i_time_mouse_last_moved = mdate(); + o_window = [[VLCVoutWindow alloc] initWithVout: p_arg_vout view: self + frame: s_arg_frame]; + [self updateTitle]; + [view setFrame: [self frame]]; + + if( var_GetBool( p_real_vout, "video-on-top" ) ) + { + [o_window setLevel: NSStatusWindowLevel]; } + + + [o_window setAcceptsMouseMovedEvents: TRUE]; + return b_return; } -- (void)mouseUp:(NSEvent *)o_event +- (void)closeVout { - vlc_value_t val; + [o_window closeWindow]; + [o_window setAcceptsMouseMovedEvents: NO]; + i_time_mouse_last_moved = 0; + [super closeVout]; +} + +- (void)mouseMoved:(NSEvent *)o_event +{ + i_time_mouse_last_moved = mdate(); + [super mouseMoved: o_event]; +} + +- (void)hideMouse:(BOOL)b_hide +{ + BOOL b_inside; + NSPoint ml; + NSView *o_contents = [o_window contentView]; + + ml = [o_window convertScreenToBase:[NSEvent mouseLocation]]; + ml = [o_contents convertPoint:ml fromView:nil]; + b_inside = [o_contents mouse: ml inRect: [o_contents bounds]]; - switch( [o_event type] ) + if( b_hide && b_inside ) { - case NSLeftMouseUp: - { - vlc_value_t b_val; - b_val.b_bool = VLC_TRUE; - var_Set( p_vout, "mouse-clicked", b_val ); + [NSCursor setHiddenUntilMouseMoves: YES]; + } + else if( !b_hide ) + { + [NSCursor setHiddenUntilMouseMoves: NO]; + } +} - var_Get( p_vout, "mouse-button-down", &val ); - val.i_int &= ~1; - var_Set( p_vout, "mouse-button-down", val ); +- (void)manage +{ + [super manage]; + if( p_vout->b_fullscreen ) + { + if( mdate() - i_time_mouse_last_moved > 3000000 ) + { + [self hideMouse: YES]; } - break; - - default: - [super mouseUp: o_event]; - break; + } + else + { + [self hideMouse: NO]; } } -- (void)otherMouseUp:(NSEvent *)o_event +@end + +/***************************************************************************** + * VLCEmbeddedVoutView implementation + *****************************************************************************/ + +@implementation VLCEmbeddedVoutView + +- (id)initWithFrame: (NSRect)frameRect { - vlc_value_t val; + [super initWithFrame: frameRect]; + b_used = NO; + [[[VLCMain sharedInstance] getEmbeddedList] addEmbeddedVout: self]; + return self; +} - switch( [o_event type] ) +- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view + frame: (NSRect *) s_arg_frame + +{ + BOOL b_return; + b_return = [super setVout: p_arg_vout subView: view frame: s_arg_frame]; + if( b_return ) { - case NSOtherMouseUp: + o_window = [self window]; + [o_window makeKeyAndOrderFront: self]; + [o_window setAcceptsMouseMovedEvents: TRUE]; + + if( var_GetBool( p_real_vout, "video-on-top" ) ) { - var_Get( p_vout, "mouse-button-down", &val ); - val.i_int &= ~2; - var_Set( p_vout, "mouse-button-down", val ); + [o_window setLevel: NSStatusWindowLevel]; } - break; - default: - [super mouseUp: o_event]; - break; + [view setFrameSize: [self frame].size]; } + return b_return; } -- (void)rightMouseUp:(NSEvent *)o_event +- (void)setUsed: (BOOL)b_new_used { - vlc_value_t val; + b_used = b_new_used; +} + +- (BOOL)isUsed +{ + return b_used; +} + +- (void)closeVout +{ + [super closeVout]; + [o_window setAcceptsMouseMovedEvents: NO]; + [[[VLCMain sharedInstance] getEmbeddedList] releaseEmbeddedVout: self]; +} + + +@end + +@implementation VLCDetachedEmbeddedVoutView +- (void)awakeFromNib +{ + o_embeddedwindow = [self window]; +} - switch( [o_event type] ) +- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view + frame: (NSRect *) s_arg_frame +{ + BOOL b_return = [super setVout: p_arg_vout subView: view frame: s_arg_frame]; + + /* o_window needs to point to our o_embeddedwindow, super might have set it + * to the fullscreen window that o_embeddedwindow setups during fullscreen */ + o_window = o_embeddedwindow; + + if( b_return ) { - case NSRightMouseUp: - { - var_Get( p_vout, "mouse-button-down", &val ); - val.i_int &= ~4; - var_Set( p_vout, "mouse-button-down", val ); - } - break; + [o_window setAlphaValue: var_GetFloat( p_vout, "macosx-opaqueness" )]; + [self updateTitle]; + + if(!([o_window isFullscreen])) + [o_window makeKeyAndOrderFront: self]; - default: - [super mouseUp: o_event]; - break; + [self scaleWindowWithFactor: 1.0 animate: [o_window isVisible] && (![o_window isFullscreen])]; } + return b_return; } -- (void)mouseDragged:(NSEvent *)o_event +- (void)closeVout { - [self mouseMoved: o_event]; + playlist_t * p_playlist = pl_Yield( VLCIntf ); + + if(!playlist_IsPlaying( p_playlist )) + [o_window performSelectorOnMainThread: @selector(orderOut:) withObject: self waitUntilDone: YES]; + + vlc_object_release( p_playlist ); + + [super closeVout]; } -- (void)otherMouseDragged:(NSEvent *)o_event +- (void)enterFullscreen { - [self mouseMoved: o_event]; + /* We are in a VLCEmbeddedWindow */ + [o_embeddedwindow performSelectorOnMainThread: @selector(enterFullscreen) withObject: NULL waitUntilDone: YES]; } -- (void)rightMouseDragged:(NSEvent *)o_event +- (void)leaveFullscreen { - [self mouseMoved: o_event]; + /* We are in a VLCEmbeddedWindow */ + [o_embeddedwindow performSelectorOnMainThread: @selector(leaveFullscreen) withObject: NULL waitUntilDone: YES]; } +@end -- (void)mouseMoved:(NSEvent *)o_event -{ - NSPoint ml; - NSRect s_rect; - BOOL b_inside; - NSView * o_view; +/***************************************************************************** + * VLCVoutWindow implementation + *****************************************************************************/ +@implementation VLCVoutWindow - i_time_mouse_last_moved = mdate(); +- (id) initWithVout: (vout_thread_t *) vout view: (VLCVoutView *) view + frame: (NSRect *) frame +{ + p_vout = vout; + o_view = view; + s_frame = frame; - o_view = [self contentView]; - s_rect = [o_view bounds]; - ml = [o_view convertPoint: [o_event locationInWindow] fromView: nil]; - b_inside = [o_view mouse: ml inRect: s_rect]; + [self performSelectorOnMainThread: @selector(initReal:) + withObject: NULL waitUntilDone: YES]; - if( b_inside ) + if( !b_init_ok ) { - vlc_value_t val; - int i_width, i_height, i_x, i_y; + return NULL; + } + + return self; +} + +- (id)initReal: (id) sender +{ + NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; + NSArray *o_screens = [NSScreen screens]; + NSScreen *o_screen; + vlc_bool_t b_menubar_screen = VLC_FALSE; + int i_device; - vout_PlacePicture( p_vout, (unsigned int)s_rect.size.width, - (unsigned int)s_rect.size.height, - &i_x, &i_y, &i_width, &i_height ); + b_init_ok = VLC_FALSE; - val.i_int = ( ((int)ml.x) - i_x ) * - p_vout->render.i_width / i_width; - var_Set( p_vout, "mouse-x", val ); + p_real_vout = [VLCVoutView getRealVout: p_vout]; + i_device = var_GetInteger( p_real_vout->p_libvlc, "video-device" ); + b_black = var_GetBool( p_vout, "macosx-black" ); + b_embedded = var_GetBool( p_vout, "macosx-embedded" ); - if( [[o_view className] isEqualToString: @"VLCGLView"] ) + /* Find out on which screen to open the window */ + o_screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)i_device]; + + if( !o_screen ) + o_screen = [NSScreen mainScreen]; + + if( [o_screen isMainScreen] ) + b_menubar_screen = VLC_TRUE; + + if( p_vout->b_fullscreen ) + { + CGDisplayFadeReservationToken token; + NSRect screen_rect = [o_screen frame]; + screen_rect.origin.x = screen_rect.origin.y = 0; + + /* move the FSPanel to front in case that it is currently shown + * this won't and is not supposed to work when it's fading right now */ + if( [[[[VLCMain sharedInstance] getControls] getFSPanel] isDisplayed] ) + [[[[VLCMain sharedInstance] getControls] getFSPanel] orderFront: self]; + + /* tell the fspanel to move itself to front next time it's triggered */ + [[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: i_device]; + + /* Creates a window with size: screen_rect on o_screen */ + [self initWithContentRect: screen_rect + styleMask: NSBorderlessWindowMask + backing: NSBackingStoreBuffered + defer: YES screen: o_screen]; + + if( b_black == VLC_TRUE ) + [o_screen blackoutOtherScreens]; + + if( b_menubar_screen ) { - val.i_int = ( ((int)(s_rect.size.height - ml.y)) - i_y ) * - p_vout->render.i_height / i_height; + SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); + } + if( b_black == VLC_TRUE ) + { + CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token); + CGDisplayFade( token, 2 , kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, false ); + CGReleaseDisplayFadeReservation( token); + } + } + else if( var_GetBool( p_vout, "macosx-background" ) ) + { + NSRect screen_rect = [o_screen frame]; + screen_rect.origin.x = screen_rect.origin.y = 0; + + /* Creates a window with size: screen_rect on o_screen */ + [self initWithContentRect: screen_rect + styleMask: NSBorderlessWindowMask + backing: NSBackingStoreBuffered + defer: YES screen: o_screen]; + + [self setLevel: CGWindowLevelForKey(kCGDesktopWindowLevelKey)]; + } + else + { + unsigned int i_stylemask = NSTitledWindowMask | + NSMiniaturizableWindowMask | + NSClosableWindowMask | + NSResizableWindowMask; + + NSRect s_rect; + if( !s_frame ) + { + s_rect.size.width = p_vout->i_window_width; + s_rect.size.height = p_vout->i_window_height; } else { - val.i_int = ( ((int)ml.y) - i_y ) * - p_vout->render.i_height / i_height; + s_rect = *s_frame; + } + + [self initWithContentRect: s_rect + styleMask: i_stylemask + backing: NSBackingStoreBuffered + defer: YES screen: o_screen]; + + [self setAlphaValue: var_GetFloat( p_vout, "macosx-opaqueness" )]; + + if( !s_frame ) + { + [self center]; } - var_Set( p_vout, "mouse-y", val ); - - val.b_bool = VLC_TRUE; - var_Set( p_vout, "mouse-moved", val ); } - [super mouseMoved: o_event]; + [self makeKeyAndOrderFront: nil]; + [self setReleasedWhenClosed: YES]; + + /* We'll catch mouse events */ + [self makeFirstResponder: o_view]; + + /* Add the view. It's automatically resized to fit the window */ + [self setContentView: o_view]; + + [o_pool release]; + + b_init_ok = VLC_TRUE; + return self; } +- (void)close +{ + [o_view closeVout]; +} + +- (void)closeWindow +{ + /* XXX waitUntilDone = NO to avoid a possible deadlock when hitting + Command-Q */ + [self setContentView: NULL]; + [self performSelectorOnMainThread: @selector(closeReal:) + withObject: NULL waitUntilDone: NO]; +} + +- (id)closeReal:(id)sender +{ + if( b_black == VLC_TRUE ) + { + CGDisplayFadeReservationToken token; + CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token); + CGDisplayFade( token, 2, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, false ); + CGReleaseDisplayFadeReservation( token); + CGDisplayRestoreColorSyncSettings(); + } + SetSystemUIMode( kUIModeNormal, 0); + [super close]; + /* this does only work in embedded mode */ + if( b_embedded == VLC_TRUE ) + [[[[VLCMain sharedInstance] getControls] getFSPanel] orderOut: self]; + + return NULL; +} + +- (id)getVoutView +{ + return o_view; +} + +- (BOOL)canBecomeKeyWindow +{ + return YES; +} + +/* Sometimes crashes VLC.... +- (BOOL)performKeyEquivalent:(NSEvent *)o_event +{ + return [[VLCMain sharedInstance] hasDefinedShortcutKey:o_event]; +}*/ + +/* This is actually the same as VLCControls::stop. */ + +- (BOOL)windowShouldClose:(id)sender +{ + playlist_t * p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + if( p_playlist == NULL ) + { + return NO; + } + + playlist_Stop( p_playlist ); + vlc_object_release( p_playlist ); + + /* The window will be closed by the intf later. */ + return NO; +} + + @end