* fix 'fullscreen only opens where my vout is, but I told it to open on...

* fix 'fullscreen only opens where my vout is, but I told it to open on another screen'. Remember that CGScreenID is different from VLC's 'video-device'

modules/gui/macosx/embeddedwindow.m

 /*****************************************************************************
- * embeddedwindow.m: MacOS X interface module
- *****************************************************************************
- * Copyright (C) 2002-2005 the VideoLAN team
- * $Id$
- *
- * Authors: Benjamin Pracht <bigben 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
+* embeddedwindow.m: MacOS X interface module
+*****************************************************************************
+* Copyright (C) 2002-2005 the VideoLAN team
+* $Id$
+*
+* Authors: Benjamin Pracht <bigben 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
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+*****************************************************************************/
 
 /*****************************************************************************
- * Preamble
- *****************************************************************************/
+* Preamble
+*****************************************************************************/
 
 /* DisableScreenUpdates, SetSystemUIMode, ... */
 #import <QuickTime/QuickTime.h>
@@ -35,40 +35,40 @@
 #import "controls.h"
 
 /*****************************************************************************
- * VLCEmbeddedWindow Implementation
- *****************************************************************************/
+* VLCEmbeddedWindow Implementation
+*****************************************************************************/
 
 @implementation VLCEmbeddedWindow
 
 - (void)awakeFromNib
 {
     [self setDelegate: self];
-
+    
     [o_btn_backward setToolTip: _NS("Rewind")];
     [o_btn_forward setToolTip: _NS("Fast Forward")];
     [o_btn_fullscreen setToolTip: _NS("Fullscreen")];
     [o_btn_play setToolTip: _NS("Play")];
     [o_slider setToolTip: _NS("Position")];
-
+    
     o_img_play = [NSImage imageNamed: @"play_embedded"];
     o_img_play_pressed = [NSImage imageNamed: @"play_embedded_blue"];
     o_img_pause = [NSImage imageNamed: @"pause_embedded"];
     o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_blue"];
-
+    
     o_saved_frame = NSMakeRect( 0.0f, 0.0f, 0.0f, 0.0f );
-
+    
     /* Useful to save o_view frame in fullscreen mode */
     o_temp_view = [[NSView alloc] init];
     [o_temp_view setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable];
-
+    
     o_fullscreen_window = nil;
-
+    
     /* Not fullscreen when we wake up */
     [o_btn_fullscreen setState: NO];
     b_fullscreen = NO;
     /* Use a recursive lock to be able to trigger enter/leavefullscreen
-     * in middle of an animation, providing that the enter/leave functions
-     * are called from the same thread */
+        * in middle of an animation, providing that the enter/leave functions
+        * are called from the same thread */
     o_animation_lock = [[NSRecursiveLock alloc] init];
     b_animation_lock_alreadylocked = NO;
 }
@@ -114,14 +114,14 @@
         NSRect zoomRect = [[self screen] frame];
         o_saved_frame = [self frame];
         /* we don't have to take care of the eventual menu bar and dock
-          as zoomRect will be cropped automatically by setFrame:display:
-          to the right rectangle */
+            as zoomRect will be cropped automatically by setFrame:display:
+            to the right rectangle */
         [self setFrame: zoomRect display: YES animate: YES];
     }
     else
     {
         /* unzoom to the saved_frame if the o_saved_frame coords look sound
-           (just in case) */
+        (just in case) */
         if( o_saved_frame.size.width > 0 && o_saved_frame.size.height > 0 )
             [self setFrame: o_saved_frame display: YES animate: YES];
     }
@@ -130,12 +130,12 @@
 - (BOOL)windowShouldClose:(id)sender
 {
     playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
-                                                       FIND_ANYWHERE );
+                                               FIND_ANYWHERE );
     if( p_playlist == NULL )
     {
         return NO;
     }
-
+    
     playlist_Stop( p_playlist );
     vlc_object_release( p_playlist );
     return YES;
@@ -150,8 +150,8 @@
 }
 
 /*****************************************************************************
- * Fullscreen support
- */
+* Fullscreen support
+*/
 
 - (BOOL)isFullscreen
 {
@@ -175,65 +175,68 @@
     NSRect rect;
     vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
     BOOL blackout_other_displays = var_GetBool( p_vout, "macosx-black" );
-
-    screen = [NSScreen screenWithDisplayID:(CGDirectDisplayID)var_GetInteger( p_vout, "video-device" )];
-
-    vlc_object_release( p_vout );
- 
+    
+    screen = [[NSScreen screens] objectAtIndex: var_GetInteger( p_vout, "video-device" )];
+    
     [self lockFullscreenAnimation];
 
-    if (!screen)
+    if(! screen )
+    {
+        msg_Dbg( p_vout, "chosen screen isn't present, using current screen for fullscreen mode" );
         screen = [self screen];
+    }
 
+    vlc_object_release( p_vout );
+    
     screen_rect = [screen frame];
-
+    
     [o_btn_fullscreen setState: YES];
-
+    
     [NSCursor setHiddenUntilMouseMoves: YES];
- 
+    
     /* Only create the o_fullscreen_window if we are not in the middle of the zooming animation */
     if (!o_fullscreen_window)
     {
         /* We can't change the styleMask of an already created NSWindow, so we create an other window, and do eye catching stuff */
-
+        
         rect = [[o_view superview] convertRect: [o_view frame] toView: nil]; /* Convert to Window base coord */
         rect.origin.x += [self frame].origin.x;
         rect.origin.y += [self frame].origin.y;
         o_fullscreen_window = [[VLCWindow alloc] initWithContentRect:rect styleMask: NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES];
         [o_fullscreen_window setBackgroundColor: [NSColor blackColor]];
         [o_fullscreen_window setCanBecomeKeyWindow: YES];
-
+        
         CGDisplayFadeReservationToken token;
- 
+        
         [o_fullscreen_window setFrame:screen_rect display:NO];
- 
+        
         CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token);
         CGDisplayFade( token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES );
- 
+        
         if ([screen isMainScreen])
             SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
- 
+        
         if (blackout_other_displays)
             [screen blackoutOtherScreens]; /* We should do something like [screen blackoutOtherScreens]; */
-
+        
         [o_view retain];
-	[[self contentView] replaceSubview:o_view with:o_temp_view];
+        [[self contentView] replaceSubview:o_view with:o_temp_view];
         [o_temp_view setFrame:[o_view frame]];
         [o_fullscreen_window setContentView:o_view];
         [o_view release];
         [o_fullscreen_window makeKeyAndOrderFront:self];
-
+        
         CGDisplayFade( token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, NO );
         CGReleaseDisplayFadeReservation( token);
-
+        
         /* Will release the lock */
         [self hasBecomeFullscreen];
         return;
     }
-
+    
     if (blackout_other_displays)
         [screen blackoutOtherScreens]; /* We should do something like [screen blackoutOtherScreens]; */
-
+    
     b_animation_lock_alreadylocked = NO;
     [self unlockFullscreenAnimation];
 }
@@ -241,15 +244,15 @@
 - (void)hasBecomeFullscreen
 {
     [o_fullscreen_window makeFirstResponder: [[[VLCMain sharedInstance] getControls] getVoutView]];
-
+    
     [o_fullscreen_window makeKeyWindow];
     [o_fullscreen_window setAcceptsMouseMovedEvents: TRUE];
-
+    
     /* tell the fspanel to move itself to front next time it's triggered */
     [[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: (int)[[o_fullscreen_window screen] displayID]];
- 
+    
     [super orderOut: self];
-
+    
     [[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil];
     b_fullscreen = YES;
     [self unlockFullscreenAnimation];
@@ -263,39 +266,39 @@
 - (void)leaveFullscreenAndFadeOut: (BOOL)fadeout
 {
     [self lockFullscreenAnimation];
-
+    
     b_fullscreen = NO;
     [o_btn_fullscreen setState: NO];
-
+    
     /* Don't do anything if o_fullscreen_window is already closed */
     if (!o_fullscreen_window)
     {
         /* We always try to do so */
         [NSScreen unblackoutScreens];
-
+        
         b_animation_lock_alreadylocked = NO;
         [self unlockFullscreenAnimation];
         return;
     }
-
+    
     /* simply fade the display */
     CGDisplayFadeReservationToken token;
-
+    
     CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token);
     CGDisplayFade( token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES );
-
+    
     [[[[VLCMain sharedInstance] getControls] getFSPanel] setNonActive: nil];
     SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar);
-
+    
     /* We always try to do so */
     [NSScreen unblackoutScreens];
-
+    
     if (!fadeout)
         [self orderFront: self];
-
+    
     /* Will release the lock */
     [self hasEndedFullscreen];
-
+    
     CGDisplayFade( token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, NO );
     CGReleaseDisplayFadeReservation( token);
 }
@@ -315,7 +318,7 @@
         [self makeKeyAndOrderFront:self];
     [o_fullscreen_window orderOut: self];
     EnableScreenUpdates();
-
+    
     [o_fullscreen_window release];
     o_fullscreen_window = nil;
     b_animation_lock_alreadylocked = NO;
@@ -330,26 +333,26 @@
 }
 
 /* Make sure setFrame gets executed on main thread especially if we are animating.
- * (Thus we won't block the video output thread) */
+* (Thus we won't block the video output thread) */
 - (void)setFrame:(NSRect)frame display:(BOOL)display animate:(BOOL)animate
 {
     struct { NSRect frame; BOOL display; BOOL animate;} args;
     NSData *packedargs;
-
+    
     args.frame = frame;
     args.display = display;
     args.animate = animate;
-
+    
     packedargs = [NSData dataWithBytes:&args length:sizeof(args)];
-
+    
     [self performSelectorOnMainThread:@selector(setFrameOnMainThread:)
-                    withObject: packedargs waitUntilDone: YES];
+                           withObject: packedargs waitUntilDone: YES];
 }
 
 - (void)setFrameOnMainThread:(NSData*)packedargs
 {
     struct args { NSRect frame; BOOL display; BOOL animate; } * args = (struct args*)[packedargs bytes];
-
+    
     [super setFrame: args->frame display: args->display animate:args->animate];
 }