Fix setting the clipping region for a DC when the region is an

[wxWidgets.git] / src / cocoa / window.mm

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index f82db09e008c37677613932f4b671971f2ebb224..74ea906beb54c9d84009311fef46c5c225739929 100644 (file)
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -4,16 +4,20 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/26
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/26

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 2002 David Elliott
 // Copyright:   (c) 2002 David Elliott

-// Licence:    wxWidgets licence
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/window.h"

+    #include "wx/dc.h"
+    #include "wx/utils.h"

 #endif //WX_PRECOMP
 #endif //WX_PRECOMP

+

 #include "wx/tooltip.h"
 
 #include "wx/cocoa/autorelease.h"
 #include "wx/tooltip.h"
 
 #include "wx/cocoa/autorelease.h"


@@ -25,6 +29,8 @@
 #import <AppKit/NSColor.h>
 #import <AppKit/NSClipView.h>
 #import <Foundation/NSException.h>
 #import <AppKit/NSColor.h>
 #import <AppKit/NSClipView.h>
 #import <Foundation/NSException.h>

+#import <AppKit/NSApplication.h>
+#import <AppKit/NSWindow.h>

 
 // Turn this on to paint green over the dummy views for debugging
 #undef WXCOCOA_FILL_DUMMY_VIEW
 
 // Turn this on to paint green over the dummy views for debugging
 #undef WXCOCOA_FILL_DUMMY_VIEW


@@ -38,6 +44,58 @@
 - (void)getRectsBeingDrawn:(const NSRect **)rects count:(int *)count;
 @end
 
 - (void)getRectsBeingDrawn:(const NSRect **)rects count:(int *)count;
 @end
 

+NSPoint CocoaTransformNSViewBoundsToWx(NSView *nsview, NSPoint pointBounds)
+{
+    wxCHECK_MSG(nsview, pointBounds, wxT("Need to have a Cocoa view to do translation"));
+    if([nsview isFlipped])
+        return pointBounds;
+    NSRect ourBounds = [nsview bounds];
+    return NSMakePoint
+    (   pointBounds.x
+    ,   ourBounds.size.height - pointBounds.y
+    );
+}
+
+NSRect CocoaTransformNSViewBoundsToWx(NSView *nsview, NSRect rectBounds)
+{
+    wxCHECK_MSG(nsview, rectBounds, wxT("Need to have a Cocoa view to do translation"));
+    if([nsview isFlipped])
+        return rectBounds;
+    NSRect ourBounds = [nsview bounds];
+    return NSMakeRect
+    (   rectBounds.origin.x
+    ,   ourBounds.size.height - (rectBounds.origin.y + rectBounds.size.height)
+    ,   rectBounds.size.width
+    ,   rectBounds.size.height
+    );
+}
+
+NSPoint CocoaTransformNSViewWxToBounds(NSView *nsview, NSPoint pointWx)
+{
+    wxCHECK_MSG(nsview, pointWx, wxT("Need to have a Cocoa view to do translation"));
+    if([nsview isFlipped])
+        return pointWx;
+    NSRect ourBounds = [nsview bounds];
+    return NSMakePoint
+    (   pointWx.x
+    ,   ourBounds.size.height - pointWx.y
+    );
+}
+
+NSRect CocoaTransformNSViewWxToBounds(NSView *nsview, NSRect rectWx)
+{
+    wxCHECK_MSG(nsview, rectWx, wxT("Need to have a Cocoa view to do translation"));
+    if([nsview isFlipped])
+        return rectWx;
+    NSRect ourBounds = [nsview bounds];
+    return NSMakeRect
+    (   rectWx.origin.x
+    ,   ourBounds.size.height - (rectWx.origin.y + rectWx.size.height)
+    ,   rectWx.size.width
+    ,   rectWx.size.height
+    );
+}
+

 // ========================================================================
 // wxWindowCocoaHider
 // ========================================================================
 // ========================================================================
 // wxWindowCocoaHider
 // ========================================================================


@@ -253,8 +311,8 @@ void wxWindowCocoa::Init()
     m_cocoaNSView = NULL;
     m_cocoaHider = NULL;
     m_wxCocoaScrollView = NULL;
     m_cocoaNSView = NULL;
     m_cocoaHider = NULL;
     m_wxCocoaScrollView = NULL;

-    m_isBeingDeleted = FALSE;
-    m_isInPaint = FALSE;
+    m_isBeingDeleted = false;
+    m_isInPaint = false;

     m_shouldBeEnabled = true;
 }
 
     m_shouldBeEnabled = true;
 }
 


@@ -280,7 +338,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID winid,
         SetInitialFrameRect(pos,size);
     }
 
         SetInitialFrameRect(pos,size);
     }
 

-    return TRUE;
+    return true;

 }
 
 // Destructor
 }
 
 // Destructor


@@ -342,6 +400,37 @@ WX_NSView wxWindowCocoa::GetNSViewForHiding() const
         :   m_cocoaNSView;
 }
 
         :   m_cocoaNSView;
 }
 

+NSPoint wxWindowCocoa::CocoaTransformBoundsToWx(NSPoint pointBounds)
+{
+    // TODO: Handle scrolling offset
+    return CocoaTransformNSViewBoundsToWx(GetNSView(), pointBounds);
+}
+
+NSRect wxWindowCocoa::CocoaTransformBoundsToWx(NSRect rectBounds)
+{
+    // TODO: Handle scrolling offset
+    return CocoaTransformNSViewBoundsToWx(GetNSView(), rectBounds);
+}
+
+NSPoint wxWindowCocoa::CocoaTransformWxToBounds(NSPoint pointWx)
+{
+    // TODO: Handle scrolling offset
+    return CocoaTransformNSViewWxToBounds(GetNSView(), pointWx);
+}
+
+NSRect wxWindowCocoa::CocoaTransformWxToBounds(NSRect rectWx)
+{
+    // TODO: Handle scrolling offset
+    return CocoaTransformNSViewWxToBounds(GetNSView(), rectWx);
+}
+
+WX_NSAffineTransform wxWindowCocoa::CocoaGetWxToBoundsTransform()
+{
+    // TODO: Handle scrolling offset
+    NSAffineTransform *transform = wxDC::CocoaGetWxToBoundsTransform([GetNSView() isFlipped], [GetNSView() bounds].size.height);
+    return transform;
+}
+

 bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
 {
     wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_drawRect"));
 bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
 {
     wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_drawRect"));


@@ -353,7 +442,7 @@ bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
         wxLogDebug(wxT("Paint event recursion!"));
         return false;
     }
         wxLogDebug(wxT("Paint event recursion!"));
         return false;
     }

-    m_isInPaint = TRUE;
+    m_isInPaint = true;

 
     // Set m_updateRegion
     const NSRect *rects = &rect; // The bounding box of the region
 
     // Set m_updateRegion
     const NSRect *rects = &rect; // The bounding box of the region


@@ -361,23 +450,33 @@ bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
     // Try replacing the larger rectangle with a list of smaller ones:
     if ([GetNSView() respondsToSelector:@selector(getRectsBeingDrawn:count:)])
         [GetNSView() getRectsBeingDrawn:&rects count:&countRects];
     // Try replacing the larger rectangle with a list of smaller ones:
     if ([GetNSView() respondsToSelector:@selector(getRectsBeingDrawn:count:)])
         [GetNSView() getRectsBeingDrawn:&rects count:&countRects];

-    m_updateRegion = wxRegion(rects,countRects);
+
+    NSRect *transformedRects = (NSRect*)malloc(sizeof(NSRect)*countRects);
+    for(int i=0; i<countRects; i++)
+    {
+        transformedRects[i] = CocoaTransformBoundsToWx(rects[i]);
+    }
+    m_updateRegion = wxRegion(transformedRects,countRects);
+    free(transformedRects);

 
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
     bool ret = GetEventHandler()->ProcessEvent(event);
 
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
     bool ret = GetEventHandler()->ProcessEvent(event);

-    m_isInPaint = FALSE;
+    m_isInPaint = false;

     return ret;
 }
 
 void wxWindowCocoa::InitMouseEvent(wxMouseEvent& event, WX_NSEvent cocoaEvent)
 {
     wxASSERT_MSG([m_cocoaNSView window]==[cocoaEvent window],wxT("Mouse event for different NSWindow"));
     return ret;
 }
 
 void wxWindowCocoa::InitMouseEvent(wxMouseEvent& event, WX_NSEvent cocoaEvent)
 {
     wxASSERT_MSG([m_cocoaNSView window]==[cocoaEvent window],wxT("Mouse event for different NSWindow"));

+    // Mouse events happen at the NSWindow level so we need to convert
+    // into our bounds coordinates then convert to wx coordinates.

     NSPoint cocoaPoint = [m_cocoaNSView convertPoint:[(NSEvent*)cocoaEvent locationInWindow] fromView:nil];
     NSPoint cocoaPoint = [m_cocoaNSView convertPoint:[(NSEvent*)cocoaEvent locationInWindow] fromView:nil];

-    NSRect cocoaRect = [m_cocoaNSView frame];
+    NSPoint pointWx = CocoaTransformBoundsToWx(cocoaPoint);
+    // FIXME: Should we be adjusting for client area origin?

     const wxPoint &clientorigin = GetClientAreaOrigin();
     const wxPoint &clientorigin = GetClientAreaOrigin();

-    event.m_x = (wxCoord)cocoaPoint.x - clientorigin.x;
-    event.m_y = (wxCoord)(cocoaRect.size.height - cocoaPoint.y) - clientorigin.y;
+    event.m_x = (wxCoord)pointWx.x - clientorigin.x;
+    event.m_y = (wxCoord)pointWx.y - clientorigin.y;

 
     event.m_shiftDown = [cocoaEvent modifierFlags] & NSShiftKeyMask;
     event.m_controlDown = [cocoaEvent modifierFlags] & NSControlKeyMask;
 
     event.m_shiftDown = [cocoaEvent modifierFlags] & NSShiftKeyMask;
     event.m_controlDown = [cocoaEvent modifierFlags] & NSControlKeyMask;


@@ -484,9 +583,9 @@ bool wxWindowCocoa::Cocoa_resetCursorRects()
 {
     if(!m_cursor.GetNSCursor())
         return false;
 {
     if(!m_cursor.GetNSCursor())
         return false;

-    
-    [GetNSView() addCursorRect: [GetNSView() visibleRect]  cursor: m_cursor.GetNSCursor()];    
-        
+
+    [GetNSView() addCursorRect: [GetNSView() visibleRect]  cursor: m_cursor.GetNSCursor()];
+

     return true;
 }
 
     return true;
 }
 


@@ -583,7 +682,7 @@ void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags
 
     AdjustForParentClientOrigin(x,y,sizeFlags);
 
 
     AdjustForParentClientOrigin(x,y,sizeFlags);
 

-    wxSize size(-1,-1);
+    wxSize size(wxDefaultSize);

 
     if((width==-1)&&!(sizeFlags&wxSIZE_ALLOW_MINUS_ONE))
     {
 
     if((width==-1)&&!(sizeFlags&wxSIZE_ALLOW_MINUS_ONE))
     {


@@ -630,13 +729,15 @@ void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 
     NSView *nsview = GetNSViewForSuperview();
     NSView *superview = [nsview superview];
 
     NSView *nsview = GetNSViewForSuperview();
     NSView *superview = [nsview superview];

-    wxCHECK_RET(superview,wxT("NSView does not have a superview"));
-    NSRect parentRect = [superview bounds];

 
 

-    NSRect cocoaRect = NSMakeRect(x,parentRect.size.height-(y+height),width,height);
-    [nsview setFrame: cocoaRect];
+    wxCHECK_RET(GetParent(), wxT("Window can only be placed correctly when it has a parent"));
+
+    NSRect oldFrameRect = [nsview frame];
+    NSRect newFrameRect = GetParent()->CocoaTransformWxToBounds(NSMakeRect(x,y,width,height));
+    [nsview setFrame:newFrameRect];

     // Be sure to redraw the parent to reflect the changed position
     // Be sure to redraw the parent to reflect the changed position

-    [superview setNeedsDisplay:YES];
+    [superview setNeedsDisplayInRect:oldFrameRect];
+    [superview setNeedsDisplayInRect:newFrameRect];

 }
 
 void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size)
 }
 
 void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size)


@@ -644,14 +745,14 @@ void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size)
     NSView *nsview = GetNSViewForSuperview();
     NSView *superview = [nsview superview];
     wxCHECK_RET(superview,wxT("NSView does not have a superview"));
     NSView *nsview = GetNSViewForSuperview();
     NSView *superview = [nsview superview];
     wxCHECK_RET(superview,wxT("NSView does not have a superview"));

-    NSRect parentRect = [superview bounds];
+    wxCHECK_RET(GetParent(), wxT("Window can only be placed correctly when it has a parent"));

     NSRect frameRect = [nsview frame];
     if(size.x!=-1)
         frameRect.size.width = size.x;
     if(size.y!=-1)
         frameRect.size.height = size.y;
     frameRect.origin.x = pos.x;
     NSRect frameRect = [nsview frame];
     if(size.x!=-1)
         frameRect.size.width = size.x;
     if(size.y!=-1)
         frameRect.size.height = size.y;
     frameRect.origin.x = pos.x;

-    frameRect.origin.y = parentRect.size.height-(pos.y+frameRect.size.height);
+    frameRect.origin.y = pos.y;

     // Tell Cocoa to change the margin between the bottom of the superview
     // and the bottom of the control.  Keeps the control pinned to the top
     // of its superview so that its position in the wxWidgets coordinate
     // Tell Cocoa to change the margin between the bottom of the superview
     // and the bottom of the control.  Keeps the control pinned to the top
     // of its superview so that its position in the wxWidgets coordinate


@@ -660,6 +761,7 @@ void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size)
         [nsview setAutoresizingMask: NSViewMinYMargin];
     // MUST set the mask before setFrame: which can generate a size event
     // and cause a scroller to be added!
         [nsview setAutoresizingMask: NSViewMinYMargin];
     // MUST set the mask before setFrame: which can generate a size event
     // and cause a scroller to be added!

+    frameRect = GetParent()->CocoaTransformWxToBounds(frameRect);

     [nsview setFrame: frameRect];
 }
 
     [nsview setFrame: frameRect];
 }
 


@@ -677,15 +779,13 @@ void wxWindow::DoGetSize(int *w, int *h) const
 void wxWindow::DoGetPosition(int *x, int *y) const
 {
     NSView *nsview = GetNSViewForSuperview();
 void wxWindow::DoGetPosition(int *x, int *y) const
 {
     NSView *nsview = GetNSViewForSuperview();

-    NSView *superview = [nsview superview];
-    wxCHECK_RET(superview,wxT("NSView does not have a superview"));
-    NSRect parentRect = [superview bounds];

 
     NSRect cocoaRect = [nsview frame];
 
     NSRect cocoaRect = [nsview frame];

+    NSRect rectWx = GetParent()->CocoaTransformBoundsToWx(cocoaRect);

     if(x)
     if(x)

-        *x=(int)cocoaRect.origin.x;
+        *x=(int)rectWx.origin.x;

     if(y)
     if(y)

-        *y=(int)(parentRect.size.height-(cocoaRect.origin.y+cocoaRect.size.height));
+        *y=(int)rectWx.origin.y;

     wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoGetPosition = (%d,%d)"),this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
 }
 
     wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoGetPosition = (%d,%d)"),this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
 }
 


@@ -706,14 +806,8 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 
 void wxWindow::SetFocus()
 {
 
 void wxWindow::SetFocus()
 {

-#ifdef __WXDEBUG__
-    bool bOK = 
-#endif
-        [GetNSView() lockFocusIfCanDraw];
-        
-    //Note that the normal lockFocus works on hidden and minimized windows
-    //and has no return value - which probably isn't what we want
-    wxASSERT(bOK);
+    if([GetNSView() acceptsFirstResponder])
+        [[GetNSView() window] makeFirstResponder: GetNSView()];

 }
 
 void wxWindow::DoCaptureMouse()
 }
 
 void wxWindow::DoCaptureMouse()


@@ -758,7 +852,18 @@ void wxWindow::DoSetClientSize(int width, int height)
 
 void wxWindow::CocoaSetWxWindowSize(int width, int height)
 {
 
 void wxWindow::CocoaSetWxWindowSize(int width, int height)
 {

-    wxWindowCocoa::DoSetSize(-1,-1,width,height,wxSIZE_USE_EXISTING);
+    wxWindowCocoa::DoSetSize(wxDefaultCoord,wxDefaultCoord,width,height,wxSIZE_USE_EXISTING);
+}
+
+void wxWindow::SetLabel(const wxString& WXUNUSED(label))
+{
+    // TODO
+}
+
+wxString wxWindow::GetLabel() const
+{
+    // TODO
+    return wxEmptyString;

 }
 
 int wxWindow::GetCharHeight() const
 }
 
 int wxWindow::GetCharHeight() const


@@ -842,7 +947,7 @@ void wxWindow::DoSetVirtualSize( int x, int y )
 bool wxWindow::SetFont(const wxFont& font)
 {
     // TODO
 bool wxWindow::SetFont(const wxFont& font)
 {
     // TODO

-    return TRUE;
+    return true;

 }
 
 static int CocoaRaiseWindowCompareFunction(id first, id second, void *target)
 }
 
 static int CocoaRaiseWindowCompareFunction(id first, id second, void *target)


@@ -888,18 +993,36 @@ void wxWindow::Lower()
 
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {
 
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {

-    return FALSE;
+    return false;

 }
 
 // Get the window with the focus
 wxWindow *wxWindowBase::DoFindFocus()
 {
 }
 
 // Get the window with the focus
 wxWindow *wxWindowBase::DoFindFocus()
 {

-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa([NSView focusView]);
-    
-    if (!win)
+    // Basically we are somewhat emulating the responder chain here except
+    // we are only loking for the first responder in the key window or
+    // upon failing to find one if the main window is different we look
+    // for the first responder in the main window.
+
+    // Note that the firstResponder doesn't necessarily have to be an
+    // NSView but wxCocoaNSView::GetFromCocoa() will simply return
+    // NULL unless it finds its argument in its hash map.
+
+    wxCocoaNSView *win;
+
+    NSWindow *keyWindow = [[NSApplication sharedApplication] keyWindow];
+    win = wxCocoaNSView::GetFromCocoa(static_cast<NSView*>([keyWindow firstResponder]));
+    if(win)
+        return win->GetWxWindow();
+
+    NSWindow *mainWindow = [[NSApplication sharedApplication] keyWindow];
+    if(mainWindow == keyWindow)

         return NULL;
         return NULL;

-        
-    return win->GetWxWindow();
+    win = wxCocoaNSView::GetFromCocoa(static_cast<NSView*>([mainWindow firstResponder]));
+    if(win)
+        return win->GetWxWindow();
+
+    return NULL;

 }
 
 /* static */ wxWindow *wxWindowBase::GetCapture()
 }
 
 /* static */ wxWindow *wxWindowBase::GetCapture()


@@ -920,9 +1043,15 @@ wxPoint wxGetMousePosition()
     return wxDefaultPosition;
 }
 
     return wxDefaultPosition;
 }
 

+wxMouseState wxGetMouseState()
+{
+    wxMouseState ms;
+    // TODO
+    return ms;
+}
+

 wxWindow* wxFindWindowAtPointer(wxPoint& pt)
 {
     pt = wxGetMousePosition();
     return NULL;
 }
 wxWindow* wxFindWindowAtPointer(wxPoint& pt)
 {
     pt = wxGetMousePosition();
     return NULL;
 }

-