X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fvout.m;h=9f738b050292fab7b92940e10e004fb433e22ebf;hb=135139eaaf6bcb9008f8a6f689bc6ade226a12c7;hp=1aef599d4e75b3d7d463331fb58e9bd22a5ad553;hpb=4168ec3729c16ddc3cce5dcb2a69306e45ec0cb7;p=vlc

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index 1aef599d4e..9f738b0502 100644
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -274,35 +274,31 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     NSString * o_title = nil; 
     NSMutableString * o_mrl = nil;
     input_thread_t * p_input;
+    char * psz_title;
 
-    if( p_vout == NULL )
-    {
-        return;
-    }
+    if( !p_vout ) return;
 
     p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, FIND_PARENT );
 
-    if( p_input == NULL )
-    {
-        return;
-    }
+    if( !p_input ) return;
 
-    char *psz_nowPlaying = input_item_GetNowPlaying ( input_GetItem( p_input ) );
-    char *psz_name = input_item_GetName( input_GetItem( p_input ) );
-    char *psz_uri = input_item_GetURI( input_GetItem( p_input ) );
-    if( psz_nowPlaying != NULL )
-        o_title = [NSString stringWithUTF8String: psz_nowPlaying];
-    else if( psz_name != NULL )
-        o_title = [NSString stringWithUTF8String: psz_name];
+    input_item_t * p_item = input_GetItem( p_input );
 
-    if( psz_uri != NULL )
+    psz_title = input_item_GetNowPlaying ( p_item );
+    if( !psz_title )
+        psz_title = input_item_GetName( p_item );
+
+    if( psz_title )
+        o_title = [NSString stringWithUTF8String: psz_title];
+
+    char *psz_uri = input_item_GetURI( p_item );
+    if( psz_uri )
         o_mrl = [NSMutableString stringWithUTF8String: psz_uri];
 
-    FREENULL( psz_nowPlaying );
-    FREENULL( psz_name );
-    FREENULL( psz_uri );
+    free( psz_title );
+    free( psz_uri );
 
-    if( o_title == nil )
+    if( !o_title )
         o_title = o_mrl;
 
     if( o_mrl != nil )
@@ -347,36 +343,44 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     }
 }
 
-- (void)scaleWindowWithFactor: (float)factor animate: (BOOL)animate
+- (NSSize)voutSizeForFactor: (float)factor
 {
-    NSSize newsize;
     int i_corrected_height, i_corrected_width;
-    NSPoint topleftbase;
-    NSPoint topleftscreen;
+    NSSize newsize;
 
+    if( p_vout->render.i_height * p_vout->render.i_aspect >
+                    p_vout->render.i_width * VOUT_ASPECT_FACTOR )
+    {
+        i_corrected_width = p_vout->render.i_height * p_vout->render.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->render.i_width * VOUT_ASPECT_FACTOR /
+                                        p_vout->render.i_aspect;
+        newsize.width = (int) ( p_vout->render.i_width * factor );
+        newsize.height = (int) ( i_corrected_height * factor );
+    }
+
+    return newsize;
+}
+
+- (void)scaleWindowWithFactor: (float)factor animate: (BOOL)animate
+{
     if ( !p_vout->b_fullscreen )
     {
+        NSSize newsize;
+        NSPoint topleftbase;
+        NSPoint topleftscreen;
         NSView *mainView;
         NSRect new_frame;
         topleftbase.x = 0;
         topleftbase.y = [o_window frame].size.height;
         topleftscreen = [o_window convertBaseToScreen: topleftbase];
 
-        if( p_vout->render.i_height * p_vout->render.i_aspect >
-                        p_vout->render.i_width * VOUT_ASPECT_FACTOR )
-        {
-            i_corrected_width = p_vout->render.i_height * p_vout->render.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->render.i_width * VOUT_ASPECT_FACTOR /
-                                            p_vout->render.i_aspect;
-            newsize.width = (int) ( p_vout->render.i_width * factor );
-            newsize.height = (int) ( i_corrected_height * factor );
-        }
+        newsize = [self voutSizeForFactor:factor];
 
         /* In fullscreen mode we need to use a view that is different from
          * ourselves, with the VLCEmbeddedWindow */
@@ -394,8 +398,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
         new_frame.origin.x = topleftscreen.x;
         new_frame.origin.y = topleftscreen.y - new_frame.size.height;
 
-        [o_window setFrame: new_frame display: animate animate: animate];
-
+        [o_window setFrame:new_frame display:animate animate:animate];
         p_vout->i_changes |= VOUT_SIZE_CHANGE;
     }
 }
@@ -477,7 +480,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     if( i_pressed_modifiers & NSCommandKeyMask )
         val.i_int |= KEY_MODIFIER_COMMAND;
 
-    key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0];
+    key = [[[o_event charactersIgnoringModifiers] lowercaseString] characterAtIndex: 0];
 
     if( key )
     {
@@ -489,28 +492,23 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
                  [self toggleFullscreen];
              }
         }
-        else if ( key == ' ' )
-        {
-            vlc_value_t val;
-            val.i_int = config_GetInt( p_vout, "key-play-pause" );
-            var_Set( p_vout->p_libvlc, "key-pressed", val );
-        }
-        else
+        else if ( p_vout )
         {
-            val.i_int |= CocoaKeyToVLC( key );
+            if( key == ' ')
+                val.i_int = config_GetInt( p_vout, "key-play-pause" );
+            else
+                val.i_int |= (int)CocoaKeyToVLC( key );
             var_Set( p_vout->p_libvlc, "key-pressed", val );
         }
+        else NSLog( @"Could not send keyevent to VLC core" );
     }
     else
-    {
         [super keyDown: o_event];
-    }
 }
 
 - (void)mouseDown:(NSEvent *)o_event
 {
     vlc_value_t val;
-
     if( p_vout )
     {
         if( ( [o_event type] == NSLeftMouseDown ) &&
@@ -770,24 +768,18 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
 
 - (void)enterFullscreen
 {
-    if( var_GetBool( p_real_vout, "video-on-top" ) )
-    {
-        [o_window setLevel: NSNormalWindowLevel];
-    }
-
-    [[o_view class] performSelectorOnMainThread:@selector(resetVout:) withObject:[NSValue valueWithPointer:p_vout] waitUntilDone:YES];
-    [[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil];
+    /* Save the settings for next playing item */
+    playlist_t * p_playlist = pl_Yield( p_real_vout );
+    var_SetBool( p_playlist, "fullscreen", true );
+    pl_Release( p_real_vout );
 }
 
 - (void)leaveFullscreen
 {
-    if( var_GetBool( p_real_vout, "video-on-top" ) )
-    {
-        [o_window setLevel: NSStatusWindowLevel];
-    }
-
-    [[o_view class] performSelectorOnMainThread:@selector(resetVout:) withObject:[NSValue valueWithPointer:p_vout] waitUntilDone:YES];
-    [[[[VLCMain sharedInstance] getControls] getFSPanel] setNonActive: nil];
+    /* Save the settings for next playing item */
+    playlist_t * p_playlist = pl_Yield( p_real_vout );
+    var_SetBool( p_playlist, "fullscreen", false );
+    pl_Release( p_real_vout );
 }
 
 @end
@@ -804,6 +796,11 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     return self;
 }
 
+- (BOOL)mouseDownCanMoveWindow
+{
+    return YES;
+}
+
 - (bool)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
                      frame: (NSRect *) s_arg_frame
 {
@@ -811,22 +808,19 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     i_time_mouse_last_moved = mdate();
     o_window = [[VLCVoutWindow alloc] initWithVout: p_arg_vout view: self
                                                     frame: s_arg_frame];
+    
     [self updateTitle];
-    [view setFrame: [self frame]];
-
-    if( var_GetBool( p_real_vout, "video-on-top" ) )
-    {
-        [o_window setLevel: NSStatusWindowLevel];
-    }
+    if([self isFullscreen])
+        [o_window performSelectorOnMainThread: @selector(enterFullscreen) withObject: NULL waitUntilDone: YES];
+    else
+        [view setFrame: [self frame]];
 
-    [o_window setAcceptsMouseMovedEvents: TRUE];
     return b_return;
 }
 
 - (void)closeVout
 {
-    [o_window closeWindow];
-    [o_window setAcceptsMouseMovedEvents: NO];
+    [o_window performSelectorOnMainThread: @selector(close) withObject: NULL waitUntilDone: YES];
     i_time_mouse_last_moved = 0;
     [super closeVout];
 }
@@ -859,13 +853,18 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
 
 - (void)manage
 {
+    /* Dooh, why do we spend processor time doing this kind of stuff? */
     [super manage];
     unsigned int i_mouse_hide_timeout =
-        var_GetInteger(p_vout, "mouse-hide-timeout") * 1000;
+        var_CreateGetInteger(p_vout, "mouse-hide-timeout") * 1000;
+
+    if( i_mouse_hide_timeout < 100000 )
+        i_mouse_hide_timeout = 100000;
     if( p_vout->b_fullscreen )
     {
         if( mdate() - i_time_mouse_last_moved > i_mouse_hide_timeout )
         {
+            i_time_mouse_last_moved = mdate();
             [self hideMouse: YES];
         }
     }
@@ -875,6 +874,29 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     }
 }
 
+
+- (void)enterFullscreen
+{
+    [o_window performSelectorOnMainThread: @selector(enterFullscreen) withObject: NULL waitUntilDone: NO];
+    [super enterFullscreen];
+
+}
+
+- (void)leaveFullscreen
+{
+    [o_window performSelectorOnMainThread: @selector(leaveFullscreen) withObject: NULL waitUntilDone: NO];
+    [super leaveFullscreen];
+}
+
+
+- (void)scaleWindowWithFactor: (float)factor animate: (BOOL)animate
+{
+    if( p_vout->b_fullscreen )
+        return;
+    [o_window setMovableByWindowBackground: NO];
+    [super scaleWindowWithFactor: factor animate: animate];
+    [o_window setMovableByWindowBackground: YES];
+}
 @end
 
 /*****************************************************************************
@@ -888,6 +910,11 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     o_embeddedwindow = [self window];
 }
 
+- (BOOL)mouseDownCanMoveWindow
+{
+    return YES;
+}
+
 - (id)initWithFrame: (NSRect)frameRect
 {
     if(self = [super initWithFrame: frameRect])
@@ -900,7 +927,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
 }
 
 - (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
-                 frame: (NSRect *)s_arg_frame showWindow: (BOOL)b_show_window
+                 frame: (NSRect *)s_arg_frame
 {
     BOOL b_return;
 
@@ -910,11 +937,10 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     if( b_return )
     {
         o_window = [self window];
-        if (b_show_window)
-            [o_window makeKeyAndOrderFront: self];
+
         [o_window setAcceptsMouseMovedEvents: TRUE];
 
-        if( var_GetBool( p_real_vout, "video-on-top" ) )
+        if( var_CreateGetBool( p_real_vout, "video-on-top" ) )
         {
             [o_window setLevel: NSStatusWindowLevel];
         }
@@ -942,7 +968,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
 
         [self scaleWindowWithFactor: 1.0 animate: [o_window isVisible] && (![o_window isFullscreen])];
 
-        [o_window setAspectRatio:NSMakeSize([o_window frame].size.width, [o_window frame].size.height)];
+        [o_embeddedwindow setVideoRatio:[self voutSizeForFactor:1.0]];
 
         /* Make sure our window is visible, if we are not in fullscreen */
         if (![o_window isFullscreen])
@@ -954,13 +980,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     return b_return;
 }
 
-- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
-                     frame: (NSRect *) s_arg_frame
-
-{
-    return [self setVout: p_arg_vout subView: view frame:s_arg_frame showWindow: YES];
-}
-
 - (void)setUsed: (BOOL)b_new_used
 {
     b_used = b_new_used;
@@ -973,25 +992,30 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
 
 - (void)closeVout
 {
+    [super closeVout];
+
     /* Don't close the window yet, wait a bit to see if a new input is poping up */
     /* FIXME: Probably fade the window In and Out */
     /* FIXME: fix core */
-    if(![self isFullscreen])
-        [o_window performSelector:@selector(orderOut:) withObject:nil afterDelay:1.5];
+    [o_embeddedwindow performSelector:@selector(orderOut:) withObject:nil afterDelay:3.];
 
-    [super closeVout];
-    [o_window setAcceptsMouseMovedEvents: NO];
     [[[VLCMain sharedInstance] getEmbeddedList] releaseEmbeddedVout: self];
 }
 
 - (void)enterFullscreen
 {
+    /* Save settings */
+    [super enterFullscreen];
+
     /* We are in a VLCEmbeddedWindow */
     [o_embeddedwindow performSelectorOnMainThread: @selector(enterFullscreen) withObject: NULL waitUntilDone: YES];
 }
 
 - (void)leaveFullscreen
 {
+    /* Save settings */
+    [super leaveFullscreen];
+
     /* We are in a VLCEmbeddedWindow */
     [o_embeddedwindow performSelectorOnMainThread: @selector(leaveFullscreen) withObject: NULL waitUntilDone: YES];
 }
@@ -1008,209 +1032,122 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     p_vout  = vout;
     o_view  = view;
     s_frame = frame;
-
-    [self performSelectorOnMainThread: @selector(initReal:)
+    b_init_ok = NO;
+    [self performSelectorOnMainThread: @selector(initMainThread:)
         withObject: NULL waitUntilDone: YES];
 
-    if( !b_init_ok )
-    {
-        return NULL;
-    }
-
-    return self;
+    return b_init_ok ? self : nil;
 }
 
-- (id)initReal: (id) sender
+- (id)initMainThread: (id) sender
 {
-    NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
-    NSArray *o_screens = [NSScreen screens];
-    NSScreen *o_screen;
-    bool b_menubar_screen = false;
-    int i_device;
-
-    b_init_ok = false;
-
-    p_real_vout = [VLCVoutView getRealVout: p_vout];
-    i_device = var_GetInteger( p_real_vout->p_libvlc, "video-device" );
-    b_black = NO;
-    b_embedded = var_GetBool( p_vout, "embedded-video" );
-
-    /* Find out on which screen to open the window */
-    o_screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)i_device];
-
-    if( !o_screen )
-        o_screen = [NSScreen mainScreen];
-
-    if( [o_screen isMainScreen] )
-        b_menubar_screen = true;
+    NSRect rect;
+    rect.size.height = p_vout->i_window_height;
+    rect.size.width  = p_vout->i_window_width;
+    rect.origin.x = rect.origin.y = 70.;
 
-    if( p_vout->b_fullscreen )
+    if( self = [super initWithContentRect:rect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO])
     {
-        CGDisplayFadeReservationToken token;
-        NSRect screen_rect = [o_screen frame];
-        screen_rect.origin.x = screen_rect.origin.y = 0;
-
-        b_black = var_GetBool( p_vout, "macosx-black" );
-
-        /* move the FSPanel to front in case that it is currently shown
-         * this won't and is not supposed to work when it's fading right now */
-        if( [[[[VLCMain sharedInstance] getControls] getFSPanel] isDisplayed] )
-            [[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil];
- 
-        /* tell the fspanel to move itself to front next time it's triggered */
-        [[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: i_device];
-
-        /* Creates a window with size: screen_rect on o_screen */
-        [self initWithContentRect: screen_rect
-              styleMask: NSBorderlessWindowMask
-              backing: NSBackingStoreBuffered
-              defer: YES screen: o_screen];
- 
-        if( b_menubar_screen )
-        {
-            SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
-        }
-        if( b_black == true )
+        [self setBackgroundColor:[NSColor blackColor]];
+        [self setHasShadow:YES];
+        [self setMovableByWindowBackground: YES];
+        [self center];
+        [self makeKeyAndOrderFront: self];
+        [self setReleasedWhenClosed: YES];
+        [self setFrameUsingName:@"VLCVoutWindowDetached"];
+        [self setFrameAutosaveName:@"VLCVoutWindowDetached"];
+
+        /* We'll catch mouse events */
+        [self makeFirstResponder: o_view];
+        [self setCanBecomeKeyWindow: YES];
+        [self setAcceptsMouseMovedEvents: YES];
+        [self setIgnoresMouseEvents: NO];
+
+        if( var_CreateGetBool( p_vout, "macosx-background" ) )
         {
-            CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token);
-            CGDisplayFade( token, 0.6 , kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES );
+            int i_device = var_GetInteger( p_vout->p_libvlc, "video-device" );
 
-            [o_screen blackoutOtherScreens];
+            /* Find out on which screen to open the window */
+            NSScreen * screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)i_device];
+            if( !screen ) screen = [NSScreen mainScreen];
 
-            CGDisplayFade( token, 0.3 , kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, NO );
-            CGReleaseDisplayFadeReservation( token);
-        }
-    }
-    else if( var_GetBool( p_vout, "macosx-background" ) )
-    {
-        NSRect screen_rect = [o_screen frame];
-        screen_rect.origin.x = screen_rect.origin.y = 0;
+            NSRect screen_rect = [screen frame];
+            screen_rect.origin.x = screen_rect.origin.y = 0;
 
-        /* Creates a window with size: screen_rect on o_screen */
-        [self initWithContentRect: screen_rect
-              styleMask: NSBorderlessWindowMask
-              backing: NSBackingStoreBuffered
-              defer: YES screen: o_screen];
-
-        [self setLevel: CGWindowLevelForKey(kCGDesktopWindowLevelKey)];
-    }
-    else
-    {
-        unsigned int i_stylemask = NSTitledWindowMask |
-                                   NSMiniaturizableWindowMask |
-                                   NSClosableWindowMask |
-                                   NSResizableWindowMask;
+            /* Creates a window with size: screen_rect on o_screen */
+            [self setFrame: screen_rect display: NO];
 
-        NSRect s_rect;
-        if( !s_frame )
-        {
-            s_rect.size.width  = p_vout->i_window_width;
-            s_rect.size.height = p_vout->i_window_height;
+            [self setLevel: CGWindowLevelForKey(kCGDesktopWindowLevelKey)];
+            [self setMovableByWindowBackground: NO];
         }
-        else
+        if( var_CreateGetBool( p_vout, "video-on-top" ) )
         {
-            s_rect = *s_frame;
+            [self setLevel: NSStatusWindowLevel];
         }
 
-        [self initWithContentRect: s_rect
-              styleMask: i_stylemask
-              backing: NSBackingStoreBuffered
-              defer: YES screen: o_screen];
+        [self setAlphaValue: var_CreateGetFloat( p_vout, "macosx-opaqueness" )];
 
-        [self setAlphaValue: var_GetFloat( p_vout, "macosx-opaqueness" )];
+        /* Add the view. It's automatically resized to fit the window */
+        [self setContentView: o_view];
 
-        if( !s_frame )
-        {
-            [self center];
-        }
+        b_init_ok = YES;
     }
-
-    [self makeKeyAndOrderFront: nil];
-    [self setReleasedWhenClosed: YES];
-
-    /* We'll catch mouse events */
-    [self makeFirstResponder: o_view];
-
-    /* Add the view. It's automatically resized to fit the window */
-    [self setContentView: o_view];
-
-    [o_pool release];
-
-    b_init_ok = true;
     return self;
 }
 
-- (void)close
+- (void)enterFullscreen
 {
-    [o_view closeVout];
-}
+    if( fullscreen ) return;
 
-- (void)closeWindow
-{
-    /* XXX waitUntilDone = NO to avoid a possible deadlock when hitting
-       Command-Q */
-    [self performSelectorOnMainThread: @selector(closeReal:)
-        withObject: NULL waitUntilDone: NO];
-}
+    NSScreen *screen;
+    int i_device;
+    BOOL b_black = NO;
 
-- (id)closeReal:(id)sender
-{
-    if( b_black == true )
-    {
-        CGDisplayFadeReservationToken token;
-        CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token);
-        CGDisplayFade( token, 0.3 , kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES );
- 
-        [self disableScreenUpdatesUntilFlush];
-        [self orderOut: self];
+    i_device = var_GetInteger( p_vout->p_libvlc, "video-device" );
+    b_black = var_CreateGetBool( p_vout, "macosx-black" );
 
-        CGDisplayFade( token, 0.6 , kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, YES );
-        CGReleaseDisplayFadeReservation( token);
-        CGDisplayRestoreColorSyncSettings();
-    }
-    [NSScreen unblackoutScreens];
+    /* Find out on which screen to open the window */
+    screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)i_device];
+    if( !screen ) screen = [self screen];
 
-    SetSystemUIMode( kUIModeNormal, 0);
-    [super close];
-    /* this does only work in embedded mode */
-    if( b_embedded == true )
-        [[[[VLCMain sharedInstance] getControls] getFSPanel] orderOut: self];
+    if( b_black )
+        [screen blackoutOtherScreens];
 
-    return NULL;
-}
+    [self setMovableByWindowBackground: NO];
 
-- (id)getVoutView
-{
-    return o_view;
-}
+    if( [screen isMainScreen] )
+        SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
 
-- (BOOL)canBecomeKeyWindow
-{
-    return YES;
-}
+    initialFrame = [self frame];
+    [self setFrame:[screen frame] display:YES animate:YES];
+    [self setLevel:NSNormalWindowLevel];
 
-/* Sometimes crashes VLC....
-- (BOOL)performKeyEquivalent:(NSEvent *)o_event
-{
-        return [[VLCMain sharedInstance] hasDefinedShortcutKey:o_event];
-}*/
+    /* tell the fspanel to move itself to front next time it's triggered */
+    [[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: i_device];
+    [[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil];
 
-/* This is actually the same as VLCControls::stop. */
+    fullscreen = YES;
+}
 
-- (BOOL)windowShouldClose:(id)sender
+- (void)leaveFullscreen
 {
-    playlist_t * p_playlist = pl_Yield( p_vout );
-    if( p_playlist == NULL )
-    {
-        return NO;
-    }
+    if( !fullscreen ) return;
+    fullscreen = NO;
 
-    playlist_Stop( p_playlist );
-    vlc_object_release( p_playlist );
+    [NSScreen unblackoutScreens];
 
-    /* The window will be closed by the intf later. */
-    return NO;
+    [[[[VLCMain sharedInstance] getControls] getFSPanel] setNonActive: nil];
+    SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar);
+    [self setFrame:initialFrame display:YES animate:YES];
+    [self setMovableByWindowBackground: YES];
+    if( var_GetBool( p_vout, "video-on-top" ) )
+        [self setLevel: NSStatusWindowLevel];
 }
 
+- (id)getVoutView // FIXME Naming scheme!
+{
+    return o_view;
+}
 
 @end
+