X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b030203c5926bd6af8bc310469c911f2143f7e1..2aa24b607061a398d0876b87e695f4f9dc531cb2:/src/cocoa/dc.mm diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm index 55be845f80..b6ee3bf591 100644 --- a/src/cocoa/dc.mm +++ b/src/cocoa/dc.mm @@ -6,7 +6,7 @@ // Created: 2003/04/01 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -16,6 +16,7 @@ #endif //WX_PRECOMP #include "wx/cocoa/autorelease.h" +#include "wx/cocoa/string.h" #import #import @@ -27,7 +28,8 @@ #import #import -#include +#include "wx/math.h" //math constants +#include "wx/listimpl.cpp" WX_DEFINE_LIST(wxCocoaDCStack); IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) @@ -97,10 +99,10 @@ void wxDC::CocoaShutdownTextSystem() void wxDC::CocoaUnwindStackAndLoseFocus() { - wxCocoaDCStack::Node *ourNode=sm_cocoaDCStack.Find(this); + wxCocoaDCStack::compatibility_iterator ourNode=sm_cocoaDCStack.Find(this); if(ourNode) { - wxCocoaDCStack::Node *node=sm_cocoaDCStack.GetFirst(); + wxCocoaDCStack::compatibility_iterator node=sm_cocoaDCStack.GetFirst(); for(;node!=ourNode; node=sm_cocoaDCStack.GetFirst()) { wxDC *dc = node->GetData(); @@ -110,18 +112,18 @@ void wxDC::CocoaUnwindStackAndLoseFocus() { wxFAIL_MSG(wxT("Unable to unlock focus on higher-level DC!")); } - sm_cocoaDCStack.DeleteNode(node); + sm_cocoaDCStack.Erase(node); } wxASSERT(node==ourNode); wxASSERT(ourNode->GetData() == this); ourNode->GetData()->CocoaUnlockFocus(); - sm_cocoaDCStack.DeleteNode(ourNode); + sm_cocoaDCStack.Erase(ourNode); } } bool wxDC::CocoaUnwindStackAndTakeFocus() { - wxCocoaDCStack::Node *node=sm_cocoaDCStack.GetFirst(); + wxCocoaDCStack::compatibility_iterator node=sm_cocoaDCStack.GetFirst(); for(;node;node = sm_cocoaDCStack.GetFirst()) { wxDC *dc = node->GetData(); @@ -132,20 +134,20 @@ bool wxDC::CocoaUnwindStackAndTakeFocus() // If unable to unlockFocus (e.g. wxPaintDC) stop here if(!dc->CocoaUnlockFocus()) break; - sm_cocoaDCStack.DeleteNode(node); + sm_cocoaDCStack.Erase(node); } return CocoaLockFocus(); } wxDC::wxDC(void) { - m_cocoaFlipped = false; - m_cocoaHeight = 0.0; + m_cocoaWxToBoundsTransform = nil; m_pen = *wxBLACK_PEN; } wxDC::~wxDC(void) { + [m_cocoaWxToBoundsTransform release]; } bool wxDC::CocoaLockFocus() @@ -158,30 +160,54 @@ bool wxDC::CocoaUnlockFocus() return false; } -void wxDC::CocoaApplyTransformations() +/*static*/ WX_NSAffineTransform wxDC::CocoaGetWxToBoundsTransform(bool isFlipped, float height) { + NSAffineTransform *transform = nil; // This transform flips the graphics since wxDC uses top-left origin - if(!m_cocoaFlipped) + if(!isFlipped) { // The transform is auto released - NSAffineTransform *transform = [NSAffineTransform transform]; + transform = [NSAffineTransform transform]; /* x' = 1x + 0y + 0 y' = 0x + -1y + window's height */ NSAffineTransformStruct matrix = { 1, 0 , 0, -1 - , 0, m_cocoaHeight + , 0, height }; [transform setTransformStruct: matrix]; - // Apply the transform - [transform concat]; } - // TODO: Apply scaling transformation + return transform; +} + +void wxDC::CocoaApplyTransformations() +{ + [m_cocoaWxToBoundsTransform concat]; + // TODO: Apply device/logical/user position/scaling transformations +} + +void wxDC::CocoaUnapplyTransformations() +{ + // NOTE: You *must* call this with focus held. + // Undo all transforms so we're back in true Cocoa coords with + // no scaling or flipping. + NSAffineTransform *invertTransform; + invertTransform = [m_cocoaWxToBoundsTransform copy]; + [invertTransform invert]; + [invertTransform concat]; + [invertTransform release]; +} + +bool wxDC::CocoaGetBounds(void *rectData) +{ + // We don't know what we are so we can't return anything. + return false; } void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { + wxAutoNSAutoreleasePool pool; if(!CocoaTakeFocus()) return; NSBezierPath *bezpath = [NSBezierPath bezierPathWithRect:NSMakeRect(x,y,width,height)]; CocoaSetPenForNSBezierPath(m_pen,bezpath); @@ -192,6 +218,7 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { + wxAutoNSAutoreleasePool pool; if(!CocoaTakeFocus()) return; NSBezierPath *bezpath = [NSBezierPath bezierPath]; [bezpath moveToPoint:NSMakePoint(x1,y1)]; @@ -207,7 +234,7 @@ void wxDC::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord // FIXME: Cache this so it can be used for DoDrawText wxASSERT_MSG(sm_cocoaNSTextStorage && sm_cocoaNSLayoutManager && sm_cocoaNSTextContainer, wxT("Text system has not been initialized. BAD PROGRAMMER!")); NSAttributedString *attributedString = [[NSAttributedString alloc] - initWithString:[NSString stringWithCString:text.c_str()]]; + initWithString:wxNSStringWithWxString(text.c_str())]; [sm_cocoaNSTextStorage setAttributedString:attributedString]; [attributedString release]; @@ -225,10 +252,11 @@ void wxDC::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y) { + wxAutoNSAutoreleasePool pool; if(!CocoaTakeFocus()) return; wxASSERT_MSG(sm_cocoaNSTextStorage && sm_cocoaNSLayoutManager && sm_cocoaNSTextContainer, wxT("Text system has not been initialized. BAD PROGRAMMER!")); NSAttributedString *attributedString = [[NSAttributedString alloc] - initWithString:[NSString stringWithCString:text.c_str()]]; + initWithString:wxNSStringWithWxString(text.c_str())]; [sm_cocoaNSTextStorage setAttributedString:attributedString]; [attributedString release]; @@ -274,7 +302,7 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y) [flipTransform concat]; #if 0 // Draw+fill a rectangle so we can see where the shit is supposed to be. - wxLogDebug(wxT("(%f,%f) (%fx%f)"),usedRect.origin.x,usedRect.origin.y,usedRect.size.width,usedRect.size.height); + wxLogTrace(wxTRACE_COCOA,wxT("(%f,%f) (%fx%f)"),usedRect.origin.x,usedRect.origin.y,usedRect.size.width,usedRect.size.height); NSBezierPath *bezpath = [NSBezierPath bezierPathWithRect:NSMakeRect(0,0,usedRect.size.width,usedRect.size.height)]; [[NSColor blackColor] set]; [bezpath stroke]; @@ -338,17 +366,6 @@ int wxDCBase::LogicalToDeviceYRel(int y) const // cut here, the rest is stubs /////////////////////////////////////////////////////////////////////////// -//----------------------------------------------------------------------------- -// constants -//----------------------------------------------------------------------------- - -#define mm2inches 0.0393700787402 -#define inches2mm 25.4 -#define mm2twips 56.6929133859 -#define twips2mm 0.0176388888889 -#define mm2pt 2.83464566929 -#define pt2mm 0.352777777778 - //----------------------------------------------------------------------------- // wxDC //----------------------------------------------------------------------------- @@ -448,13 +465,14 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) void wxDC::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask) { + wxAutoNSAutoreleasePool pool; if(!CocoaTakeFocus()) return; if(!bmp.Ok()) return; #if 0 // Draw a rect so we can see where it's supposed to be - wxLogDebug(wxT("image at (%d,%d) size %dx%d"),x,y,bmp.GetWidth(),bmp.GetHeight()); + wxLogTrace(wxTRACE_COCOA,wxT("image at (%d,%d) size %dx%d"),x,y,bmp.GetWidth(),bmp.GetHeight()); NSBezierPath *bezpath = [NSBezierPath bezierPathWithRect:NSMakeRect(x,y,bmp.GetWidth(),bmp.GetHeight())]; [[NSColor blackColor] set]; [bezpath stroke]; @@ -544,6 +562,22 @@ void wxDC::SetTextBackground( const wxColour &col ) void wxDC::Clear() { + if(!CocoaTakeFocus()) return; + + NSRect boundsRect; + if(!CocoaGetBounds(&boundsRect)) return; + + NSGraphicsContext *context = [NSGraphicsContext currentContext]; + [context saveGraphicsState]; + + // Undo all transforms so when we draw our bounds rect we + // really overwrite our bounds rect. + CocoaUnapplyTransformations(); + + [m_backgroundBrush.GetNSColor() set]; + [NSBezierPath fillRect:boundsRect]; + + [context restoreGraphicsState]; } void wxDC::SetBackground(const wxBrush& brush) @@ -631,7 +665,7 @@ void wxDC::ComputeScaleAndOrigin(void) { // this is a bit artificial, but we need to force wxDC to think // the pen has changed - wxPen* pen = & GetPen(); + const wxPen* pen = & GetPen(); wxPen tempPen; m_pen = tempPen; SetPen(* pen);