+
/*****************************************************************************
* vout.m: MacOS X video output plugin
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: vout.m,v 1.9 2002/12/25 02:23:36 massiot Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $Id: vout.m,v 1.57 2003/09/20 19:37:53 hartman Exp $
*
* Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net>
+ * Derk-Jan Hartman <thedj@users.sourceforge.net>
*
* 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 <stdlib.h> /* free() */
#include <string.h> /* strerror() */
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/aout.h>
-#include <vlc/intf.h>
-
-#include <Cocoa/Cocoa.h>
#include <QuickTime/QuickTime.h>
#include "intf.h"
#include "vout.h"
#define QT_MAX_DIRECTBUFFERS 10
+#define VL_MAX_DISPLAYS 16
struct picture_sys_t
{
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+
static int vout_Init ( vout_thread_t * );
static void vout_End ( vout_thread_t * );
static int vout_Manage ( vout_thread_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 * );
vout_thread_t * p_vout = (vout_thread_t *)p_this;
OSErr err;
int i_timeout;
+ vlc_value_t value_drawable;
+
+ var_Get( p_vout->p_vlc, "drawable", &value_drawable );
p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL )
memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) );
- /* 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 )
+ /* We don't need an intf in mozilla plugin */
+ if( value_drawable.i_int == 0 )
{
- msg_Err( p_vout, "no MacOS X interface present" );
- free( p_vout->p_sys );
- return( 1 );
- }
-
- if( [NSApp respondsToSelector: @selector(getIntf)] )
- {
- intf_thread_t * p_intf;
-
- for( i_timeout = 10 ; i_timeout-- ; )
+ /* Wait for a MacOS X interface to appear. Timeout is 2 seconds. */
+ for( i_timeout = 20 ; i_timeout-- ; )
{
- if( ( p_intf = [NSApp getIntf] ) == NULL )
+ if( NSApp == NULL )
{
msleep( INTF_IDLE_SLEEP );
}
}
-
- if( p_intf == NULL )
+
+ if( NSApp == NULL )
{
- msg_Err( p_vout, "MacOS X intf has getIntf, but is 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)] )
+ {
+ 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 );
+ }
+ }
}
p_vout->p_sys->h_img_descr =
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();
+
+ 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
+ {
+ p_vout->p_sys->mask = NULL;
+ p_vout->p_sys->isplugin = 0 ;
+ }
/* set window size */
p_vout->p_sys->s_rect.size.width = p_vout->i_window_width;
return( 1 );
}
- if( vout_ChromaCmp( p_vout->render.i_chroma, VLC_FOURCC('I','4','2','0') ) )
+ /* 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 )
{
- err = FindCodec( kYUV420CodecType, bestSpeedCodec,
- nil, &p_vout->p_sys->img_dc );
- 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;
- }
- else
- {
- msg_Err( p_vout, "failed to find an appropriate codec" );
- }
+ p_vout->output.i_chroma = VLC_FOURCC('I','4','2','0');
+ p_vout->p_sys->i_codec = kYUV420CodecType;
}
else
{
- msg_Err( p_vout, "chroma 0x%08x not supported",
- p_vout->render.i_chroma );
+ 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( 1 );
+ return VLC_EGENERIC;
}
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
NSArray * o_screens = [NSScreen screens];
- if ( [o_screens count] > 0 )
+ if( [o_screens count] > 0 && var_Type( p_vout, "video-device" ) == 0 )
{
int i = 1;
- vlc_value_t val;
+ vlc_value_t val, text;
NSScreen * o_screen;
- var_Destroy( p_vout, "video-device" );
- var_Create( p_vout, "video-device",
- VLC_VAR_STRING | VLC_VAR_HASCHOICE );
+ int i_option = config_GetInt( p_vout, "macosx-vdev" );
+ 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];
- while ( (o_screen = [o_enumerator nextObject]) != NULL )
+ while( (o_screen = [o_enumerator nextObject]) != NULL )
{
char psz_temp[255];
NSRect s_rect = [o_screen frame];
"%s %d (%dx%d)", _("Screen"), i,
(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 );
+ 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 )
+ {
+ var_Set( p_vout, "video-device", val );
+ }
i++;
}
}
[o_pool release];
- if( CoCreateWindow( p_vout ) )
+ /* We don't need a window either in the mozilla plugin */
+ if( p_vout->p_sys->isplugin == 0 )
{
- 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 );
+ 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 );
+ }
}
p_vout->pf_init = vout_Init;
{
int i_index;
picture_t *p_pic;
+ vlc_value_t val;
I_OUTPUTPICTURES = 0;
p_vout->output.i_height = p_vout->render.i_height;
p_vout->output.i_aspect = p_vout->render.i_aspect;
+ var_Get( p_vout->p_vlc, "drawable", &val );
+
+ if( p_vout->p_sys->isplugin )
+ {
+ p_vout->p_sys->p_qdport = val.i_int;
+ }
+
SetPort( p_vout->p_sys->p_qdport );
QTScaleMatrix( p_vout );
*****************************************************************************/
void E_(CloseVideo) ( vlc_object_t *p_this )
{
- vout_thread_t * p_vout = (vout_thread_t *)p_this;
+ vout_thread_t * p_vout = (vout_thread_t *)p_this;
- if( CoDestroyWindow( p_vout ) )
+ if ( p_vout->p_sys->isplugin == 0)
{
- msg_Err( p_vout, "unable to destroy window" );
+ if( CoDestroyWindow( p_vout ) )
+ {
+ msg_Err( p_vout, "unable to destroy window" );
+ }
}
+ if ( p_vout->p_sys->p_fullscreen_state != NULL )
+ EndFullScreen ( p_vout->p_sys->p_fullscreen_state, NULL );
+
ExitMovies();
free( p_vout->p_sys->p_matrix );
* console events. It returns a non null value on error.
*****************************************************************************/
static int vout_Manage( vout_thread_t *p_vout )
-{
+{
+ vlc_value_t val1;
+ var_Get( p_vout->p_vlc, "drawableredraw", &val1 );
+
if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE )
{
if( CoToggleFullscreen( p_vout ) )
p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
}
- if( p_vout->i_changes & VOUT_SIZE_CHANGE )
+ 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 );
-
- p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
}
- /* hide/show mouse cursor */
- if( p_vout->p_sys->b_mouse_moved ||
- p_vout->p_sys->i_time_mouse_last_moved )
+ /* 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 )
{
- vlc_bool_t b_change = 0;
-
- if( !p_vout->p_sys->b_mouse_pointer_visible )
+ if( mdate() - p_vout->p_sys->i_time_mouse_last_moved > 2000000 &&
+ p_vout->p_sys->b_mouse_pointer_visible )
{
- CGDisplayShowCursor( kCGDirectMainDisplay );
- b_change = 1;
+ VLCHideMouse( p_vout, YES );
}
-#if 0
- else if( !p_vout->p_sys->b_mouse_moved &&
- mdate() - p_vout->p_sys->i_time_mouse_last_moved > 2000000 &&
- p_vout->p_sys->b_mouse_pointer_visible )
+ else if ( !p_vout->p_sys->b_mouse_pointer_visible )
{
- CGDisplayHideCursor( kCGDirectMainDisplay );
- b_change = 1;
- }
-#endif
+ vlc_bool_t b_playing = NO;
+ input_thread_t * p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
- if( b_change )
+ 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 );
+ }
+ }
+ }
+ else if ( p_vout->p_sys->b_mouse_moved && p_vout->b_fullscreen )
+ {
+ if( !p_vout->p_sys->b_mouse_pointer_visible )
+ {
+ VLCHideMouse( p_vout, NO );
+ }
+ else
{
- p_vout->p_sys->i_time_mouse_last_moved = 0;
- p_vout->p_sys->b_mouse_moved = 0;
- p_vout->p_sys->b_mouse_pointer_visible =
- !p_vout->p_sys->b_mouse_pointer_visible;
+ p_vout->p_sys->b_mouse_moved = NO;
}
}
-
+
return( 0 );
}
{
OSErr err;
CodecFlags flags;
+ Rect oldrect;
+ RgnHandle oldClip;
- 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 ) )
+ if( p_vout->p_sys->isplugin )
{
- msg_Err( p_vout, "DecompressSequenceFrameS failed: %d", err );
+ 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
+ {
+ 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 );
+
}
else
- {
- QDFlushPortBuffer( p_vout->p_sys->p_qdport, nil );
+ {
+ 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 );
+ }
}
}
{
int i_ret = 0;
- NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
- VLCVout * o_vlv = [[[VLCVout alloc] init] autorelease];
+ VLCVout * o_vlv = [[VLCVout alloc] init];
- if( [o_vlv respondsToSelector: @selector(performSelectorOnMainThread:
- withObject:waitUntilDone:)] )
- {
- [o_vlv performSelectorOnMainThread: sel
- withObject: [NSValue valueWithPointer: p_vout]
- waitUntilDone: YES];
- }
- else if( [NSApp respondsToSelector: @selector(getIntf)] )
- {
- NSArray * o_array;
- NSValue * o_value;
- NSPort * o_recv_port;
- NSInvocation * o_inv;
- NSPortMessage * o_msg;
- intf_thread_t * p_intf;
- NSMethodSignature * o_sig;
-
- p_intf = (intf_thread_t *)[NSApp getIntf];
-
- o_recv_port = [[NSPort port] retain];
- o_value = [NSValue valueWithPointer: p_vout];
-
- o_sig = [VLCVout instanceMethodSignatureForSelector: sel];
- o_inv = [NSInvocation invocationWithMethodSignature: o_sig];
- [o_inv setArgument: &o_value atIndex: 2];
- [o_inv setTarget: o_vlv];
- [o_inv setSelector: sel];
-
- o_array = [NSArray arrayWithObject:
- [NSData dataWithBytes: &o_inv length: sizeof(o_inv)]];
- o_msg = [[NSPortMessage alloc]
- initWithSendPort: p_intf->p_sys->o_sendport
- receivePort: o_recv_port components: o_array];
-
- p_vout->p_sys->o_lock =
- [[NSConditionLock alloc] initWithCondition: 0];
- [o_msg sendBeforeDate: [NSDate distantPast]];
- [p_vout->p_sys->o_lock lockWhenCondition: 1];
- [p_vout->p_sys->o_lock unlock];
- [p_vout->p_sys->o_lock release];
- p_vout->p_sys->o_lock = nil;
-
- [o_msg release];
- [o_recv_port release];
- }
- else
+ if( ( i_ret = ExecuteOnMainThread( o_vlv, sel, (void *)p_vout ) ) )
{
msg_Err( p_vout, "SendRequest: no way to communicate with mt" );
- i_ret = 1;
}
- [o_pool release];
+ [o_vlv release];
return( i_ret );
}
{
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:) ) )
p_vout->b_fullscreen = !p_vout->b_fullscreen;
- if( p_vout->b_fullscreen )
- {
- if ( p_vout->p_sys->p_fullscreen_state == NULL )
- BeginFullScreen( &p_vout->p_sys->p_fullscreen_state, NULL, 0, 0,
- NULL, NULL, fullScreenHideCursor | fullScreenAllowEvents );
- }
- else
- {
- 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;
- }
+ config_PutInt( p_vout, "fullscreen", p_vout->b_fullscreen );
if( CoCreateWindow( p_vout ) )
{
return( 1 );
}
- SetPort( p_vout->p_sys->p_qdport );
- QTScaleMatrix( p_vout );
-
if( QTCreateSequence( p_vout ) )
{
msg_Err( p_vout, "unable to create sequence" );
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
*****************************************************************************/
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 )
{
int i_adj_width = i_height * p_vout->output.i_aspect /
factor_y = FixDiv( Long2Fix( i_height ),
Long2Fix( p_vout->output.i_height ) );
- i_offset_x = (i_width - i_adj_width) / 2;
+ i_offset_x = (i_width - i_adj_width) / 2 + i_offset_x;
}
else
{
factor_y = FixDiv( Long2Fix( i_adj_height ),
Long2Fix( p_vout->output.i_height ) );
- i_offset_y = (i_height - i_adj_height) / 2;
+ i_offset_y = (i_height - i_adj_height) / 2 + i_offset_y;
}
-
+
SetIdentityMatrix( p_vout->p_sys->p_matrix );
ScaleMatrix( p_vout->p_sys->p_matrix,
TranslateMatrix( p_vout->p_sys->p_matrix,
Long2Fix(i_offset_x),
Long2Fix(i_offset_y) );
+
}
/*****************************************************************************
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,
p_vout->p_sys->p_qdport,
NULL, NULL,
p_vout->p_sys->p_matrix,
- 0, NULL,
+ 0, p_vout->p_sys->mask,
codecFlagUseImageBuffer,
codecLosslessQuality,
p_vout->p_sys->img_dc ) ) )
return( 1 );
}
+
return( 0 );
}
return( p_vout );
}
+- (void)scaleWindowWithFactor: (float)factor
+{
+ 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;
+ }
+}
+
+- (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)keyDown:(NSEvent *)o_event
{
+ playlist_t * p_playlist;
unichar key = 0;
+ vlc_value_t val;
if( [[o_event characters] length] )
{
switch( key )
{
- case (unichar)0xf700: /* up-arrow */
- {
- aout_instance_t * p_aout = vlc_object_find( p_vout, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
- if ( p_aout != NULL )
- {
- aout_VolumeUp( p_aout, 1, NULL );
- vlc_object_release( (vlc_object_t *)p_aout );
- }
- }
- break;
-
- case (unichar)0xf701: /* down-arrow */
- {
- aout_instance_t * p_aout = vlc_object_find( p_vout, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
- if ( p_aout != NULL )
- {
- aout_VolumeDown( p_aout, 1, NULL );
- vlc_object_release( (vlc_object_t *)p_aout );
- }
- }
- break;
-
case 'f': case 'F':
[self toggleFullscreen];
break;
break;
case ' ':
- input_SetStatus( p_vout, INPUT_STATUS_PAUSE );
+ p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if ( p_playlist != NULL )
+ {
+ playlist_Pause( p_playlist );
+ vlc_object_release( p_playlist);
+ }
+ 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 )
+ {
+ return NO;
+ }
+
+ playlist_Stop( p_playlist );
+ vlc_object_release( p_playlist );
+
+ /* The window will be closed by the intf later. */
+ return NO;
+}
+
@end
/*****************************************************************************
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];
- (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 );
}
+- (void)mouseDown:(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;
+ }
+}
+
+- (void)otherMouseDown:(NSEvent *)o_event
+{
+ /* 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;
+
+ 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;
+ }
+}
+
+- (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] )
+ {
+ 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;
+ }
+}
+
- (void)mouseUp:(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 NSLeftMouseUp:
{
- vlc_value_t val;
- val.b_bool = VLC_TRUE;
- var_Set( p_vout, "mouse-clicked", 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;
+ }
+}
+
+- (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] )
+ {
+ 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;
+ }
+}
+- (void)rightMouseUp:(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 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;
{
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.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
+ else if ( !b_inside && !p_vout->p_sys->b_mouse_pointer_visible )
{
- [super mouseMoved: o_event];
+ /* people with multiple monitors need their mouse,
+ * even if VLCView in fullscreen. */
+ VLCHideMouse( p_vout, NO );
}
+
+ [super mouseMoved: o_event];
}
@end
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];
if( var_Get( p_vout, "video-device", &val ) < 0 )
{
o_screen = [NSScreen mainScreen];
+ b_main_screen = 1;
}
else
{
- unsigned int i_index = 0;
NSArray *o_screens = [NSScreen screens];
-
- if( !sscanf( val.psz_string, "Screen %d", &i_index ) ||
- [o_screens count] < i_index )
+ unsigned int i_index = val.i_int;
+
+ if( [o_screens count] < i_index )
{
o_screen = [NSScreen mainScreen];
+ b_main_screen = 1;
}
else
{
- o_screen = [o_screens objectAtIndex: i_index - 1];
- }
-
- free( val.psz_string );
+ i_index--;
+ o_screen = [o_screens objectAtIndex: i_index];
+ config_PutInt( p_vout, "macosx-vdev", i_index );
+ b_main_screen = (i_index == 0);
+ }
}
if( p_vout->b_fullscreen )
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 );
+
[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: NSModalPanelWindowLevel];
+ //[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();
}
else
{
unsigned int i_stylemask = NSTitledWindowMask |
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
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];
}
o_view = [[VLCView alloc] init];
+
/* FIXME: [o_view setMenu:] */
[p_vout->p_sys->o_window setContentView: o_view];
[o_view autorelease];
[o_view lockFocus];
p_vout->p_sys->p_qdport = [o_view qdPort];
- [o_view unlockFocus];
- [p_vout->p_sys->o_window setTitle:
- [NSString stringWithCString: VOUT_TITLE " (QuickTime)"]];
+ [o_view unlockFocus];
+
+ [p_vout->p_sys->o_window updateTitle];
[p_vout->p_sys->o_window makeKeyAndOrderFront: nil];
}
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;
[p_vout->p_sys->o_window close];
p_vout->p_sys->o_window = nil;
projects / vlc / blobdiff