* vout.m: MacOS X video output plugin
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
- * $Id: vout.m,v 1.37 2003/03/06 11:43:07 hartman Exp $
+ * $Id: vout.m,v 1.46 2003/05/04 22:42:16 gbazin Exp $
*
* Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org>
#include "vout.h"
#define QT_MAX_DIRECTBUFFERS 10
+#define VL_MAX_DISPLAYS 16
struct picture_sys_t
{
static int CoDestroyWindow ( vout_thread_t * );
static int CoToggleFullscreen ( vout_thread_t * );
+static void VLCHideMouse ( vout_thread_t *, BOOL );
+
static void QTScaleMatrix ( vout_thread_t * );
static int QTCreateSequence ( vout_thread_t * );
static void QTDestroySequence ( vout_thread_t * );
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 );
p_vout->p_sys->p_matrix = (MatrixRecordPtr)malloc( sizeof(MatrixRecord) );
p_vout->p_sys->p_fullscreen_state = NULL;
- p_vout->p_sys->b_mouse_pointer_visible = 1;
+ 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();
/* set window size */
p_vout->p_sys->s_rect.size.width = p_vout->i_window_width;
(int)s_rect.size.width, (int)s_rect.size.height );
val.psz_string = psz_temp;
- var_Change( p_vout, "video-device", VLC_VAR_ADDCHOICE, &val );
+ var_Change( p_vout, "video-device",
+ VLC_VAR_ADDCHOICE, &val, NULL );
if( ( i - 1 ) == i_option )
{
* console events. It returns a non null value on error.
*****************************************************************************/
static int vout_Manage( vout_thread_t *p_vout )
-{
- vlc_bool_t b_change = 0;
- intf_thread_t * p_intf = [NSApp getIntf];
-
+{
if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE )
{
if( CoToggleFullscreen( p_vout ) )
p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
}
- /* hide/show mouse cursor */
- if( p_vout->p_sys->b_mouse_moved && p_vout->b_fullscreen &&
- p_intf->p_sys->b_play_status )
+ /* 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( !p_vout->p_sys->b_mouse_pointer_visible )
- {
- CGDisplayShowCursor( kCGDirectMainDisplay );
- p_vout->p_sys->b_mouse_pointer_visible = 1;
- b_change = 1;
- }
- else if( mdate() - p_vout->p_sys->i_time_mouse_last_moved > 2000000 &&
+ if( mdate() - p_vout->p_sys->i_time_mouse_last_moved > 2000000 &&
p_vout->p_sys->b_mouse_pointer_visible )
{
- CGDisplayHideCursor( kCGDirectMainDisplay );
- p_vout->p_sys->b_mouse_pointer_visible = 0;
- b_change = 1;
+ VLCHideMouse( p_vout, YES );
}
+ else if ( !p_vout->p_sys->b_mouse_pointer_visible )
+ {
+ vlc_bool_t b_playing = NO;
+ playlist_t * p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if ( p_playlist != nil )
+ {
+ vlc_mutex_lock( &p_playlist->object_lock );
+ if( p_playlist->p_input != NULL )
+ {
+ vlc_mutex_lock( &p_playlist->p_input->stream.stream_lock );
+ b_playing = p_playlist->p_input->stream.control.i_status != PAUSE_S;
+ vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
+ }
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ vlc_object_release( p_playlist );
+ }
+ if ( !b_playing )
+ {
+ VLCHideMouse( p_vout, NO );
+ }
+ }
}
- else if ( p_vout->b_fullscreen && !p_intf->p_sys->b_play_status )
+ else if ( p_vout->p_sys->b_mouse_moved && p_vout->b_fullscreen )
{
if( !p_vout->p_sys->b_mouse_pointer_visible )
{
- CGDisplayShowCursor( kCGDirectMainDisplay );
- p_vout->p_sys->b_mouse_pointer_visible = 1;
- b_change = 1;
+ VLCHideMouse( p_vout, NO );
}
- else if( p_vout->p_sys->b_mouse_pointer_visible )
+ else
{
- p_vout->p_sys->i_time_mouse_last_moved = mdate();
- p_vout->p_sys->b_mouse_moved = 1;
+ p_vout->p_sys->b_mouse_moved = NO;
}
}
- if( b_change )
- {
- p_vout->p_sys->b_mouse_moved = 0;
- p_vout->p_sys->i_time_mouse_last_moved = 0;
- }
-
return( 0 );
}
{
if( !p_vout->p_sys->b_mouse_pointer_visible )
{
- CGDisplayShowCursor( kCGDirectMainDisplay );
- p_vout->p_sys->b_mouse_pointer_visible = 1;
+ VLCHideMouse( p_vout, NO );
}
if( CoSendRequest( p_vout, @selector(destroyWindow:) ) )
return( 0 );
}
+/*****************************************************************************
+ * VLCHideMouse: if b_hide then hide the cursor
+ *****************************************************************************/
+static void VLCHideMouse ( vout_thread_t *p_vout, BOOL b_hide )
+{
+ 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 )
+ {
+ [NSCursor unhide];
+ p_vout->p_sys->b_mouse_pointer_visible = 1;
+ }
+ p_vout->p_sys->b_mouse_moved = NO;
+ p_vout->p_sys->i_time_mouse_last_moved = mdate();
+ return;
+}
+
/*****************************************************************************
* QTScaleMatrix: scale matrix
*****************************************************************************/
- (void)scaleWindowWithFactor: (float)factor
{
NSSize newsize;
- int i_corrected_height;
+ int i_corrected_height, i_corrected_width;
NSPoint topleftbase;
NSPoint topleftscreen;
topleftbase.y = [self frame].size.height;
topleftscreen = [self convertBaseToScreen: topleftbase];
- i_corrected_height = p_vout->output.i_width * VOUT_ASPECT_FACTOR /
+ 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 );
+ newsize.width = (int) ( p_vout->render.i_width * factor );
+ newsize.height = (int) ( i_corrected_height * factor );
+ }
+
[self setContentSize: newsize];
[self setFrameTopLeftPoint: topleftscreen];
}
}
+- (void)toggleFloatOnTop
+{
+ if( config_GetInt( p_vout, "macosx-float" ) )
+ {
+ config_PutInt( p_vout, "macosx-float", 0 );
+ [p_vout->p_sys->o_window setLevel: NSNormalWindowLevel];
+ }
+ else
+ {
+ config_PutInt( p_vout, "macosx-float", 1 );
+ [p_vout->p_sys->o_window setLevel: NSStatusWindowLevel];
+ }
+}
+
- (void)toggleFullscreen
{
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
- (void)updateTitle
{
NSMutableString * o_title;
-
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ playlist_t * p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
/* This is actually the same as VLCControls::stop. */
- (BOOL)windowShouldClose:(id)sender
{
- intf_thread_t * p_intf = [NSApp getIntf];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ playlist_t * p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
{
- (BOOL)becomeFirstResponder
{
- [[self window] setAcceptsMouseMovedEvents: YES];
+ vout_thread_t * p_vout;
+ id o_window = [self window];
+ p_vout = (vout_thread_t *)[o_window getVout];
+
+ [o_window setAcceptsMouseMovedEvents: YES];
return( YES );
}
- (BOOL)resignFirstResponder
{
- [[self window] setAcceptsMouseMovedEvents: NO];
+ vout_thread_t * p_vout;
+ id o_window = [self window];
+ p_vout = (vout_thread_t *)[o_window getVout];
+
+ [o_window setAcceptsMouseMovedEvents: NO];
+ VLCHideMouse( p_vout, NO );
return( YES );
}
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;
}
- p_vout->p_sys->i_time_mouse_last_moved = mdate();
- p_vout->p_sys->b_mouse_moved = 1;
+ else if ( !b_inside && !p_vout->p_sys->b_mouse_pointer_visible )
+ {
+ /* people with multiple monitors need their mouse,
+ * even if VLCView in fullscreen. */
+ VLCHideMouse( p_vout, NO );
+ }
+
[super mouseMoved: o_event];
}
defer: NO screen: o_screen];
[p_vout->p_sys->o_window setLevel: NSPopUpMenuWindowLevel - 1];
- p_vout->p_sys->b_mouse_moved = 1;
+ p_vout->p_sys->b_mouse_moved = YES;
p_vout->p_sys->i_time_mouse_last_moved = mdate();
}
else
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" ) )
+ {
+ [p_vout->p_sys->o_window setLevel: NSStatusWindowLevel];
+ }
+
if( !p_vout->p_sys->b_pos_saved )
{
[p_vout->p_sys->o_window center];
s_rect = [p_vout->p_sys->o_window frame];
p_vout->p_sys->s_rect.origin = s_rect.origin;
- p_vout->p_sys->b_pos_saved = 1;
+ p_vout->p_sys->b_pos_saved = YES;
}
p_vout->p_sys->p_qdport = nil;
projects / vlc / blobdiff