Fix OS X memory leak prints when starting blender:
[blender-staging.git] / intern / ghost / intern / GHOST_WindowCocoa.mm
index 4d117d25df36dd0531dc38c14341b7b3fe23692e..83f86840eb4b0b61f978ef69ac4e95478a9bc707 100644 (file)
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
  * All rights reserved.
 
 #include <Cocoa/Cocoa.h>
 
+#ifndef MAC_OS_X_VERSION_10_6
+//Use of the SetSystemUIMode function (64bit compatible)
+#include <Carbon/Carbon.h>
+#endif
+
+#include <OpenGL/gl.h>
+/***** Multithreaded opengl code : uncomment for enabling
+#include <OpenGL/OpenGL.h>
+*/
+
 #include "GHOST_WindowCocoa.h"
 #include "GHOST_SystemCocoa.h"
 #include "GHOST_Debug.h"
-/*
-AGLContext GHOST_WindowCocoa::s_firstaglCtx = NULL;
-#ifdef GHOST_DRAW_CARBON_GUTTER
-const GHOST_TInt32 GHOST_WindowCocoa::s_sizeRectSize = 16;
-#endif //GHOST_DRAW_CARBON_GUTTER
-
-static const GLint sPreferredFormatWindow[8] = {
-AGL_RGBA,
-AGL_DOUBLEBUFFER,      
-AGL_ACCELERATED,
-AGL_DEPTH_SIZE,                32,
-AGL_NONE,
-};
-
-static const GLint sPreferredFormatFullScreen[9] = {
-AGL_RGBA,
-AGL_DOUBLEBUFFER,
-AGL_ACCELERATED,
-AGL_FULLSCREEN,
-AGL_DEPTH_SIZE,                32,
-AGL_NONE,
-};
-
-
-
-WindowRef ugly_hack=NULL;
-
-const EventTypeSpec    kWEvents[] = {
-       { kEventClassWindow, kEventWindowZoom },  // for new zoom behaviour  
-};
-
-static OSStatus myWEventHandlerProc(EventHandlerCallRef handler, EventRef event, void* userData) {
-       WindowRef mywindow;
-       GHOST_WindowCocoa *ghost_window;
-       OSStatus err;
-       int theState;
-       
-       if (::GetEventKind(event) == kEventWindowZoom) {
-               err =  ::GetEventParameter (event,kEventParamDirectObject,typeWindowRef,NULL,sizeof(mywindow),NULL, &mywindow);
-               ghost_window = (GHOST_WindowCocoa *) GetWRefCon(mywindow);
-               theState = ghost_window->getMac_windowState();
-               if (theState == 1) 
-                       ghost_window->setMac_windowState(2);
-               else if (theState == 2)
-                       ghost_window->setMac_windowState(1);
-
-       }
-       return eventNotHandledErr;
-}*/
-
-#pragma mark Cocoa delegate object
+
+
+#pragma mark Cocoa window delegate object
+/* live resize ugly patch
+extern "C" {
+       struct bContext;
+       typedef struct bContext bContext;
+       bContext* ghostC;
+       extern int wm_window_timer(const bContext *C);
+       extern void wm_window_process_events(const bContext *C);
+       extern void wm_event_do_handlers(bContext *C);
+       extern void wm_event_do_notifiers(bContext *C);
+       extern void wm_draw_update(bContext *C);
+};*/
 @interface CocoaWindowDelegate : NSObject
+#ifdef MAC_OS_X_VERSION_10_6
+<NSWindowDelegate>
+#endif
 {
        GHOST_SystemCocoa *systemCocoa;
        GHOST_WindowCocoa *associatedWindow;
 }
 
-- (void)setSystemAndWindowCocoa:(const GHOST_SystemCocoa *)sysCocoa windowCocoa:(GHOST_WindowCocoa *)winCocoa;
+- (void)setSystemAndWindowCocoa:(GHOST_SystemCocoa *)sysCocoa windowCocoa:(GHOST_WindowCocoa *)winCocoa;
 - (void)windowWillClose:(NSNotification *)notification;
 - (void)windowDidBecomeKey:(NSNotification *)notification;
 - (void)windowDidResignKey:(NSNotification *)notification;
-- (void)windowDidUpdate:(NSNotification *)notification;
+- (void)windowDidExpose:(NSNotification *)notification;
 - (void)windowDidResize:(NSNotification *)notification;
+- (void)windowDidMove:(NSNotification *)notification;
+- (void)windowWillMove:(NSNotification *)notification;
 @end
 
 @implementation CocoaWindowDelegate : NSObject
@@ -119,22 +98,144 @@ static OSStatus myWEventHandlerProc(EventHandlerCallRef handler, EventRef event,
        systemCocoa->handleWindowEvent(GHOST_kEventWindowDeactivate, associatedWindow);
 }
 
-- (void)windowDidUpdate:(NSNotification *)notification
+- (void)windowDidExpose:(NSNotification *)notification
 {
        systemCocoa->handleWindowEvent(GHOST_kEventWindowUpdate, associatedWindow);
 }
 
+- (void)windowDidMove:(NSNotification *)notification
+{
+       systemCocoa->handleWindowEvent(GHOST_kEventWindowMove, associatedWindow);
+}
+
+- (void)windowWillMove:(NSNotification *)notification
+{
+       systemCocoa->handleWindowEvent(GHOST_kEventWindowMove, associatedWindow);
+}
+
 - (void)windowDidResize:(NSNotification *)notification
 {
-       systemCocoa->handleWindowEvent(GHOST_kEventWindowSize, associatedWindow);
+#ifdef MAC_OS_X_VERSION_10_6
+       //if (![[notification object] inLiveResize]) {
+               //Send event only once, at end of resize operation (when user has released mouse button)
+#endif
+               systemCocoa->handleWindowEvent(GHOST_kEventWindowSize, associatedWindow);
+#ifdef MAC_OS_X_VERSION_10_6
+       //}
+#endif
+       /* Live resize ugly patch. Needed because live resize runs in a modal loop, not letting main loop run
+        if ([[notification object] inLiveResize]) {
+               systemCocoa->dispatchEvents();
+               wm_window_timer(ghostC);
+               wm_event_do_handlers(ghostC);
+               wm_event_do_notifiers(ghostC);
+               wm_draw_update(ghostC);
+       }*/
+}
+@end
+
+#pragma mark NSWindow subclass
+//We need to subclass it to tell that even borderless (fullscreen), it can become key (receive user events)
+@interface CocoaWindow: NSWindow
+{
+       GHOST_SystemCocoa *systemCocoa;
+       GHOST_WindowCocoa *associatedWindow;
+       GHOST_TDragnDropTypes m_draggedObjectType;
 }
+- (void)setSystemAndWindowCocoa:(GHOST_SystemCocoa *)sysCocoa windowCocoa:(GHOST_WindowCocoa *)winCocoa;
 @end
+@implementation CocoaWindow
+- (void)setSystemAndWindowCocoa:(GHOST_SystemCocoa *)sysCocoa windowCocoa:(GHOST_WindowCocoa *)winCocoa
+{
+       systemCocoa = sysCocoa;
+       associatedWindow = winCocoa;
+}
+
+-(BOOL)canBecomeKeyWindow
+{
+       return YES;
+}
+
+//The drag'n'drop dragging destination methods
+- (NSDragOperation)draggingEntered:(id < NSDraggingInfo >)sender
+{
+       NSPoint mouseLocation = [sender draggingLocation];
+       NSPasteboard *draggingPBoard = [sender draggingPasteboard];
+       
+       if ([[draggingPBoard types] containsObject:NSTIFFPboardType]) m_draggedObjectType = GHOST_kDragnDropTypeBitmap;
+       else if ([[draggingPBoard types] containsObject:NSFilenamesPboardType]) m_draggedObjectType = GHOST_kDragnDropTypeFilenames;
+       else if ([[draggingPBoard types] containsObject:NSStringPboardType]) m_draggedObjectType = GHOST_kDragnDropTypeString;
+       else return NSDragOperationNone;
+       
+       associatedWindow->setAcceptDragOperation(TRUE); //Drag operation is accepted by default
+       systemCocoa->handleDraggingEvent(GHOST_kEventDraggingEntered, m_draggedObjectType, associatedWindow, mouseLocation.x, mouseLocation.y, nil);
+       return NSDragOperationCopy;
+}
+
+- (BOOL)wantsPeriodicDraggingUpdates
+{
+       return NO; //No need to overflow blender event queue. Events shall be sent only on changes
+}
+
+- (NSDragOperation)draggingUpdated:(id < NSDraggingInfo >)sender
+{
+       NSPoint mouseLocation = [sender draggingLocation];
+       
+       systemCocoa->handleDraggingEvent(GHOST_kEventDraggingUpdated, m_draggedObjectType, associatedWindow, mouseLocation.x, mouseLocation.y, nil);
+       return associatedWindow->canAcceptDragOperation()?NSDragOperationCopy:NSDragOperationNone;
+}
+
+- (void)draggingExited:(id < NSDraggingInfo >)sender
+{
+       systemCocoa->handleDraggingEvent(GHOST_kEventDraggingExited, m_draggedObjectType, associatedWindow, 0, 0, nil);
+       m_draggedObjectType = GHOST_kDragnDropTypeUnknown;
+}
+
+- (BOOL)prepareForDragOperation:(id < NSDraggingInfo >)sender
+{
+       if (associatedWindow->canAcceptDragOperation())
+               return YES;
+       else
+               return NO;
+}
+
+- (BOOL)performDragOperation:(id < NSDraggingInfo >)sender
+{
+       NSPoint mouseLocation = [sender draggingLocation];
+       NSPasteboard *draggingPBoard = [sender draggingPasteboard];
+       NSImage *droppedImg;
+       id data;
+       
+       switch (m_draggedObjectType) {
+               case GHOST_kDragnDropTypeBitmap:
+                       if([NSImage canInitWithPasteboard:draggingPBoard]) {
+                               droppedImg = [[NSImage alloc]initWithPasteboard:draggingPBoard];
+                               data = droppedImg; //[draggingPBoard dataForType:NSTIFFPboardType];
+                       }
+                       else return NO;
+                       break;
+               case GHOST_kDragnDropTypeFilenames:
+                       data = [draggingPBoard propertyListForType:NSFilenamesPboardType];
+                       break;
+               case GHOST_kDragnDropTypeString:
+                       data = [draggingPBoard stringForType:NSStringPboardType];
+                       break;
+               default:
+                       return NO;
+                       break;
+       }
+       systemCocoa->handleDraggingEvent(GHOST_kEventDraggingDropDone, m_draggedObjectType, associatedWindow, mouseLocation.x, mouseLocation.y, (void*)data);
+       return YES;
+}
+
+@end
+
+
 
 #pragma mark NSOpenGLView subclass
 //We need to subclass it in order to give Cocoa the feeling key events are trapped
 @interface CocoaOpenGLView : NSOpenGLView
 {
-       
 }
 @end
 @implementation CocoaOpenGLView
@@ -148,6 +249,32 @@ static OSStatus myWEventHandlerProc(EventHandlerCallRef handler, EventRef event,
 - (void)keyDown:(NSEvent *)theEvent
 {}
 
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
+//Cmd+key are handled differently before 10.5
+- (BOOL)performKeyEquivalent:(NSEvent *)theEvent
+{
+       NSString *chars = [theEvent charactersIgnoringModifiers];
+       
+       if ([chars length] <1) 
+               return NO;
+       
+       //Let cocoa handle menu shortcuts
+       switch ([chars characterAtIndex:0]) {
+               case 'q':
+               case 'w':
+               case 'h':
+               case 'm':
+               case '<':
+               case '>':
+               case '~':
+               case '`':
+                       return NO;
+               default:
+                       return YES;
+       }
+}
+#endif
+
 - (BOOL)isOpaque
 {
     return YES;
@@ -158,8 +285,10 @@ static OSStatus myWEventHandlerProc(EventHandlerCallRef handler, EventRef event,
 
 #pragma mark initialization / finalization
 
+NSOpenGLContext* GHOST_WindowCocoa::s_firstOpenGLcontext = nil;
+
 GHOST_WindowCocoa::GHOST_WindowCocoa(
-       const GHOST_SystemCocoa *systemCocoa,
+       GHOST_SystemCocoa *systemCocoa,
        const STR_String& title,
        GHOST_TInt32 left,
        GHOST_TInt32 top,
@@ -167,139 +296,134 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
        GHOST_TUns32 height,
        GHOST_TWindowState state,
        GHOST_TDrawingContextType type,
-       const bool stereoVisual
+       const bool stereoVisual, const GHOST_TUns16 numOfAASamples
 ) :
-       GHOST_Window(title, left, top, width, height, state, GHOST_kDrawingContextTypeNone),
-       m_customCursor(0),
-       m_fullScreenDirty(false)
+       GHOST_Window(title, left, top, width, height, state, GHOST_kDrawingContextTypeNone, stereoVisual, numOfAASamples),
+       m_customCursor(0)
 {
+       NSOpenGLPixelFormatAttribute pixelFormatAttrsWindow[40];
+       NSOpenGLPixelFormat *pixelFormat = nil;
+       int i;
+               
+       m_systemCocoa = systemCocoa;
+       m_fullScreen = false;
+       
        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
        
-       //fprintf(stderr," main screen top %i left %i height %i width %i\n", top, left, height, width);
-       /*
-       if (state >= GHOST_kWindowState8Normal ) {
-               if(state == GHOST_kWindowState8Normal) state= GHOST_kWindowStateNormal;
-               else if(state == GHOST_kWindowState8Maximized) state= GHOST_kWindowStateMaximized;
-               else if(state == GHOST_kWindowState8Minimized) state= GHOST_kWindowStateMinimized;
-               else if(state == GHOST_kWindowState8FullScreen) state= GHOST_kWindowStateFullScreen;
-               
-               // state = state - 8;   this was the simple version of above code, doesnt work in gcc 4.0
-               
-               setMac_windowState(1);
-       } else 
-               setMac_windowState(0);
-*/
-       if (state != GHOST_kWindowStateFullScreen) {
-               
-               //Creates the window
-               NSRect rect;
-               
-               rect.origin.x = left;
-               rect.origin.y = top;
-               rect.size.width = width;
-               rect.size.height = height;
-               
-               m_window = [[NSWindow alloc] initWithContentRect:rect
-                                                                                          styleMask:NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask
-                                                                                                backing:NSBackingStoreBuffered defer:NO];
-               if (m_window == nil) {
-                       [pool drain];
-                       return;
-               }
-               
-               [m_window setTitle:[NSString stringWithUTF8String:title]];
-               
-                               
-               //Creates the OpenGL View inside the window
-               NSOpenGLPixelFormatAttribute attributes[] =
-               {
-                       NSOpenGLPFADoubleBuffer,
-                       NSOpenGLPFAAccelerated,
-                       NSOpenGLPFAAllowOfflineRenderers,   // NOTE: Needed to connect to secondary GPUs
-                       NSOpenGLPFADepthSize, 32,
-                       0
-               };
-               
-               NSOpenGLPixelFormat *pixelFormat =
-        [[NSOpenGLPixelFormat alloc] initWithAttributes:attributes];
+
+       //Creates the window
+       NSRect rect;
+       NSSize  minSize;
+       
+       rect.origin.x = left;
+       rect.origin.y = top;
+       rect.size.width = width;
+       rect.size.height = height;
+       
+       m_window = [[CocoaWindow alloc] initWithContentRect:rect
+                                                                                  styleMask:NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask
+                                                                                        backing:NSBackingStoreBuffered defer:NO];
+       if (m_window == nil) {
+               [pool drain];
+               return;
+       }
+       
+       [m_window setSystemAndWindowCocoa:systemCocoa windowCocoa:this];
+       
+       //Forbid to resize the window below the blender defined minimum one
+       minSize.width = 320;
+       minSize.height = 240;
+       [m_window setContentMinSize:minSize];
+       
+       setTitle(title);
+       
+       
+       // Pixel Format Attributes for the windowed NSOpenGLContext
+       i=0;
+       pixelFormatAttrsWindow[i++] = NSOpenGLPFADoubleBuffer;
+       
+       // Guarantees the back buffer contents to be valid after a call to NSOpenGLContext object’s flushBuffer
+       // needed for 'Draw Overlap' drawing method
+       pixelFormatAttrsWindow[i++] = NSOpenGLPFABackingStore; 
+       
+       pixelFormatAttrsWindow[i++] = NSOpenGLPFAAccelerated;
+       //pixelFormatAttrsWindow[i++] = NSOpenGLPFAAllowOfflineRenderers,;   // Removed to allow 10.4 builds, and 2 GPUs rendering is not used anyway
+
+       pixelFormatAttrsWindow[i++] = NSOpenGLPFADepthSize;
+       pixelFormatAttrsWindow[i++] = (NSOpenGLPixelFormatAttribute) 32;
+       
+       
+       if (stereoVisual) pixelFormatAttrsWindow[i++] = NSOpenGLPFAStereo;
+       
+       if (numOfAASamples>0) {
+               // Multisample anti-aliasing
+               pixelFormatAttrsWindow[i++] = NSOpenGLPFAMultisample;
                
-               m_openGLView = [[CocoaOpenGLView alloc] initWithFrame:rect
-                                                                                                        pixelFormat:pixelFormat];
+               pixelFormatAttrsWindow[i++] = NSOpenGLPFASampleBuffers;
+               pixelFormatAttrsWindow[i++] = (NSOpenGLPixelFormatAttribute) 1;
                
-               [pixelFormat release];
+               pixelFormatAttrsWindow[i++] = NSOpenGLPFASamples;
+               pixelFormatAttrsWindow[i++] = (NSOpenGLPixelFormatAttribute) numOfAASamples;
                
-               m_openGLContext = [m_openGLView openGLContext];
+               pixelFormatAttrsWindow[i++] = NSOpenGLPFANoRecovery;
+       }
+       
+       pixelFormatAttrsWindow[i] = (NSOpenGLPixelFormatAttribute) 0;
+       
+       pixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:pixelFormatAttrsWindow];
+       
+       
+       //Fall back to no multisampling if Antialiasing init failed
+       if (pixelFormat == nil) {
+               i=0;
+               pixelFormatAttrsWindow[i++] = NSOpenGLPFADoubleBuffer;
                
-               [m_window setContentView:m_openGLView];
-               [m_window setInitialFirstResponder:m_openGLView];
+               // Guarantees the back buffer contents to be valid after a call to NSOpenGLContext object’s flushBuffer
+               // needed for 'Draw Overlap' drawing method
+               pixelFormatAttrsWindow[i++] = NSOpenGLPFABackingStore;
                
-               [m_window setReleasedWhenClosed:NO]; //To avoid bad pointer exception in case of user closing the window
+               pixelFormatAttrsWindow[i++] = NSOpenGLPFAAccelerated;
+               //pixelFormatAttrsWindow[i++] = NSOpenGLPFAAllowOfflineRenderers,;   // Removed to allow 10.4 builds, and 2 GPUs rendering is not used anyway
                
-               [m_window makeKeyAndOrderFront:nil];
+               pixelFormatAttrsWindow[i++] = NSOpenGLPFADepthSize;
+               pixelFormatAttrsWindow[i++] = (NSOpenGLPixelFormatAttribute) 32;
                
-               setDrawingContextType(type);
-               updateDrawingContext();
-               activateDrawingContext();
+               if (stereoVisual) pixelFormatAttrsWindow[i++] = NSOpenGLPFAStereo;
                
-               // Boolean visible = (state == GHOST_kWindowStateNormal) || (state == GHOST_kWindowStateMaximized); /*unused*/
-        /*gen2mac(title, title255);
-        
+               pixelFormatAttrsWindow[i] = (NSOpenGLPixelFormatAttribute) 0;
                
-               err =  ::CreateNewWindow( kDocumentWindowClass,
-                                                                kWindowStandardDocumentAttributes+kWindowLiveResizeAttribute,
-                                                                &bnds,
-                                                                &m_windowRef);
+               pixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:pixelFormatAttrsWindow];
                
-               if ( err != noErr) {
-                       fprintf(stderr," error creating window %i \n",(int)err);
-               } else {
-                       
-                       ::SetWRefCon(m_windowRef,(SInt32)this);
-                       setTitle(title);
-                       err = InstallWindowEventHandler (m_windowRef, myWEventHandlerProc, GetEventTypeCount(kWEvents), kWEvents,NULL,NULL); 
-                       if ( err != noErr) {
-                               fprintf(stderr," error creating handler %i \n",(int)err);
-                       } else {
-                               //      ::TransitionWindow (m_windowRef,kWindowZoomTransitionEffect,kWindowShowTransitionAction,NULL);
-                               ::ShowWindow(m_windowRef);
-                               ::MoveWindow (m_windowRef, left, top,true);
-                               
-                       }
+       }
+       
+       if (numOfAASamples>0) { //Set m_numOfAASamples to the actual value
+               GLint gli;
+               [pixelFormat getValues:&gli forAttribute:NSOpenGLPFASamples forVirtualScreen:0];
+               if (m_numOfAASamples != (GHOST_TUns16)gli) {
+                       m_numOfAASamples = (GHOST_TUns16)gli;
+                       printf("GHOST_Window could be created with anti-aliasing of only %i samples\n",m_numOfAASamples);
                }
-        if (m_windowRef) {
-            m_grafPtr = ::GetWindowPort(m_windowRef);
-            setDrawingContextType(type);
-            updateDrawingContext();
-            activateDrawingContext();
-        }
-               if(ugly_hack==NULL) {
-                       ugly_hack= m_windowRef;
-                       // when started from commandline, window remains in the back... also for play anim
-                       ProcessSerialNumber psn;
-                       GetCurrentProcess(&psn);
-                       SetFrontProcess(&psn);
-               }*/
-    }
-    else {
-    /*
-        Rect bnds = { top, left, top+height, left+width };
-        gen2mac("", title255);
-        m_windowRef = ::NewCWindow(
-            nil,                                                       // Storage 
-            &bnds,                                                     // Bounding rectangle of the window
-            title255,                                          // Title of the window
-            0,                                                         // Window initially visible
-            plainDBox,                                                 // procID
-            (WindowRef)-1L,                                    // Put window before all other windows
-            0,                                                         // Window has minimize box
-            (SInt32)this);                                     // Store a pointer to the class in the refCon
-    */
-        //GHOST_PRINT("GHOST_WindowCocoa::GHOST_WindowCocoa(): creating full-screen OpenGL context\n");
-        setDrawingContextType(GHOST_kDrawingContextTypeOpenGL);
-               installDrawingContext(GHOST_kDrawingContextTypeOpenGL);
-        updateDrawingContext();
-        activateDrawingContext();
-    }
+       }
+               
+       //Creates the OpenGL View inside the window
+       m_openGLView = [[CocoaOpenGLView alloc] initWithFrame:rect
+                                                                                                pixelFormat:pixelFormat];
+       
+       [pixelFormat release];
+       
+       m_openGLContext = [m_openGLView openGLContext]; //This context will be replaced by the proper one just after
+       
+       [m_window setContentView:m_openGLView];
+       [m_window setInitialFirstResponder:m_openGLView];
+       
+       [m_window setReleasedWhenClosed:NO]; //To avoid bad pointer exception in case of user closing the window
+       
+       [m_window makeKeyAndOrderFront:nil];
+       
+       setDrawingContextType(type);
+       updateDrawingContext();
+       activateDrawingContext();
+       
        m_tablet.Active = GHOST_kTabletModeNone;
        
        CocoaWindowDelegate *windowDelegate = [[CocoaWindowDelegate alloc] init];
@@ -308,6 +432,12 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
        
        [m_window setAcceptsMouseMovedEvents:YES];
        
+       [m_window registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType,
+                                                                                 NSStringPboardType, NSTIFFPboardType, nil]];
+                                                                                 
+       if (state == GHOST_kWindowStateFullScreen)
+               setState(GHOST_kWindowStateFullScreen);
+               
        [pool drain];
 }
 
@@ -316,33 +446,35 @@ GHOST_WindowCocoa::~GHOST_WindowCocoa()
 {
        if (m_customCursor) delete m_customCursor;
 
-       /*if(ugly_hack==m_windowRef) ugly_hack= NULL;
-       
-       if(ugly_hack==NULL) setDrawingContextType(GHOST_kDrawingContextTypeNone);*/
-    
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
        [m_openGLView release];
        
        if (m_window) {
                [m_window close];
+               [[m_window delegate] release];
                [m_window release];
                m_window = nil;
        }
+       
+       //Check for other blender opened windows and make the frontmost key
+       NSArray *windowsList = [NSApp orderedWindows];
+       if ([windowsList count]) {
+               [[windowsList objectAtIndex:0] makeKeyAndOrderFront:nil];
+       }
+       [pool drain];
 }
 
 #pragma mark accessors
 
 bool GHOST_WindowCocoa::getValid() const
 {
-    bool valid;
-    if (!m_fullScreen) {
-        valid = (m_window != 0); //&& ::IsValidWindowPtr(m_windowRef);
-    }
-    else {
-        valid = true;
-    }
-    return valid;
+       return (m_window != 0);
 }
 
+void* GHOST_WindowCocoa::getOSWindow() const
+{
+       return (void*)m_window;
+}
 
 void GHOST_WindowCocoa::setTitle(const STR_String& title)
 {
@@ -351,7 +483,38 @@ void GHOST_WindowCocoa::setTitle(const STR_String& title)
 
        NSString *windowTitle = [[NSString alloc] initWithUTF8String:title];
        
-       [m_window setTitle:windowTitle];
+       //Set associated file if applicable
+       if ([windowTitle hasPrefix:@"Blender"])
+       {
+               NSRange fileStrRange;
+               NSString *associatedFileName;
+               int len;
+               
+               fileStrRange.location = [windowTitle rangeOfString:@"["].location+1;
+               len = [windowTitle rangeOfString:@"]"].location - fileStrRange.location;
+       
+               if (len >0)
+               {
+                       fileStrRange.length = len;
+                       associatedFileName = [windowTitle substringWithRange:fileStrRange];
+                       @try {
+                               [m_window setRepresentedFilename:associatedFileName];
+                       }
+                       @catch (NSException * e) {
+                               printf("\nInvalid file path given in window title");
+                       }
+                       [m_window setTitle:[associatedFileName lastPathComponent]];
+               }
+               else {
+                       [m_window setTitle:windowTitle];
+                       [m_window setRepresentedFilename:@""];
+               }
+
+       } else {
+               [m_window setTitle:windowTitle];
+               [m_window setRepresentedFilename:@""];
+       }
+
        
        [windowTitle release];
        [pool drain];
@@ -400,19 +563,30 @@ void GHOST_WindowCocoa::getClientBounds(GHOST_Rect& bounds) const
        GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::getClientBounds(): window invalid")
        
        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-       NSRect screenSize = [[m_window screen] visibleFrame];
+       
+       if (!m_fullScreen)
+       {
+               NSRect screenSize = [[m_window screen] visibleFrame];
 
-       //Max window contents as screen size (excluding title bar...)
-       NSRect contentRect = [NSWindow contentRectForFrameRect:screenSize
-                                                                                                styleMask:(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask)];
+               //Max window contents as screen size (excluding title bar...)
+               NSRect contentRect = [CocoaWindow contentRectForFrameRect:screenSize
+                                                                                                        styleMask:(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)];
 
-       rect = [m_window contentRectForFrameRect:[m_window frame]];
-       
-       bounds.m_b = contentRect.size.height - (rect.origin.y -contentRect.origin.y);
-       bounds.m_l = rect.origin.x -contentRect.origin.x;
-       bounds.m_r = rect.origin.x-contentRect.origin.x + rect.size.width;
-       bounds.m_t = contentRect.size.height - (rect.origin.y + rect.size.height -contentRect.origin.y);
-       
+               rect = [m_window contentRectForFrameRect:[m_window frame]];
+               
+               bounds.m_b = contentRect.size.height - (rect.origin.y -contentRect.origin.y);
+               bounds.m_l = rect.origin.x -contentRect.origin.x;
+               bounds.m_r = rect.origin.x-contentRect.origin.x + rect.size.width;
+               bounds.m_t = contentRect.size.height - (rect.origin.y + rect.size.height -contentRect.origin.y);
+       }
+       else {
+               NSRect screenSize = [[m_window screen] frame];
+               
+               bounds.m_b = screenSize.origin.y + screenSize.size.height;
+               bounds.m_l = screenSize.origin.x;
+               bounds.m_r = screenSize.origin.x + screenSize.size.width;
+               bounds.m_t = screenSize.origin.y;
+       }
        [pool drain];
 }
 
@@ -420,6 +594,7 @@ void GHOST_WindowCocoa::getClientBounds(GHOST_Rect& bounds) const
 GHOST_TSuccess GHOST_WindowCocoa::setClientWidth(GHOST_TUns32 width)
 {
        GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::setClientWidth(): window invalid")
+       NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
        GHOST_Rect cBnds, wBnds;
        getClientBounds(cBnds);
        if (((GHOST_TUns32)cBnds.getWidth()) != width) {
@@ -428,6 +603,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setClientWidth(GHOST_TUns32 width)
                size.height=cBnds.getHeight();
                [m_window setContentSize:size];
        }
+       [pool drain];
        return GHOST_kSuccess;
 }
 
@@ -435,6 +611,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setClientWidth(GHOST_TUns32 width)
 GHOST_TSuccess GHOST_WindowCocoa::setClientHeight(GHOST_TUns32 height)
 {
        GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::setClientHeight(): window invalid")
+       NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
        GHOST_Rect cBnds, wBnds;
        getClientBounds(cBnds);
        if (((GHOST_TUns32)cBnds.getHeight()) != height) {
@@ -443,6 +620,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setClientHeight(GHOST_TUns32 height)
                size.height=height;
                [m_window setContentSize:size];
        }
+       [pool drain];
        return GHOST_kSuccess;
 }
 
@@ -450,6 +628,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setClientHeight(GHOST_TUns32 height)
 GHOST_TSuccess GHOST_WindowCocoa::setClientSize(GHOST_TUns32 width, GHOST_TUns32 height)
 {
        GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::setClientSize(): window invalid")
+       NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
        GHOST_Rect cBnds, wBnds;
        getClientBounds(cBnds);
        if ((((GHOST_TUns32)cBnds.getWidth()) != width) ||
@@ -459,6 +638,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setClientSize(GHOST_TUns32 width, GHOST_TUns32
                size.height=height;
                [m_window setContentSize:size];
        }
+       [pool drain];
        return GHOST_kSuccess;
 }
 
@@ -468,7 +648,10 @@ GHOST_TWindowState GHOST_WindowCocoa::getState() const
        GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::getState(): window invalid")
        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
        GHOST_TWindowState state;
-       if ([m_window isMiniaturized]) {
+       if (m_fullScreen) {
+               state = GHOST_kWindowStateFullScreen;
+       } 
+       else if ([m_window isMiniaturized]) {
                state = GHOST_kWindowStateMinimized;
        }
        else if ([m_window isZoomed]) {
@@ -516,31 +699,161 @@ void GHOST_WindowCocoa::clientToScreen(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST
 }
 
 
+NSScreen* GHOST_WindowCocoa::getScreen()
+{
+       return [m_window screen];
+}
+
+
+/**
+ * @note Fullscreen switch is not actual fullscreen with display capture. As this capture removes all OS X window manager features.
+ * Instead, the menu bar and the dock are hidden, and the window is made borderless and enlarged.
+ * Thus, process switch, exposé, spaces, ... still work in fullscreen mode
+ */
 GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state)
 {
        GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::setState(): window invalid")
     switch (state) {
-       case GHOST_kWindowStateMinimized:
+               case GHOST_kWindowStateMinimized:
             [m_window miniaturize:nil];
             break;
-       case GHOST_kWindowStateMaximized:
+               case GHOST_kWindowStateMaximized:
                        [m_window zoom:nil];
                        break;
-       case GHOST_kWindowStateNormal:
+               
+               case GHOST_kWindowStateFullScreen:
+                       if (!m_fullScreen)
+                       {
+                               NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+                       
+                               //This status change needs to be done before Cocoa call to enter fullscreen mode
+                               //to give window delegate hint not to forward its deactivation to ghost wm that doesn't know view/window difference
+                               m_fullScreen = true;
+
+#ifdef MAC_OS_X_VERSION_10_6
+                               //10.6 provides Cocoa functions to autoshow menu bar, and to change a window style
+                               //Hide menu & dock if needed
+                               if ([[m_window screen] isEqual:[[NSScreen screens] objectAtIndex:0]])
+                               {
+                                       [NSApp setPresentationOptions:(NSApplicationPresentationHideDock | NSApplicationPresentationAutoHideMenuBar)];
+                               }
+                               //Make window borderless and enlarge it
+                               [m_window setStyleMask:NSBorderlessWindowMask];
+                               [m_window setFrame:[[m_window screen] frame] display:YES];
+                               [m_window makeFirstResponder:m_openGLView];
+#else
+                               //With 10.5, we need to create a new window to change its style to borderless
+                               //Hide menu & dock if needed
+                               if ([[m_window screen] isEqual:[[NSScreen screens] objectAtIndex:0]])
+                               {
+                                       //Cocoa function in 10.5 does not allow to set the menu bar in auto-show mode [NSMenu setMenuBarVisible:NO];
+                                       //One of the very few 64bit compatible Carbon function
+                                       SetSystemUIMode(kUIModeAllHidden,kUIOptionAutoShowMenuBar);
+                               }
+                               //Create a fullscreen borderless window
+                               CocoaWindow *tmpWindow = [[CocoaWindow alloc]
+                                                                                 initWithContentRect:[[m_window screen] frame]
+                                                                                 styleMask:NSBorderlessWindowMask
+                                                                                 backing:NSBackingStoreBuffered
+                                                                                 defer:YES];
+                               //Copy current window parameters
+                               [tmpWindow setTitle:[m_window title]];
+                               [tmpWindow setRepresentedFilename:[m_window representedFilename]];
+                               [tmpWindow setReleasedWhenClosed:NO];
+                               [tmpWindow setAcceptsMouseMovedEvents:YES];
+                               [tmpWindow setDelegate:[m_window delegate]];
+                               
+                               //Assign the openGL view to the new window
+                               [tmpWindow setContentView:m_openGLView];
+                               
+                               //Show the new window
+                               [tmpWindow makeKeyAndOrderFront:nil];
+                               //Close and release old window
+                               [m_window setDelegate:nil]; // To avoid the notification of "window closed" event
+                               [m_window close];
+                               [m_window release];
+                               m_window = tmpWindow;
+#endif
+                       
+                               //Tell WM of view new size
+                               m_systemCocoa->handleWindowEvent(GHOST_kEventWindowSize, this);
+                               
+                               [pool drain];
+                               }
+                       break;
+               case GHOST_kWindowStateNormal:
         default:
-            if ([m_window isMiniaturized])
+                       NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+                       if (m_fullScreen)
+                       {
+                               m_fullScreen = false;
+
+                               //Exit fullscreen
+#ifdef MAC_OS_X_VERSION_10_6
+                               //Show again menu & dock if needed
+                               if ([[m_window screen] isEqual:[NSScreen mainScreen]])
+                               {
+                                       [NSApp setPresentationOptions:NSApplicationPresentationDefault];
+                               }
+                               //Make window normal and resize it
+                               [m_window setStyleMask:(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)];
+                               [m_window setFrame:[[m_window screen] visibleFrame] display:YES];
+                               //TODO for 10.6 only : window title is forgotten after the style change
+                               [m_window makeFirstResponder:m_openGLView];
+#else
+                               //With 10.5, we need to create a new window to change its style to borderless
+                               //Show menu & dock if needed
+                               if ([[m_window screen] isEqual:[NSScreen mainScreen]])
+                               {
+                                       //Cocoa function in 10.5 does not allow to set the menu bar in auto-show mode [NSMenu setMenuBarVisible:YES];
+                                       SetSystemUIMode(kUIModeNormal, 0); //One of the very few 64bit compatible Carbon function
+                               }
+                               //Create a fullscreen borderless window
+                               CocoaWindow *tmpWindow = [[CocoaWindow alloc]
+                                                                                 initWithContentRect:[[m_window screen] frame]
+                                                                                                       styleMask:(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)
+                                                                                                         backing:NSBackingStoreBuffered
+                                                                                                               defer:YES];
+                               //Copy current window parameters
+                               [tmpWindow setTitle:[m_window title]];
+                               [tmpWindow setRepresentedFilename:[m_window representedFilename]];
+                               [tmpWindow setReleasedWhenClosed:NO];
+                               [tmpWindow setAcceptsMouseMovedEvents:YES];
+                               [tmpWindow setDelegate:[m_window delegate]];
+                               
+                               //Assign the openGL view to the new window
+                               [tmpWindow setContentView:m_openGLView];
+                               
+                               //Show the new window
+                               [tmpWindow makeKeyAndOrderFront:nil];
+                               //Close and release old window
+                               [m_window setDelegate:nil]; // To avoid the notification of "window closed" event
+                               [m_window close];
+                               [m_window release];
+                               m_window = tmpWindow;
+#endif
+                       
+                               //Tell WM of view new size
+                               m_systemCocoa->handleWindowEvent(GHOST_kEventWindowSize, this);
+                       }
+            else if ([m_window isMiniaturized])
                                [m_window deminiaturize:nil];
                        else if ([m_window isZoomed])
                                [m_window zoom:nil];
+                       [pool drain];
             break;
     }
+
     return GHOST_kSuccess;
 }
 
 GHOST_TSuccess GHOST_WindowCocoa::setModifiedState(bool isUnsavedChanges)
 {
+       NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+       
        [m_window setDocumentEdited:isUnsavedChanges];
        
+       [pool drain];
        return GHOST_Window::setModifiedState(isUnsavedChanges);
 }
 
@@ -548,13 +861,25 @@ GHOST_TSuccess GHOST_WindowCocoa::setModifiedState(bool isUnsavedChanges)
 
 GHOST_TSuccess GHOST_WindowCocoa::setOrder(GHOST_TWindowOrder order)
 {
+       NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+       
        GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::setOrder(): window invalid")
     if (order == GHOST_kWindowOrderTop) {
-               [m_window orderFront:nil];
+               [m_window makeKeyAndOrderFront:nil];
     }
     else {
+               NSArray *windowsList;
+               
                [m_window orderBack:nil];
+               
+               //Check for other blender opened windows and make the frontmost key
+               windowsList = [NSApp orderedWindows];
+               if ([windowsList count]) {
+                       [[windowsList objectAtIndex:0] makeKeyAndOrderFront:nil];
+               }
     }
+       
+       [pool drain];
     return GHOST_kSuccess;
 }
 
@@ -566,7 +891,9 @@ GHOST_TSuccess GHOST_WindowCocoa::swapBuffers()
 {
     if (m_drawingContextType == GHOST_kDrawingContextTypeOpenGL) {
         if (m_openGLContext != nil) {
+                       NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
                        [m_openGLContext flushBuffer];
+                       [pool drain];
             return GHOST_kSuccess;
         }
     }
@@ -577,7 +904,9 @@ GHOST_TSuccess GHOST_WindowCocoa::updateDrawingContext()
 {
        if (m_drawingContextType == GHOST_kDrawingContextTypeOpenGL) {
                if (m_openGLContext != nil) {
+                       NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
                        [m_openGLContext update];
+                       [pool drain];
                        return GHOST_kSuccess;
                }
        }
@@ -588,21 +917,12 @@ GHOST_TSuccess GHOST_WindowCocoa::activateDrawingContext()
 {
        if (m_drawingContextType == GHOST_kDrawingContextTypeOpenGL) {
                if (m_openGLContext != nil) {
+                       NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
                        [m_openGLContext makeCurrentContext];
-#ifdef GHOST_DRAW_CARBON_GUTTER
-                       // Restrict drawing to non-gutter area
-                       ::aglEnable(m_aglCtx, AGL_BUFFER_RECT);
-                       GHOST_Rect bnds;
-                       getClientBounds(bnds);
-                       GLint b[4] =
-                       {
-                               bnds.m_l,
-                               bnds.m_t+s_sizeRectSize,
-                               bnds.m_r-bnds.m_l,
-                               bnds.m_b-bnds.m_t
-                       };
-                       GLboolean result = ::aglSetInteger(m_aglCtx, AGL_BUFFER_RECT, b);
-#endif //GHOST_DRAW_CARBON_GUTTER
+                       
+                       // Disable AA by default
+                       if (m_numOfAASamples > 0) glDisable(GL_MULTISAMPLE_ARB);
+                       [pool drain];
                        return GHOST_kSuccess;
                }
        }
@@ -619,57 +939,43 @@ GHOST_TSuccess GHOST_WindowCocoa::installDrawingContext(GHOST_TDrawingContextTyp
        NSOpenGLPixelFormat *pixelFormat;
        NSOpenGLContext *tmpOpenGLContext;
        
+       /***** Multithreaded opengl code : uncomment for enabling
+       CGLContextObj cglCtx;
+       */
+        
        switch (type) {
                case GHOST_kDrawingContextTypeOpenGL:
                        if (!getValid()) break;
                                        
-                       if(!m_fullScreen)
-                       {
-                               pixelFormat = [m_openGLView pixelFormat];
-                               tmpOpenGLContext = [[NSOpenGLContext alloc] initWithFormat:pixelFormat
-                                                                                                                         shareContext:m_openGLContext];
-                               if (tmpOpenGLContext == nil)
-                                       break;
+                       pixelFormat = [m_openGLView pixelFormat];
+                       tmpOpenGLContext = [[NSOpenGLContext alloc] initWithFormat:pixelFormat
+                                                                                                                         shareContext:s_firstOpenGLcontext];
+                       if (tmpOpenGLContext == nil) {
+                               success = GHOST_kFailure;
+                               break;
+                       }
+                       
+                       //Switch openGL to multhreaded mode
+                       /******* Multithreaded opengl code : uncomment for enabling
+                       cglCtx = (CGLContextObj)[tmpOpenGLContext CGLContextObj];
+                       if (CGLEnable(cglCtx, kCGLCEMPEngine) == kCGLNoError)
+                               printf("\nSwitched openGL to multithreaded mode");
+                        */
+                       
+                       if (!s_firstOpenGLcontext) s_firstOpenGLcontext = tmpOpenGLContext;
 #ifdef WAIT_FOR_VSYNC
+                       {
+                               GLint swapInt = 1;
                                /* wait for vsync, to avoid tearing artifacts */
-                               [tmpOpenGLContext setValues:1 forParameter:NSOpenGLCPSwapInterval];
-#endif
-                               [m_openGLView setOpenGLContext:tmpOpenGLContext];
-                               [tmpOpenGLContext setView:m_openGLView];
-                               
-                               //[m_openGLContext release];
-                               m_openGLContext = tmpOpenGLContext;
+                               [tmpOpenGLContext setValues:&swapInt forParameter:NSOpenGLCPSwapInterval];
                        }
-                       /*      
-            AGLPixelFormat pixelFormat;
-            if (!m_fullScreen) {
-                pixelFormat = ::aglChoosePixelFormat(0, 0, sPreferredFormatWindow);
-                m_aglCtx = ::aglCreateContext(pixelFormat, s_firstaglCtx);
-                if (!m_aglCtx) break;
-                               if (!s_firstaglCtx) s_firstaglCtx = m_aglCtx;
-                 success = ::aglSetDrawable(m_aglCtx, m_grafPtr) == GL_TRUE ? GHOST_kSuccess : GHOST_kFailure;
-            }
-            else {
-                //GHOST_PRINT("GHOST_WindowCocoa::installDrawingContext(): init full-screen OpenGL\n");
-GDHandle device=::GetMainDevice();pixelFormat=::aglChoosePixelFormat(&device,1,sPreferredFormatFullScreen);
-                m_aglCtx = ::aglCreateContext(pixelFormat, 0);
-                if (!m_aglCtx) break;
-                               if (!s_firstaglCtx) s_firstaglCtx = m_aglCtx;
-                //GHOST_PRINT("GHOST_WindowCocoa::installDrawingContext(): created OpenGL context\n");
-                //::CGGetActiveDisplayList(0, NULL, &m_numDisplays)
-                success = ::aglSetFullScreen(m_aglCtx, m_fullScreenWidth, m_fullScreenHeight, 75, 0) == GL_TRUE ? GHOST_kSuccess : GHOST_kFailure;
-                
-                if (success == GHOST_kSuccess) {
-                    GHOST_PRINT("GHOST_WindowCocoa::installDrawingContext(): init full-screen OpenGL succeeded\n");
-                }
-                else {
-                    GHOST_PRINT("GHOST_WindowCocoa::installDrawingContext(): init full-screen OpenGL failed\n");
-                }
-                
-            }
-            ::aglDestroyPixelFormat(pixelFormat);*/
+#endif
+                       [m_openGLView setOpenGLContext:tmpOpenGLContext];
+                       [tmpOpenGLContext setView:m_openGLView];
+                       
+                       m_openGLContext = tmpOpenGLContext;
                        break;
-               
+       
                case GHOST_kDrawingContextTypeNone:
                        success = GHOST_kSuccess;
                        break;
@@ -687,15 +993,22 @@ GHOST_TSuccess GHOST_WindowCocoa::removeDrawingContext()
        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
        switch (m_drawingContextType) {
                case GHOST_kDrawingContextTypeOpenGL:
-                       [m_openGLView clearGLContext];
+                       if (m_openGLContext)
+                       {
+                               [m_openGLView clearGLContext];
+                               if (s_firstOpenGLcontext == m_openGLContext) s_firstOpenGLcontext = nil;
+                               m_openGLContext = nil;
+                       }
+                       [pool drain];
                        return GHOST_kSuccess;
                case GHOST_kDrawingContextTypeNone:
+                       [pool drain];
                        return GHOST_kSuccess;
                        break;
                default:
+                       [pool drain];
                        return GHOST_kFailure;
        }
-       [pool drain];
 }
 
 
@@ -703,32 +1016,77 @@ GHOST_TSuccess GHOST_WindowCocoa::invalidate()
 {
        GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::invalidate(): window invalid")
        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    if (!m_fullScreen) {
-               [m_openGLView setNeedsDisplay:YES];
-    }
-    else {
-        //EventRef event;
-        //OSStatus status = ::CreateEvent(NULL, kEventClassWindow, kEventWindowUpdate, 0, 0, &event);
-        //GHOST_PRINT("GHOST_WindowCocoa::invalidate(): created event " << status << " \n");
-        //status = ::SetEventParameter(event, kEventParamDirectObject, typeWindowRef, sizeof(WindowRef), this);
-        //GHOST_PRINT("GHOST_WindowCocoa::invalidate(): set event parameter " << status << " \n");
-        //status = ::PostEventToQueue(::GetMainEventQueue(), event, kEventPriorityStandard);
-        //status = ::SendEventToEventTarget(event, ::GetApplicationEventTarget());
-        //GHOST_PRINT("GHOST_WindowCocoa::invalidate(): added event to queue " << status << " \n");
-        m_fullScreenDirty = true;
-    }
+       [m_openGLView setNeedsDisplay:YES];
+       [pool drain];
+       return GHOST_kSuccess;
+}
+
+#pragma mark Progress bar
+
+GHOST_TSuccess GHOST_WindowCocoa::setProgressBar(float progress)
+{
+       NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+       
+       if ((progress >=0.0) && (progress <=1.0)) {
+               NSImage* dockIcon = [[NSImage alloc] initWithSize:NSMakeSize(128,128)];
+               
+               [dockIcon lockFocus];
+        NSRect progressBox = {{4, 4}, {120, 16}};
+
+        [[NSImage imageNamed:@"NSApplicationIcon"] dissolveToPoint:NSZeroPoint fraction:1.0];
+        
+        // Track & Outline
+        [[NSColor blackColor] setFill];
+        NSRectFill(progressBox);
+        
+        [[NSColor whiteColor] set];
+        NSFrameRect(progressBox);
+        
+        // Progress fill
+        progressBox = NSInsetRect(progressBox, 1, 1);
+        [[NSColor knobColor] setFill];
+        progressBox.size.width = progressBox.size.width * progress;
+               NSRectFill(progressBox);
+               
+               [dockIcon unlockFocus];
+               
+               [NSApp setApplicationIconImage:dockIcon];
+               [dockIcon release];
+               
+               m_progressBarVisible = true;
+       }
+       
+       [pool drain];
+       return GHOST_kSuccess;
+}
+
+
+GHOST_TSuccess GHOST_WindowCocoa::endProgressBar()
+{
+       if (!m_progressBarVisible) return GHOST_kFailure;
+       m_progressBarVisible = false;
+       
+       NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+       
+       NSImage* dockIcon = [[NSImage alloc] initWithSize:NSMakeSize(128,128)];
+       [dockIcon lockFocus];
+       [[NSImage imageNamed:@"NSApplicationIcon"] dissolveToPoint:NSZeroPoint fraction:1.0];
+       [dockIcon unlockFocus];
+       [NSApp setApplicationIconImage:dockIcon];
+       [dockIcon release];
+       
        [pool drain];
        return GHOST_kSuccess;
 }
 
+
+
 #pragma mark Cursor handling
 
 void GHOST_WindowCocoa::loadCursor(bool visible, GHOST_TStandardCursor cursor) const
 {
        static bool systemCursorVisible = true;
        
-       NSAutoreleasePool *pool =[[NSAutoreleasePool alloc] init];
-
        NSCursor *tmpCursor =nil;
        
        if (visible != systemCursorVisible) {
@@ -784,6 +1142,7 @@ void GHOST_WindowCocoa::loadCursor(bool visible, GHOST_TStandardCursor cursor) c
                        case GHOST_kStandardCursorTopRightCorner:
                        case GHOST_kStandardCursorBottomRightCorner:
                        case GHOST_kStandardCursorBottomLeftCorner:
+                       case GHOST_kStandardCursorCopy:
                        case GHOST_kStandardCursorDefault:
                        default:
                                tmpCursor = [NSCursor arrowCursor];
@@ -791,27 +1150,71 @@ void GHOST_WindowCocoa::loadCursor(bool visible, GHOST_TStandardCursor cursor) c
                };
        }
        [tmpCursor set];
-       [pool drain];
 }
 
 
-bool GHOST_WindowCocoa::getFullScreenDirty()
-{
-    return m_fullScreen && m_fullScreenDirty;
-}
-
 
 GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorVisibility(bool visible)
 {
+       NSAutoreleasePool *pool = [[NSAutoreleasePool alloc]init];
+       
        if ([m_window isVisible]) {
                loadCursor(visible, getCursorShape());
        }
        
+       [pool drain];
        return GHOST_kSuccess;
 }
+
+
+GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorGrab(GHOST_TGrabCursorMode mode)
+{
+       GHOST_TSuccess err = GHOST_kSuccess;
+       
+       if (mode != GHOST_kGrabDisable)
+       {
+               //No need to perform grab without warp as it is always on in OS X
+               if(mode != GHOST_kGrabNormal) {
+                       GHOST_TInt32 x_old,y_old;
+                       NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+                       m_systemCocoa->getCursorPosition(x_old,y_old);
+                       screenToClient(x_old, y_old, m_cursorGrabInitPos[0], m_cursorGrabInitPos[1]);
+                       //Warp position is stored in client (window base) coordinates
+                       setCursorGrabAccum(0, 0);
+                       
+                       if(mode == GHOST_kGrabHide) {
+                               setWindowCursorVisibility(false);
+                       }
+                       
+                       //Make window key if it wasn't to get the mouse move events
+                       [m_window makeKeyWindow];
+                       
+                       //Dissociate cursor position even for warp mode, to allow mouse acceleration to work even when warping the cursor
+                       err = CGAssociateMouseAndMouseCursorPosition(false) == kCGErrorSuccess ? GHOST_kSuccess : GHOST_kFailure;
+                       
+                       [pool drain];
+               }
+       }
+       else {
+               if(m_cursorGrab==GHOST_kGrabHide)
+               {
+                       //No need to set again cursor position, as it has not changed for Cocoa
+                       setWindowCursorVisibility(true);
+               }
+               
+               err = CGAssociateMouseAndMouseCursorPosition(true) == kCGErrorSuccess ? GHOST_kSuccess : GHOST_kFailure;
+               /* Almost works without but important otherwise the mouse GHOST location can be incorrect on exit */
+               setCursorGrabAccum(0, 0);
+               m_cursorGrabBounds.m_l= m_cursorGrabBounds.m_r= -1; /* disable */
+       }
+       return err;
+}
        
 GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorShape(GHOST_TStandardCursor shape)
 {
+       NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
        if (m_customCursor) {
                [m_customCursor release];
                m_customCursor = nil;
@@ -821,11 +1224,11 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorShape(GHOST_TStandardCursor sha
                loadCursor(getCursorVisibility(), shape);
        }
        
+       [pool drain];
        return GHOST_kSuccess;
 }
 
-#if 0
-/** Reverse the bits in a GHOST_TUns8 */
+/** Reverse the bits in a GHOST_TUns8
 static GHOST_TUns8 uns8ReverseBits(GHOST_TUns8 ch)
 {
        ch= ((ch>>1)&0x55) | ((ch<<1)&0xAA);
@@ -833,7 +1236,7 @@ static GHOST_TUns8 uns8ReverseBits(GHOST_TUns8 ch)
        ch= ((ch>>4)&0x0F) | ((ch<<4)&0xF0);
        return ch;
 }
-#endif
+*/
 
 
 /** Reverse the bits in a GHOST_TUns16 */
@@ -849,43 +1252,68 @@ static GHOST_TUns16 uns16ReverseBits(GHOST_TUns16 shrt)
 GHOST_TSuccess GHOST_WindowCocoa::setWindowCustomCursorShape(GHOST_TUns8 *bitmap, GHOST_TUns8 *mask,
                                        int sizex, int sizey, int hotX, int hotY, int fg_color, int bg_color)
 {
-       int y;
+       int y,nbUns16;
        NSPoint hotSpotPoint;
+       NSBitmapImageRep *cursorImageRep;
        NSImage *cursorImage;
+       NSSize imSize;
+       GHOST_TUns16 *cursorBitmap;
+       
+       
+       NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
        
        if (m_customCursor) {
                [m_customCursor release];
                m_customCursor = nil;
        }
-       /*TODO: implement this (but unused inproject at present)
-       cursorImage = [[NSImage alloc] initWithData:bitmap];
        
-       for (y=0; y<16; y++) {
+
+       cursorImageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:nil
+                                                                                                                        pixelsWide:sizex
+                                                                                                                        pixelsHigh:sizey
+                                                                                                                 bitsPerSample:1 
+                                                                                                               samplesPerPixel:2
+                                                                                                                          hasAlpha:YES
+                                                                                                                          isPlanar:YES
+                                                                                                                colorSpaceName:NSDeviceWhiteColorSpace
+                                                                                                                       bytesPerRow:(sizex/8 + (sizex%8 >0 ?1:0))
+                                                                                                                  bitsPerPixel:1];
+       
+       
+       cursorBitmap = (GHOST_TUns16*)[cursorImageRep bitmapData];
+       nbUns16 = [cursorImageRep bytesPerPlane]/2;
+       
+       for (y=0; y<nbUns16; y++) {
 #if !defined(__LITTLE_ENDIAN__)
-               m_customCursor->data[y] = uns16ReverseBits((bitmap[2*y]<<0) | (bitmap[2*y+1]<<8));
-               m_customCursor->mask[y] = uns16ReverseBits((mask[2*y]<<0) | (mask[2*y+1]<<8));
+               cursorBitmap[y] = ~uns16ReverseBits((bitmap[2*y]<<0) | (bitmap[2*y+1]<<8));
+               cursorBitmap[nbUns16+y] = uns16ReverseBits((mask[2*y]<<0) | (mask[2*y+1]<<8));
 #else
-               m_customCursor->data[y] = uns16ReverseBits((bitmap[2*y+1]<<0) | (bitmap[2*y]<<8));
-               m_customCursor->mask[y] = uns16ReverseBits((mask[2*y+1]<<0) | (mask[2*y]<<8));
+               cursorBitmap[y] = ~uns16ReverseBits((bitmap[2*y+1]<<0) | (bitmap[2*y]<<8));
+               cursorBitmap[nbUns16+y] = uns16ReverseBits((mask[2*y+1]<<0) | (mask[2*y]<<8));
 #endif
-                       
+               
        }
        
        
+       imSize.width = sizex;
+       imSize.height= sizey;
+       cursorImage = [[NSImage alloc] initWithSize:imSize];
+       [cursorImage addRepresentation:cursorImageRep];
+       
        hotSpotPoint.x = hotX;
        hotSpotPoint.y = hotY;
        
+       //foreground and background color parameter is not handled for now (10.6)
        m_customCursor = [[NSCursor alloc] initWithImage:cursorImage
-                                                                foregroundColorHint:<#(NSColor *)fg#>
-                                                                backgroundColorHint:<#(NSColor *)bg#>
                                                                                         hotSpot:hotSpotPoint];
        
+       [cursorImageRep release];
        [cursorImage release];
        
        if ([m_window isVisible]) {
                loadCursor(getCursorVisibility(), GHOST_kStandardCursorCustom);
        }
-       */
+       [pool drain];
        return GHOST_kSuccess;
 }
 
@@ -894,36 +1322,3 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCustomCursorShape(GHOST_TUns8 bitmap[
 {
        return setWindowCustomCursorShape((GHOST_TUns8*)bitmap, (GHOST_TUns8*) mask, 16, 16, hotX, hotY, 0, 1);
 }
-
-#pragma mark Old carbon stuff to remove
-
-#if 0
-void GHOST_WindowCocoa::setMac_windowState(short value)
-{
-       mac_windowState = value;
-}
-
-short GHOST_WindowCocoa::getMac_windowState()
-{
-       return mac_windowState;
-}
-
-void GHOST_WindowCocoa::gen2mac(const STR_String& in, Str255 out) const
-{
-       STR_String tempStr  = in;
-       int num = tempStr.Length();
-       if (num > 255) num = 255;
-       ::memcpy(out+1, tempStr.Ptr(), num);
-       out[0] = num;
-}
-
-
-void GHOST_WindowCocoa::mac2gen(const Str255 in, STR_String& out) const
-{
-       char tmp[256];
-       ::memcpy(tmp, in+1, in[0]);
-       tmp[in[0]] = '\0';
-       out = tmp;
-}
-
-#endif
\ No newline at end of file