/*****************************************************************************
* voutgl.m: MacOS X OpenGL provider
*****************************************************************************
- * Copyright (C) 2001-2004 the VideoLAN team
- * $Id: vout.m 8351 2004-08-02 13:06:38Z hartman $
+ * Copyright (C) 2001-2004, 2007 the VideoLAN team
+ * $Id$
*
* Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org>
* Derk-Jan Hartman <hartman at videolan dot org>
* Eric Petit <titer@m0k.org>
* Benjamin Pracht <bigben at videolan dot org>
+ * Damien Fouilleul <damienf 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 <errno.h> /* ENOMEM */
#include <stdlib.h> /* free() */
-#include <string.h> /* strerror() */
+#include <string.h>
#include <vlc_keys.h>
#include <AGL/agl.h>
/*****************************************************************************
- * VLCView interface
+ * VLCGLView interface
*****************************************************************************/
-@interface VLCGLView : NSOpenGLView
+@interface VLCGLView : NSOpenGLView <VLCVoutViewResetting>
{
vout_thread_t * p_vout;
}
++ (void)resetVout: (vout_thread_t *) p_vout;
- (id) initWithVout: (vout_thread_t *) p_vout;
@end
NSAutoreleasePool * o_pool;
VLCGLView * o_glview;
VLCVoutView * o_vout_view;
- vlc_bool_t b_saved_frame;
+ bool b_saved_frame;
NSRect s_frame;
- vlc_bool_t b_got_frame;
- vlc_mutex_t lock;
+ bool b_got_frame;
/* Mozilla plugin-related variables */
- vlc_bool_t b_embedded;
+ bool b_embedded;
AGLContext agl_ctx;
AGLDrawable agl_drawable;
int i_offx, i_offy;
int i_width, i_height;
+ WindowRef theWindow;
+ WindowGroupRef winGroup;
+ bool b_clipped_out;
+ Rect clipBounds, viewBounds;
};
/*****************************************************************************
static int aglInit ( vout_thread_t * p_vout );
static void aglEnd ( vout_thread_t * p_vout );
static int aglManage ( vout_thread_t * p_vout );
+static int aglControl( vout_thread_t *, int, va_list );
static void aglSwap ( vout_thread_t * p_vout );
-
-static int DrawableRedraw( vlc_object_t *p_this, const char *psz_name,
- vlc_value_t oval, vlc_value_t nval, void *param);
+static int aglLock ( vout_thread_t * p_vout );
+static void aglUnlock ( vout_thread_t * p_vout );
int E_(OpenVideoGL) ( vlc_object_t * p_this )
{
memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) );
- vlc_mutex_init( p_vout, &p_vout->p_sys->lock );
-
- var_Get( p_vout->p_vlc, "drawable", &value_drawable );
+ var_Get( p_vout->p_libvlc, "drawable", &value_drawable );
if( value_drawable.i_int != 0 )
{
- static const GLint ATTRIBUTES[] = {
+ static const GLint ATTRIBUTES[] = {
AGL_WINDOW,
AGL_RGBA,
AGL_NO_RECOVERY,
AGL_DEPTH_SIZE, 24,
AGL_NONE };
- AGLDevice screen;
AGLPixelFormat pixFormat;
- p_vout->p_sys->b_embedded = VLC_TRUE;
+ p_vout->p_sys->b_embedded = true;
- screen = GetGWorldDevice((CGrafPtr)value_drawable.i_int);
- if( NULL == screen )
- {
- msg_Err( p_vout, "can't find screen device for drawable" );
- return VLC_EGENERIC;
- }
-
- pixFormat = aglChoosePixelFormat(&screen, 1, ATTRIBUTES);
+ pixFormat = aglChoosePixelFormat(NULL, 0, ATTRIBUTES);
if( NULL == pixFormat )
{
msg_Err( p_vout, "no screen renderer available for required attributes." );
return VLC_EGENERIC;
}
-
+
p_vout->p_sys->agl_ctx = aglCreateContext(pixFormat, NULL);
aglDestroyPixelFormat(pixFormat);
if( NULL == p_vout->p_sys->agl_ctx )
return VLC_EGENERIC;
}
else {
- // tell opengl to sync buffer swap with vertical retrace
- GLint param = 1;
+ // tell opengl not to sync buffer swap with vertical retrace (too inefficient)
+ GLint param = 0;
aglSetInteger(p_vout->p_sys->agl_ctx, AGL_SWAP_INTERVAL, ¶m);
aglEnable(p_vout->p_sys->agl_ctx, AGL_SWAP_INTERVAL);
}
p_vout->pf_init = aglInit;
p_vout->pf_end = aglEnd;
p_vout->pf_manage = aglManage;
- p_vout->pf_control = NULL;
+ p_vout->pf_control = aglControl;
p_vout->pf_swap = aglSwap;
- p_vout->pf_lock = Lock;
- p_vout->pf_unlock = Unlock;
+ p_vout->pf_lock = aglLock;
+ p_vout->pf_unlock = aglUnlock;
}
else
{
- p_vout->p_sys->b_embedded = VLC_FALSE;
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
- p_vout->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
+ p_vout->p_sys->b_embedded = false;
- /* Create the GL view */
- p_vout->p_sys->o_glview = [[VLCGLView alloc] initWithVout: p_vout];
- [p_vout->p_sys->o_glview autorelease];
+ [VLCGLView performSelectorOnMainThread:@selector(initVout:) withObject:[NSValue valueWithPointer:p_vout] waitUntilDone:YES];
- /* Spawn the window */
+ [o_pool release];
+
+ /* Check to see if initVout: was successfull */
- if( !(p_vout->p_sys->o_vout_view = [VLCVoutView getVoutView: p_vout
- subView: p_vout->p_sys->o_glview frame: nil]) )
+ if( !p_vout->p_sys->o_vout_view )
{
return VLC_EGENERIC;
}
+
p_vout->pf_init = Init;
p_vout->pf_end = End;
p_vout->pf_manage = Manage;
p_vout->pf_lock = Lock;
p_vout->pf_unlock = Unlock;
}
- p_vout->p_sys->b_got_frame = VLC_FALSE;
+ p_vout->p_sys->b_got_frame = false;
return VLC_SUCCESS;
}
vout_thread_t * p_vout = (vout_thread_t *) p_this;
if( p_vout->p_sys->b_embedded )
{
- var_DelCallback(p_vout->p_vlc, "drawableredraw", DrawableRedraw, p_vout);
aglDestroyContext(p_vout->p_sys->agl_ctx);
}
- else
+ else if(VLCIntf && !VLCIntf->b_die)
{
NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
/* Close the window */
- [p_vout->p_sys->o_vout_view closeVout];
+ [p_vout->p_sys->o_vout_view performSelectorOnMainThread:@selector(closeVout) withObject:NULL waitUntilDone:YES];
[o_pool release];
}
/* Clean up */
- vlc_mutex_destroy( &p_vout->p_sys->lock );
free( p_vout->p_sys );
}
{
NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
- if( !p_vout->b_fullscreen )
- {
- /* Save window size and position */
- p_vout->p_sys->s_frame.size =
- [p_vout->p_sys->o_vout_view frame].size;
- p_vout->p_sys->s_frame.origin =
- [[p_vout->p_sys->o_vout_view getWindow ]frame].origin;
- p_vout->p_sys->b_saved_frame = VLC_TRUE;
- }
- [p_vout->p_sys->o_vout_view closeVout];
-
p_vout->b_fullscreen = !p_vout->b_fullscreen;
-#define o_glview p_vout->p_sys->o_glview
- o_glview = [[VLCGLView alloc] initWithVout: p_vout];
- [o_glview autorelease];
-
- if( p_vout->p_sys->b_saved_frame )
- {
- p_vout->p_sys->o_vout_view = [VLCVoutView getVoutView: p_vout
- subView: o_glview
- frame: &p_vout->p_sys->s_frame];
- }
+ if( p_vout->b_fullscreen )
+ [p_vout->p_sys->o_vout_view enterFullscreen];
else
- {
- p_vout->p_sys->o_vout_view = [VLCVoutView getVoutView: p_vout
- subView: o_glview frame: nil];
-
- }
-
- [[o_glview openGLContext] makeCurrentContext];
-#undef o_glview
+ [p_vout->p_sys->o_vout_view leaveFullscreen];
[o_pool release];
*****************************************************************************/
static int Control( vout_thread_t *p_vout, int i_query, va_list args )
{
- vlc_bool_t b_arg;
+ bool b_arg;
switch( i_query )
{
case VOUT_SET_STAY_ON_TOP:
- b_arg = va_arg( args, vlc_bool_t );
+ b_arg = (bool) va_arg( args, int );
[p_vout->p_sys->o_vout_view setOnTop: b_arg];
return VLC_SUCCESS;
static void Swap( vout_thread_t * p_vout )
{
- p_vout->p_sys->b_got_frame = VLC_TRUE;
- [[p_vout->p_sys->o_glview openGLContext] makeCurrentContext];
- glFlush();
+ p_vout->p_sys->b_got_frame = true;
+ [[p_vout->p_sys->o_glview openGLContext] flushBuffer];
}
static int Lock( vout_thread_t * p_vout )
{
- vlc_mutex_lock( &p_vout->p_sys->lock );
- return 0;
+ if( kCGLNoError == CGLLockContext([[p_vout->p_sys->o_glview openGLContext] CGLContextObj]) )
+ {
+ [[p_vout->p_sys->o_glview openGLContext] makeCurrentContext];
+ return 0;
+ }
+ return 1;
}
static void Unlock( vout_thread_t * p_vout )
{
- vlc_mutex_unlock( &p_vout->p_sys->lock );
+ CGLUnlockContext([[p_vout->p_sys->o_glview openGLContext] CGLContextObj]);
}
/*****************************************************************************
* VLCGLView implementation
*****************************************************************************/
@implementation VLCGLView
++ (void)initVout:(NSValue *)arg
+{
+ vout_thread_t * p_vout = [arg pointerValue];
+
+ /* Create the GL view */
+ p_vout->p_sys->o_glview = [[VLCGLView alloc] initWithVout: p_vout];
+ [p_vout->p_sys->o_glview autorelease];
+
+ /* Spawn the window */
+ p_vout->p_sys->o_vout_view = [VLCVoutView getVoutView: p_vout
+ subView: p_vout->p_sys->o_glview frame: nil];
+}
+
+/* This function will reset the o_vout_view. It's useful to go fullscreen. */
++ (void)resetVout:(vout_thread_t *) p_vout
+{
+ if( p_vout->b_fullscreen )
+ {
+ /* Save window size and position */
+ p_vout->p_sys->s_frame.size =
+ [p_vout->p_sys->o_vout_view frame].size;
+ p_vout->p_sys->s_frame.origin =
+ [[p_vout->p_sys->o_vout_view getWindow ]frame].origin;
+ p_vout->p_sys->b_saved_frame = true;
+ }
+
+ [p_vout->p_sys->o_vout_view closeVout];
+
+#define o_glview p_vout->p_sys->o_glview
+ o_glview = [[VLCGLView alloc] initWithVout: p_vout];
+ [o_glview autorelease];
+
+ if( p_vout->p_sys->b_saved_frame )
+ {
+ p_vout->p_sys->o_vout_view = [VLCVoutView getVoutView: p_vout
+ subView: o_glview
+ frame: &p_vout->p_sys->s_frame];
+ }
+ else
+ {
+ p_vout->p_sys->o_vout_view = [VLCVoutView getVoutView: p_vout
+ subView: o_glview frame: nil];
+
+ }
+#undef o_glview
+}
- (id) initWithVout: (vout_thread_t *) vout
{
+ /* Must be called from main thread:
+ * "The NSView class is generally thread-safe, with a few exceptions. You
+ * should create, destroy, resize, move, and perform other operations on NSView
+ * objects only from the main thread of an application. Drawing from secondary
+ * threads is thread-safe as long as you bracket drawing calls with calls to
+ * lockFocusIfCanDraw and unlockFocus." Cocoa Thread Safety */
+
p_vout = vout;
NSOpenGLPixelFormatAttribute attribs[] =
{
+ NSOpenGLPFADoubleBuffer,
NSOpenGLPFAAccelerated,
NSOpenGLPFANoRecovery,
NSOpenGLPFAColorSize, 24,
/* Swap buffers only during the vertical retrace of the monitor.
http://developer.apple.com/documentation/GraphicsImaging/
Conceptual/OpenGL/chap5/chapter_5_section_44.html */
- long params[] = { 1 };
- CGLSetParameter( CGLGetCurrentContext(), kCGLCPSwapInterval,
- params );
+ GLint params[] = { 1 };
+ CGLSetParameter( CGLGetCurrentContext(), kCGLCPSwapInterval, params );
return self;
}
Lock( p_vout );
NSRect bounds = [self bounds];
- [[self openGLContext] makeCurrentContext];
-
var_Get( p_vout, "macosx-stretch", &val );
if( val.b_bool )
{
glViewport( ( bounds.size.width - x ) / 2,
( bounds.size.height - y ) / 2, x, y );
+ [super reshape];
+
if( p_vout->p_sys->b_got_frame )
{
/* Ask the opengl module to redraw */
glClear( GL_COLOR_BUFFER_BIT );
Unlock( p_vout );
}
- [super reshape];
}
- (void) update
- (void) drawRect: (NSRect) rect
{
Lock( p_vout );
- [[self openGLContext] makeCurrentContext];
- glFlush();
+ [[p_vout->p_sys->o_glview openGLContext] flushBuffer];
[super drawRect:rect];
Unlock( p_vout );
}
* embedded AGL context implementation
*****************************************************************************/
-static void UpdateEmbeddedGeometry( vout_thread_t *p_vout );
+static void aglSetViewport( vout_thread_t *p_vout, Rect viewBounds, Rect clipBounds );
static void aglReshape( vout_thread_t * p_vout );
+static OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData);
static int aglInit( vout_thread_t * p_vout )
{
- UpdateEmbeddedGeometry(p_vout);
- var_AddCallback(p_vout->p_vlc, "drawableredraw", DrawableRedraw, p_vout);
+ vlc_value_t val;
+
+ Rect viewBounds;
+ Rect clipBounds;
+
+ var_Get( p_vout->p_libvlc, "drawable", &val );
+ p_vout->p_sys->agl_drawable = (AGLDrawable)val.i_int;
+ aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys->agl_drawable);
+
+ var_Get( p_vout->p_libvlc, "drawable-view-top", &val );
+ viewBounds.top = val.i_int;
+ var_Get( p_vout->p_libvlc, "drawable-view-left", &val );
+ viewBounds.left = val.i_int;
+ var_Get( p_vout->p_libvlc, "drawable-view-bottom", &val );
+ viewBounds.bottom = val.i_int;
+ var_Get( p_vout->p_libvlc, "drawable-view-right", &val );
+ viewBounds.right = val.i_int;
+ var_Get( p_vout->p_libvlc, "drawable-clip-top", &val );
+ clipBounds.top = val.i_int;
+ var_Get( p_vout->p_libvlc, "drawable-clip-left", &val );
+ clipBounds.left = val.i_int;
+ var_Get( p_vout->p_libvlc, "drawable-clip-bottom", &val );
+ clipBounds.bottom = val.i_int;
+ var_Get( p_vout->p_libvlc, "drawable-clip-right", &val );
+ clipBounds.right = val.i_int;
+
+ p_vout->p_sys->b_clipped_out = (clipBounds.top == clipBounds.bottom)
+ || (clipBounds.left == clipBounds.right);
+ if( ! p_vout->p_sys->b_clipped_out )
+ {
+ aglLock(p_vout);
+ aglSetViewport(p_vout, viewBounds, clipBounds);
+ aglReshape(p_vout);
+ aglUnlock(p_vout);
+ }
+ p_vout->p_sys->clipBounds = clipBounds;
+ p_vout->p_sys->viewBounds = viewBounds;
- aglSetCurrentContext(p_vout->p_sys->agl_ctx);
return VLC_SUCCESS;
}
static void aglEnd( vout_thread_t * p_vout )
{
- aglSetCurrentContext(p_vout->p_sys->agl_ctx);
+ aglSetCurrentContext(NULL);
+ if( p_vout->p_sys->theWindow ) DisposeWindow( p_vout->p_sys->theWindow );
}
static void aglReshape( vout_thread_t * p_vout )
{
- int x, y;
- vlc_value_t val;
- int i_offx = p_vout->p_sys->i_offx;
- int i_offy = p_vout->p_sys->i_offy;
- int i_height = p_vout->p_sys->i_height;
- int i_width = p_vout->p_sys->i_width;
-
- Lock( p_vout );
-
- aglSetCurrentContext(p_vout->p_sys->agl_ctx);
-
- var_Get( p_vout, "macosx-stretch", &val );
- if( val.b_bool )
- {
- x = i_width;
- y = i_height;
- }
- else if( i_height * p_vout->fmt_in.i_visible_width *
- p_vout->fmt_in.i_sar_num <
- i_width * p_vout->fmt_in.i_visible_height *
- p_vout->fmt_in.i_sar_den )
- {
- x = ( i_height * p_vout->fmt_in.i_visible_width *
- p_vout->fmt_in.i_sar_num ) /
- ( p_vout->fmt_in.i_visible_height * p_vout->fmt_in.i_sar_den);
+ unsigned int x, y;
+ unsigned int i_height = p_vout->p_sys->i_height;
+ unsigned int i_width = p_vout->p_sys->i_width;
- y = i_height;
- }
- else
- {
- x = i_width;
- y = ( i_width * p_vout->fmt_in.i_visible_height *
- p_vout->fmt_in.i_sar_den) /
- ( p_vout->fmt_in.i_visible_width * p_vout->fmt_in.i_sar_num );
- }
+ vout_PlacePicture(p_vout, i_width, i_height, &x, &y, &i_width, &i_height);
- glViewport( i_offx+( i_width - x ) / 2,
- i_offy+( i_height - y ) / 2, x, y );
+ glViewport( p_vout->p_sys->i_offx + x, p_vout->p_sys->i_offy + y, i_width, i_height );
if( p_vout->p_sys->b_got_frame )
{
/* Ask the opengl module to redraw */
vout_thread_t * p_parent;
p_parent = (vout_thread_t *) p_vout->p_parent;
- Unlock( p_vout );
if( p_parent && p_parent->pf_display )
{
p_parent->pf_display( p_parent, NULL );
else
{
glClear( GL_COLOR_BUFFER_BIT );
- Unlock( p_vout );
+ }
+}
+
+/* private event class */
+enum
+{
+ kEventClassVLCPlugin = 'vlcp',
+};
+/* private event kinds */
+enum
+{
+ kEventVLCPluginShowFullscreen = 32768,
+ kEventVLCPluginHideFullscreen,
+};
+
+static void sendEventToMainThread(EventTargetRef target, UInt32 class, UInt32 kind)
+{
+ EventRef myEvent;
+ if( noErr == CreateEvent(NULL, class, kind, 0, kEventAttributeNone, &myEvent) )
+ {
+ if( noErr == SetEventParameter(myEvent, kEventParamPostTarget, typeEventTargetRef, sizeof(EventTargetRef), &target) )
+ {
+ PostEventToQueue(GetMainEventQueue(), myEvent, kEventPriorityStandard);
+ }
+ ReleaseEvent(myEvent);
}
}
{
if( p_vout->i_changes & VOUT_ASPECT_CHANGE )
{
+ aglLock( p_vout );
aglReshape(p_vout);
+ aglUnlock( p_vout );
p_vout->i_changes &= ~VOUT_ASPECT_CHANGE;
}
if( p_vout->i_changes & VOUT_CROP_CHANGE )
{
+ aglLock( p_vout );
aglReshape(p_vout);
+ aglUnlock( p_vout );
p_vout->i_changes &= ~VOUT_CROP_CHANGE;
}
+ if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE )
+ {
+ aglSetDrawable(p_vout->p_sys->agl_ctx, NULL);
+ aglLock( p_vout );
+ if( p_vout->b_fullscreen )
+ {
+ /* Close the fullscreen window and resume normal drawing */
+ vlc_value_t val;
+ Rect viewBounds;
+ Rect clipBounds;
+
+ var_Get( p_vout->p_libvlc, "drawable", &val );
+ p_vout->p_sys->agl_drawable = (AGLDrawable)val.i_int;
+ aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys->agl_drawable);
+
+ var_Get( p_vout->p_libvlc, "drawable-view-top", &val );
+ viewBounds.top = val.i_int;
+ var_Get( p_vout->p_libvlc, "drawable-view-left", &val );
+ viewBounds.left = val.i_int;
+ var_Get( p_vout->p_libvlc, "drawable-view-bottom", &val );
+ viewBounds.bottom = val.i_int;
+ var_Get( p_vout->p_libvlc, "drawable-view-right", &val );
+ viewBounds.right = val.i_int;
+ var_Get( p_vout->p_libvlc, "drawable-clip-top", &val );
+ clipBounds.top = val.i_int;
+ var_Get( p_vout->p_libvlc, "drawable-clip-left", &val );
+ clipBounds.left = val.i_int;
+ var_Get( p_vout->p_libvlc, "drawable-clip-bottom", &val );
+ clipBounds.bottom = val.i_int;
+ var_Get( p_vout->p_libvlc, "drawable-clip-right", &val );
+ clipBounds.right = val.i_int;
+
+ aglSetCurrentContext(p_vout->p_sys->agl_ctx);
+ aglSetViewport(p_vout, viewBounds, clipBounds);
+
+ /* Most Carbon APIs are not thread-safe, therefore delagate some GUI visibilty update to the main thread */
+ sendEventToMainThread(GetWindowEventTarget(p_vout->p_sys->theWindow), kEventClassVLCPlugin, kEventVLCPluginHideFullscreen);
+ }
+ else
+ {
+ Rect deviceRect;
+
+ GDHandle deviceHdl = GetMainDevice();
+ deviceRect = (*deviceHdl)->gdRect;
+
+ if( !p_vout->p_sys->theWindow )
+ {
+ /* Create a window */
+ WindowAttributes windowAttrs;
+
+ windowAttrs = kWindowStandardDocumentAttributes
+ | kWindowStandardHandlerAttribute
+ | kWindowLiveResizeAttribute
+ | kWindowNoShadowAttribute;
+
+ windowAttrs &= (~kWindowResizableAttribute);
+
+ CreateNewWindow(kDocumentWindowClass, windowAttrs, &deviceRect, &p_vout->p_sys->theWindow);
+ if( !p_vout->p_sys->winGroup )
+ {
+ CreateWindowGroup(0, &p_vout->p_sys->winGroup);
+ SetWindowGroup(p_vout->p_sys->theWindow, p_vout->p_sys->winGroup);
+ SetWindowGroupParent( p_vout->p_sys->winGroup, GetWindowGroupOfClass(kDocumentWindowClass) ) ;
+ }
+
+ // Window title
+ CFStringRef titleKey = CFSTR("Fullscreen VLC media plugin");
+ CFStringRef windowTitle = CFCopyLocalizedString(titleKey, NULL);
+ SetWindowTitleWithCFString(p_vout->p_sys->theWindow, windowTitle);
+ CFRelease(titleKey);
+ CFRelease(windowTitle);
+
+ //Install event handler
+ static const EventTypeSpec win_events[] = {
+ { kEventClassMouse, kEventMouseDown },
+ { kEventClassMouse, kEventMouseMoved },
+ { kEventClassMouse, kEventMouseUp },
+ { kEventClassWindow, kEventWindowClosed },
+ { kEventClassWindow, kEventWindowBoundsChanged },
+ { kEventClassCommand, kEventCommandProcess },
+ { kEventClassVLCPlugin, kEventVLCPluginShowFullscreen },
+ { kEventClassVLCPlugin, kEventVLCPluginHideFullscreen },
+ };
+ InstallWindowEventHandler (p_vout->p_sys->theWindow, NewEventHandlerUPP (WindowEventHandler), GetEventTypeCount(win_events), win_events, p_vout, NULL);
+ }
+ else
+ {
+ /* just in case device resolution changed */
+ SetWindowBounds(p_vout->p_sys->theWindow, kWindowContentRgn, &deviceRect);
+ }
+ glClear( GL_COLOR_BUFFER_BIT );
+ p_vout->p_sys->agl_drawable = (AGLDrawable)GetWindowPort(p_vout->p_sys->theWindow);
+ aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys->agl_drawable);
+ aglSetCurrentContext(p_vout->p_sys->agl_ctx);
+ aglSetViewport(p_vout, deviceRect, deviceRect);
+ //aglSetFullScreen(p_vout->p_sys->agl_ctx, device_width, device_height, 0, 0);
+
+ /* Most Carbon APIs are not thread-safe, therefore delagate some GUI visibilty update to the main thread */
+ sendEventToMainThread(GetWindowEventTarget(p_vout->p_sys->theWindow), kEventClassVLCPlugin, kEventVLCPluginShowFullscreen);
+ }
+ aglReshape(p_vout);
+ aglUnlock( p_vout );
+ p_vout->b_fullscreen = !p_vout->b_fullscreen;
+ p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
+ }
return VLC_SUCCESS;
}
-static void aglSwap( vout_thread_t * p_vout )
+static int aglControl( vout_thread_t *p_vout, int i_query, va_list args )
{
- p_vout->p_sys->b_got_frame = VLC_TRUE;
- aglSwapBuffers(p_vout->p_sys->agl_ctx);
-}
+ switch( i_query )
+ {
+ case VOUT_SET_VIEWPORT:
+ {
+ Rect viewBounds, clipBounds;
+ viewBounds.top = va_arg( args, int);
+ viewBounds.left = va_arg( args, int);
+ viewBounds.bottom = va_arg( args, int);
+ viewBounds.right = va_arg( args, int);
+ clipBounds.top = va_arg( args, int);
+ clipBounds.left = va_arg( args, int);
+ clipBounds.bottom = va_arg( args, int);
+ clipBounds.right = va_arg( args, int);
+
+ if( !p_vout->b_fullscreen )
+ {
+ /*
+ ** check that the clip rect is not empty, as this is used
+ ** by Firefox to prevent a plugin from displaying during
+ ** a scrolling event. In this case we just prevent buffers
+ ** from being swapped and ignore clipping as this is less
+ ** disruptive than a GL geometry change
+ */
+
+ p_vout->p_sys->b_clipped_out = (clipBounds.top == clipBounds.bottom)
+ || (clipBounds.left == clipBounds.right);
+ if( ! p_vout->p_sys->b_clipped_out )
+ {
+ /* ignore consecutive viewport update with identical parameters */
+ if( memcmp(&clipBounds, &(p_vout->p_sys->clipBounds), sizeof(clipBounds) )
+ && memcmp(&viewBounds, &(p_vout->p_sys->viewBounds), sizeof(viewBounds)) )
+ {
+ aglLock( p_vout );
+ aglSetViewport(p_vout, viewBounds, clipBounds);
+ aglReshape( p_vout );
+ aglUnlock( p_vout );
+ p_vout->p_sys->clipBounds = clipBounds;
+ p_vout->p_sys->viewBounds = viewBounds;
+ }
+ }
+ }
+ return VLC_SUCCESS;
+ }
-static void UpdateEmbeddedGeometry( vout_thread_t *p_vout )
-{
- vlc_value_t val;
- vlc_value_t valt, vall, valb, valr, valx, valy, valw, valh,
- valportx, valporty;
+ case VOUT_REDRAW_RECT:
+ {
+ vout_thread_t * p_parent;
+ Rect areaBounds;
+
+ areaBounds.top = va_arg( args, int);
+ areaBounds.left = va_arg( args, int);
+ areaBounds.bottom = va_arg( args, int);
+ areaBounds.right = va_arg( args, int);
+
+ /* Ask the opengl module to redraw */
+ p_parent = (vout_thread_t *) p_vout->p_parent;
+ if( p_parent && p_parent->pf_display )
+ {
+ p_parent->pf_display( p_parent, NULL );
+ }
+ return VLC_SUCCESS;
+ }
- Rect winBounds;
- Rect clientBounds;
-
- GLint rect[4];
+ case VOUT_REPARENT:
+ {
+ AGLDrawable drawable = (AGLDrawable)va_arg( args, int);
+ if( !p_vout->b_fullscreen && drawable != p_vout->p_sys->agl_drawable )
+ {
+ p_vout->p_sys->agl_drawable = drawable;
+ aglSetDrawable(p_vout->p_sys->agl_ctx, drawable);
+ }
+ return VLC_SUCCESS;
+ }
- 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 );
+ default:
+ return vout_vaControlDefault( p_vout, i_query, args );
+ }
+}
+static void aglSwap( vout_thread_t * p_vout )
+{
+ if( ! p_vout->p_sys->b_clipped_out )
+ {
+ p_vout->p_sys->b_got_frame = true;
+ aglSwapBuffers(p_vout->p_sys->agl_ctx);
+ }
+ else
+ {
+ /* drop frame */
+ glFlush();
+ }
+}
+
+/* Enter this function with the p_vout locked */
+static void aglSetViewport( vout_thread_t *p_vout, Rect viewBounds, Rect clipBounds )
+{
// mozilla plugin provides coordinates based on port bounds
// however AGL coordinates are based on window structure region
// and are vertically flipped
+ GLint rect[4];
+ CGrafPtr port = (CGrafPtr)p_vout->p_sys->agl_drawable;
+ Rect winBounds, clientBounds;
- GetWindowBounds(GetWindowFromPort((CGrafPtr)val.i_int),
+ GetWindowBounds(GetWindowFromPort(port),
kWindowStructureRgn, &winBounds);
- GetWindowBounds(GetWindowFromPort((CGrafPtr)val.i_int),
+ GetWindowBounds(GetWindowFromPort(port),
kWindowContentRgn, &clientBounds);
/* update video clipping bounds in drawable */
rect[0] = (clientBounds.left-winBounds.left)
- + vall.i_int; // from window left edge
+ + clipBounds.left; // from window left edge
rect[1] = (winBounds.bottom-winBounds.top)
- (clientBounds.top-winBounds.top)
- - valb.i_int; // from window bottom edge
- rect[2] = valr.i_int-vall.i_int; // width
- rect[3] = valb.i_int-valt.i_int; // height
+ - clipBounds.bottom; // from window bottom edge
+ rect[2] = clipBounds.right-clipBounds.left; // width
+ rect[3] = clipBounds.bottom-clipBounds.top; // height
aglSetInteger(p_vout->p_sys->agl_ctx, AGL_BUFFER_RECT, rect);
aglEnable(p_vout->p_sys->agl_ctx, AGL_BUFFER_RECT);
/* update video internal bounds in drawable */
- p_vout->p_sys->i_offx = -vall.i_int - valportx.i_int;
- p_vout->p_sys->i_offy = valb.i_int + valporty.i_int - valh.i_int;
- p_vout->p_sys->i_width = valw.i_int;
- p_vout->p_sys->i_height = valh.i_int;
+ p_vout->p_sys->i_width = viewBounds.right-viewBounds.left;
+ p_vout->p_sys->i_height = viewBounds.bottom-viewBounds.top;
+ p_vout->p_sys->i_offx = -clipBounds.left - viewBounds.left;
+ p_vout->p_sys->i_offy = clipBounds.bottom + viewBounds.top
+ - p_vout->p_sys->i_height;
- if( p_vout->p_sys->agl_drawable == (AGLDrawable)val.i_int )
+ aglUpdateContext(p_vout->p_sys->agl_ctx);
+}
+
+//default window event handler
+static pascal OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *userData)
+{
+ OSStatus result = noErr;
+ UInt32 class = GetEventClass (event);
+ UInt32 kind = GetEventKind (event);
+ vout_thread_t *p_vout = (vout_thread_t *)userData;
+
+ result = CallNextEventHandler(nextHandler, event);
+ if(class == kEventClassCommand)
{
- aglUpdateContext(p_vout->p_sys->agl_ctx);
+ HICommand theHICommand;
+ GetEventParameter( event, kEventParamDirectObject, typeHICommand, NULL, sizeof( HICommand ), NULL, &theHICommand );
+
+ switch ( theHICommand.commandID )
+ {
+ default:
+ result = eventNotHandledErr;
+ }
}
- else
+ else if(class == kEventClassWindow)
+ {
+ WindowRef window;
+ Rect rectPort = {0,0,0,0};
+
+ GetEventParameter(event, kEventParamDirectObject, typeWindowRef, NULL, sizeof(WindowRef), NULL, &window);
+
+ if(window)
+ {
+ GetPortBounds(GetWindowPort(window), &rectPort);
+ }
+
+ switch (kind)
+ {
+ case kEventWindowClosed:
+ case kEventWindowZoomed:
+ case kEventWindowBoundsChanged:
+ break;
+
+ default:
+ result = eventNotHandledErr;
+ }
+ }
+ else if(class == kEventClassMouse)
+ {
+ switch (kind)
+ {
+ case kEventMouseDown:
+ {
+ UInt16 button;
+
+ GetEventParameter(event, kEventParamMouseButton, typeMouseButton, NULL, sizeof(button), NULL, &button);
+ switch (button)
+ {
+ case kEventMouseButtonPrimary:
+ {
+ vlc_value_t val;
+
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int |= 1;
+ var_Set( p_vout, "mouse-button-down", val );
+ break;
+ }
+ case kEventMouseButtonSecondary:
+ {
+ vlc_value_t val;
+
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int |= 2;
+ var_Set( p_vout, "mouse-button-down", val );
+ break;
+ }
+ case kEventMouseButtonTertiary:
+ {
+ vlc_value_t val;
+
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int |= 4;
+ var_Set( p_vout, "mouse-button-down", val );
+ break;
+ }
+ default:
+ result = eventNotHandledErr;
+ }
+ break;
+ }
+
+ case kEventMouseUp:
+ {
+ UInt16 button;
+
+ GetEventParameter(event, kEventParamMouseButton, typeMouseButton, NULL, sizeof(button), NULL, &button);
+ switch (button)
+ {
+ case kEventMouseButtonPrimary:
+ {
+ UInt32 clickCount = 0;
+ GetEventParameter(event, kEventParamClickCount, typeUInt32, NULL, sizeof(clickCount), NULL, &clickCount);
+ if( clickCount > 1 )
+ {
+ vlc_value_t val;
+
+ val.b_bool = false;
+ var_Set((vout_thread_t *) p_vout->p_parent, "fullscreen", val);
+ }
+ else
+ {
+ vlc_value_t val;
+
+ val.b_bool = true;
+ var_Set( p_vout, "mouse-clicked", val );
+
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int &= ~1;
+ var_Set( p_vout, "mouse-button-down", val );
+ }
+ break;
+ }
+ case kEventMouseButtonSecondary:
+ {
+ vlc_value_t val;
+
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int &= ~2;
+ var_Set( p_vout, "mouse-button-down", val );
+ break;
+ }
+ case kEventMouseButtonTertiary:
+ {
+ vlc_value_t val;
+
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int &= ~2;
+ var_Set( p_vout, "mouse-button-down", val );
+ break;
+ }
+ default:
+ result = eventNotHandledErr;
+ }
+ break;
+ }
+
+ case kEventMouseMoved:
+ {
+ Point ml;
+ vlc_value_t val;
+
+ unsigned int i_x, i_y;
+ unsigned int i_height = p_vout->p_sys->i_height;
+ unsigned int i_width = p_vout->p_sys->i_width;
+
+ vout_PlacePicture(p_vout, i_width, i_height, &i_x, &i_y, &i_width, &i_height);
+
+ GetEventParameter(event, kEventParamWindowMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &ml);
+
+ val.i_int = ( ((int)ml.h) - i_x ) *
+ p_vout->render.i_width / i_width;
+ var_Set( p_vout, "mouse-x", val );
+
+ val.i_int = ( ((int)ml.v) - i_y ) *
+ p_vout->render.i_height / i_height;
+
+ var_Set( p_vout, "mouse-y", val );
+
+ val.b_bool = true;
+ var_Set( p_vout, "mouse-moved", val );
+
+ break;
+ }
+
+ default:
+ result = eventNotHandledErr;
+ }
+ }
+ else if(class == kEventClassTextInput)
{
- p_vout->p_sys->agl_drawable = (AGLDrawable)val.i_int;
- aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys->agl_drawable);
+ switch (kind)
+ {
+ case kEventTextInputUnicodeForKeyEvent:
+ {
+ break;
+ }
+ default:
+ result = eventNotHandledErr;
+ }
}
- aglReshape( p_vout );
+ else if(class == kEventClassVLCPlugin)
+ {
+ switch (kind)
+ {
+ case kEventVLCPluginShowFullscreen:
+ ShowWindow (p_vout->p_sys->theWindow);
+ SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
+ //CGDisplayHideCursor(kCGDirectMainDisplay);
+ break;
+ case kEventVLCPluginHideFullscreen:
+ HideWindow (p_vout->p_sys->theWindow);
+ SetSystemUIMode( kUIModeNormal, 0);
+ CGDisplayShowCursor(kCGDirectMainDisplay);
+ break;
+ default:
+ result = eventNotHandledErr;
+ break;
+ }
+ }
+ return result;
}
-/* If we're embedded, the application is expected to indicate a
- * window change (move/resize/etc) via the "drawableredraw" value.
- */
-
-static int DrawableRedraw( vlc_object_t *p_this, const char *psz_name,
- vlc_value_t oval, vlc_value_t nval, void *param)
+static int aglLock( vout_thread_t * p_vout )
{
- vout_thread_t *p_vout = (vout_thread_t *)param;
-
- UpdateEmbeddedGeometry( p_vout );
+ /* get the underlying CGL context */
+ CGLContextObj cglContext;
+ if( aglGetCGLContext(p_vout->p_sys->agl_ctx, (void**)&cglContext) )
+ {
+ if( kCGLNoError == CGLLockContext( cglContext ) )
+ {
+ aglSetCurrentContext(p_vout->p_sys->agl_ctx);
+ return 0;
+ }
+ }
+ return 1;
+}
- return VLC_SUCCESS;
+static void aglUnlock( vout_thread_t * p_vout )
+{
+ /* get the underlying CGL context */
+ CGLContextObj cglContext;
+ if( aglGetCGLContext(p_vout->p_sys->agl_ctx, (void**)&cglContext) )
+ {
+ CGLUnlockContext( cglContext );
+ }
}
+
projects / vlc / blobdiff