* Jon Lech Johansen <jon-vl@nanocrew.net>
* Derk-Jan Hartman <hartman at videolan dot org>
* Eric Petit <titer@m0k.org>
+ * Benjamin Pracht <bigben at videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* 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
{
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_vlc, "video-device", VLC_VAR_INTEGER );
var_Set( p_vout->p_vlc, "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 *) vout view: (NSView *) view
- frame: (NSRect *) frame
+- (id)init
{
- p_vout = vout;
- o_view = view;
- s_frame = frame;
-
- [self performSelectorOnMainThread: @selector(initReal:)
- withObject: NULL waitUntilDone: YES];
-
- if( !b_init_ok )
- {
- return NULL;
- }
-
+ [super init];
+ o_embedded_array = [NSMutableArray array];
return self;
}
-- (id) initReal: (id) sender
+- (id)getEmbeddedVout
{
- NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
- NSArray *o_screens = [NSScreen screens];
- NSScreen *o_screen;
- vlc_bool_t b_menubar_screen = VLC_FALSE;
- int i_timeout, i_device;
- vlc_value_t value_drawable;
-
- b_init_ok = VLC_FALSE;
-
- var_Get( p_vout->p_vlc, "drawable", &value_drawable );
+ unsigned int i;
- /* 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 )
+ for( i = 0; i < [o_embedded_array count]; i++ )
{
- /* Wait for a MacOS X interface to appear. Timeout is 2 seconds. */
- for( i_timeout = 20 ; i_timeout-- ; )
+ id o_vout_view = [o_embedded_array objectAtIndex: i];
+ if( ![o_vout_view isUsed] )
{
- if( NSApp == NULL )
- {
- msleep( INTF_IDLE_SLEEP );
- }
+ [o_vout_view setUsed: YES];
+ return o_vout_view;
}
+ }
+ return nil;
+}
- if( NSApp == NULL )
- {
- /* No MacOS X intf, unable to communicate with MT */
- msg_Err( p_vout, "no MacOS X interface present" );
- return NULL;
- }
+- (void)releaseEmbeddedVout: (id)o_vout_view
+{
+ if( [o_embedded_array containsObject: o_vout_view] )
+ {
+ [o_vout_view setUsed: NO];
}
-
- if( [o_screens count] <= 0 )
+ else
{
- msg_Err( p_vout, "no OSX screens available" );
- return NULL;
+ msg_Warn( VLCIntf, "Cannot find Video Output");
}
+}
- /* 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 )
+- (void)addEmbeddedVout: (id)o_vout_view
+{
+ if( ![o_embedded_array containsObject: o_vout_view] )
{
- p_real_vout = (vout_thread_t *) p_vout->p_parent;
+ [o_embedded_array addObject: o_vout_view];
}
- else
+}
+
+- (BOOL)windowContainsEmbedded: (id)o_window
+{
+ 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]) )
{
- p_real_vout = p_vout;
+ if( [o_current_embedded getWindow] == o_window )
+ {
+ return o_current_embedded;
+ }
}
+ return nil;
+}
- p_fullscreen_state = NULL;
- i_time_mouse_last_moved = mdate();
+@end
- 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 );
+/*****************************************************************************
+ * 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_vlc, "video-device" ) == 0 )
var_Set( p_real_vout, "intf-change", val2 );
}
- /* 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];
- if( o_screen == [o_screens objectAtIndex: 0] )
- b_menubar_screen = VLC_TRUE;
- }
- else
- {
- i_device--;
- o_screen = [o_screens objectAtIndex: i_device];
- b_menubar_screen = ( i_device == 0 );
- }
-
- 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_menubar_screen )
- {
- BeginFullScreen( &p_fullscreen_state, NULL, 0, 0,
- NULL, NULL, fullScreenAllowEvents );
- }
- }
- else if( var_GetBool( p_real_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
- {
- 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];
- }
-
- if( !s_frame )
- {
- [self center];
- }
- }
-
- [self updateTitle];
- [self makeKeyAndOrderFront: nil];
- [self setReleasedWhenClosed: YES];
-
- /* We'll catch mouse events */
- [self setAcceptsMouseMovedEvents: YES];
- [self makeFirstResponder: self];
-
/* Add the view. It's automatically resized to fit the window */
- [self setContentView: o_view];
-
+ [self addSubview: o_view];
+ [self setAutoresizesSubviews: YES];
[o_pool release];
- b_init_ok = VLC_TRUE;
- return self;
+ return YES;
}
-- (void) close
+- (void)resizeSubviewsWithOldSize:(NSSize)oldBoundsSize
{
- /* XXX waitUntilDone = NO to avoid a possible deadlock when hitting
- Command-Q */
- [self setAcceptsMouseMovedEvents: NO];
- [self setContentView: NULL];
- [self performSelectorOnMainThread: @selector(closeReal:)
- withObject: NULL waitUntilDone: NO];
+ [super resizeSubviewsWithOldSize: oldBoundsSize];
+ [o_view setFrameSize: [self frame].size];
}
-- (id) closeReal: (id) sender
+- (void)closeVout
{
- [super close];
- if( p_fullscreen_state )
- {
- EndFullScreen( p_fullscreen_state, 0 );
- }
- return NULL;
+ [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
{
if( b_on_top )
{
- [self setLevel: NSStatusWindowLevel];
- }
- else
- {
- [self setLevel: NSNormalWindowLevel];
- }
-}
-
-- (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 )
- {
- [NSCursor setHiddenUntilMouseMoves: YES];
- }
- else if( !b_hide )
- {
- [NSCursor setHiddenUntilMouseMoves: NO];
- }
-}
-
-- (void)manage
-{
- if( p_fullscreen_state )
- {
- 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
int i_corrected_height, i_corrected_width;
NSPoint topleftbase;
NSPoint topleftscreen;
-
+
if ( !p_vout->b_fullscreen )
{
+ 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 /
newsize.width = (int) ( p_vout->render.i_width * factor );
newsize.height = (int) ( i_corrected_height * factor );
}
-
- [self setContentSize: newsize];
-
- [self setFrameTopLeftPoint: topleftscreen];
+
+ /* 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;
+
+ new_frame.origin.x = topleftscreen.x;
+ new_frame.origin.y = topleftscreen.y - new_frame.size.height;
+
+ [o_window setFrame: new_frame display: YES];
+
p_vout->i_changes |= VOUT_SIZE_CHANGE;
}
}
vout_Control( p_real_vout, VOUT_SNAPSHOT );
}
-- (BOOL)canBecomeKeyWindow
+- (void)manage
{
- return YES;
+ /* Disable Screensaver */
+ 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
{
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 )
}
}
-- (void)updateTitle
+- (void)mouseDown:(NSEvent *)o_event
{
- NSMutableString * o_title = NULL, * o_mrl = NULL;
- input_thread_t * p_input;
-
- if( p_vout == NULL )
+ vlc_value_t val;
+
+ if( p_vout )
{
- return;
+ 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;
+ }
}
-
- p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, FIND_PARENT );
-
- if( p_input == NULL )
+}
+
+- (void)otherMouseDown:(NSEvent *)o_event
+{
+ vlc_value_t val;
+
+ if( p_vout )
{
- return;
+ 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;
+
+ default:
+ [super mouseDown: o_event];
+ break;
+ }
}
+}
- 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;
+- (void)rightMouseDown:(NSEvent *)o_event
+{
+ vlc_value_t val;
- if( o_mrl != nil )
+ if( p_vout )
{
- if( p_input->input.p_access && !strcmp( p_input->input.p_access->p_module->psz_shortname, "File" ) )
+ switch( [o_event type] )
{
- NSRange prefix_range = [o_mrl rangeOfString: @"file:"];
- if( prefix_range.location != NSNotFound )
- [o_mrl deleteCharactersInRange: prefix_range];
- [self setRepresentedFilename: o_mrl];
+ 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;
}
- [self setTitle: o_title];
}
- else
+}
+
+- (void)mouseUp:(NSEvent *)o_event
+{
+ vlc_value_t val;
+
+ if( p_vout )
{
- [self setTitle: [NSString stringWithCString: VOUT_TITLE]];
+ 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 );
+
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int &= ~1;
+ var_Set( p_vout, "mouse-button-down", val );
+ }
+ break;
+
+ default:
+ [super mouseUp: o_event];
+ break;
+ }
}
- vlc_object_release( p_input );
}
-/* This is actually the same as VLCControls::stop. */
-- (BOOL)windowShouldClose:(id)sender
+- (void)otherMouseUp:(NSEvent *)o_event
{
- playlist_t * p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist == NULL )
+ vlc_value_t val;
+
+ if( p_vout )
{
- return NO;
+ 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;
+ }
}
+}
- playlist_Stop( p_playlist );
- vlc_object_release( p_playlist );
+- (void)rightMouseUp:(NSEvent *)o_event
+{
+ vlc_value_t val;
- /* The window will be closed by the intf later. */
- return NO;
+ if( p_vout )
+ {
+ 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;
+
+ default:
+ [super mouseUp: o_event];
+ break;
+ }
+ }
+}
+
+- (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 );
+ }
+ }
+ [super mouseMoved: o_event];
}
- (BOOL)acceptsFirstResponder
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;
+ vout_thread_t * p_real_vout = [VLCVoutView getRealVout: p_vout];
+
+ var_Get( p_vout->p_vlc, "drawable", &value_drawable );
+
+ 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 );
- switch( [o_event type] )
+
+ /* 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-- ; )
{
- var_Get( p_vout, "mouse-button-down", &val );
- val.i_int |= 2;
- var_Set( p_vout, "mouse-button-down", val );
+ 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;
}
- break;
+ else
+ {
+ if ( VLCIntf && !(p_vout->b_fullscreen) &&
+ !(var_GetBool( p_real_vout, "macosx-background" )) )
+ {
+ o_return = [[[VLCMain sharedInstance] getEmbeddedList]
+ getEmbeddedVout];
+ }
+ }
+ }
- 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
+@end
+
+/*****************************************************************************
+ * VLCDetachedVoutView implementation
+ *****************************************************************************/
+@implementation VLCDetachedVoutView
+
+- (id)initWithFrame: (NSRect)frameRect
{
- vlc_value_t val;
+ [super initWithFrame: frameRect];
+ i_time_mouse_last_moved = 0;
+ 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 = [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];
+ [view setFrame: [self frame]];
+ [o_window setAcceptsMouseMovedEvents: TRUE];
+ return b_return;
+}
+
+- (void)closeVout
+{
+ [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]];
+
+ if( b_hide && b_inside )
+ {
+ [NSCursor setHiddenUntilMouseMoves: YES];
+ }
+ else if( !b_hide )
+ {
+ [NSCursor setHiddenUntilMouseMoves: NO];
+ }
+}
+
+- (void)manage
+{
+ [super manage];
+ if( p_vout->b_fullscreen )
{
- case NSRightMouseDown:
+ if( mdate() - i_time_mouse_last_moved > 3000000 )
{
- var_Get( p_vout, "mouse-button-down", &val );
- val.i_int |= 4;
- var_Set( p_vout, "mouse-button-down", val );
+ [self hideMouse: YES];
}
- break;
-
- default:
- [super mouseDown: o_event];
- break;
+ }
+ else
+ {
+ [self hideMouse: NO];
}
}
-- (void)mouseUp:(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;
+}
+
+- (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 NSLeftMouseUp:
- {
- vlc_value_t b_val;
- b_val.b_bool = VLC_TRUE;
- var_Set( p_vout, "mouse-clicked", b_val );
+ o_window = [self window];
+ [o_window makeKeyAndOrderFront: self];
+ [o_window setAcceptsMouseMovedEvents: TRUE];
+ [view setFrameSize: [self frame].size];
+ }
+ return b_return;
+}
- var_Get( p_vout, "mouse-button-down", &val );
- val.i_int &= ~1;
- var_Set( p_vout, "mouse-button-down", val );
- }
- break;
+- (void)setUsed: (BOOL)b_new_used
+{
+ b_used = b_new_used;
+}
+
+- (BOOL)isUsed
+{
+ return b_used;
+}
+
+- (void)closeVout
+{
+ [super closeVout];
+ [o_window setAcceptsMouseMovedEvents: NO];
+ [[[VLCMain sharedInstance] getEmbeddedList] releaseEmbeddedVout: self];
+}
+
+
+@end
+
+
+/*****************************************************************************
+ * VLCWindow implementation
+ *****************************************************************************/
+@implementation VLCWindow
+
+- (id) initWithVout: (vout_thread_t *) vout view: (VLCVoutView *) view
+ frame: (NSRect *) frame
+{
+ p_vout = vout;
+ o_view = view;
+ s_frame = frame;
+
+ [self performSelectorOnMainThread: @selector(initReal:)
+ withObject: NULL waitUntilDone: YES];
- default:
- [super mouseUp: o_event];
- break;
+ if( !b_init_ok )
+ {
+ return NULL;
}
+
+ return self;
}
-- (void)otherMouseUp:(NSEvent *)o_event
+- (id) initReal: (id) sender
{
- vlc_value_t val;
+ 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_fullscreen_state = NULL;
- switch( [o_event type] )
+ p_real_vout = [VLCVoutView getRealVout: p_vout];
+ i_device = var_GetInteger( p_real_vout->p_vlc, "video-device" );
+
+ /* Find out on which screen to open the window */
+ if( i_device <= 0 || i_device > (int)[o_screens count] )
{
- case NSOtherMouseUp:
+ /* No preference specified. Use the main screen */
+ o_screen = [NSScreen mainScreen];
+ if( o_screen == [o_screens objectAtIndex: 0] )
+ b_menubar_screen = VLC_TRUE;
+ }
+ else
+ {
+ i_device--;
+ o_screen = [o_screens objectAtIndex: i_device];
+ b_menubar_screen = ( i_device == 0 );
+ }
+
+ 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_menubar_screen )
{
- var_Get( p_vout, "mouse-button-down", &val );
- val.i_int &= ~2;
- var_Set( p_vout, "mouse-button-down", val );
+ BeginFullScreen( &p_fullscreen_state, NULL, 0, 0,
+ NULL, NULL, fullScreenAllowEvents );
}
- break;
-
- default:
- [super mouseUp: o_event];
- break;
}
-}
+ else if( var_GetBool( p_real_vout, "macosx-background" ) )
+ {
+ NSRect screen_rect = [o_screen frame];
+ screen_rect.origin.x = screen_rect.origin.y = 0;
-- (void)rightMouseUp:(NSEvent *)o_event
-{
- vlc_value_t val;
+ /* Creates a window with size: screen_rect on o_screen */
+ [self initWithContentRect: screen_rect
+ styleMask: NSBorderlessWindowMask
+ backing: NSBackingStoreBuffered
+ defer: YES screen: o_screen];
- switch( [o_event type] )
+ [self setLevel: CGWindowLevelForKey(kCGDesktopWindowLevelKey)];
+ }
+ else
{
- case NSRightMouseUp:
+ 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" ) )
{
- var_Get( p_vout, "mouse-button-down", &val );
- val.i_int &= ~4;
- var_Set( p_vout, "mouse-button-down", val );
+ [self setLevel: NSStatusWindowLevel];
}
- break;
- default:
- [super mouseUp: o_event];
- break;
+ if( !s_frame )
+ {
+ [self center];
+ }
}
+
+ [self updateTitle];
+ [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)mouseDragged:(NSEvent *)o_event
+- (void)close
{
- [self mouseMoved: o_event];
+ [o_view closeVout];
}
-- (void)otherMouseDragged:(NSEvent *)o_event
+- (void) closeWindow
{
- [self mouseMoved: o_event];
+ /* XXX waitUntilDone = NO to avoid a possible deadlock when hitting
+ Command-Q */
+ [self setContentView: NULL];
+ [self performSelectorOnMainThread: @selector(closeReal:)
+ withObject: NULL waitUntilDone: NO];
}
-- (void)rightMouseDragged:(NSEvent *)o_event
+- (id) closeReal: (id) sender
{
- [self mouseMoved: o_event];
+ [super close];
+ if( p_fullscreen_state )
+ {
+ EndFullScreen( p_fullscreen_state, 0 );
+ }
+ return NULL;
}
-- (void)mouseMoved:(NSEvent *)o_event
-{
- NSPoint ml;
- NSRect s_rect;
- BOOL b_inside;
+- (id)getVoutView
+{
+ return o_view;
+}
- i_time_mouse_last_moved = mdate();
+- (BOOL)canBecomeKeyWindow
+{
+ return YES;
+}
- s_rect = [o_view bounds];
- ml = [o_view convertPoint: [o_event locationInWindow] fromView: nil];
- b_inside = [o_view mouse: ml inRect: s_rect];
+/* Sometimes crashes VLC....
+- (BOOL)performKeyEquivalent:(NSEvent *)o_event
+{
+ return [[VLCMain sharedInstance] hasDefinedShortcutKey:o_event];
+}*/
+
+/* This is actually the same as VLCControls::stop. */
+
+- (void)updateTitle /*not modified yey ! */
+{
+ NSMutableString * o_title = NULL, * o_mrl = NULL;
+ input_thread_t * p_input;
- if( b_inside )
+ if( p_vout == NULL )
{
- vlc_value_t val;
- unsigned int i_width, i_height, i_x, i_y;
+ return;
+ }
- vout_PlacePicture( p_vout, (unsigned int)s_rect.size.width,
- (unsigned int)s_rect.size.height,
- &i_x, &i_y, &i_width, &i_height );
+ p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, FIND_PARENT );
- val.i_int = ( ((int)ml.x) - i_x ) *
- p_vout->render.i_width / i_width;
- var_Set( p_vout, "mouse-x", val );
+ if( p_input == NULL )
+ {
+ return;
+ }
- 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
+ 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( o_mrl != nil )
+ {
+ if( p_input->input.p_access && !strcmp( p_input->input.p_access->p_module->psz_shortname, "File" ) )
{
- val.i_int = ( ((int)ml.y) - i_y ) *
- p_vout->render.i_height / i_height;
+ NSRange prefix_range = [o_mrl rangeOfString: @"file:"];
+ if( prefix_range.location != NSNotFound )
+ [o_mrl deleteCharactersInRange: prefix_range];
+ [self setRepresentedFilename: o_mrl];
}
- var_Set( p_vout, "mouse-y", val );
-
- val.b_bool = VLC_TRUE;
- var_Set( p_vout, "mouse-moved", val );
+ [self setTitle: o_title];
}
+ else
+ {
+ [self setTitle: [NSString stringWithCString: VOUT_TITLE]];
+ }
+ vlc_object_release( p_input );
+}
- [super mouseMoved: o_event];
+- (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
projects / vlc / commitdiff