/*****************************************************************************
* vout.m: MacOS X video output plugin
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: vout.m,v 1.6 2002/12/07 23:50:30 massiot Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $Id: vout.m,v 1.65 2003/11/15 22:42:16 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 <vlc_keys.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 void vout_Display ( vout_thread_t *, picture_t * );
-static int CoSendRequest ( vout_thread_t *, long );
+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 * );
+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 * );
/* Wait for a MacOS X interface to appear. Timeout is 2 seconds. */
for( i_timeout = 20 ; i_timeout-- ; )
{
- vlc_list_t * p_list = vlc_list_find( p_vout, VLC_OBJECT_INTF,
- FIND_ANYWHERE );
- intf_thread_t ** pp_intf = (intf_thread_t **)p_list->pp_objects;
-
- /* Parse the list of interfaces to see if one suits us */
- for( ; *pp_intf ; pp_intf++ )
- {
- if( (*pp_intf)->p_module &&
- !strcmp( (*pp_intf)->p_module->psz_object_name, MODULE_STRING ) )
- {
- vlc_object_yield( *pp_intf );
- p_vout->p_sys->p_intf = *pp_intf;
- break;
- }
- }
- vlc_list_release( p_list );
-
- if( p_vout->p_sys->p_intf == NULL )
+ if( NSApp == NULL )
{
msleep( INTF_IDLE_SLEEP );
}
}
- if( p_vout->p_sys->p_intf == NULL )
+ 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)] )
+ {
+ 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 =
(ImageDescriptionHandle)NewHandleClear( sizeof(ImageDescription) );
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_moved = VLC_TRUE;
+ 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;
msg_Err( p_vout, "EnterMovies failed: %d", err );
free( p_vout->p_sys->p_matrix );
DisposeHandle( (Handle)p_vout->p_sys->h_img_descr );
- vlc_object_release( p_vout->p_sys->p_intf );
free( p_vout->p_sys );
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 );
- vlc_object_release( p_vout->p_sys->p_intf );
free( p_vout->p_sys );
- return( 1 );
+ return VLC_EGENERIC;
}
- NSArray * p_screens = [NSScreen screens];
- if ( [p_screens count] > 0 )
+ NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+ NSArray * o_screens = [NSScreen screens];
+ if( [o_screens count] > 0 && var_Type( p_vout, "video-device" ) == 0 )
{
- vlc_value_t val;
- var_Destroy( p_vout, "video-device" );
- var_Create( p_vout, "video-device", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
- NSEnumerator * p_enumerator = [p_screens objectEnumerator];
- NSScreen * p_screen;
int i = 1;
- while ( (p_screen = [p_enumerator nextObject]) != NULL )
+ vlc_value_t val, text;
+ NSScreen * o_screen;
+
+ 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 )
{
- NSRect p_rect = [p_screen frame];
char psz_temp[255];
- snprintf(psz_temp, sizeof(psz_temp), "%s %d (%dx%d)",
- _("Screen"), i, (int)p_rect.size.width,
- (int)p_rect.size.height);
- val.psz_string = psz_temp;
- var_Change( p_vout, "video-device", VLC_VAR_ADDCHOICE, &val );
+ NSRect s_rect = [o_screen frame];
+
+ 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 );
+
+ 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++;
}
+
var_AddCallback( p_vout, "video-device", vout_VarCallback,
NULL );
val.b_bool = VLC_TRUE;
var_Set( p_vout, "intf-change", val );
}
+ [o_pool release];
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 );
- vlc_object_release( p_vout->p_sys->p_intf );
free( p_vout->p_sys );
return( 1 );
}
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 );
DisposeHandle( (Handle)p_vout->p_sys->h_img_descr );
- vlc_object_release( p_vout->p_sys->p_intf );
-
free( p_vout->p_sys );
}
* console events. It returns a non null value on error.
*****************************************************************************/
static int vout_Manage( vout_thread_t *p_vout )
-{
+{
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->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 )
- {
- CGDisplayShowCursor( kCGDirectMainDisplay );
- b_change = 1;
- }
-#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 )
+ if( mdate() - p_vout->p_sys->i_time_mouse_last_moved > 3000000 )
{
- CGDisplayHideCursor( kCGDirectMainDisplay );
- b_change = 1;
- }
-#endif
-
- if( b_change )
- {
- 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;
+ VLCHideMouse( p_vout, YES );
}
}
-
+ else if ( p_vout->p_sys->b_mouse_moved && p_vout->b_fullscreen )
+ {
+ VLCHideMouse( p_vout, NO );
+ }
+
+ /* disable screen saver */
+ UpdateSystemActivity( UsrActivity );
+
return( 0 );
}
p_pic->p_sys->i_size,
codecFlagUseImageBuffer, &flags, nil ) != noErr ) )
{
- msg_Err( p_vout, "DecompressSequenceFrameS failed: %d", err );
+ msg_Warn( p_vout, "DecompressSequenceFrameS failed: %d", err );
}
else
{
*****************************************************************************
* Returns 0 on success, 1 otherwise
*****************************************************************************/
-static int CoSendRequest( vout_thread_t *p_vout, long i_request )
+static int CoSendRequest( vout_thread_t *p_vout, SEL sel )
{
- NSArray *o_array;
- NSPortMessage *o_msg;
- struct vout_req_t req;
- struct vout_req_t *p_req = &req;
- NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
- NSPort *recvPort = [[NSPort port] retain];
-
- memset( &req, 0, sizeof(req) );
- req.i_type = i_request;
- req.p_vout = p_vout;
-
- req.o_lock = [[NSConditionLock alloc] initWithCondition: 0];
-
- o_array = [NSArray arrayWithObject:
- [NSData dataWithBytes: &p_req length: sizeof(void *)]];
- o_msg = [[NSPortMessage alloc]
- initWithSendPort: p_vout->p_sys->p_intf->p_sys->o_sendport
- receivePort: recvPort components: o_array];
+ int i_ret = 0;
- [o_msg sendBeforeDate: [NSDate distantPast]];
+ VLCVout * o_vlv = [[VLCVout alloc] init];
- [req.o_lock lockWhenCondition: 1];
- [req.o_lock unlock];
-
- [o_msg release];
- [req.o_lock release];
+ if( ( i_ret = ExecuteOnMainThread( o_vlv, sel, (void *)p_vout ) ) )
+ {
+ msg_Err( p_vout, "SendRequest: no way to communicate with mt" );
+ }
- [recvPort release];
- [o_pool release];
+ [o_vlv release];
- return( !req.i_result );
+ return( i_ret );
}
/*****************************************************************************
*****************************************************************************/
static int CoCreateWindow( vout_thread_t *p_vout )
{
- if( CoSendRequest( p_vout, VOUT_REQ_CREATE_WINDOW ) )
+ if( CoSendRequest( p_vout, @selector(createWindow:) ) )
{
- msg_Err( p_vout, "CoSendRequest (CREATE_WINDOW) failed" );
+ msg_Err( p_vout, "CoSendRequest (createWindow) failed" );
return( 1 );
}
*****************************************************************************/
static int CoDestroyWindow( vout_thread_t *p_vout )
{
- if( !p_vout->p_sys->b_mouse_pointer_visible )
- {
- CGDisplayShowCursor( kCGDirectMainDisplay );
- p_vout->p_sys->b_mouse_pointer_visible = 1;
- }
- if( CoSendRequest( p_vout, VOUT_REQ_DESTROY_WINDOW ) )
+ VLCHideMouse( p_vout, NO );
+
+ if( CoSendRequest( p_vout, @selector(destroyWindow:) ) )
{
- msg_Err( p_vout, "CoSendRequest (DESTROY_WINDOW) failed" );
+ msg_Err( p_vout, "CoSendRequest (destroyWindow) failed" );
return( 1 );
}
p_vout->b_fullscreen = !p_vout->b_fullscreen;
- if( p_vout->b_fullscreen )
- {
- HideMenuBar();
- }
- else
- {
- ShowMenuBar();
- }
+ config_PutInt( p_vout, "fullscreen", p_vout->b_fullscreen );
if( CoCreateWindow( p_vout ) )
{
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 setHiddenUntilMouseMoves: YES];
+ }
+ else if ( !b_hide )
+ {
+ [NSCursor setHiddenUntilMouseMoves: NO];
+ }
+ 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 )
{
Rect s_rect;
- int i_width, i_height;
+ unsigned int i_width, i_height;
Fixed factor_x, factor_y;
- int i_offset_x = 0;
- int i_offset_y = 0;
+ unsigned int i_offset_x = 0;
+ unsigned int i_offset_y = 0;
GetPortBounds( p_vout->p_sys->p_qdport, &s_rect );
i_offset_y = (i_height - i_adj_height) / 2;
}
-
+
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_vout = _p_vout;
}
+- (vout_thread_t *)getVout
+{
+ 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
{
unichar key = 0;
+ 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 )
+ 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( [[o_event characters] length] )
+ key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0];
+
+ if( key )
{
- key = [[o_event characters] characterAtIndex: 0];
+ /* Escape should always get you out of fullscreen */
+ if( key == (unichar) 0x1b )
+ {
+ if( [self isFullscreen] )
+ {
+ [self toggleFullscreen];
+ }
+ }
+ else if ( key == ' ' )
+ {
+ playlist_t *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);
+ }
+ }
+ else
+ {
+ val.i_int |= CocoaKeyToVLC( key );
+ var_Set( p_vout->p_vlc, "key-pressed", val );
+ }
}
+ else
+ {
+ [super keyDown: o_event];
+ }
+}
- switch( key )
+- (void)updateTitle
+{
+ NSMutableString * o_title;
+ playlist_t * p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+
+ if( p_playlist == NULL )
{
- 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;
+ return;
+ }
+
+ vlc_mutex_lock( &p_playlist->object_lock );
+ o_title = [NSMutableString stringWithUTF8String:
+ p_playlist->pp_items[p_playlist->i_index]->psz_uri];
+ vlc_mutex_unlock( &p_playlist->object_lock );
- case (unichar)0xf701: /* down-arrow */
+ vlc_object_release( p_playlist );
+
+ if( o_title != nil )
+ {
+ NSRange prefix_range = [o_title rangeOfString: @"file:"];
+ if( prefix_range.location != NSNotFound )
{
- 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 );
- }
+ [o_title deleteCharactersInRange: prefix_range];
}
- break;
-
- case 'f': case 'F':
- [self toggleFullscreen];
- break;
- case (unichar)0x1b: /* escape */
- if( [self isFullscreen] )
- {
- [self toggleFullscreen];
- }
- break;
+ [self setTitleWithRepresentedFilename: o_title];
+ }
+ else
+ {
+ [self setTitle:
+ [NSString stringWithCString: VOUT_TITLE " (QuickTime)"]];
+ }
+}
- case 'q': case 'Q':
- p_vout->p_vlc->b_die = VLC_TRUE;
- break;
+/* 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;
+ }
- case ' ':
- input_SetStatus( p_vout, INPUT_STATUS_PAUSE );
- break;
+ playlist_Stop( p_playlist );
+ vlc_object_release( p_playlist );
- default:
- [super keyDown: o_event];
- break;
- }
+ /* The window will be closed by the intf later. */
+ return NO;
}
@end
*****************************************************************************/
@implementation VLCView
-- (void)setVout:(vout_thread_t *)_p_vout
-{
- p_vout = _p_vout;
-}
-
- (void)drawRect:(NSRect)rect
{
+ 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;
NSRect s_rect;
BOOL b_inside;
+ vout_thread_t * p_vout;
+ id o_window = [self window];
+ p_vout = (vout_thread_t *)[o_window getVout];
+
s_rect = [self bounds];
ml = [self convertPoint: [o_event locationInWindow] fromView: nil];
b_inside = [self mouse: ml inRect: s_rect];
{
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;
+ }
+
+ [super mouseMoved: o_event];
+}
+
+@end
+
+/*****************************************************************************
+ * VLCVout implementation
+ *****************************************************************************/
+@implementation VLCVout
+
+- (void)createWindow:(NSValue *)o_value
+{
+ 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 )
+ {
+ o_screen = [NSScreen mainScreen];
+ b_main_screen = 1;
}
else
{
- [super mouseMoved: o_event];
+ NSArray *o_screens = [NSScreen screens];
+ unsigned int i_index = val.i_int;
+
+ if( [o_screens count] < i_index )
+ {
+ o_screen = [NSScreen mainScreen];
+ b_main_screen = 1;
+ }
+ else
+ {
+ 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: 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
+ 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" ) )
+ {
+ [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 updateTitle];
+ [p_vout->p_sys->o_window makeKeyAndOrderFront: nil];
+}
+
+- (void)destroyWindow:(NSValue *)o_value
+{
+ vout_thread_t * p_vout;
+
+ p_vout = (vout_thread_t *)[o_value pointerValue];
+
+ if( !p_vout->b_fullscreen )
+ {
+ NSRect s_rect;
+
+ s_rect = [[p_vout->p_sys->o_window contentView] frame];
+ p_vout->p_sys->s_rect.size = s_rect.size;
+
+ 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 = YES;
+ }
+
+ p_vout->p_sys->p_qdport = nil;
+ [p_vout->p_sys->o_window close];
+ p_vout->p_sys->o_window = nil;
}
@end
projects / vlc / blobdiff