/*****************************************************************************
* vout.m: MacOS X video output module
*****************************************************************************
- * Copyright (C) 2001-2005 the VideoLAN team
+ * Copyright (C) 2001-2006 the VideoLAN team
* $Id$
*
* Authors: Colin Delacroix <colin@zoy.org>
* Derk-Jan Hartman <hartman at videolan dot org>
* Eric Petit <titer@m0k.org>
* Benjamin Pracht <bigben at videolan dot org>
+ * Felix K\9fhne <fkuehne at videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <vlc_keys.h>
#include "intf.h"
+#include "fspanel.h"
#include "vout.h"
-
+#import "controls.h"
/*****************************************************************************
* DeviceCallback: Callback triggered when the video-device variable is changed
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 );
+ 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 );
}
else
{
- msg_Warn( VLCIntf, "Cannot find Video Output");
+ msg_Warn( VLCIntf, "cannot find Video Output");
}
}
- (BOOL)windowContainsEmbedded: (id)o_window
{
- if( ![[o_window className] isEqualToString: @"VLCWindow"] )
+/* if( ![[o_window className] isEqualToString: @"VLCWindow"] )
{
NSLog( @"We were not given a VLCWindow" );
- }
+ }*/
return ([self getViewForWindow: o_window] == nil ? NO : YES );
}
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 )
+ 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_vlc, "video-device" );
+ i_device = var_GetInteger( p_real_vout->p_libvlc, "video-device" );
}
/* Setup the menuitem for the multiple displays. */
- (void)closeVout
{
+ [[[[VLCMain sharedInstance] getControls] getFSPanel] fadeOut];
+
[o_view removeFromSuperview];
o_view = nil;
p_vout = NULL;
s_frame = nil;
o_window = nil;
- p_real_vout = NULL;
+ p_real_vout = NULL;
}
- (void)updateTitle
return;
}
- if( p_input->input.p_item->psz_name != NULL )
+ if( input_GetItem(p_input)->psz_name != NULL )
o_title = [NSMutableString stringWithUTF8String:
- p_input->input.p_item->psz_name];
- if( p_input->input.p_item->psz_uri != NULL )
+ input_GetItem(p_input)->psz_name];
+ if( input_GetItem(p_input)->psz_uri != NULL )
o_mrl = [NSMutableString stringWithUTF8String:
- p_input->input.p_item->psz_uri];
+ input_GetItem(p_input)->psz_uri];
if( o_title == nil )
o_title = o_mrl;
if( o_mrl != nil )
{
+ /* FIXME once psz_access is exported, since that syntax is no longer valid */
+#if 0
if( p_input->input.p_access && !strcmp( p_input->input.p_access->p_module->psz_shortname, "File" ) )
{
NSRange prefix_range = [o_mrl rangeOfString: @"file:"];
[o_mrl deleteCharactersInRange: prefix_range];
[o_window setRepresentedFilename: o_mrl];
}
+#endif
[o_window setTitle: o_title];
}
else
new_frame.origin.x = topleftscreen.x;
new_frame.origin.y = topleftscreen.y - new_frame.size.height;
- [o_window setFrame: new_frame display: YES];
+ [o_window setFrame: new_frame display: NO];
p_vout->i_changes |= VOUT_SIZE_CHANGE;
}
{
vlc_value_t val;
+ if( !p_real_vout ) return;
if( var_Get( p_real_vout, "video-on-top", &val )>=0 && val.b_bool)
{
val.b_bool = VLC_FALSE;
- (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 );
+ if( [self isFullscreen] )
+ [[[[VLCMain sharedInstance] getControls] getFSPanel] orderFront: self];
+ else
+ [[[[VLCMain sharedInstance] getControls] getFSPanel] orderOut: self];
}
- (BOOL)isFullscreen
/* Escape should always get you out of fullscreen */
if( key == (unichar) 0x1b )
{
- if( [self isFullscreen] )
+ if( p_real_vout && [self isFullscreen] )
{
[self toggleFullscreen];
}
{
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
if( p_vout )
{
- switch( [o_event type] )
+ if( ( [o_event type] == NSLeftMouseDown ) &&
+ ( ! ( [o_event modifierFlags] & NSControlKeyMask ) ) )
{
- 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 );
}
- break;
-
- default:
- [super mouseDown: o_event];
- break;
+ 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]];
}
}
+
+ [super mouseDown: o_event];
}
- (void)otherMouseDown:(NSEvent *)o_event
{
vlc_value_t val;
- if( p_vout )
+ if( p_vout && [o_event type] == NSOtherMouseDown )
{
- 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;
- }
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int |= 2;
+ var_Set( p_vout, "mouse-button-down", val );
}
+
+ [super mouseDown: o_event];
}
- (void)rightMouseDown:(NSEvent *)o_event
{
- vlc_value_t val;
-
- if( p_vout )
+ if( p_vout && [o_event type] == NSRightMouseDown )
{
- 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;
-
- default:
- [super mouseDown: o_event];
- break;
- }
+ msg_Dbg( p_vout, "received NSRightMouseDown (specific method)" );
+ [NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] getVoutView]];
}
+
+ [super mouseDown: o_event];
}
- (void)mouseUp:(NSEvent *)o_event
{
vlc_value_t val;
- if( p_vout )
+ if( p_vout && [o_event type] == NSLeftMouseUp )
{
- 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 );
+ 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;
- }
+ 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 )
+ if( p_vout && [o_event type] == NSOtherMouseUp )
{
- 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;
- }
+ 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
{
- vlc_value_t val;
-
- if( p_vout )
+ if( p_vout && [o_event type] == NSRightMouseUp )
{
- 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;
- }
+ /* 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
val.b_bool = VLC_TRUE;
var_Set( p_vout, "mouse-moved", val );
}
+ if( [self isFullscreen] )
+ [[[[VLCMain sharedInstance] getControls] getFSPanel] fadeIn];
}
+
[super mouseMoved: o_event];
}
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_Get( p_vout->p_libvlc, "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 );
else
{
if ( VLCIntf && !(p_vout->b_fullscreen) &&
- !(var_GetBool( p_real_vout, "macosx-background" )) &&
+ !(var_GetBool( p_vout, "macosx-background" )) &&
var_GetBool( p_vout, "macosx-embedded") )
{
o_return = [[[VLCMain sharedInstance] getEmbeddedList]
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;
}
o_window = [self window];
[o_window makeKeyAndOrderFront: self];
[o_window setAcceptsMouseMovedEvents: TRUE];
+
+ if( var_GetBool( p_real_vout, "video-on-top" ) )
+ {
+ [o_window setLevel: NSStatusWindowLevel];
+ }
+
[view setFrameSize: [self frame].size];
}
return b_return;
b_init_ok = VLC_FALSE;
- p_fullscreen_state = NULL;
p_real_vout = [VLCVoutView getRealVout: p_vout];
- i_device = var_GetInteger( p_real_vout->p_vlc, "video-device" );
+ 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" );
/* Find out on which screen to open the window */
if( i_device <= 0 || i_device > (int)[o_screens count] )
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( var_GetBool( p_vout, "macosx-black" ) )
+
+ if( b_black == VLC_TRUE )
{
CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token);
CGDisplayFade( token, 0.5, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, true );
}
if( b_menubar_screen )
{
- BeginFullScreen( &p_fullscreen_state, NULL, 0, 0,
- NULL, NULL, fullScreenAllowEvents );
+ SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
}
- if( var_GetBool( p_vout, "macosx-black" ) )
+ 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" ) )
+ else if( var_GetBool( p_vout, "macosx-background" ) )
{
NSRect screen_rect = [o_screen frame];
screen_rect.origin.x = screen_rect.origin.y = 0;
[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];
[o_view closeVout];
}
-- (void) closeWindow
+- (void)closeWindow
{
/* XXX waitUntilDone = NO to avoid a possible deadlock when hitting
Command-Q */
withObject: NULL waitUntilDone: NO];
}
-- (id) closeReal: (id) sender
+- (id)closeReal:(id)sender
{
- if( p_fullscreen_state )
- EndFullScreen( p_fullscreen_state, 0 );
- if( var_GetBool( p_vout, "macosx-black" ) )
+ if( b_black == VLC_TRUE )
{
CGDisplayFadeReservationToken token;
CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token);
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;
}
projects / vlc / blobdiff