X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fvout.m;h=6be49cc14fa6a5b51c2e9a80d6ef25ae273c3d27;hb=6d1c28b3c74828f7810301f3dadd41d89e326ccb;hp=2ef183fe3c6f2dd3b5b9bcaf5ee8e12ff7d7ea65;hpb=47d57d6db23a6bd693dfba2abaec210b1cdb15c3;p=vlc diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m index 2ef183fe3c..6be49cc14f 100644 --- a/modules/gui/macosx/vout.m +++ b/modules/gui/macosx/vout.m @@ -1,20 +1,21 @@ - /***************************************************************************** - * vout.m: MacOS X video output plugin + * vout.m: MacOS X video output module ***************************************************************************** - * Copyright (C) 2001-2003 VideoLAN - * $Id: vout.m,v 1.56 2003/09/20 13:46:00 hartman Exp $ + * Copyright (C) 2001-2006 the VideoLAN team + * $Id$ * * Authors: Colin Delacroix * Florian G. Pflug * Jon Lech Johansen - * Derk-Jan Hartman + * Derk-Jan Hartman + * Eric Petit + * Benjamin Pracht * * 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 +23,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. *****************************************************************************/ /***************************************************************************** @@ -32,1389 +33,1024 @@ #include /* free() */ #include /* strerror() */ +/* BeginFullScreen, EndFullScreen */ #include +#include + #include "intf.h" #include "vout.h" -#define QT_MAX_DIRECTBUFFERS 10 -#define VL_MAX_DISPLAYS 16 - -struct picture_sys_t -{ - void *p_info; - unsigned int i_size; - - /* When using I420 output */ - PlanarPixmapInfoYUV420 pixmap_i420; -}; /***************************************************************************** - * Local prototypes + * 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; -static int vout_Init ( vout_thread_t * ); -static void vout_End ( vout_thread_t * ); -static int vout_Manage ( vout_thread_t * ); -static void vout_Display ( vout_thread_t *, picture_t * ); - -static int CoSendRequest ( vout_thread_t *, SEL ); -static int CoCreateWindow ( vout_thread_t * ); -static int CoDestroyWindow ( vout_thread_t * ); -static int CoToggleFullscreen ( vout_thread_t * ); + msg_Dbg( p_vout, "set %d", new_val.i_int ); + var_Create( p_vout->p_vlc, "video-device", VLC_VAR_INTEGER ); + var_Set( p_vout->p_vlc, "video-device", new_val ); -static void VLCHideMouse ( vout_thread_t *, BOOL ); + val.b_bool = VLC_TRUE; + var_Set( p_vout, "intf-change", val ); + return VLC_SUCCESS; +} -static void QTScaleMatrix ( vout_thread_t * ); -static int QTCreateSequence ( vout_thread_t * ); -static void QTDestroySequence ( vout_thread_t * ); -static int QTNewPicture ( vout_thread_t *, picture_t * ); -static void QTFreePicture ( vout_thread_t *, picture_t * ); /***************************************************************************** - * OpenVideo: allocates MacOS X video thread output method - ***************************************************************************** - * This function allocates and initializes a MacOS X vout method. + * VLCEmbeddedList implementation *****************************************************************************/ -int E_(OpenVideo) ( vlc_object_t *p_this ) -{ - vout_thread_t * p_vout = (vout_thread_t *)p_this; - OSErr err; - int i_timeout; - vlc_value_t value_drawable; +@implementation VLCEmbeddedList - var_Get( p_vout->p_vlc, "drawable", &value_drawable ); +- (id)init +{ + [super init]; + o_embedded_array = [NSMutableArray array]; + return self; +} - p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); - if( p_vout->p_sys == NULL ) +- (id)getEmbeddedVout +{ + unsigned int i; + + for( i = 0; i < [o_embedded_array count]; i++ ) { - msg_Err( p_vout, "out of memory" ); - return( 1 ); + 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; +} - memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) ); +- (void)releaseEmbeddedVout: (id)o_vout_view +{ + if( [o_embedded_array containsObject: o_vout_view] ) + { + [o_vout_view setUsed: NO]; + } + else + { + msg_Warn( VLCIntf, "cannot find Video Output"); + } +} - /* We don't need an intf in mozilla plugin */ - if( value_drawable.i_int == 0 ) +- (void)addEmbeddedVout: (id)o_vout_view +{ + if( ![o_embedded_array containsObject: o_vout_view] ) { - /* 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" ); - free( p_vout->p_sys ); - return( 1 ); - } - - - if( [NSApp respondsToSelector: @selector(getIntf)] ) + [o_embedded_array addObject: o_vout_view]; + } +} + +- (BOOL)windowContainsEmbedded: (id)o_window +{ +/* if( ![[o_window className] isEqualToString: @"VLCWindow"] ) + { + NSLog( @"We were not given a VLCWindow" ); + }*/ + return ([self getViewForWindow: o_window] == nil ? NO : YES ); +} + +- (id)getViewForWindow: (id)o_window +{ + id o_enumerator = [o_embedded_array objectEnumerator]; + id o_current_embedded; + + while( (o_current_embedded = [o_enumerator nextObject]) ) + { + if( [o_current_embedded getWindow] == o_window ) { - intf_thread_t * p_intf; - - for( i_timeout = 10 ; i_timeout-- ; ) - { - if( ( p_intf = [NSApp getIntf] ) == NULL ) - { - msleep( INTF_IDLE_SLEEP ); - } - } - - if( p_intf == NULL ) - { - msg_Err( p_vout, "MacOS X intf has getIntf, but is NULL" ); - free( p_vout->p_sys ); - return( 1 ); - } + return o_current_embedded; } } + return nil; +} - p_vout->p_sys->h_img_descr = - (ImageDescriptionHandle)NewHandleClear( sizeof(ImageDescription) ); - p_vout->p_sys->p_matrix = (MatrixRecordPtr)malloc( sizeof(MatrixRecord) ); - p_vout->p_sys->p_fullscreen_state = NULL; +@end - p_vout->p_sys->b_mouse_pointer_visible = YES; - p_vout->p_sys->b_mouse_moved = YES; - p_vout->p_sys->i_time_mouse_last_moved = mdate(); +/***************************************************************************** + * VLCVoutView implementation + *****************************************************************************/ +@implementation VLCVoutView - if( value_drawable.i_int != 0 ) - { - p_vout->p_sys->mask = NewRgn(); - p_vout->p_sys->rect.left = 0 ; - p_vout->p_sys->rect.right = 0 ; - p_vout->p_sys->rect.top = 0 ; - p_vout->p_sys->rect.bottom = 0 ; - - p_vout->p_sys->isplugin = 1 ; - - } else +- (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 ) { - p_vout->p_sys->mask = NULL; - p_vout->p_sys->isplugin = 0 ; + msg_Err( p_vout, "no OSX screens available" ); + return NO; } - /* set window size */ - p_vout->p_sys->s_rect.size.width = p_vout->i_window_width; - p_vout->p_sys->s_rect.size.height = p_vout->i_window_height; + p_real_vout = [VLCVoutView getRealVout: p_vout]; - if( ( err = EnterMovies() ) != noErr ) + /* 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_vlc, "video-device" ) == 0 ) { - msg_Err( p_vout, "EnterMovies failed: %d", err ); - free( p_vout->p_sys->p_matrix ); - DisposeHandle( (Handle)p_vout->p_sys->h_img_descr ); - free( p_vout->p_sys ); - return( 1 ); - } - - /* Damn QT isn't thread safe. so keep a lock in the p_vlc object */ - vlc_mutex_lock( &p_vout->p_vlc->quicktime_lock ); - - err = FindCodec( kYUV420CodecType, bestSpeedCodec, - nil, &p_vout->p_sys->img_dc ); - - vlc_mutex_unlock( &p_vout->p_vlc->quicktime_lock ); - if( err == noErr && p_vout->p_sys->img_dc != 0 ) - { - p_vout->output.i_chroma = VLC_FOURCC('I','4','2','0'); - p_vout->p_sys->i_codec = kYUV420CodecType; + i_device = var_GetInteger( p_vout, "macosx-vdev" ); } else { - msg_Err( p_vout, "failed to find an appropriate codec" ); - } - - if( p_vout->p_sys->img_dc == 0 ) - { - free( p_vout->p_sys->p_matrix ); - DisposeHandle( (Handle)p_vout->p_sys->h_img_descr ); - free( p_vout->p_sys ); - return VLC_EGENERIC; + i_device = var_GetInteger( p_real_vout->p_vlc, "video-device" ); } - NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; - NSArray * o_screens = [NSScreen screens]; - if( [o_screens count] > 0 && var_Type( p_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, text; + vlc_value_t val2, text; NSScreen * o_screen; - int i_option = config_GetInt( p_vout, "macosx-vdev" ); + var_Create( p_real_vout, "video-device", VLC_VAR_INTEGER | + VLC_VAR_HASCHOICE ); + text.psz_string = _("Video Device"); + var_Change( p_real_vout, "video-device", VLC_VAR_SETTEXT, &text, NULL ); - var_Create( p_vout, "video-device", VLC_VAR_INTEGER | - VLC_VAR_HASCHOICE ); - text.psz_string = _("Video device"); - var_Change( p_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]; NSRect s_rect = [o_screen frame]; - snprintf( psz_temp, sizeof(psz_temp)/sizeof(psz_temp[0])-1, + snprintf( psz_temp, sizeof(psz_temp)/sizeof(psz_temp[0])-1, "%s %d (%dx%d)", _("Screen"), i, - (int)s_rect.size.width, (int)s_rect.size.height ); + (int)s_rect.size.width, (int)s_rect.size.height ); text.psz_string = psz_temp; - val.i_int = i; - var_Change( p_vout, "video-device", - VLC_VAR_ADDCHOICE, &val, &text ); - - if( ( i - 1 ) == i_option ) + val2.i_int = i; + var_Change( p_real_vout, "video-device", + VLC_VAR_ADDCHOICE, &val2, &text ); + if( i == i_device ) { - var_Set( p_vout, "video-device", val ); + var_Set( p_real_vout, "video-device", val2 ); } i++; } - var_AddCallback( p_vout, "video-device", vout_VarCallback, + var_AddCallback( p_real_vout, "video-device", DeviceCallback, NULL ); - val.b_bool = VLC_TRUE; - var_Set( p_vout, "intf-change", val ); + val2.b_bool = VLC_TRUE; + var_Set( p_real_vout, "intf-change", val2 ); } + + /* Add the view. It's automatically resized to fit the window */ + [self addSubview: o_view]; + [self setAutoresizesSubviews: YES]; [o_pool release]; - /* We don't need a window either in the mozilla plugin */ - if( p_vout->p_sys->isplugin == 0 ) - { - if( CoCreateWindow( p_vout ) ) - { - msg_Err( p_vout, "unable to create window" ); - free( p_vout->p_sys->p_matrix ); - DisposeHandle( (Handle)p_vout->p_sys->h_img_descr ); - free( p_vout->p_sys ); - return( 1 ); - } - } + return YES; +} - p_vout->pf_init = vout_Init; - p_vout->pf_end = vout_End; - p_vout->pf_manage = vout_Manage; - p_vout->pf_render = NULL; - p_vout->pf_display = vout_Display; +- (void)resizeSubviewsWithOldSize:(NSSize)oldBoundsSize +{ + [super resizeSubviewsWithOldSize: oldBoundsSize]; + [o_view setFrameSize: [self frame].size]; +} - return( 0 ); +- (void)closeVout +{ + [o_view removeFromSuperview]; + o_view = nil; + p_vout = NULL; + s_frame = nil; + o_window = nil; + p_real_vout = NULL; } -/***************************************************************************** - * vout_Init: initialize video thread output method - *****************************************************************************/ -static int vout_Init( vout_thread_t *p_vout ) +- (void)updateTitle { - int i_index; - picture_t *p_pic; - vlc_value_t val; + NSMutableString * o_title = nil, * o_mrl = nil; + input_thread_t * p_input; + + if( p_vout == NULL ) + { + return; + } - I_OUTPUTPICTURES = 0; + p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, FIND_PARENT ); - /* Initialize the output structure; we already found a codec, - * and the corresponding chroma we will be using. Since we can - * arbitrary scale, stick to the coordinates and aspect. */ - p_vout->output.i_width = p_vout->render.i_width; - p_vout->output.i_height = p_vout->render.i_height; - p_vout->output.i_aspect = p_vout->render.i_aspect; + if( p_input == NULL ) + { + return; + } - var_Get( p_vout->p_vlc, "drawable", &val ); + if( p_input->input.p_item->psz_name != NULL ) + o_title = [NSMutableString stringWithUTF8String: + p_input->input.p_item->psz_name]; + if( p_input->input.p_item->psz_uri != NULL ) + o_mrl = [NSMutableString stringWithUTF8String: + p_input->input.p_item->psz_uri]; + if( o_title == nil ) + o_title = o_mrl; - if( p_vout->p_sys->isplugin ) + if( o_mrl != nil ) + { + if( p_input->input.p_access && !strcmp( p_input->input.p_access->p_module->psz_shortname, "File" ) ) + { + NSRange prefix_range = [o_mrl rangeOfString: @"file:"]; + if( prefix_range.location != NSNotFound ) + [o_mrl deleteCharactersInRange: prefix_range]; + [o_window setRepresentedFilename: o_mrl]; + } + [o_window setTitle: o_title]; + } + else { - p_vout->p_sys->p_qdport = val.i_int; + [o_window setTitle: [NSString stringWithCString: VOUT_TITLE]]; } + vlc_object_release( p_input ); +} - SetPort( p_vout->p_sys->p_qdport ); - QTScaleMatrix( p_vout ); - if( QTCreateSequence( p_vout ) ) +- (void)setOnTop:(BOOL)b_on_top +{ + if( b_on_top ) { - msg_Err( p_vout, "unable to create sequence" ); - return( 1 ); + [o_window setLevel: NSStatusWindowLevel]; } + else + { + [o_window setLevel: NSNormalWindowLevel]; + } +} + +- (void)scaleWindowWithFactor: (float)factor +{ + NSSize newsize; + int i_corrected_height, i_corrected_width; + NSPoint topleftbase; + NSPoint topleftscreen; - /* Try to initialize up to QT_MAX_DIRECTBUFFERS direct buffers */ - while( I_OUTPUTPICTURES < QT_MAX_DIRECTBUFFERS ) + if ( !p_vout->b_fullscreen ) { - p_pic = NULL; + NSRect new_frame; + topleftbase.x = 0; + topleftbase.y = [o_window frame].size.height; + topleftscreen = [o_window convertBaseToScreen: topleftbase]; - /* Find an empty picture slot */ - for( i_index = 0; i_index < VOUT_MAX_PICTURES; i_index++ ) + if( p_vout->render.i_height * p_vout->render.i_aspect > + p_vout->render.i_width * VOUT_ASPECT_FACTOR ) { - if( p_vout->p_picture[ i_index ].i_status == FREE_PICTURE ) - { - p_pic = p_vout->p_picture + i_index; - break; - } + i_corrected_width = p_vout->render.i_height * p_vout->render.i_aspect / + VOUT_ASPECT_FACTOR; + newsize.width = (int) ( i_corrected_width * factor ); + newsize.height = (int) ( p_vout->render.i_height * factor ); } - - /* Allocate the picture */ - if( p_pic == NULL || QTNewPicture( p_vout, p_pic ) ) + else { - break; + i_corrected_height = p_vout->render.i_width * VOUT_ASPECT_FACTOR / + p_vout->render.i_aspect; + newsize.width = (int) ( p_vout->render.i_width * factor ); + newsize.height = (int) ( i_corrected_height * factor ); } - p_pic->i_status = DESTROYED_PICTURE; - p_pic->i_type = DIRECT_PICTURE; + /* Calculate the window's new size */ + new_frame.size.width = [o_window frame].size.width - + [self frame].size.width + newsize.width; + new_frame.size.height = [o_window frame].size.height - + [self frame].size.height + newsize.height; - PP_OUTPUTPICTURE[ I_OUTPUTPICTURES ] = p_pic; + new_frame.origin.x = topleftscreen.x; + new_frame.origin.y = topleftscreen.y - new_frame.size.height; - I_OUTPUTPICTURES++; - } + [o_window setFrame: new_frame display: YES]; - return( 0 ); + p_vout->i_changes |= VOUT_SIZE_CHANGE; + } } -/***************************************************************************** - * vout_End: terminate video thread output method - *****************************************************************************/ -static void vout_End( vout_thread_t *p_vout ) +- (void)toggleFloatOnTop { - int i_index; - - QTDestroySequence( p_vout ); + vlc_value_t val; - /* Free the direct buffers we allocated */ - for( i_index = I_OUTPUTPICTURES; i_index; ) + if( !p_real_vout ) return; + if( var_Get( p_real_vout, "video-on-top", &val )>=0 && val.b_bool) { - i_index--; - QTFreePicture( p_vout, PP_OUTPUTPICTURE[ i_index ] ); + val.b_bool = VLC_FALSE; } -} - -/***************************************************************************** - * CloseVideo: destroy video thread output method - *****************************************************************************/ -void E_(CloseVideo) ( vlc_object_t *p_this ) -{ - vout_thread_t * p_vout = (vout_thread_t *)p_this; - - if ( p_vout->p_sys->isplugin == 0) + else { - if( CoDestroyWindow( p_vout ) ) - { - msg_Err( p_vout, "unable to destroy window" ); - } + val.b_bool = VLC_TRUE; } + var_Set( p_real_vout, "video-on-top", val ); +} - if ( p_vout->p_sys->p_fullscreen_state != NULL ) - EndFullScreen ( p_vout->p_sys->p_fullscreen_state, NULL ); +- (void)toggleFullscreen +{ + vlc_value_t val; + 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 ); +} - ExitMovies(); +- (BOOL)isFullscreen +{ + vlc_value_t val; + var_Get( p_real_vout, "fullscreen", &val ); + return( val.b_bool ); +} - free( p_vout->p_sys->p_matrix ); - DisposeHandle( (Handle)p_vout->p_sys->h_img_descr ); +- (void)snapshot +{ + vout_Control( p_real_vout, VOUT_SNAPSHOT ); +} - free( p_vout->p_sys ); +- (void)manage +{ + /* Disable Screensaver */ + UpdateSystemActivity( UsrActivity ); } -/***************************************************************************** - * vout_Manage: handle events - ***************************************************************************** - * This function should be called regularly by video output thread. It manages - * console events. It returns a non null value on error. - *****************************************************************************/ -static int vout_Manage( vout_thread_t *p_vout ) +- (id)getWindow +{ + return o_window; +} + +- (void)keyDown:(NSEvent *)o_event { - vlc_value_t val1; - var_Get( p_vout->p_vlc, "drawableredraw", &val1 ); + unichar key = 0; + vlc_value_t val; + unsigned int i_pressed_modifiers = 0; + val.i_int = 0; - if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE ) - { - if( CoToggleFullscreen( p_vout ) ) - { - return( 1 ); - } + i_pressed_modifiers = [o_event modifierFlags]; - p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE; - } + if( i_pressed_modifiers & NSShiftKeyMask ) + val.i_int |= KEY_MODIFIER_SHIFT; + if( i_pressed_modifiers & NSControlKeyMask ) + val.i_int |= KEY_MODIFIER_CTRL; + if( i_pressed_modifiers & NSAlternateKeyMask ) + val.i_int |= KEY_MODIFIER_ALT; + if( i_pressed_modifiers & NSCommandKeyMask ) + val.i_int |= KEY_MODIFIER_COMMAND; - if( (p_vout->i_changes & VOUT_SIZE_CHANGE) || (val1.i_int == 1)) - { - if (val1.i_int == 1) - { - val1.i_int = 0; - var_Set( p_vout->p_vlc, "drawableredraw", val1 ); - SetDSequenceMask( p_vout->p_sys->i_seq , p_vout->p_sys->mask ); - } else if (p_vout->i_changes & VOUT_SIZE_CHANGE) - { - p_vout->i_changes &= ~VOUT_SIZE_CHANGE; - } - - QTScaleMatrix( p_vout ); - SetDSequenceMatrix( p_vout->p_sys->i_seq, - p_vout->p_sys->p_matrix ); - } + key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0]; - /* hide/show mouse cursor - * this code looks unnecessarily complicated, but is necessary like this. - * it has to deal with multiple monitors and therefore checks a lot */ - if( !p_vout->p_sys->b_mouse_moved && p_vout->b_fullscreen ) + if( key ) { - if( mdate() - p_vout->p_sys->i_time_mouse_last_moved > 2000000 && - p_vout->p_sys->b_mouse_pointer_visible ) - { - VLCHideMouse( p_vout, YES ); - } - else if ( !p_vout->p_sys->b_mouse_pointer_visible ) + /* Escape should always get you out of fullscreen */ + if( key == (unichar) 0x1b ) { - vlc_bool_t b_playing = NO; - input_thread_t * p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, - FIND_ANYWHERE ); - - if ( p_input != NULL ) - { - vlc_value_t state; - var_Get( p_input, "state", &state ); - b_playing = state.i_int != PAUSE_S; - vlc_object_release( p_input ); - } - if ( !b_playing ) - { - VLCHideMouse( p_vout, NO ); - } + if( p_real_vout && [self isFullscreen] ) + { + [self toggleFullscreen]; + } } - } - else if ( p_vout->p_sys->b_mouse_moved && p_vout->b_fullscreen ) - { - if( !p_vout->p_sys->b_mouse_pointer_visible ) + else if ( key == ' ' ) { - VLCHideMouse( p_vout, NO ); + vlc_value_t val; + val.i_int = config_GetInt( p_vout, "key-play-pause" ); + var_Set( p_vout->p_vlc, "key-pressed", val ); } else { - p_vout->p_sys->b_mouse_moved = NO; + val.i_int |= CocoaKeyToVLC( key ); + var_Set( p_vout->p_vlc, "key-pressed", val ); } } - - return( 0 ); + else + { + [super keyDown: o_event]; + } } -/***************************************************************************** - * vout_Display: displays previously rendered output - ***************************************************************************** - * This function sends the currently rendered image to the display. - *****************************************************************************/ -static void vout_Display( vout_thread_t *p_vout, picture_t *p_pic ) +- (void)mouseDown:(NSEvent *)o_event { - OSErr err; - CodecFlags flags; - Rect oldrect; - RgnHandle oldClip; + vlc_value_t val; - if( p_vout->p_sys->isplugin ) + if( p_vout ) { - oldClip = NewRgn(); - - /* In mozilla plugin, mozilla browser also draws things in - * the windows. So we have to update the port/Origin for each - * picture. FIXME : the vout should lock something ! */ - GetPort( &p_vout->p_sys->p_qdportold ); - GetPortBounds( p_vout->p_sys->p_qdportold, &oldrect ); - GetClip( oldClip ); - - LockPortBits( p_vout->p_sys->p_qdport ); - - SetPort( p_vout->p_sys->p_qdport ); - SetOrigin( p_vout->p_sys->portx , p_vout->p_sys->porty ); - ClipRect( &p_vout->p_sys->rect ); - - - if( ( err = DecompressSequenceFrameS( - p_vout->p_sys->i_seq, - p_pic->p_sys->p_info, - p_pic->p_sys->i_size, - codecFlagUseImageBuffer, &flags, nil ) != noErr ) ) - { - msg_Warn( p_vout, "DecompressSequenceFrameS failed: %d", err ); - } - else + switch( [o_event type] ) { - QDFlushPortBuffer( p_vout->p_sys->p_qdport, p_vout->p_sys->mask ); - } - - - SetOrigin( oldrect.left , oldrect.top ); - SetClip( oldClip ); - SetPort( p_vout->p_sys->p_qdportold ); - - UnlockPortBits( p_vout->p_sys->p_qdport ); + case NSLeftMouseDown: + { + 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]; + } + } + break; - } - else - { - if( ( err = DecompressSequenceFrameS( - p_vout->p_sys->i_seq, - p_pic->p_sys->p_info, - p_pic->p_sys->i_size, - codecFlagUseImageBuffer, &flags, nil ) != noErr ) ) - { - msg_Warn( p_vout, "DecompressSequenceFrameS failed: %d", err ); - } - else - { - QDFlushPortBuffer( p_vout->p_sys->p_qdport, nil ); + default: + [super mouseDown: o_event]; + break; } } } -/***************************************************************************** - * CoSendRequest: send request to interface thread - ***************************************************************************** - * Returns 0 on success, 1 otherwise - *****************************************************************************/ -static int CoSendRequest( vout_thread_t *p_vout, SEL sel ) +- (void)otherMouseDown:(NSEvent *)o_event { - int i_ret = 0; - - VLCVout * o_vlv = [[VLCVout alloc] init]; + vlc_value_t val; - if( ( i_ret = ExecuteOnMainThread( o_vlv, sel, (void *)p_vout ) ) ) + if( p_vout ) { - msg_Err( p_vout, "SendRequest: no way to communicate with mt" ); - } - - [o_vlv release]; - - return( i_ret ); -} + switch( [o_event type] ) + { + case NSOtherMouseDown: + { + var_Get( p_vout, "mouse-button-down", &val ); + val.i_int |= 2; + var_Set( p_vout, "mouse-button-down", val ); + } + break; -/***************************************************************************** - * CoCreateWindow: create new window - ***************************************************************************** - * Returns 0 on success, 1 otherwise - *****************************************************************************/ -static int CoCreateWindow( vout_thread_t *p_vout ) -{ - if( CoSendRequest( p_vout, @selector(createWindow:) ) ) - { - msg_Err( p_vout, "CoSendRequest (createWindow) failed" ); - return( 1 ); + default: + [super mouseDown: o_event]; + break; + } } - - return( 0 ); } -/***************************************************************************** - * CoDestroyWindow: destroy window - ***************************************************************************** - * Returns 0 on success, 1 otherwise - *****************************************************************************/ -static int CoDestroyWindow( vout_thread_t *p_vout ) +- (void)rightMouseDown:(NSEvent *)o_event { - if( !p_vout->p_sys->b_mouse_pointer_visible ) - { - VLCHideMouse( p_vout, NO ); - } + vlc_value_t val; - if( CoSendRequest( p_vout, @selector(destroyWindow:) ) ) + if( p_vout ) { - msg_Err( p_vout, "CoSendRequest (destroyWindow) failed" ); - return( 1 ); - } + 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; - return( 0 ); + default: + [super mouseDown: o_event]; + break; + } + } } -/***************************************************************************** - * CoToggleFullscreen: toggle fullscreen - ***************************************************************************** - * Returns 0 on success, 1 otherwise - *****************************************************************************/ -static int CoToggleFullscreen( vout_thread_t *p_vout ) +- (void)mouseUp:(NSEvent *)o_event { - QTDestroySequence( p_vout ); + vlc_value_t val; - if( CoDestroyWindow( p_vout ) ) + if( p_vout ) { - msg_Err( p_vout, "unable to destroy window" ); - return( 1 ); - } - - p_vout->b_fullscreen = !p_vout->b_fullscreen; - - config_PutInt( p_vout, "fullscreen", p_vout->b_fullscreen ); - - if( CoCreateWindow( p_vout ) ) - { - msg_Err( p_vout, "unable to create window" ); - return( 1 ); - } + switch( [o_event type] ) + { + case NSLeftMouseUp: + { + vlc_value_t b_val; + b_val.b_bool = VLC_TRUE; + var_Set( p_vout, "mouse-clicked", b_val ); - if( QTCreateSequence( p_vout ) ) - { - msg_Err( p_vout, "unable to create sequence" ); - return( 1 ); - } + var_Get( p_vout, "mouse-button-down", &val ); + val.i_int &= ~1; + var_Set( p_vout, "mouse-button-down", val ); + } + break; - return( 0 ); + default: + [super mouseUp: o_event]; + break; + } + } } -/***************************************************************************** - * VLCHideMouse: if b_hide then hide the cursor - *****************************************************************************/ -static void VLCHideMouse ( vout_thread_t *p_vout, BOOL b_hide ) +- (void)otherMouseUp:(NSEvent *)o_event { - BOOL b_inside; - NSRect s_rect; - NSPoint ml; - NSWindow *o_window = p_vout->p_sys->o_window; - NSView *o_contents = [o_window contentView]; - - s_rect = [o_contents bounds]; - ml = [o_window convertScreenToBase:[NSEvent mouseLocation]]; - ml = [o_contents convertPoint:ml fromView:nil]; - b_inside = [o_contents mouse: ml inRect: s_rect]; - - if ( b_hide && b_inside ) - { - /* only hide if mouse over VLCView */ - [NSCursor hide]; - p_vout->p_sys->b_mouse_pointer_visible = 0; - } - else if ( !b_hide ) + vlc_value_t val; + + if( p_vout ) { - [NSCursor unhide]; - p_vout->p_sys->b_mouse_pointer_visible = 1; + switch( [o_event type] ) + { + case NSOtherMouseUp: + { + var_Get( p_vout, "mouse-button-down", &val ); + val.i_int &= ~2; + var_Set( p_vout, "mouse-button-down", val ); + } + break; + + default: + [super mouseUp: o_event]; + break; + } } - p_vout->p_sys->b_mouse_moved = NO; - p_vout->p_sys->i_time_mouse_last_moved = mdate(); - return; } -/***************************************************************************** - * QTScaleMatrix: scale matrix - *****************************************************************************/ -static void QTScaleMatrix( vout_thread_t *p_vout ) +- (void)rightMouseUp:(NSEvent *)o_event { - Rect s_rect; - unsigned int i_width, i_height; - Fixed factor_x, factor_y; - unsigned int i_offset_x = 0; - unsigned int i_offset_y = 0; vlc_value_t val; - vlc_value_t valt; - vlc_value_t vall; - vlc_value_t valb; - vlc_value_t valr; - vlc_value_t valx; - vlc_value_t valy; - vlc_value_t valw; - vlc_value_t valh; - vlc_value_t valportx; - vlc_value_t valporty; - - GetPortBounds( p_vout->p_sys->p_qdport, &s_rect ); - i_width = s_rect.right - s_rect.left; - i_height = s_rect.bottom - s_rect.top; - - var_Get( p_vout->p_vlc, "drawable", &val ); - var_Get( p_vout->p_vlc, "drawablet", &valt ); - var_Get( p_vout->p_vlc, "drawablel", &vall ); - var_Get( p_vout->p_vlc, "drawableb", &valb ); - var_Get( p_vout->p_vlc, "drawabler", &valr ); - var_Get( p_vout->p_vlc, "drawablex", &valx ); - var_Get( p_vout->p_vlc, "drawabley", &valy ); - var_Get( p_vout->p_vlc, "drawablew", &valw ); - var_Get( p_vout->p_vlc, "drawableh", &valh ); - var_Get( p_vout->p_vlc, "drawableportx", &valportx ); - var_Get( p_vout->p_vlc, "drawableporty", &valporty ); - - if( p_vout->p_sys->isplugin ) - { - p_vout->p_sys->portx = valportx.i_int; - p_vout->p_sys->porty = valporty.i_int; - p_vout->p_sys->p_qdport = val.i_int; - i_width = valw.i_int; - i_height = valh.i_int; - - SetRectRgn( p_vout->p_sys->mask , vall.i_int - valx.i_int , - valt.i_int - valy.i_int , valr.i_int - valx.i_int , - valb.i_int - valy.i_int ); - p_vout->p_sys->rect.top = 0; - p_vout->p_sys->rect.left = 0; - p_vout->p_sys->rect.bottom = valb.i_int - valt.i_int; - p_vout->p_sys->rect.right = valr.i_int - vall.i_int; - } - if( i_height * p_vout->output.i_aspect < i_width * VOUT_ASPECT_FACTOR ) + if( p_vout ) { - int i_adj_width = i_height * p_vout->output.i_aspect / - VOUT_ASPECT_FACTOR; - - factor_x = FixDiv( Long2Fix( i_adj_width ), - Long2Fix( p_vout->output.i_width ) ); - factor_y = FixDiv( Long2Fix( i_height ), - Long2Fix( p_vout->output.i_height ) ); - - i_offset_x = (i_width - i_adj_width) / 2 + i_offset_x; - } - else - { - int i_adj_height = i_width * VOUT_ASPECT_FACTOR / - p_vout->output.i_aspect; - - factor_x = FixDiv( Long2Fix( i_width ), - Long2Fix( p_vout->output.i_width ) ); - factor_y = FixDiv( Long2Fix( i_adj_height ), - Long2Fix( p_vout->output.i_height ) ); + switch( [o_event type] ) + { + case NSRightMouseUp: + { + var_Get( p_vout, "mouse-button-down", &val ); + val.i_int &= ~4; + var_Set( p_vout, "mouse-button-down", val ); + } + break; - i_offset_y = (i_height - i_adj_height) / 2 + i_offset_y; + default: + [super mouseUp: o_event]; + break; + } } - - SetIdentityMatrix( p_vout->p_sys->p_matrix ); - - ScaleMatrix( p_vout->p_sys->p_matrix, - factor_x, factor_y, - Long2Fix(0), Long2Fix(0) ); - - TranslateMatrix( p_vout->p_sys->p_matrix, - Long2Fix(i_offset_x), - Long2Fix(i_offset_y) ); - } -/***************************************************************************** - * QTCreateSequence: create a new sequence - ***************************************************************************** - * Returns 0 on success, 1 otherwise - *****************************************************************************/ -static int QTCreateSequence( vout_thread_t *p_vout ) +- (void)mouseDragged:(NSEvent *)o_event { - OSErr err; - ImageDescriptionPtr p_descr; - - HLock( (Handle)p_vout->p_sys->h_img_descr ); - p_descr = *p_vout->p_sys->h_img_descr; - - p_descr->idSize = sizeof(ImageDescription); - p_descr->cType = p_vout->p_sys->i_codec; - p_descr->version = 1; - p_descr->revisionLevel = 0; - p_descr->vendor = 'appl'; - p_descr->width = p_vout->output.i_width; - p_descr->height = p_vout->output.i_height; - p_descr->hRes = Long2Fix(72); - p_descr->vRes = Long2Fix(72); - p_descr->spatialQuality = codecLosslessQuality; - p_descr->frameCount = 1; - p_descr->clutID = -1; - p_descr->dataSize = 0; - p_descr->depth = 24; - - - HUnlock( (Handle)p_vout->p_sys->h_img_descr ); - - - if( ( err = DecompressSequenceBeginS( - &p_vout->p_sys->i_seq, - p_vout->p_sys->h_img_descr, - NULL, 0, - p_vout->p_sys->p_qdport, - NULL, NULL, - p_vout->p_sys->p_matrix, - 0, p_vout->p_sys->mask, - codecFlagUseImageBuffer, - codecLosslessQuality, - p_vout->p_sys->img_dc ) ) ) - { - msg_Err( p_vout, "DecompressSequenceBeginS failed: %d", err ); - return( 1 ); - } - - - return( 0 ); + [self mouseMoved: o_event]; } -/***************************************************************************** - * QTDestroySequence: destroy sequence - *****************************************************************************/ -static void QTDestroySequence( vout_thread_t *p_vout ) +- (void)otherMouseDragged:(NSEvent *)o_event { - CDSequenceEnd( p_vout->p_sys->i_seq ); + [self mouseMoved: o_event]; } -/***************************************************************************** - * QTNewPicture: allocate a picture - ***************************************************************************** - * Returns 0 on success, 1 otherwise - *****************************************************************************/ -static int QTNewPicture( vout_thread_t *p_vout, picture_t *p_pic ) +- (void)rightMouseDragged:(NSEvent *)o_event { - int i_width = p_vout->output.i_width; - int i_height = p_vout->output.i_height; + [self mouseMoved: o_event]; +} - /* We know the chroma, allocate a buffer which will be used - * directly by the decoder */ - p_pic->p_sys = malloc( sizeof( picture_sys_t ) ); +- (void)mouseMoved:(NSEvent *)o_event +{ + NSPoint ml; + NSRect s_rect; + BOOL b_inside; - if( p_pic->p_sys == NULL ) + if( p_vout ) { - return( -1 ); - } + s_rect = [o_view bounds]; + ml = [o_view convertPoint: [o_event locationInWindow] fromView: nil]; + b_inside = [o_view mouse: ml inRect: s_rect]; - switch( p_vout->output.i_chroma ) - { - case VLC_FOURCC('I','4','2','0'): - - p_pic->p_sys->p_info = (void *)&p_pic->p_sys->pixmap_i420; - p_pic->p_sys->i_size = sizeof(PlanarPixmapInfoYUV420); - - /* Allocate the memory buffer */ - p_pic->p_data = vlc_memalign( &p_pic->p_data_orig, - 16, i_width * i_height * 3 / 2 ); - - /* Y buffer */ - p_pic->Y_PIXELS = p_pic->p_data; - p_pic->p[Y_PLANE].i_lines = i_height; - p_pic->p[Y_PLANE].i_pitch = i_width; - p_pic->p[Y_PLANE].i_pixel_pitch = 1; - p_pic->p[Y_PLANE].i_visible_pitch = i_width; - - /* U buffer */ - p_pic->U_PIXELS = p_pic->Y_PIXELS + i_height * i_width; - p_pic->p[U_PLANE].i_lines = i_height / 2; - p_pic->p[U_PLANE].i_pitch = i_width / 2; - p_pic->p[U_PLANE].i_pixel_pitch = 1; - p_pic->p[U_PLANE].i_visible_pitch = i_width / 2; - - /* V buffer */ - p_pic->V_PIXELS = p_pic->U_PIXELS + i_height * i_width / 4; - p_pic->p[V_PLANE].i_lines = i_height / 2; - p_pic->p[V_PLANE].i_pitch = i_width / 2; - p_pic->p[V_PLANE].i_pixel_pitch = 1; - p_pic->p[V_PLANE].i_visible_pitch = i_width / 2; - - /* We allocated 3 planes */ - p_pic->i_planes = 3; - -#define P p_pic->p_sys->pixmap_i420 - P.componentInfoY.offset = (void *)p_pic->Y_PIXELS - - p_pic->p_sys->p_info; - P.componentInfoCb.offset = (void *)p_pic->U_PIXELS - - p_pic->p_sys->p_info; - P.componentInfoCr.offset = (void *)p_pic->V_PIXELS - - p_pic->p_sys->p_info; - - P.componentInfoY.rowBytes = i_width; - P.componentInfoCb.rowBytes = i_width / 2; - P.componentInfoCr.rowBytes = i_width / 2; -#undef P + if( b_inside ) + { + vlc_value_t val; + unsigned int i_width, i_height, i_x, i_y; - break; + vout_PlacePicture( p_vout, (unsigned int)s_rect.size.width, + (unsigned int)s_rect.size.height, + &i_x, &i_y, &i_width, &i_height ); - default: - /* Unknown chroma, tell the guy to get lost */ - free( p_pic->p_sys ); - msg_Err( p_vout, "never heard of chroma 0x%.8x (%4.4s)", - p_vout->output.i_chroma, (char*)&p_vout->output.i_chroma ); - p_pic->i_planes = 0; - return( -1 ); - } + val.i_int = ( ((int)ml.x) - i_x ) * + p_vout->render.i_width / i_width; + var_Set( p_vout, "mouse-x", val ); - return( 0 ); -} + 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 ); -/***************************************************************************** - * QTFreePicture: destroy a picture allocated with QTNewPicture - *****************************************************************************/ -static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) -{ - switch( p_vout->output.i_chroma ) - { - case VLC_FOURCC('I','4','2','0'): - free( p_pic->p_data_orig ); - break; + val.b_bool = VLC_TRUE; + var_Set( p_vout, "mouse-moved", val ); + } } - - free( p_pic->p_sys ); + [super mouseMoved: o_event]; } -/***************************************************************************** - * VLCWindow implementation - *****************************************************************************/ -@implementation VLCWindow - -- (void)setVout:(vout_thread_t *)_p_vout +- (BOOL)acceptsFirstResponder { - p_vout = _p_vout; + return YES; } -- (vout_thread_t *)getVout +- (BOOL)becomeFirstResponder { - return( p_vout ); + return YES; } -- (void)scaleWindowWithFactor: (float)factor +- (BOOL)resignFirstResponder { - NSSize newsize; - int i_corrected_height, i_corrected_width; - NSPoint topleftbase; - NSPoint topleftscreen; - - if ( !p_vout->b_fullscreen ) - { - topleftbase.x = 0; - topleftbase.y = [self frame].size.height; - topleftscreen = [self convertBaseToScreen: topleftbase]; - - if( p_vout->output.i_height * p_vout->output.i_aspect > - p_vout->output.i_width * VOUT_ASPECT_FACTOR ) - { - i_corrected_width = p_vout->output.i_height * p_vout->output.i_aspect / - VOUT_ASPECT_FACTOR; - newsize.width = (int) ( i_corrected_width * factor ); - newsize.height = (int) ( p_vout->render.i_height * factor ); - } - else - { - i_corrected_height = p_vout->output.i_width * VOUT_ASPECT_FACTOR / - p_vout->output.i_aspect; - newsize.width = (int) ( p_vout->render.i_width * factor ); - newsize.height = (int) ( i_corrected_height * factor ); - } - - [self setContentSize: newsize]; - - [self setFrameTopLeftPoint: topleftscreen]; - p_vout->i_changes |= VOUT_SIZE_CHANGE; - } + /* We need to stay the first responder or we'll miss some + events */ + return NO; } -- (void)toggleFloatOnTop +/* Class methods used by the different vout modules */ + ++ (vout_thread_t *)getRealVout: (vout_thread_t *)p_vout { - if( config_GetInt( p_vout, "macosx-float" ) ) + /* 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 ) { - config_PutInt( p_vout, "macosx-float", 0 ); - [p_vout->p_sys->o_window setLevel: NSNormalWindowLevel]; + return (vout_thread_t *) p_vout->p_parent; } else { - config_PutInt( p_vout, "macosx-float", 1 ); - [p_vout->p_sys->o_window setLevel: NSStatusWindowLevel]; + return p_vout; } -} -- (void)toggleFullscreen -{ - p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; } -- (BOOL)isFullscreen ++ (id)getVoutView: (vout_thread_t *)p_vout subView: (NSView *)view + frame: (NSRect *)s_frame { - return( p_vout->b_fullscreen ); -} + vlc_value_t value_drawable; + int i_timeout; + id o_return = nil; + vout_thread_t * p_real_vout = [VLCVoutView getRealVout: p_vout]; -- (BOOL)canBecomeKeyWindow -{ - return( YES ); -} + var_Get( p_vout->p_vlc, "drawable", &value_drawable ); -- (void)keyDown:(NSEvent *)o_event -{ - playlist_t * p_playlist; - unichar key = 0; - vlc_value_t val; + 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 ); + 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 ); - if( [[o_event characters] length] ) - { - key = [[o_event characters] characterAtIndex: 0]; - } - switch( key ) + /* 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 'f': case 'F': - [self toggleFullscreen]; - break; - - case (unichar)0x1b: /* escape */ - if( [self isFullscreen] ) + /* Wait for a MacOS X interface to appear. Timeout is 2 seconds. */ + for( i_timeout = 20 ; i_timeout-- ; ) + { + if( NSApp == NULL ) { - [self toggleFullscreen]; + msleep( INTF_IDLE_SLEEP ); } - break; - - case 'q': case 'Q': - p_vout->p_vlc->b_die = VLC_TRUE; - break; + } - case ' ': - p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if ( p_playlist != NULL ) + if( NSApp == NULL ) + { + /* No MacOS X intf, unable to communicate with MT */ + msg_Err( p_vout, "no MacOS X interface present" ); + return nil; + } + else + { + if ( VLCIntf && !(p_vout->b_fullscreen) && + !(var_GetBool( p_real_vout, "macosx-background" )) && + var_GetBool( p_vout, "macosx-embedded") ) { - playlist_Pause( p_playlist ); - vlc_object_release( p_playlist); + o_return = [[[VLCMain sharedInstance] getEmbeddedList] + getEmbeddedVout]; } - break; - - case (unichar)0xf700: /* arrow up */ - val.psz_string = "UP"; - var_Set( p_vout, "key-pressed", val ); - break; - - case (unichar)0xf701: /* arrow down */ - val.psz_string = "DOWN"; - var_Set( p_vout, "key-pressed", val ); - break; - - case (unichar)0xf702: /* arrow left */ - val.psz_string = "LEFT"; - var_Set( p_vout, "key-pressed", val ); - break; - - case (unichar)0xf703: /* arrow right */ - val.psz_string = "RIGHT"; - var_Set( p_vout, "key-pressed", val ); - break; - - case (unichar)0xd: /* return */ - case (unichar)0x3: /* enter */ - val.psz_string = "ENTER"; - var_Set( p_vout, "key-pressed", val ); - break; - - - default: - [super keyDown: o_event]; - break; - } -} - -- (void)updateTitle -{ - NSMutableString * o_title; - playlist_t * 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->pp_items[p_playlist->i_index]->psz_name]; - vlc_mutex_unlock( &p_playlist->object_lock ); - - vlc_object_release( p_playlist ); - - if( o_title != nil ) - { - NSRange prefix_range = [o_title rangeOfString: @"file:"]; - if( prefix_range.location != NSNotFound ) - { - [o_title deleteCharactersInRange: prefix_range]; } - - [self setTitleWithRepresentedFilename: o_title]; } - else - { - [self setTitle: - [NSString stringWithCString: VOUT_TITLE " (QuickTime)"]]; - } -} -/* 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 ) + /* No embedded vout is available */ + if( o_return == nil ) { - return NO; + NSRect null_rect; + bzero( &null_rect, sizeof( NSRect ) ); + o_return = [[VLCDetachedVoutView alloc] initWithFrame: null_rect ]; } - - playlist_Stop( p_playlist ); - vlc_object_release( p_playlist ); - - /* The window will be closed by the intf later. */ - return NO; + [o_return setVout: p_vout subView: view frame: s_frame]; + return o_return; } @end /***************************************************************************** - * VLCView implementation + * VLCDetachedVoutView implementation *****************************************************************************/ -@implementation VLCView +@implementation VLCDetachedVoutView -- (void)drawRect:(NSRect)rect +- (id)initWithFrame: (NSRect)frameRect { - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; - - [[NSColor blackColor] set]; - NSRectFill( rect ); - [super drawRect: rect]; - - p_vout->i_changes |= VOUT_SIZE_CHANGE; + [super initWithFrame: frameRect]; + i_time_mouse_last_moved = 0; + return self; } -- (BOOL)acceptsFirstResponder +- (bool)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view + frame: (NSRect *) s_arg_frame { - return( YES ); -} + BOOL b_return = [super setVout: p_arg_vout subView: view frame:s_arg_frame]; + i_time_mouse_last_moved = mdate(); + o_window = [[VLCWindow 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]; + } -- (BOOL)becomeFirstResponder -{ - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; - - [o_window setAcceptsMouseMovedEvents: YES]; - return( YES ); + + [o_window setAcceptsMouseMovedEvents: TRUE]; + return b_return; } -- (BOOL)resignFirstResponder +- (void)closeVout { - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; - + [o_window closeWindow]; [o_window setAcceptsMouseMovedEvents: NO]; - VLCHideMouse( p_vout, NO ); - return( YES ); + i_time_mouse_last_moved = 0; + [super closeVout]; } -- (void)mouseDown:(NSEvent *)o_event +- (void)mouseMoved:(NSEvent *)o_event { - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; - vlc_value_t val; - - switch( [o_event type] ) - { - 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; - } + i_time_mouse_last_moved = mdate(); + [super mouseMoved: o_event]; } -- (void)otherMouseDown:(NSEvent *)o_event +- (void)hideMouse:(BOOL)b_hide { - /* This is not the the wheel button. you need to poll the - * mouseWheel event for that. other is a third, forth or fifth button */ - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; - vlc_value_t val; + 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 NSOtherMouseDown: - { - var_Get( p_vout, "mouse-button-down", &val ); - val.i_int |= 2; - var_Set( p_vout, "mouse-button-down", val ); - } - break; - - default: - [super mouseDown: o_event]; - break; + [NSCursor setHiddenUntilMouseMoves: YES]; } -} - -- (void)rightMouseDown:(NSEvent *)o_event -{ - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; - vlc_value_t val; - - switch( [o_event type] ) + else if( !b_hide ) { - case NSRightMouseDown: - { - var_Get( p_vout, "mouse-button-down", &val ); - val.i_int |= 4; - var_Set( p_vout, "mouse-button-down", val ); - } - break; - - default: - [super mouseDown: o_event]; - break; + [NSCursor setHiddenUntilMouseMoves: NO]; } } -- (void)mouseUp:(NSEvent *)o_event +- (void)manage { - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; - vlc_value_t val; - - switch( [o_event type] ) + [super manage]; + if( p_vout->b_fullscreen ) { - case NSLeftMouseUp: + if( mdate() - i_time_mouse_last_moved > 3000000 ) { - 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 ); + [self hideMouse: YES]; } - break; - - default: - [super mouseUp: o_event]; - break; } -} - -- (void)otherMouseUp:(NSEvent *)o_event -{ - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; - vlc_value_t val; - - switch( [o_event type] ) + else { - case NSOtherMouseUp: - { - var_Get( p_vout, "mouse-button-down", &val ); - val.i_int &= ~2; - var_Set( p_vout, "mouse-button-down", val ); - } - break; - - default: - [super mouseUp: o_event]; - break; + [self hideMouse: NO]; } } -- (void)rightMouseUp:(NSEvent *)o_event +@end + +/***************************************************************************** + * VLCEmbeddedVoutView implementation + *****************************************************************************/ + +@implementation VLCEmbeddedVoutView + +- (id)initWithFrame: (NSRect)frameRect { - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; - vlc_value_t val; + [super initWithFrame: frameRect]; + b_used = NO; + [[[VLCMain sharedInstance] getEmbeddedList] addEmbeddedVout: self]; + return self; +} + +- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view + frame: (NSRect *) s_arg_frame - switch( [o_event type] ) +{ + BOOL b_return; + b_return = [super setVout: p_arg_vout subView: view frame: s_arg_frame]; + if( b_return ) { - case NSRightMouseUp: + 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 &= ~4; - 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)mouseDragged:(NSEvent *)o_event +- (void)setUsed: (BOOL)b_new_used { - [self mouseMoved:o_event]; + b_used = b_new_used; } -- (void)otherMouseDragged:(NSEvent *)o_event +- (BOOL)isUsed { - [self mouseMoved:o_event]; + return b_used; } -- (void)rightMouseDragged:(NSEvent *)o_event +- (void)closeVout { - [self mouseMoved:o_event]; + [super closeVout]; + [o_window setAcceptsMouseMovedEvents: NO]; + [[[VLCMain sharedInstance] getEmbeddedList] releaseEmbeddedVout: self]; } -- (void)mouseMoved:(NSEvent *)o_event -{ - NSPoint ml; - NSRect s_rect; - BOOL b_inside; - vout_thread_t * p_vout; - id o_window = [self window]; - p_vout = (vout_thread_t *)[o_window getVout]; +@end - s_rect = [self bounds]; - ml = [self convertPoint: [o_event locationInWindow] fromView: nil]; - b_inside = [self mouse: ml inRect: s_rect]; +@implementation VLCDetachedEmbeddedVoutView - if( b_inside ) - { - vlc_value_t val; - 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 ); - - 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 ); - p_vout->p_sys->i_time_mouse_last_moved = mdate(); - p_vout->p_sys->b_mouse_moved = YES; - } - else if ( !b_inside && !p_vout->p_sys->b_mouse_pointer_visible ) +- (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]; + + if( b_return ) { - /* people with multiple monitors need their mouse, - * even if VLCView in fullscreen. */ - VLCHideMouse( p_vout, NO ); + [o_window setAlphaValue: var_GetFloat( p_vout, "macosx-opaqueness" )]; + [self updateTitle]; + [self scaleWindowWithFactor: 1.0]; + [o_window makeKeyAndOrderFront: self]; } - - [super mouseMoved: o_event]; + return b_return; +} + +- (void)closeVout +{ + [o_window orderOut: self]; + [super closeVout]; } @end /***************************************************************************** - * VLCVout implementation + * VLCWindow implementation *****************************************************************************/ -@implementation VLCVout +@implementation VLCWindow -- (void)createWindow:(NSValue *)o_value +- (id) initWithVout: (vout_thread_t *) vout view: (VLCVoutView *) view + frame: (NSRect *) frame { - vlc_value_t val; - VLCView * o_view; - NSScreen * o_screen; - vout_thread_t * p_vout; - vlc_bool_t b_main_screen; - - p_vout = (vout_thread_t *)[o_value pointerValue]; - - p_vout->p_sys->o_window = [VLCWindow alloc]; - [p_vout->p_sys->o_window setVout: p_vout]; - [p_vout->p_sys->o_window setReleasedWhenClosed: YES]; - - if( var_Get( p_vout, "video-device", &val ) < 0 ) + p_vout = vout; + o_view = view; + s_frame = frame; + + [self performSelectorOnMainThread: @selector(initReal:) + withObject: NULL waitUntilDone: YES]; + + if( !b_init_ok ) { + 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; + + b_init_ok = VLC_FALSE; + + p_real_vout = [VLCVoutView getRealVout: p_vout]; + i_device = var_GetInteger( p_real_vout->p_vlc, "video-device" ); + b_black = var_GetBool( p_real_vout->p_vlc, "macosx-black" ); + + /* Find out on which screen to open the window */ + if( i_device <= 0 || i_device > (int)[o_screens count] ) + { + /* No preference specified. Use the main screen */ o_screen = [NSScreen mainScreen]; - b_main_screen = 1; + i_device = [o_screens indexOfObject: o_screen]; + if( o_screen == [o_screens objectAtIndex: 0] ) + b_menubar_screen = VLC_TRUE; } else { - NSArray *o_screens = [NSScreen screens]; - unsigned int i_index = val.i_int; - - if( [o_screens count] < i_index ) + i_device--; + o_screen = [o_screens objectAtIndex: i_device]; + b_menubar_screen = ( i_device == 0 ); + } + + if( p_vout->b_fullscreen ) + { + CGDisplayFadeReservationToken token; + 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( var_GetBool( p_real_vout, "macosx-black" ) ) + if( b_black == VLC_TRUE ) { - o_screen = [NSScreen mainScreen]; - b_main_screen = 1; + CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token); + CGDisplayFade( token, 0.5, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, true ); + CGReleaseDisplayFadeReservation( token ); + unsigned int i; + for( i = 0 ; i < [o_screens count]; i++) + { + struct + { + CGDirectDisplayID displayID; + CGGammaValue redMin, redMax, redGamma, + greenMin, greenMax, greenGamma, + blueMin, blueMax, blueGamma; + } dispSettings; + CGDisplayCount dspyCnt; + CGPoint gPoint; + + if( i == (unsigned int)i_device ) continue; + + screen_rect = [[o_screens objectAtIndex: i] frame]; + + gPoint.x = screen_rect.origin.x; + gPoint.y = screen_rect.origin.y; + CGGetDisplaysWithPoint( gPoint, 1, &(dispSettings.displayID), &dspyCnt); + CGGetDisplayTransferByFormula( + dispSettings.displayID, + &dispSettings.redMin, &dispSettings.redMax, &dispSettings.redGamma, + &dispSettings.greenMin, &dispSettings.greenMax, &dispSettings.greenGamma, + &dispSettings.blueMin, &dispSettings.blueMax, &dispSettings.blueGamma ); + CGSetDisplayTransferByFormula( + dispSettings.displayID, + dispSettings.redMin, 0, dispSettings.redGamma, + dispSettings.greenMin, 0, dispSettings.greenGamma, + dispSettings.blueMin, 0, dispSettings.blueGamma ); + } } - else + if( b_menubar_screen ) { - i_index--; - o_screen = [o_screens objectAtIndex: i_index]; - config_PutInt( p_vout, "macosx-vdev", i_index ); - b_main_screen = (i_index == 0); + SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); } - } - - if( p_vout->b_fullscreen ) + if( b_black == VLC_TRUE ) + { + CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token); + CGDisplayFade( token, 2 , kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, false ); + CGReleaseDisplayFadeReservation( token); + } + } + else if( var_GetBool( p_real_vout, "macosx-background" ) ) { NSRect screen_rect = [o_screen frame]; screen_rect.origin.x = screen_rect.origin.y = 0; - if ( b_main_screen && p_vout->p_sys->p_fullscreen_state == NULL ) - BeginFullScreen( &p_vout->p_sys->p_fullscreen_state, NULL, 0, 0, - NULL, NULL, fullScreenAllowEvents ); + /* Creates a window with size: screen_rect on o_screen */ + [self initWithContentRect: screen_rect + styleMask: NSBorderlessWindowMask + backing: NSBackingStoreBuffered + defer: YES screen: o_screen]; - [p_vout->p_sys->o_window - initWithContentRect: screen_rect - styleMask: NSBorderlessWindowMask - backing: NSBackingStoreBuffered - defer: NO screen: o_screen]; - - [p_vout->p_sys->o_window setLevel: NSPopUpMenuWindowLevel - 1]; - p_vout->p_sys->b_mouse_moved = YES; - p_vout->p_sys->i_time_mouse_last_moved = mdate(); + [self setLevel: CGWindowLevelForKey(kCGDesktopWindowLevelKey)]; } else { @@ -1422,67 +1058,108 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) NSMiniaturizableWindowMask | NSClosableWindowMask | NSResizableWindowMask; - - if ( p_vout->p_sys->p_fullscreen_state != NULL ) - EndFullScreen ( p_vout->p_sys->p_fullscreen_state, NULL ); - p_vout->p_sys->p_fullscreen_state = NULL; - - [p_vout->p_sys->o_window - initWithContentRect: p_vout->p_sys->s_rect - styleMask: i_stylemask - backing: NSBackingStoreBuffered - defer: NO screen: o_screen]; - - [p_vout->p_sys->o_window setAlphaValue: config_GetFloat( p_vout, "macosx-opaqueness" )]; - - if( config_GetInt( p_vout, "macosx-float" ) ) + + NSRect s_rect; + if( !s_frame ) { - [p_vout->p_sys->o_window setLevel: NSStatusWindowLevel]; + s_rect.size.width = p_vout->i_window_width; + s_rect.size.height = p_vout->i_window_height; } - - if( !p_vout->p_sys->b_pos_saved ) + 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( !s_frame ) { - [p_vout->p_sys->o_window center]; + [self center]; } } - o_view = [[VLCView alloc] init]; + [self makeKeyAndOrderFront: nil]; + [self setReleasedWhenClosed: YES]; + + /* We'll catch mouse events */ + [self makeFirstResponder: o_view]; - /* FIXME: [o_view setMenu:] */ - [p_vout->p_sys->o_window setContentView: o_view]; - [o_view autorelease]; + /* Add the view. It's automatically resized to fit the window */ + [self setContentView: o_view]; - [o_view lockFocus]; - p_vout->p_sys->p_qdport = [o_view qdPort]; + [o_pool release]; - [o_view unlockFocus]; - - [p_vout->p_sys->o_window updateTitle]; - [p_vout->p_sys->o_window makeKeyAndOrderFront: nil]; + b_init_ok = VLC_TRUE; + return self; } -- (void)destroyWindow:(NSValue *)o_value +- (void)close { - vout_thread_t * p_vout; + [o_view closeVout]; +} - p_vout = (vout_thread_t *)[o_value pointerValue]; +- (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]; +} - if( !p_vout->b_fullscreen ) +- (id) closeReal: (id) sender +{ + if( b_black == VLC_TRUE ) { - NSRect s_rect; + CGDisplayFadeReservationToken token; + CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token); + CGDisplayFade( token, 2, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, false ); + CGReleaseDisplayFadeReservation( token); + CGDisplayRestoreColorSyncSettings(); + } + SetSystemUIMode( kUIModeNormal, 0); + [super close]; + return NULL; +} + +- (id)getVoutView +{ + return o_view; +} - s_rect = [[p_vout->p_sys->o_window contentView] frame]; - p_vout->p_sys->s_rect.size = s_rect.size; +- (BOOL)canBecomeKeyWindow +{ + return YES; +} - s_rect = [p_vout->p_sys->o_window frame]; - p_vout->p_sys->s_rect.origin = s_rect.origin; +/* Sometimes crashes VLC.... +- (BOOL)performKeyEquivalent:(NSEvent *)o_event +{ + return [[VLCMain sharedInstance] hasDefinedShortcutKey:o_event]; +}*/ - p_vout->p_sys->b_pos_saved = YES; +/* 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; } - - p_vout->p_sys->p_qdport = nil; - [p_vout->p_sys->o_window close]; - p_vout->p_sys->o_window = nil; + + playlist_Stop( p_playlist ); + vlc_object_release( p_playlist ); + + /* The window will be closed by the intf later. */ + return NO; } + @end