X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eec960fa8987d15fd87e249c8441474188124425..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/mac/carbon/graphics.cpp diff --git a/src/mac/carbon/graphics.cpp b/src/mac/carbon/graphics.cpp old mode 100755 new mode 100644 index 6aec43bfc2..48cd16a9cf --- a/src/mac/carbon/graphics.cpp +++ b/src/mac/carbon/graphics.cpp @@ -11,14 +11,15 @@ #include "wx/wxprec.h" -#if wxUSE_GRAPHICS_CONTEXT && wxMAC_USE_CORE_GRAPHICS - #include "wx/graphics.h" #ifndef WX_PRECOMP #include "wx/dcclient.h" + #include "wx/dcmemory.h" #include "wx/log.h" #include "wx/region.h" + #include "wx/image.h" + #include "wx/icon.h" #endif #include "wx/mac/uma.h" @@ -34,10 +35,6 @@ #include "wx/mac/private.h" -#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 -typedef float CGFloat; -#endif - //----------------------------------------------------------------------------- // constants //----------------------------------------------------------------------------- @@ -51,1317 +48,2363 @@ const double M_PI = 3.14159265358979; static const double RAD2DEG = 180.0 / M_PI; // -// Graphics Path +// Pen, Brushes and Fonts // -class WXDLLEXPORT wxMacCoreGraphicsPath : public wxGraphicsPath +#pragma mark - +#pragma mark wxMacCoreGraphicsPattern, ImagePattern, HatchPattern classes + +OSStatus wxMacDrawCGImage( + CGContextRef inContext, + const HIRect * inBounds, + CGImageRef inImage) +{ +#ifdef __LP64__ + // todo flip + CGContextDrawImage(inContext, *inBounds, inImage ); + return noErr; +#else + return HIViewDrawCGImage( inContext, inBounds, inImage ); +#endif +} + +// CGPattern wrapper class: always allocate on heap, never call destructor + +class wxMacCoreGraphicsPattern { public : - wxMacCoreGraphicsPath(); - ~wxMacCoreGraphicsPath(); + wxMacCoreGraphicsPattern() {} - // begins a new subpath at (x,y) - virtual void MoveToPoint( wxDouble x, wxDouble y ); + // is guaranteed to be called only with a non-Null CGContextRef + virtual void Render( CGContextRef ctxRef ) = 0; - // adds a straight line from the current point to (x,y) - virtual void AddLineToPoint( wxDouble x, wxDouble y ); + operator CGPatternRef() const { return m_patternRef; } - // adds a cubic Bezier curve from the current point, using two control points and an end point - virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ); +protected : + virtual ~wxMacCoreGraphicsPattern() + { + // as this is called only when the m_patternRef is been released; + // don't release it again + } - // closes the current sub-path - virtual void CloseSubpath(); + static void _Render( void *info, CGContextRef ctxRef ) + { + wxMacCoreGraphicsPattern* self = (wxMacCoreGraphicsPattern*) info; + if ( self && ctxRef ) + self->Render( ctxRef ); + } - // gets the last point of the current path, (0,0) if not yet set - virtual void GetCurrentPoint( wxDouble& x, wxDouble&y); + static void _Dispose( void *info ) + { + wxMacCoreGraphicsPattern* self = (wxMacCoreGraphicsPattern*) info; + delete self; + } - // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle - virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ); + CGPatternRef m_patternRef; - // - // These are convenience functions which - if not available natively will be assembled - // using the primitives from above - // + static const CGPatternCallbacks ms_Callbacks; +}; - // adds a quadratic Bezier curve from the current point, using a control point and an end point - virtual void AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y ); +const CGPatternCallbacks wxMacCoreGraphicsPattern::ms_Callbacks = { 0, &wxMacCoreGraphicsPattern::_Render, &wxMacCoreGraphicsPattern::_Dispose }; - // appends a rectangle as a new closed subpath - virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ); +class ImagePattern : public wxMacCoreGraphicsPattern +{ +public : + ImagePattern( const wxBitmap* bmp , const CGAffineTransform& transform ) + { + wxASSERT( bmp && bmp->Ok() ); - // appends an ellipsis as a new closed subpath fitting the passed rectangle - virtual void AddCircle( wxDouble x, wxDouble y, wxDouble r ); + Init( (CGImageRef) bmp->CreateCGImage() , transform ); + } - // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1) - virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ); - - // returns the native path - virtual void * GetNativePath() const { return m_path; } - - // give the native path returned by GetNativePath() back (there might be some deallocations necessary) - virtual void UnGetNativePath(void *p) {} - - DECLARE_DYNAMIC_CLASS(wxMacCoreGraphicsPath) - DECLARE_NO_COPY_CLASS(wxMacCoreGraphicsPath) -private : - CGMutablePathRef m_path; -}; + // ImagePattern takes ownership of CGImageRef passed in + ImagePattern( CGImageRef image , const CGAffineTransform& transform ) + { + if ( image ) + CFRetain( image ); -//----------------------------------------------------------------------------- -// wxGraphicsPath implementation -//----------------------------------------------------------------------------- + Init( image , transform ); + } -IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsPath, wxGraphicsPath) + virtual void Render( CGContextRef ctxRef ) + { + if (m_image != NULL) + wxMacDrawCGImage( ctxRef, &m_imageBounds, m_image ); + } -wxMacCoreGraphicsPath::wxMacCoreGraphicsPath() -{ - m_path = CGPathCreateMutable(); -} +protected : + void Init( CGImageRef image, const CGAffineTransform& transform ) + { + m_image = image; + if ( m_image ) + { + m_imageBounds = CGRectMake( 0.0, 0.0, (CGFloat)CGImageGetWidth( m_image ), (CGFloat)CGImageGetHeight( m_image ) ); + m_patternRef = CGPatternCreate( + this , m_imageBounds, transform , + m_imageBounds.size.width, m_imageBounds.size.height, + kCGPatternTilingNoDistortion, true , &wxMacCoreGraphicsPattern::ms_Callbacks ); + } + } -wxMacCoreGraphicsPath::~wxMacCoreGraphicsPath() -{ - CGPathRelease( m_path ); -} + virtual ~ImagePattern() + { + if ( m_image ) + CGImageRelease( m_image ); + } -// opens (starts) a new subpath -void wxMacCoreGraphicsPath::MoveToPoint( wxDouble x1 , wxDouble y1 ) -{ - CGPathMoveToPoint( m_path , NULL , x1 , y1 ); -} + CGImageRef m_image; + CGRect m_imageBounds; +}; -void wxMacCoreGraphicsPath::AddLineToPoint( wxDouble x1 , wxDouble y1 ) +class HatchPattern : public wxMacCoreGraphicsPattern { - CGPathAddLineToPoint( m_path , NULL , x1 , y1 ); -} +public : + HatchPattern( int hatchstyle, const CGAffineTransform& transform ) + { + m_hatch = hatchstyle; + m_imageBounds = CGRectMake( 0.0, 0.0, 8.0 , 8.0 ); + m_patternRef = CGPatternCreate( + this , m_imageBounds, transform , + m_imageBounds.size.width, m_imageBounds.size.height, + kCGPatternTilingNoDistortion, false , &wxMacCoreGraphicsPattern::ms_Callbacks ); + } -void wxMacCoreGraphicsPath::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) -{ - CGPathAddCurveToPoint( m_path , NULL , cx1 , cy1 , cx2, cy2, x , y ); -} + void StrokeLineSegments( CGContextRef ctxRef , const CGPoint pts[] , size_t count ) + { + CGContextStrokeLineSegments( ctxRef , pts , count ); + } -void wxMacCoreGraphicsPath::AddQuadCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble x, wxDouble y ) -{ - CGPathAddQuadCurveToPoint( m_path , NULL , cx1 , cy1 , x , y ); -} + virtual void Render( CGContextRef ctxRef ) + { + switch ( m_hatch ) + { + case wxBDIAGONAL_HATCH : + { + CGPoint pts[] = + { + { 8.0 , 0.0 } , { 0.0 , 8.0 } + }; + StrokeLineSegments( ctxRef , pts , 2 ); + } + break; -void wxMacCoreGraphicsPath::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) -{ - CGRect cgRect = { { x , y } , { w , h } }; - CGPathAddRect( m_path , NULL , cgRect ); -} + case wxCROSSDIAG_HATCH : + { + CGPoint pts[] = + { + { 0.0 , 0.0 } , { 8.0 , 8.0 } , + { 8.0 , 0.0 } , { 0.0 , 8.0 } + }; + StrokeLineSegments( ctxRef , pts , 4 ); + } + break; -void wxMacCoreGraphicsPath::AddCircle( wxDouble x, wxDouble y , wxDouble r ) -{ - CGPathAddArc( m_path , NULL , x , y , r , 0.0 , 2 * M_PI , true ); -} + case wxFDIAGONAL_HATCH : + { + CGPoint pts[] = + { + { 0.0 , 0.0 } , { 8.0 , 8.0 } + }; + StrokeLineSegments( ctxRef , pts , 2 ); + } + break; -// adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle -void wxMacCoreGraphicsPath::AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) -{ - // inverse direction as we the 'normal' state is a y axis pointing down, ie mirrored to the standard core graphics setup - CGPathAddArc( m_path, NULL , x, y, r, startAngle, endAngle, !clockwise); -} + case wxCROSS_HATCH : + { + CGPoint pts[] = + { + { 0.0 , 4.0 } , { 8.0 , 4.0 } , + { 4.0 , 0.0 } , { 4.0 , 8.0 } , + }; + StrokeLineSegments( ctxRef , pts , 4 ); + } + break; -void wxMacCoreGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) -{ - CGPathAddArcToPoint( m_path, NULL , x1, y1, x2, y2, r); -} + case wxHORIZONTAL_HATCH : + { + CGPoint pts[] = + { + { 0.0 , 4.0 } , { 8.0 , 4.0 } , + }; + StrokeLineSegments( ctxRef , pts , 2 ); + } + break; -// closes the current subpath -void wxMacCoreGraphicsPath::CloseSubpath() -{ - CGPathCloseSubpath( m_path ); -} + case wxVERTICAL_HATCH : + { + CGPoint pts[] = + { + { 4.0 , 0.0 } , { 4.0 , 8.0 } , + }; + StrokeLineSegments( ctxRef , pts , 2 ); + } + break; -// gets the last point of the current path, (0,0) if not yet set -void wxMacCoreGraphicsPath::GetCurrentPoint( wxDouble& x, wxDouble&y) -{ - CGPoint p = CGPathGetCurrentPoint( m_path ); - x = p.x; - y = p.y; -} + default: + break; + } + } -// -// Graphics Context -// +protected : + virtual ~HatchPattern() {} -class WXDLLEXPORT wxMacCoreGraphicsContext : public wxGraphicsContext + CGRect m_imageBounds; + int m_hatch; +}; + +class wxMacCoreGraphicsPenData : public wxGraphicsObjectRefData { public: - wxMacCoreGraphicsContext( CGContextRef cgcontext ); - - wxMacCoreGraphicsContext( WindowRef window ); - - wxMacCoreGraphicsContext( wxWindow* window ); - - wxMacCoreGraphicsContext(); - - ~wxMacCoreGraphicsContext(); + wxMacCoreGraphicsPenData( wxGraphicsRenderer* renderer, const wxPen &pen ); + ~wxMacCoreGraphicsPenData(); - void Init(); + void Init(); + virtual void Apply( wxGraphicsContext* context ); + virtual wxDouble GetWidth() { return m_width; } - // creates a path instance that corresponds to the type of graphics context, ie GDIPlus, cairo, CoreGraphics ... - virtual wxGraphicsPath * CreatePath(); +protected : + CGLineCap m_cap; + wxMacCFRefHolder m_color; + wxMacCFRefHolder m_colorSpace; - // push the current state of the context, ie the transformation matrix on a stack - virtual void PushState(); + CGLineJoin m_join; + CGFloat m_width; - // pops a stored state from the stack - virtual void PopState(); + int m_count; + const CGFloat *m_lengths; + CGFloat *m_userLengths; - // clips drawings to the region - virtual void Clip( const wxRegion ®ion ); - // clips drawings to the rect - virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ); - - // resets the clipping to original extent - virtual void ResetClip(); + bool m_isPattern; + wxMacCFRefHolder m_pattern; + CGFloat* m_patternColorComponents; +}; - virtual void * GetNativeContext(); - - // - // transformation - // - - // translate - virtual void Translate( wxDouble dx , wxDouble dy ); +wxMacCoreGraphicsPenData::wxMacCoreGraphicsPenData( wxGraphicsRenderer* renderer, const wxPen &pen ) : + wxGraphicsObjectRefData( renderer ) +{ + Init(); - // scale - virtual void Scale( wxDouble xScale , wxDouble yScale ); + CGFloat components[4] = { pen.GetColour().Red() / 255.0 , pen.GetColour().Green() / 255.0 , + pen.GetColour().Blue() / 255.0 , pen.GetColour().Alpha() / 255.0 } ; + m_color.Set( CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ) ; - // rotate (radians) - virtual void Rotate( wxDouble angle ); + // TODO: * m_dc->m_scaleX + m_width = pen.GetWidth(); + if (m_width <= 0.0) + m_width = 0.1; - // - // setting the paint - // - - // sets the pan - virtual void SetPen( const wxPen &pen ); + switch ( pen.GetCap() ) + { + case wxCAP_ROUND : + m_cap = kCGLineCapRound; + break; - // sets the brush for filling - virtual void SetBrush( const wxBrush &brush ); + case wxCAP_PROJECTING : + m_cap = kCGLineCapSquare; + break; - // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2 - virtual void SetLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, - const wxColour&c1, const wxColour&c2); + case wxCAP_BUTT : + m_cap = kCGLineCapButt; + break; - // sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc) - // with radius r and color cColor - virtual void SetRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius, - const wxColour &oColor, const wxColour &cColor); + default : + m_cap = kCGLineCapButt; + break; + } - // sets the font - virtual void SetFont( const wxFont &font ); - - // sets the text color - virtual void SetTextColor( const wxColour &col ); + switch ( pen.GetJoin() ) + { + case wxJOIN_BEVEL : + m_join = kCGLineJoinBevel; + break; - // strokes along a path with the current pen - virtual void StrokePath( const wxGraphicsPath *path ); + case wxJOIN_MITER : + m_join = kCGLineJoinMiter; + break; - // fills a path with the current brush - virtual void FillPath( const wxGraphicsPath *path, int fillStyle = wxWINDING_RULE ); + case wxJOIN_ROUND : + m_join = kCGLineJoinRound; + break; - // draws a path by first filling and then stroking - virtual void DrawPath( const wxGraphicsPath *path, int fillStyle = wxWINDING_RULE ); + default : + m_join = kCGLineJoinMiter; + break; + } - // - // text - // - - virtual void DrawText( const wxString &str, wxDouble x, wxDouble y ); + const CGFloat dashUnit = m_width < 1.0 ? 1.0 : m_width; - virtual void DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle ); + const CGFloat dotted[] = { dashUnit , dashUnit + 2.0 }; + static const CGFloat short_dashed[] = { 9.0 , 6.0 }; + static const CGFloat dashed[] = { 19.0 , 9.0 }; + static const CGFloat dotted_dashed[] = { 9.0 , 6.0 , 3.0 , 3.0 }; - virtual void GetTextExtent( const wxString &text, wxDouble *width, wxDouble *height, - wxDouble *descent, wxDouble *externalLeading ) const; + switch ( pen.GetStyle() ) + { + case wxSOLID : + break; + + case wxDOT : + m_count = WXSIZEOF(dotted); + m_userLengths = new CGFloat[ m_count ] ; + memcpy( m_userLengths, dotted, sizeof(dotted) ); + m_lengths = m_userLengths; + break; + + case wxLONG_DASH : + m_count = WXSIZEOF(dashed); + m_lengths = dashed; + break; + + case wxSHORT_DASH : + m_count = WXSIZEOF(short_dashed); + m_lengths = short_dashed; + break; + + case wxDOT_DASH : + m_count = WXSIZEOF(dotted_dashed); + m_lengths = dotted_dashed; + break; + + case wxUSER_DASH : + wxDash *dashes; + m_count = pen.GetDashes( &dashes ); + if ((dashes != NULL) && (m_count > 0)) + { + m_userLengths = new CGFloat[m_count]; + for ( int i = 0; i < m_count; ++i ) + { + m_userLengths[i] = dashes[i] * dashUnit; - virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const; + if ( i % 2 == 1 && m_userLengths[i] < dashUnit + 2.0 ) + m_userLengths[i] = dashUnit + 2.0; + else if ( i % 2 == 0 && m_userLengths[i] < dashUnit ) + m_userLengths[i] = dashUnit; + } + } + m_lengths = m_userLengths; + break; - // - // image support - // + case wxSTIPPLE : + { + wxBitmap* bmp = pen.GetStipple(); + if ( bmp && bmp->Ok() ) + { + m_colorSpace.Set( CGColorSpaceCreatePattern( NULL ) ); + m_pattern.Set( *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) ); + m_patternColorComponents = new CGFloat[1] ; + m_patternColorComponents[0] = 1.0; + m_isPattern = true; + } + } + break; - virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ); + default : + { + m_isPattern = true; + m_colorSpace.Set( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) ); + m_pattern.Set( *( new HatchPattern( pen.GetStyle() , CGAffineTransformMakeScale( 1,-1 ) ) ) ); + m_patternColorComponents = new CGFloat[4] ; + m_patternColorComponents[0] = pen.GetColour().Red() / 255.0; + m_patternColorComponents[1] = pen.GetColour().Green() / 255.0; + m_patternColorComponents[2] = pen.GetColour().Blue() / 255.0; + m_patternColorComponents[3] = pen.GetColour().Alpha() / 255.0; + } + break; + } + if ((m_lengths != NULL) && (m_count > 0)) + { + // force the line cap, otherwise we get artifacts (overlaps) and just solid lines + m_cap = kCGLineCapButt; + } +} - virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ); +wxMacCoreGraphicsPenData::~wxMacCoreGraphicsPenData() +{ + delete[] m_userLengths; + delete[] m_patternColorComponents; +} - void SetNativeContext( CGContextRef cg ); - CGPathDrawingMode GetDrawingMode() const { return m_mode; } - - DECLARE_NO_COPY_CLASS(wxMacCoreGraphicsContext) - DECLARE_DYNAMIC_CLASS(wxMacCoreGraphicsContext) +void wxMacCoreGraphicsPenData::Init() +{ + m_lengths = NULL; + m_userLengths = NULL; + m_width = 0; + m_count = 0; + m_patternColorComponents = NULL; + m_isPattern = false; +} -private: - void EnsureIsValid(); +void wxMacCoreGraphicsPenData::Apply( wxGraphicsContext* context ) +{ + CGContextRef cg = (CGContextRef) context->GetNativeContext(); + CGContextSetLineWidth( cg , m_width ); + CGContextSetLineJoin( cg , m_join ); - CGContextRef m_cgContext; - WindowRef m_windowRef; - int m_originX; - int m_originY; - wxMacCFRefHolder m_clipRgn; - bool m_releaseContext; - CGPathDrawingMode m_mode; - ATSUStyle m_macATSUIStyle; - wxPen m_pen; - wxBrush m_brush; - wxFont m_font; - wxColor m_textForegroundColor; -}; + CGContextSetLineDash( cg , 0 , m_lengths , m_count ); + CGContextSetLineCap( cg , m_cap ); + + if ( m_isPattern ) + { + CGAffineTransform matrix = CGContextGetCTM( cg ); + CGContextSetPatternPhase( cg, CGSizeMake(matrix.tx, matrix.ty) ); + CGContextSetStrokeColorSpace( cg , m_colorSpace ); + CGContextSetStrokePattern( cg, m_pattern , m_patternColorComponents ); + } + else + { + if ( context->GetLogicalFunction() == wxINVERT || context->GetLogicalFunction() == wxXOR ) + { + CGContextSetRGBStrokeColor( cg , 1.0, 1.0 , 1.0, 1.0 ); + } + else + CGContextSetStrokeColorWithColor( cg , m_color ); + } +} -//----------------------------------------------------------------------------- -// device context implementation // -// more and more of the dc functionality should be implemented by calling -// the appropricate wxMacCoreGraphicsContext, but we will have to do that step by step -// also coordinate conversions should be moved to native matrix ops -//----------------------------------------------------------------------------- +// Brush +// -// we always stock two context states, one at entry, to be able to preserve the -// state we were called with, the other one after changing to HI Graphics orientation -// (this one is used for getting back clippings etc) +static const char *gs_stripedback_xpm[] = { +/* columns rows colors chars-per-pixel */ +"4 4 2 1", +". c #F0F0F0", +"X c #ECECEC", +/* pixels */ +"....", +"....", +"XXXX", +"XXXX" +}; -//----------------------------------------------------------------------------- -// wxGraphicsContext implementation -//----------------------------------------------------------------------------- +wxBitmap gs_stripedback_bmp( wxImage( (const char* const* ) gs_stripedback_xpm ), -1 ) ; -IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsContext, wxGraphicsContext) +// make sure we all use one class for all conversions from wx to native colour -void wxMacCoreGraphicsContext::Init() +class wxMacCoreGraphicsColour { - m_cgContext = NULL; - m_mode = kCGPathFill; - m_macATSUIStyle = NULL; - m_releaseContext = false; - m_clipRgn.Set(HIShapeCreateEmpty()); -} + public: + wxMacCoreGraphicsColour(); + wxMacCoreGraphicsColour(const wxBrush &brush); + ~wxMacCoreGraphicsColour(); + + void Apply( CGContextRef cgContext ); + protected: + void Init(); + wxMacCFRefHolder m_color; + wxMacCFRefHolder m_colorSpace; + + bool m_isPattern; + wxMacCFRefHolder m_pattern; + CGFloat* m_patternColorComponents; +} ; -wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( CGContextRef cgcontext ) +wxMacCoreGraphicsColour::~wxMacCoreGraphicsColour() { - Init(); - m_cgContext = cgcontext; - CGContextSaveGState( m_cgContext ); - CGContextSaveGState( m_cgContext ); + delete[] m_patternColorComponents; } -wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( WindowRef window ) +void wxMacCoreGraphicsColour::Init() { - Init(); - m_windowRef = window; + m_isPattern = false; + m_patternColorComponents = NULL; } -wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxWindow* window ) +void wxMacCoreGraphicsColour::Apply( CGContextRef cgContext ) { - Init(); - m_windowRef = (WindowRef) window->MacGetTopLevelWindowRef(); - m_originX = m_originY = 0; - window->MacWindowToRootWindow( &m_originX , &m_originY ); + if ( m_isPattern ) + { + CGAffineTransform matrix = CGContextGetCTM( cgContext ); + CGContextSetPatternPhase( cgContext, CGSizeMake(matrix.tx, matrix.ty) ); + CGContextSetFillColorSpace( cgContext , m_colorSpace ); + CGContextSetFillPattern( cgContext, m_pattern , m_patternColorComponents ); + } + else + { + CGContextSetFillColorWithColor( cgContext, m_color ); + } } -wxMacCoreGraphicsContext::wxMacCoreGraphicsContext() +wxMacCoreGraphicsColour::wxMacCoreGraphicsColour() { - Init(); + Init(); } -wxMacCoreGraphicsContext::~wxMacCoreGraphicsContext() +wxMacCoreGraphicsColour::wxMacCoreGraphicsColour( const wxBrush &brush ) { - if ( m_cgContext ) + Init(); + if ( brush.GetStyle() == wxSOLID ) { - // TODO : when is this necessary - should we add a Flush() method ? CGContextSynchronize( m_cgContext ); - CGContextRestoreGState( m_cgContext ); - CGContextRestoreGState( m_cgContext ); + m_color.Set( brush.GetColour().CreateCGColor() ); + } + else if ( brush.IsHatch() ) + { + m_isPattern = true; + m_colorSpace.Set( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) ); + m_pattern.Set( *( new HatchPattern( brush.GetStyle() , CGAffineTransformMakeScale( 1,-1 ) ) ) ); + + m_patternColorComponents = new CGFloat[4] ; + m_patternColorComponents[0] = brush.GetColour().Red() / 255.0; + m_patternColorComponents[1] = brush.GetColour().Green() / 255.0; + m_patternColorComponents[2] = brush.GetColour().Blue() / 255.0; + m_patternColorComponents[3] = brush.GetColour().Alpha() / 255.0; + } + else + { + // now brush is a bitmap + wxBitmap* bmp = brush.GetStipple(); + if ( bmp && bmp->Ok() ) + { + m_isPattern = true; + m_patternColorComponents = new CGFloat[1] ; + m_patternColorComponents[0] = 1.0; + m_colorSpace.Set( CGColorSpaceCreatePattern( NULL ) ); + m_pattern.Set( *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) ); + } } - - if ( m_releaseContext ) - QDEndCGContext( GetWindowPort( m_windowRef ) , &m_cgContext); } -void wxMacCoreGraphicsContext::EnsureIsValid() +class wxMacCoreGraphicsBrushData : public wxGraphicsObjectRefData { - if ( !m_cgContext ) - { - OSStatus status = QDBeginCGContext( GetWindowPort( m_windowRef ) , &m_cgContext ); - wxASSERT_MSG( status == noErr , wxT("Cannot nest wxDCs on the same window") ); - Rect bounds; - GetWindowBounds( m_windowRef, kWindowContentRgn, &bounds ); - CGContextSaveGState( m_cgContext ); - CGContextTranslateCTM( m_cgContext , 0 , bounds.bottom - bounds.top ); - CGContextScaleCTM( m_cgContext , 1 , -1 ); - CGContextTranslateCTM( m_cgContext, m_originX, m_originY ); - CGContextSaveGState( m_cgContext ); - m_releaseContext = true; - if ( !HIShapeIsEmpty(m_clipRgn) ) - { - HIShapeReplacePathInCGContext( m_clipRgn, m_cgContext ); - CGContextClip( m_cgContext ); - } - } -} +public: + wxMacCoreGraphicsBrushData( wxGraphicsRenderer* renderer ); + wxMacCoreGraphicsBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush ); + ~wxMacCoreGraphicsBrushData (); + + virtual void Apply( wxGraphicsContext* context ); + void CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, + const wxColour&c1, const wxColour&c2 ); + void CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius, + const wxColour &oColor, const wxColour &cColor ); + + virtual bool IsShading() { return m_isShading; } + CGShadingRef GetShading() { return m_shading; } +protected: + CGFunctionRef CreateGradientFunction( const wxColour& c1, const wxColour& c2 ); + static void CalculateShadingValues (void *info, const CGFloat *in, CGFloat *out); + virtual void Init(); + + wxMacCoreGraphicsColour m_cgColor; + + bool m_isShading; + CGFunctionRef m_gradientFunction; + CGShadingRef m_shading; + CGFloat *m_gradientComponents; +}; +wxMacCoreGraphicsBrushData::wxMacCoreGraphicsBrushData( wxGraphicsRenderer* renderer) : wxGraphicsObjectRefData( renderer ) +{ + Init(); +} -void wxMacCoreGraphicsContext::Clip( const wxRegion ®ion ) +void wxMacCoreGraphicsBrushData::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, + const wxColour&c1, const wxColour&c2 ) { - if( m_cgContext ) - { - HIShapeRef shape = HIShapeCreateWithQDRgn( (RgnHandle) region.GetWXHRGN() ); - HIShapeReplacePathInCGContext( shape, m_cgContext ); - CGContextClip( m_cgContext ); - CFRelease( shape ); - } - else - { - m_clipRgn.Set(HIShapeCreateWithQDRgn( (RgnHandle) region.GetWXHRGN() )); - } + m_gradientFunction = CreateGradientFunction( c1, c2 ); + m_shading = CGShadingCreateAxial( wxMacGetGenericRGBColorSpace(), CGPointMake(x1,y1), CGPointMake(x2,y2), m_gradientFunction, true, true ) ; + m_isShading = true ; } -// clips drawings to the rect -void wxMacCoreGraphicsContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +void wxMacCoreGraphicsBrushData::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius, + const wxColour &oColor, const wxColour &cColor ) { - HIRect r = CGRectMake( x , y , w , h ); - if ( m_cgContext ) - { - CGContextClipToRect( m_cgContext, r ); - } - else - { - m_clipRgn.Set(HIShapeCreateWithRect(&r)); - } + m_gradientFunction = CreateGradientFunction( oColor, cColor ); + m_shading = CGShadingCreateRadial( wxMacGetGenericRGBColorSpace(), CGPointMake(xo,yo), 0, CGPointMake(xc,yc), radius, m_gradientFunction, true, true ) ; + m_isShading = true ; } - - // resets the clipping to original extent -void wxMacCoreGraphicsContext::ResetClip() + +wxMacCoreGraphicsBrushData::wxMacCoreGraphicsBrushData(wxGraphicsRenderer* renderer, const wxBrush &brush) : wxGraphicsObjectRefData( renderer ), + m_cgColor( brush ) { - if ( m_cgContext ) - { - CGContextRestoreGState( m_cgContext ); - CGContextSaveGState( m_cgContext ); - } - else - { - m_clipRgn.Set(HIShapeCreateEmpty()); - } + Init(); + } -void wxMacCoreGraphicsContext::StrokePath( const wxGraphicsPath *path ) +wxMacCoreGraphicsBrushData::~wxMacCoreGraphicsBrushData() { - EnsureIsValid(); - - int width = m_pen.GetWidth(); - if ( width == 0 ) - width = 1 ; - if ( m_pen.GetStyle() == wxTRANSPARENT ) - width = 0 ; - - bool offset = ( width % 2 ) == 1 ; + if ( m_shading ) + CGShadingRelease(m_shading); - if ( offset ) - CGContextTranslateCTM( m_cgContext, 0.5, 0.5 ); + if( m_gradientFunction ) + CGFunctionRelease(m_gradientFunction); - CGContextAddPath( m_cgContext , (CGPathRef) path->GetNativePath() ); - CGContextStrokePath( m_cgContext ); + delete[] m_gradientComponents; +} - if ( offset ) - CGContextTranslateCTM( m_cgContext, -0.5, -0.5 ); +void wxMacCoreGraphicsBrushData::Init() +{ + m_gradientFunction = NULL; + m_shading = NULL; + m_gradientComponents = NULL; + m_isShading = false; } -void wxMacCoreGraphicsContext::DrawPath( const wxGraphicsPath *path , int fillStyle ) +void wxMacCoreGraphicsBrushData::Apply( wxGraphicsContext* context ) { - EnsureIsValid(); - - CGPathDrawingMode mode = m_mode; + CGContextRef cg = (CGContextRef) context->GetNativeContext(); + + if ( m_isShading ) + { + // nothing to set as shades are processed by clipping using the path and filling + } + else + { + m_cgColor.Apply( cg ); + } +} - if ( fillStyle == wxODDEVEN_RULE ) +void wxMacCoreGraphicsBrushData::CalculateShadingValues (void *info, const CGFloat *in, CGFloat *out) +{ + CGFloat* colors = (CGFloat*) info ; + CGFloat f = *in; + for( int i = 0 ; i < 4 ; ++i ) { - if ( mode == kCGPathFill ) - mode = kCGPathEOFill; - else if ( mode == kCGPathFillStroke ) - mode = kCGPathEOFillStroke; + out[i] = colors[i] + ( colors[4+i] - colors[i] ) * f; } +} - int width = m_pen.GetWidth(); - if ( width == 0 ) - width = 1 ; - if ( m_pen.GetStyle() == wxTRANSPARENT ) - width = 0 ; - - bool offset = ( width % 2 ) == 1 ; +CGFunctionRef wxMacCoreGraphicsBrushData::CreateGradientFunction( const wxColour& c1, const wxColour& c2 ) +{ + static const CGFunctionCallbacks callbacks = { 0, &CalculateShadingValues, NULL }; + static const CGFloat input_value_range [2] = { 0, 1 }; + static const CGFloat output_value_ranges [8] = { 0, 1, 0, 1, 0, 1, 0, 1 }; + m_gradientComponents = new CGFloat[8] ; + m_gradientComponents[0] = c1.Red() / 255.0; + m_gradientComponents[1] = c1.Green() / 255.0; + m_gradientComponents[2] = c1.Blue() / 255.0; + m_gradientComponents[3] = c1.Alpha() / 255.0; + m_gradientComponents[4] = c2.Red() / 255.0; + m_gradientComponents[5] = c2.Green() / 255.0; + m_gradientComponents[6] = c2.Blue() / 255.0; + m_gradientComponents[7] = c2.Alpha() / 255.0; + + return CGFunctionCreate ( m_gradientComponents, 1, + input_value_range, + 4, + output_value_ranges, + &callbacks); +} - if ( offset ) - CGContextTranslateCTM( m_cgContext, 0.5, 0.5 ); +// +// Font +// - CGContextAddPath( m_cgContext , (CGPathRef) path->GetNativePath() ); - CGContextDrawPath( m_cgContext , mode ); +class wxMacCoreGraphicsFontData : public wxGraphicsObjectRefData +{ +public: + wxMacCoreGraphicsFontData( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col ); + ~wxMacCoreGraphicsFontData(); - if ( offset ) - CGContextTranslateCTM( m_cgContext, -0.5, -0.5 ); -} +#if wxMAC_USE_ATSU_TEXT + virtual ATSUStyle GetATSUStyle() { return m_macATSUIStyle; } +#endif +#if wxMAC_USE_CORE_TEXT + CTFontRef GetCTFont() const { return m_ctFont ; } +#endif + wxColour GetColour() const { return m_colour ; } + + bool GetUnderlined() const { return m_underlined ; } +private : + wxColour m_colour; + bool m_underlined; +#if wxMAC_USE_ATSU_TEXT + ATSUStyle m_macATSUIStyle; +#endif +#if wxMAC_USE_CORE_TEXT + wxCFRef< CTFontRef > m_ctFont; +#endif +}; -void wxMacCoreGraphicsContext::FillPath( const wxGraphicsPath *path , int fillStyle ) +wxMacCoreGraphicsFontData::wxMacCoreGraphicsFontData(wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col) : wxGraphicsObjectRefData( renderer ) { - EnsureIsValid(); - - CGContextAddPath( m_cgContext , (CGPathRef) path->GetNativePath() ); - if ( fillStyle == wxODDEVEN_RULE ) - CGContextEOFillPath( m_cgContext ); - else - CGContextFillPath( m_cgContext ); + m_colour = col; + m_underlined = font.GetUnderlined(); + +#if wxMAC_USE_CORE_TEXT + m_ctFont.reset( wxCFRetain((CTFontRef) font.MacGetCTFont()) ); +#endif +#if wxMAC_USE_ATSU_TEXT + OSStatus status = noErr; + m_macATSUIStyle = NULL; + + status = ATSUCreateAndCopyStyle( (ATSUStyle) font.MacGetATSUStyle() , &m_macATSUIStyle ); + + wxASSERT_MSG( status == noErr, wxT("couldn't create ATSU style") ); + + // we need the scale here ... + + Fixed atsuSize = IntToFixed( int( 1 * font.MacGetFontSize()) ); + RGBColor atsuColor ; + col.GetRGBColor( &atsuColor ); + ATSUAttributeTag atsuTags[] = + { + kATSUSizeTag , + kATSUColorTag , + }; + ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = + { + sizeof( Fixed ) , + sizeof( RGBColor ) , + }; + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = + { + &atsuSize , + &atsuColor , + }; + + status = ::ATSUSetAttributes( + m_macATSUIStyle, sizeof(atsuTags) / sizeof(ATSUAttributeTag) , + atsuTags, atsuSizes, atsuValues); + + wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ); +#endif +#if wxMAC_USE_CG_TEXT +#endif } -wxGraphicsPath* wxMacCoreGraphicsContext::CreatePath() +wxMacCoreGraphicsFontData::~wxMacCoreGraphicsFontData() { - return new wxMacCoreGraphicsPath(); +#if wxMAC_USE_CORE_TEXT +#endif +#if wxMAC_USE_ATSU_TEXT + if ( m_macATSUIStyle ) + { + ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle); + m_macATSUIStyle = NULL; + } +#endif +#if wxMAC_USE_CG_TEXT +#endif } -void wxMacCoreGraphicsContext::SetNativeContext( CGContextRef cg ) +// +// Graphics Matrix +// + +//----------------------------------------------------------------------------- +// wxMacCoreGraphicsMatrix declaration +//----------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxMacCoreGraphicsMatrixData : public wxGraphicsMatrixData { - // we allow either setting or clearing but not replacing - wxASSERT( m_cgContext == NULL || cg == NULL ); +public : + wxMacCoreGraphicsMatrixData(wxGraphicsRenderer* renderer) ; - if ( cg ) - CGContextSaveGState( cg ); - m_cgContext = cg; + virtual ~wxMacCoreGraphicsMatrixData() ; + + virtual wxGraphicsObjectRefData *Clone() const ; + + // concatenates the matrix + virtual void Concat( const wxGraphicsMatrixData *t ); + + // sets the matrix to the respective values + virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, + wxDouble tx=0.0, wxDouble ty=0.0); + + // gets the component valuess of the matrix + virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL, + wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const; + + // makes this the inverse matrix + virtual void Invert(); + + // returns true if the elements of the transformation matrix are equal ? + virtual bool IsEqual( const wxGraphicsMatrixData* t) const ; + + // return true if this is the identity matrix + virtual bool IsIdentity() const; + + // + // transformation + // + + // add the translation to this matrix + virtual void Translate( wxDouble dx , wxDouble dy ); + + // add the scale to this matrix + virtual void Scale( wxDouble xScale , wxDouble yScale ); + + // add the rotation to this matrix (radians) + virtual void Rotate( wxDouble angle ); + + // + // apply the transforms + // + + // applies that matrix to the point + virtual void TransformPoint( wxDouble *x, wxDouble *y ) const; + + // applies the matrix except for translations + virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const; + + // returns the native representation + virtual void * GetNativeMatrix() const; + +private : + CGAffineTransform m_matrix; +} ; + +//----------------------------------------------------------------------------- +// wxMacCoreGraphicsMatrix implementation +//----------------------------------------------------------------------------- + +wxMacCoreGraphicsMatrixData::wxMacCoreGraphicsMatrixData(wxGraphicsRenderer* renderer) : wxGraphicsMatrixData(renderer) +{ } -void wxMacCoreGraphicsContext::Translate( wxDouble dx , wxDouble dy ) +wxMacCoreGraphicsMatrixData::~wxMacCoreGraphicsMatrixData() { - EnsureIsValid(); - - CGContextTranslateCTM( m_cgContext, dx, dy ); } -void wxMacCoreGraphicsContext::Scale( wxDouble xScale , wxDouble yScale ) +wxGraphicsObjectRefData *wxMacCoreGraphicsMatrixData::Clone() const { - EnsureIsValid(); - - CGContextScaleCTM( m_cgContext , xScale , yScale ); + wxMacCoreGraphicsMatrixData* m = new wxMacCoreGraphicsMatrixData(GetRenderer()) ; + m->m_matrix = m_matrix ; + return m; } -void wxMacCoreGraphicsContext::Rotate( wxDouble angle ) +// concatenates the matrix +void wxMacCoreGraphicsMatrixData::Concat( const wxGraphicsMatrixData *t ) { - EnsureIsValid(); - - CGContextRotateCTM( m_cgContext , angle ); + m_matrix = CGAffineTransformConcat(m_matrix, *((CGAffineTransform*) t->GetNativeMatrix()) ); } -void wxMacCoreGraphicsContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +// sets the matrix to the respective values +void wxMacCoreGraphicsMatrixData::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d, + wxDouble tx, wxDouble ty) { - EnsureIsValid(); - - CGImageRef image = (CGImageRef)( bmp.CGImageCreate() ); - HIRect r = CGRectMake( x , y , w , h ); - HIViewDrawCGImage( m_cgContext , &r , image ); - CGImageRelease( image ); + m_matrix = CGAffineTransformMake(a,b,c,d,tx,ty); } -void wxMacCoreGraphicsContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +// gets the component valuess of the matrix +void wxMacCoreGraphicsMatrixData::Get(wxDouble* a, wxDouble* b, wxDouble* c, + wxDouble* d, wxDouble* tx, wxDouble* ty) const { - EnsureIsValid(); - - CGRect r = CGRectMake( 00 , 00 , w , h ); - CGContextSaveGState( m_cgContext ); - CGContextTranslateCTM( m_cgContext, x , y + h ); - CGContextScaleCTM( m_cgContext, 1, -1 ); - PlotIconRefInContext( m_cgContext , &r , kAlignNone , kTransformNone , - NULL , kPlotIconRefNormalFlags , MAC_WXHICON( icon.GetHICON() ) ); - CGContextRestoreGState( m_cgContext ); + if (a) *a = m_matrix.a; + if (b) *b = m_matrix.b; + if (c) *c = m_matrix.c; + if (d) *d = m_matrix.d; + if (tx) *tx= m_matrix.tx; + if (ty) *ty= m_matrix.ty; } -void wxMacCoreGraphicsContext::PushState() +// makes this the inverse matrix +void wxMacCoreGraphicsMatrixData::Invert() { - EnsureIsValid(); - - CGContextSaveGState( m_cgContext ); + m_matrix = CGAffineTransformInvert( m_matrix ); } -void wxMacCoreGraphicsContext::PopState() +// returns true if the elements of the transformation matrix are equal ? +bool wxMacCoreGraphicsMatrixData::IsEqual( const wxGraphicsMatrixData* t) const { - EnsureIsValid(); - - CGContextRestoreGState( m_cgContext ); + return CGAffineTransformEqualToTransform(m_matrix, *((CGAffineTransform*) t->GetNativeMatrix())); } -void wxMacCoreGraphicsContext::SetTextColor( const wxColour &col ) +// return true if this is the identity matrix +bool wxMacCoreGraphicsMatrixData::IsIdentity() const { - m_textForegroundColor = col; - // to recreate the native font after color change - SetFont( m_font ); + return ( m_matrix.a == 1 && m_matrix.d == 1 && + m_matrix.b == 0 && m_matrix.d == 0 && m_matrix.tx == 0 && m_matrix.ty == 0); } -#pragma mark - -#pragma mark wxMacCoreGraphicsPattern, ImagePattern, HatchPattern classes +// +// transformation +// -// CGPattern wrapper class: always allocate on heap, never call destructor +// add the translation to this matrix +void wxMacCoreGraphicsMatrixData::Translate( wxDouble dx , wxDouble dy ) +{ + m_matrix = CGAffineTransformTranslate( m_matrix, dx, dy); +} -class wxMacCoreGraphicsPattern +// add the scale to this matrix +void wxMacCoreGraphicsMatrixData::Scale( wxDouble xScale , wxDouble yScale ) { -public : - wxMacCoreGraphicsPattern() {} + m_matrix = CGAffineTransformScale( m_matrix, xScale, yScale); +} - // is guaranteed to be called only with a non-Null CGContextRef - virtual void Render( CGContextRef ctxRef ) = 0; +// add the rotation to this matrix (radians) +void wxMacCoreGraphicsMatrixData::Rotate( wxDouble angle ) +{ + m_matrix = CGAffineTransformRotate( m_matrix, angle); +} - operator CGPatternRef() const { return m_patternRef; } +// +// apply the transforms +// -protected : - virtual ~wxMacCoreGraphicsPattern() - { - // as this is called only when the m_patternRef is been released; - // don't release it again +// applies that matrix to the point +void wxMacCoreGraphicsMatrixData::TransformPoint( wxDouble *x, wxDouble *y ) const +{ + CGPoint pt = CGPointApplyAffineTransform( CGPointMake(*x,*y), m_matrix); + + *x = pt.x; + *y = pt.y; +} + +// applies the matrix except for translations +void wxMacCoreGraphicsMatrixData::TransformDistance( wxDouble *dx, wxDouble *dy ) const +{ + CGSize sz = CGSizeApplyAffineTransform( CGSizeMake(*dx,*dy) , m_matrix ); + *dx = sz.width; + *dy = sz.height; +} + +// returns the native representation +void * wxMacCoreGraphicsMatrixData::GetNativeMatrix() const +{ + return (void*) &m_matrix; +} + +// +// Graphics Path +// + +//----------------------------------------------------------------------------- +// wxMacCoreGraphicsPath declaration +//----------------------------------------------------------------------------- + +class WXDLLEXPORT wxMacCoreGraphicsPathData : public wxGraphicsPathData +{ +public : + wxMacCoreGraphicsPathData( wxGraphicsRenderer* renderer, CGMutablePathRef path = NULL); + + ~wxMacCoreGraphicsPathData(); + + virtual wxGraphicsObjectRefData *Clone() const; + + // begins a new subpath at (x,y) + virtual void MoveToPoint( wxDouble x, wxDouble y ); + + // adds a straight line from the current point to (x,y) + virtual void AddLineToPoint( wxDouble x, wxDouble y ); + + // adds a cubic Bezier curve from the current point, using two control points and an end point + virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ); + + // closes the current sub-path + virtual void CloseSubpath(); + + // gets the last point of the current path, (0,0) if not yet set + virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const; + + // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle + virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ); + + // + // These are convenience functions which - if not available natively will be assembled + // using the primitives from above + // + + // adds a quadratic Bezier curve from the current point, using a control point and an end point + virtual void AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y ); + + // appends a rectangle as a new closed subpath + virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ); + + // appends an ellipsis as a new closed subpath fitting the passed rectangle + virtual void AddCircle( wxDouble x, wxDouble y, wxDouble r ); + + // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1) + virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ); + + // adds another path + virtual void AddPath( const wxGraphicsPathData* path ); + + // returns the native path + virtual void * GetNativePath() const { return m_path; } + + // give the native path returned by GetNativePath() back (there might be some deallocations necessary) + virtual void UnGetNativePath(void *WXUNUSED(p)) const {} + + // transforms each point of this path by the matrix + virtual void Transform( const wxGraphicsMatrixData* matrix ); + + // gets the bounding box enclosing all points (possibly including control points) + virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *y) const; + + virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE) const; +private : + CGMutablePathRef m_path; +}; + +//----------------------------------------------------------------------------- +// wxMacCoreGraphicsPath implementation +//----------------------------------------------------------------------------- + +wxMacCoreGraphicsPathData::wxMacCoreGraphicsPathData( wxGraphicsRenderer* renderer, CGMutablePathRef path) : wxGraphicsPathData(renderer) +{ + if ( path ) + m_path = path; + else + m_path = CGPathCreateMutable(); +} + +wxMacCoreGraphicsPathData::~wxMacCoreGraphicsPathData() +{ + CGPathRelease( m_path ); +} + +wxGraphicsObjectRefData* wxMacCoreGraphicsPathData::Clone() const +{ + wxMacCoreGraphicsPathData* clone = new wxMacCoreGraphicsPathData(GetRenderer(),CGPathCreateMutableCopy(m_path)); + return clone ; +} + + +// opens (starts) a new subpath +void wxMacCoreGraphicsPathData::MoveToPoint( wxDouble x1 , wxDouble y1 ) +{ + CGPathMoveToPoint( m_path , NULL , x1 , y1 ); +} + +void wxMacCoreGraphicsPathData::AddLineToPoint( wxDouble x1 , wxDouble y1 ) +{ + CGPathAddLineToPoint( m_path , NULL , x1 , y1 ); +} + +void wxMacCoreGraphicsPathData::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) +{ + CGPathAddCurveToPoint( m_path , NULL , cx1 , cy1 , cx2, cy2, x , y ); +} + +void wxMacCoreGraphicsPathData::AddQuadCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble x, wxDouble y ) +{ + CGPathAddQuadCurveToPoint( m_path , NULL , cx1 , cy1 , x , y ); +} + +void wxMacCoreGraphicsPathData::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +{ + CGRect cgRect = { { x , y } , { w , h } }; + CGPathAddRect( m_path , NULL , cgRect ); +} + +void wxMacCoreGraphicsPathData::AddCircle( wxDouble x, wxDouble y , wxDouble r ) +{ + CGPathAddArc( m_path , NULL , x , y , r , 0.0 , 2 * M_PI , true ); +} + +// adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle +void wxMacCoreGraphicsPathData::AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) +{ + // inverse direction as we the 'normal' state is a y axis pointing down, ie mirrored to the standard core graphics setup + CGPathAddArc( m_path, NULL , x, y, r, startAngle, endAngle, !clockwise); +} + +void wxMacCoreGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) +{ + CGPathAddArcToPoint( m_path, NULL , x1, y1, x2, y2, r); +} + +void wxMacCoreGraphicsPathData::AddPath( const wxGraphicsPathData* path ) +{ + CGPathAddPath( m_path , NULL, (CGPathRef) path->GetNativePath() ); +} + +// closes the current subpath +void wxMacCoreGraphicsPathData::CloseSubpath() +{ + CGPathCloseSubpath( m_path ); +} + +// gets the last point of the current path, (0,0) if not yet set +void wxMacCoreGraphicsPathData::GetCurrentPoint( wxDouble* x, wxDouble* y) const +{ + CGPoint p = CGPathGetCurrentPoint( m_path ); + *x = p.x; + *y = p.y; +} + +// transforms each point of this path by the matrix +void wxMacCoreGraphicsPathData::Transform( const wxGraphicsMatrixData* matrix ) +{ + CGMutablePathRef p = CGPathCreateMutable() ; + CGPathAddPath( p, (CGAffineTransform*) matrix->GetNativeMatrix() , m_path ); + CGPathRelease( m_path ); + m_path = p; +} + +// gets the bounding box enclosing all points (possibly including control points) +void wxMacCoreGraphicsPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const +{ + CGRect bounds = CGPathGetBoundingBox( m_path ) ; + *x = bounds.origin.x; + *y = bounds.origin.y; + *w = bounds.size.width; + *h = bounds.size.height; +} + +bool wxMacCoreGraphicsPathData::Contains( wxDouble x, wxDouble y, int fillStyle) const +{ + return CGPathContainsPoint( m_path, NULL, CGPointMake(x,y), fillStyle == wxODDEVEN_RULE ); +} + +// +// Graphics Context +// + +//----------------------------------------------------------------------------- +// wxMacCoreGraphicsContext declaration +//----------------------------------------------------------------------------- + +class WXDLLEXPORT wxMacCoreGraphicsContext : public wxGraphicsContext +{ +public: + wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext, wxDouble width = 0, wxDouble height = 0 ); + + wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, WindowRef window ); + + wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, wxWindow* window ); + + wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer); + + wxMacCoreGraphicsContext(); + + ~wxMacCoreGraphicsContext(); + + void Init(); + + // returns the size of the graphics context in device coordinates + virtual void GetSize( wxDouble* width, wxDouble* height); + + virtual void StartPage( wxDouble width, wxDouble height ); + + virtual void EndPage(); + + virtual void Flush(); + + // push the current state of the context, ie the transformation matrix on a stack + virtual void PushState(); + + // pops a stored state from the stack + virtual void PopState(); + + // clips drawings to the region + virtual void Clip( const wxRegion ®ion ); + + // clips drawings to the rect + virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ); + + // resets the clipping to original extent + virtual void ResetClip(); + + virtual void * GetNativeContext(); + + bool SetLogicalFunction( int function ); + // + // transformation + // + + // translate + virtual void Translate( wxDouble dx , wxDouble dy ); + + // scale + virtual void Scale( wxDouble xScale , wxDouble yScale ); + + // rotate (radians) + virtual void Rotate( wxDouble angle ); + + // concatenates this transform with the current transform of this context + virtual void ConcatTransform( const wxGraphicsMatrix& matrix ); + + // sets the transform of this context + virtual void SetTransform( const wxGraphicsMatrix& matrix ); + + // gets the matrix of this context + virtual wxGraphicsMatrix GetTransform() const; + // + // setting the paint + // + + // strokes along a path with the current pen + virtual void StrokePath( const wxGraphicsPath &path ); + + // fills a path with the current brush + virtual void FillPath( const wxGraphicsPath &path, int fillStyle = wxODDEVEN_RULE ); + + // draws a path by first filling and then stroking + virtual void DrawPath( const wxGraphicsPath &path, int fillStyle = wxODDEVEN_RULE ); + + virtual bool ShouldOffset() const + { + int penwidth = 0 ; + if ( !m_pen.IsNull() ) + { + penwidth = (int)((wxMacCoreGraphicsPenData*)m_pen.GetRefData())->GetWidth(); + if ( penwidth == 0 ) + penwidth = 1; + } + return ( penwidth % 2 ) == 1; } + // + // text + // - static void _Render( void *info, CGContextRef ctxRef ) + virtual void DrawText( const wxString &str, wxDouble x, wxDouble y ); + + virtual void DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle ); + + virtual void GetTextExtent( const wxString &text, wxDouble *width, wxDouble *height, + wxDouble *descent, wxDouble *externalLeading ) const; + + virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const; + + // + // image support + // + + virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ); + + virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ); + + void SetNativeContext( CGContextRef cg ); + + DECLARE_NO_COPY_CLASS(wxMacCoreGraphicsContext) + DECLARE_DYNAMIC_CLASS(wxMacCoreGraphicsContext) + +private: + void EnsureIsValid(); + + CGContextRef m_cgContext; + WindowRef m_windowRef; + bool m_releaseContext; + CGAffineTransform m_windowTransform; + wxDouble m_width; + wxDouble m_height; + + wxMacCFRefHolder m_clipRgn; +}; + +//----------------------------------------------------------------------------- +// device context implementation +// +// more and more of the dc functionality should be implemented by calling +// the appropricate wxMacCoreGraphicsContext, but we will have to do that step by step +// also coordinate conversions should be moved to native matrix ops +//----------------------------------------------------------------------------- + +// we always stock two context states, one at entry, to be able to preserve the +// state we were called with, the other one after changing to HI Graphics orientation +// (this one is used for getting back clippings etc) + +//----------------------------------------------------------------------------- +// wxMacCoreGraphicsContext implementation +//----------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsContext, wxGraphicsContext) + +class wxQuartzOffsetHelper +{ +public : + wxQuartzOffsetHelper( CGContextRef cg , bool offset ) { - wxMacCoreGraphicsPattern* self = (wxMacCoreGraphicsPattern*) info; - if ( self && ctxRef ) - self->Render( ctxRef ); + m_cg = cg; + m_offset = offset; + if ( m_offset ) + CGContextTranslateCTM( m_cg, 0.5, 0.5 ); } - - static void _Dispose( void *info ) + ~wxQuartzOffsetHelper( ) { - wxMacCoreGraphicsPattern* self = (wxMacCoreGraphicsPattern*) info; - delete self; + if ( m_offset ) + CGContextTranslateCTM( m_cg, -0.5, -0.5 ); } +public : + CGContextRef m_cg; + bool m_offset; +} ; - CGPatternRef m_patternRef; +void wxMacCoreGraphicsContext::Init() +{ + m_cgContext = NULL; + m_releaseContext = false; + m_windowRef = NULL; + m_width = 0; + m_height = 0; - static const CGPatternCallbacks ms_Callbacks; -}; + HIRect r = CGRectMake(0,0,0,0); + m_clipRgn.Set(HIShapeCreateWithRect(&r)); +} -const CGPatternCallbacks wxMacCoreGraphicsPattern::ms_Callbacks = { 0, &wxMacCoreGraphicsPattern::_Render, &wxMacCoreGraphicsPattern::_Dispose }; +wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext, wxDouble width, wxDouble height ) : wxGraphicsContext(renderer) +{ + Init(); + SetNativeContext(cgcontext); + m_width = width; + m_height = height; +} -class ImagePattern : public wxMacCoreGraphicsPattern +wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, WindowRef window ): wxGraphicsContext(renderer) { -public : - ImagePattern( const wxBitmap* bmp , const CGAffineTransform& transform ) + Init(); + m_windowRef = window; +} + +wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, wxWindow* window ): wxGraphicsContext(renderer) +{ + Init(); + m_windowRef = (WindowRef) window->MacGetTopLevelWindowRef(); + int originX , originY; + originX = originY = 0; + window->MacWindowToRootWindow( &originX , &originY ); + + Rect bounds = { 0,0,0,0 }; +#ifdef __LP64__ +#else + GetWindowBounds( m_windowRef, kWindowContentRgn, &bounds ); +#endif + m_windowTransform = CGAffineTransformMakeTranslation( 0 , bounds.bottom - bounds.top ); + m_windowTransform = CGAffineTransformScale( m_windowTransform , 1 , -1 ); + m_windowTransform = CGAffineTransformTranslate( m_windowTransform, originX, originY ) ; +} + +wxMacCoreGraphicsContext::wxMacCoreGraphicsContext(wxGraphicsRenderer* renderer) : wxGraphicsContext(renderer) +{ + Init(); +} + +wxMacCoreGraphicsContext::wxMacCoreGraphicsContext() : wxGraphicsContext(NULL) +{ + Init(); + wxLogDebug(wxT("Illegal Constructor called")); +} + +wxMacCoreGraphicsContext::~wxMacCoreGraphicsContext() +{ + SetNativeContext(NULL); +} + +void wxMacCoreGraphicsContext::GetSize( wxDouble* width, wxDouble* height) +{ + *width = m_width; + *height = m_height; +} + + +void wxMacCoreGraphicsContext::StartPage( wxDouble width, wxDouble height ) +{ + CGRect r; + if ( width != 0 && height != 0) + r = CGRectMake( 0 , 0 , width , height ); + else + r = CGRectMake( 0 , 0 , m_width , m_height ); + + CGContextBeginPage(m_cgContext, &r ); +// CGContextTranslateCTM( m_cgContext , 0 , height == 0 ? m_height : height ); +// CGContextScaleCTM( m_cgContext , 1 , -1 ); +} + +void wxMacCoreGraphicsContext::EndPage() +{ + CGContextEndPage(m_cgContext); +} + +void wxMacCoreGraphicsContext::Flush() +{ + CGContextFlush(m_cgContext); +} + +void wxMacCoreGraphicsContext::EnsureIsValid() +{ + if ( !m_cgContext ) + { + OSStatus status = +#ifndef __LP64__ + QDBeginCGContext( GetWindowPort( m_windowRef ) , &m_cgContext ); +#else + paramErr; +#endif + wxASSERT_MSG( status == noErr , wxT("Cannot nest wxDCs on the same window") ); + + CGContextConcatCTM( m_cgContext, m_windowTransform ); + CGContextSaveGState( m_cgContext ); + m_releaseContext = true; + if ( !HIShapeIsEmpty(m_clipRgn) ) + { + // the clip region is in device coordinates, so we convert this again to user coordinates + wxMacCFRefHolder hishape ; + hishape.Set( HIShapeCreateMutableCopy( m_clipRgn ) ); + CGPoint transformedOrigin = CGPointApplyAffineTransform( CGPointZero,m_windowTransform); + HIShapeOffset( hishape, -transformedOrigin.x, -transformedOrigin.y ); + HIShapeReplacePathInCGContext( hishape, m_cgContext ); + CGContextClip( m_cgContext ); + } + CGContextSaveGState( m_cgContext ); + } +} + +// TODO test whether the private CGContextSetCompositeOperation works under 10.3 (using NSCompositingModes) + +bool wxMacCoreGraphicsContext::SetLogicalFunction( int function ) +{ + if (m_logicalFunction == function) + return true; + + EnsureIsValid(); + + bool retval = false; + + if ( function == wxCOPY ) + { + retval = true; + CGContextSetBlendMode( m_cgContext, kCGBlendModeNormal ); + } + else if ( function == wxINVERT || function == wxXOR ) + { + // change color to white + CGContextSetBlendMode( m_cgContext, kCGBlendModeExclusion ); + CGContextSetShouldAntialias( m_cgContext, false ); + retval = true; + } + + if (retval) + m_logicalFunction = function; + return retval ; +} + +void wxMacCoreGraphicsContext::Clip( const wxRegion ®ion ) +{ + if( m_cgContext ) + { + HIShapeReplacePathInCGContext( region.GetWXHRGN() , m_cgContext ); + CGContextClip( m_cgContext ); + } + else + { + // this offsetting to device coords is not really correct, but since we cannot apply affine transforms + // to regions we try at least to have correct translations + HIMutableShapeRef mutableShape = HIShapeCreateMutableCopy( region.GetWXHRGN() ); + + CGPoint transformedOrigin = CGPointApplyAffineTransform( CGPointZero, m_windowTransform ); + HIShapeOffset( mutableShape, transformedOrigin.x, transformedOrigin.y ); + m_clipRgn.Set(mutableShape); + } +} + +// clips drawings to the rect +void wxMacCoreGraphicsContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +{ + HIRect r = CGRectMake( x , y , w , h ); + if ( m_cgContext ) { - wxASSERT( bmp && bmp->Ok() ); - - Init( (CGImageRef) bmp->CGImageCreate() , transform ); + CGContextClipToRect( m_cgContext, r ); } - - // ImagePattern takes ownership of CGImageRef passed in - ImagePattern( CGImageRef image , const CGAffineTransform& transform ) + else { - if ( image ) - CFRetain( image ); - - Init( image , transform ); + // the clipping itself must be stored as device coordinates, otherwise + // we cannot apply it back correctly + r.origin= CGPointApplyAffineTransform( r.origin, m_windowTransform ); + m_clipRgn.Set(HIShapeCreateWithRect(&r)); } +} - virtual void Render( CGContextRef ctxRef ) + // resets the clipping to original extent +void wxMacCoreGraphicsContext::ResetClip() +{ + if ( m_cgContext ) { - if (m_image != NULL) - HIViewDrawCGImage( ctxRef, &m_imageBounds, m_image ); + // there is no way for clearing the clip, we can only revert to the stored + // state, but then we have to make sure everything else is NOT restored + CGAffineTransform transform = CGContextGetCTM( m_cgContext ); + CGContextRestoreGState( m_cgContext ); + CGContextSaveGState( m_cgContext ); + CGAffineTransform transformNew = CGContextGetCTM( m_cgContext ); + transformNew = CGAffineTransformInvert( transformNew ) ; + CGContextConcatCTM( m_cgContext, transformNew); + CGContextConcatCTM( m_cgContext, transform); } - -protected : - void Init( CGImageRef image, const CGAffineTransform& transform ) + else { - m_image = image; - if ( m_image ) - { - m_imageBounds = CGRectMake( 0.0, 0.0, (CGFloat)CGImageGetWidth( m_image ), (CGFloat)CGImageGetHeight( m_image ) ); - m_patternRef = CGPatternCreate( - this , m_imageBounds, transform , - m_imageBounds.size.width, m_imageBounds.size.height, - kCGPatternTilingNoDistortion, true , &wxMacCoreGraphicsPattern::ms_Callbacks ); - } + HIRect r = CGRectMake(0,0,0,0); + m_clipRgn.Set(HIShapeCreateWithRect(&r)); } +} - virtual ~ImagePattern() - { - if ( m_image ) - CGImageRelease( m_image ); - } +void wxMacCoreGraphicsContext::StrokePath( const wxGraphicsPath &path ) +{ + if ( m_pen.IsNull() ) + return ; - CGImageRef m_image; - CGRect m_imageBounds; -}; + EnsureIsValid(); -class HatchPattern : public wxMacCoreGraphicsPattern + wxQuartzOffsetHelper helper( m_cgContext , ShouldOffset() ); + + ((wxMacCoreGraphicsPenData*)m_pen.GetRefData())->Apply(this); + CGContextAddPath( m_cgContext , (CGPathRef) path.GetNativePath() ); + CGContextStrokePath( m_cgContext ); +} + +void wxMacCoreGraphicsContext::DrawPath( const wxGraphicsPath &path , int fillStyle ) { -public : - HatchPattern( int hatchstyle, const CGAffineTransform& transform ) + if ( !m_brush.IsNull() && ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->IsShading() ) { - m_hatch = hatchstyle; - m_imageBounds = CGRectMake( 0.0, 0.0, 8.0 , 8.0 ); - m_patternRef = CGPatternCreate( - this , m_imageBounds, transform , - m_imageBounds.size.width, m_imageBounds.size.height, - kCGPatternTilingNoDistortion, false , &wxMacCoreGraphicsPattern::ms_Callbacks ); + // when using shading, we cannot draw pen and brush at the same time + // revert to the base implementation of first filling and then stroking + wxGraphicsContext::DrawPath( path, fillStyle ); + return; } - void StrokeLineSegments( CGContextRef ctxRef , const CGPoint pts[] , size_t count ) + CGPathDrawingMode mode = kCGPathFill ; + if ( m_brush.IsNull() ) + { + if ( m_pen.IsNull() ) + return; + else + mode = kCGPathStroke; + } + else { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if ( UMAGetSystemVersion() >= 0x1040 ) + if ( m_pen.IsNull() ) { - CGContextStrokeLineSegments( ctxRef , pts , count ); + if ( fillStyle == wxODDEVEN_RULE ) + mode = kCGPathEOFill; + else + mode = kCGPathFill; } else -#endif { - CGContextBeginPath( ctxRef ); - for (size_t i = 0; i < count; i += 2) - { - CGContextMoveToPoint(ctxRef, pts[i].x, pts[i].y); - CGContextAddLineToPoint(ctxRef, pts[i+1].x, pts[i+1].y); - } - CGContextStrokePath(ctxRef); + if ( fillStyle == wxODDEVEN_RULE ) + mode = kCGPathEOFillStroke; + else + mode = kCGPathFillStroke; } } - virtual void Render( CGContextRef ctxRef ) - { - switch ( m_hatch ) - { - case wxBDIAGONAL_HATCH : - { - CGPoint pts[] = - { - { 8.0 , 0.0 } , { 0.0 , 8.0 } - }; - StrokeLineSegments( ctxRef , pts , 2 ); - } - break; + EnsureIsValid(); - case wxCROSSDIAG_HATCH : - { - CGPoint pts[] = - { - { 0.0 , 0.0 } , { 8.0 , 8.0 } , - { 8.0 , 0.0 } , { 0.0 , 8.0 } - }; - StrokeLineSegments( ctxRef , pts , 4 ); - } - break; + if ( !m_brush.IsNull() ) + ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->Apply(this); + if ( !m_pen.IsNull() ) + ((wxMacCoreGraphicsPenData*)m_pen.GetRefData())->Apply(this); - case wxFDIAGONAL_HATCH : - { - CGPoint pts[] = - { - { 0.0 , 0.0 } , { 8.0 , 8.0 } - }; - StrokeLineSegments( ctxRef , pts , 2 ); - } - break; + wxQuartzOffsetHelper helper( m_cgContext , ShouldOffset() ); - case wxCROSS_HATCH : - { - CGPoint pts[] = - { - { 0.0 , 4.0 } , { 8.0 , 4.0 } , - { 4.0 , 0.0 } , { 4.0 , 8.0 } , - }; - StrokeLineSegments( ctxRef , pts , 4 ); - } - break; + CGContextAddPath( m_cgContext , (CGPathRef) path.GetNativePath() ); + CGContextDrawPath( m_cgContext , mode ); +} - case wxHORIZONTAL_HATCH : - { - CGPoint pts[] = - { - { 0.0 , 4.0 } , { 8.0 , 4.0 } , - }; - StrokeLineSegments( ctxRef , pts , 2 ); - } - break; +void wxMacCoreGraphicsContext::FillPath( const wxGraphicsPath &path , int fillStyle ) +{ + if ( m_brush.IsNull() ) + return; - case wxVERTICAL_HATCH : - { - CGPoint pts[] = - { - { 4.0 , 0.0 } , { 4.0 , 8.0 } , - }; - StrokeLineSegments( ctxRef , pts , 2 ); - } - break; + EnsureIsValid(); - default: - break; - } + if ( ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->IsShading() ) + { + CGContextSaveGState( m_cgContext ); + CGContextAddPath( m_cgContext , (CGPathRef) path.GetNativePath() ); + CGContextClip( m_cgContext ); + CGContextDrawShading( m_cgContext, ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->GetShading() ); + CGContextRestoreGState( m_cgContext); } + else + { + ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->Apply(this); + CGContextAddPath( m_cgContext , (CGPathRef) path.GetNativePath() ); + if ( fillStyle == wxODDEVEN_RULE ) + CGContextEOFillPath( m_cgContext ); + else + CGContextFillPath( m_cgContext ); + } +} -protected : - virtual ~HatchPattern() {} - - CGRect m_imageBounds; - int m_hatch; -}; +void wxMacCoreGraphicsContext::SetNativeContext( CGContextRef cg ) +{ + // we allow either setting or clearing but not replacing + wxASSERT( m_cgContext == NULL || cg == NULL ); -#pragma mark - + if ( m_cgContext ) + { + // TODO : when is this necessary - should we add a Flush() method ? CGContextSynchronize( m_cgContext ); + CGContextRestoreGState( m_cgContext ); + CGContextRestoreGState( m_cgContext ); + if ( m_releaseContext ) + { +#ifndef __LP64__ + QDEndCGContext( GetWindowPort( m_windowRef ) , &m_cgContext); +#endif + } + else + CGContextRelease(m_cgContext); + } -void wxMacCoreGraphicsContext::SetPen( const wxPen &pen ) -{ - m_pen = pen; - if ( m_cgContext == NULL ) - return; - bool fill = m_brush.GetStyle() != wxTRANSPARENT; - bool stroke = pen.GetStyle() != wxTRANSPARENT; + m_cgContext = cg; -#if 0 - // we can benchmark performance; should go into a setting eventually - CGContextSetShouldAntialias( m_cgContext , false ); -#endif + // FIXME: This check is needed because currently we need to use a DC/GraphicsContext + // in order to get font properties, like wxFont::GetPixelSize, but since we don't have + // a native window attached to use, I create a wxGraphicsContext with a NULL CGContextRef + // for this one operation. - if ( fill || stroke ) + // When wxFont::GetPixelSize on Mac no longer needs a graphics context, this check + // can be removed. + if (m_cgContext) { - // set up brushes - m_mode = kCGPathFill; // just a default - - if ( stroke ) - { - CGContextSetRGBStrokeColor( m_cgContext , pen.GetColour().Red() / 255.0 , pen.GetColour().Green() / 255.0 , - pen.GetColour().Blue() / 255.0 , pen.GetColour().Alpha() / 255.0 ); + CGContextRetain(m_cgContext); + CGContextSaveGState( m_cgContext ); + CGContextSaveGState( m_cgContext ); + m_releaseContext = false; + } +} - // TODO: * m_dc->m_scaleX - CGFloat penWidth = pen.GetWidth(); - if (penWidth <= 0.0) - penWidth = 0.1; - CGContextSetLineWidth( m_cgContext , penWidth ); +void wxMacCoreGraphicsContext::Translate( wxDouble dx , wxDouble dy ) +{ + if ( m_cgContext ) + CGContextTranslateCTM( m_cgContext, dx, dy ); + else + m_windowTransform = CGAffineTransformTranslate(m_windowTransform,dx,dy); +} - CGLineCap cap; - switch ( pen.GetCap() ) - { - case wxCAP_ROUND : - cap = kCGLineCapRound; - break; +void wxMacCoreGraphicsContext::Scale( wxDouble xScale , wxDouble yScale ) +{ + if ( m_cgContext ) + CGContextScaleCTM( m_cgContext , xScale , yScale ); + else + m_windowTransform = CGAffineTransformScale(m_windowTransform,xScale,yScale); +} - case wxCAP_PROJECTING : - cap = kCGLineCapSquare; - break; +void wxMacCoreGraphicsContext::Rotate( wxDouble angle ) +{ + if ( m_cgContext ) + CGContextRotateCTM( m_cgContext , angle ); + else + m_windowTransform = CGAffineTransformRotate(m_windowTransform,angle); +} - case wxCAP_BUTT : - cap = kCGLineCapButt; - break; +void wxMacCoreGraphicsContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +{ + EnsureIsValid(); - default : - cap = kCGLineCapButt; - break; + CGImageRef image = (CGImageRef)( bmp.CreateCGImage() ); + HIRect r = CGRectMake( x , y , w , h ); + if ( bmp.GetDepth() == 1 ) + { + // is is a mask, the '1' in the mask tell where to draw the current brush + if ( !m_brush.IsNull() ) + { + if ( ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->IsShading() ) + { + // TODO clip to mask + /* + CGContextSaveGState( m_cgContext ); + CGContextAddPath( m_cgContext , (CGPathRef) path.GetNativePath() ); + CGContextClip( m_cgContext ); + CGContextDrawShading( m_cgContext, ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->GetShading() ); + CGContextRestoreGState( m_cgContext); + */ } - - CGLineJoin join; - switch ( pen.GetJoin() ) + else { - case wxJOIN_BEVEL : - join = kCGLineJoinBevel; - break; + ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->Apply(this); + wxMacDrawCGImage( m_cgContext , &r , image ); + } + } + } + else + { + wxMacDrawCGImage( m_cgContext , &r , image ); + } + CGImageRelease( image ); +} - case wxJOIN_MITER : - join = kCGLineJoinMiter; - break; +void wxMacCoreGraphicsContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +{ + EnsureIsValid(); - case wxJOIN_ROUND : - join = kCGLineJoinRound; - break; + CGRect r = CGRectMake( 00 , 00 , w , h ); + CGContextSaveGState( m_cgContext ); + CGContextTranslateCTM( m_cgContext, x , y + h ); + CGContextScaleCTM( m_cgContext, 1, -1 ); + PlotIconRefInContext( m_cgContext , &r , kAlignNone , kTransformNone , + NULL , kPlotIconRefNormalFlags , MAC_WXHICON( icon.GetHICON() ) ); + CGContextRestoreGState( m_cgContext ); +} - default : - join = kCGLineJoinMiter; - break; - } +void wxMacCoreGraphicsContext::PushState() +{ + EnsureIsValid(); + + CGContextSaveGState( m_cgContext ); +} - m_mode = kCGPathStroke; - int count = 0; +void wxMacCoreGraphicsContext::PopState() +{ + EnsureIsValid(); - const CGFloat *lengths = NULL; - CGFloat *userLengths = NULL; + CGContextRestoreGState( m_cgContext ); +} - const CGFloat dashUnit = penWidth < 1.0 ? 1.0 : penWidth; +void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y ) +{ + if ( m_font.IsNull() ) + return; + + EnsureIsValid(); +#if wxMAC_USE_CORE_TEXT + if ( UMAGetSystemVersion() >= 0x1050 ) + { + wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData(); + wxMacCFStringHolder text(str, wxLocale::GetSystemEncoding() ); + CTFontRef font = fref->GetCTFont(); + CGColorRef col = fref->GetColour().GetPixel(); + CTUnderlineStyle ustyle = fref->GetUnderlined() ? kCTUnderlineStyleSingle : kCTUnderlineStyleNone ; + wxCFRef underlined( CFNumberCreate(NULL, kCFNumberSInt32Type, &ustyle) ); + CFStringRef keys[] = { kCTFontAttributeName , kCTForegroundColorAttributeName, kCTUnderlineStyleAttributeName }; + CFTypeRef values[] = { font, col, underlined }; + wxCFRef attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values, + WXSIZEOF( keys ), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks) ); + wxCFRef attrtext( CFAttributedStringCreate(kCFAllocatorDefault, text, attributes) ); + wxCFRef line( CTLineCreateWithAttributedString(attrtext) ); + + y += CTFontGetAscent(font); + + CGContextSaveGState(m_cgContext); + CGContextTranslateCTM(m_cgContext, x, y); + CGContextScaleCTM(m_cgContext, 1, -1); + CGContextSetTextPosition(m_cgContext, 0, 0); + CTLineDraw( line, m_cgContext ); + CGContextRestoreGState(m_cgContext); + return; + } +#endif +#if wxMAC_USE_ATSU_TEXT + { + DrawText(str, x, y, 0.0); + return; + } +#endif +#if wxMAC_USE_CG_TEXT + // TODO core graphics text implementation here +#endif +} - const CGFloat dotted[] = { dashUnit , dashUnit + 2.0 }; - const CGFloat short_dashed[] = { 9.0 , 6.0 }; - const CGFloat dashed[] = { 19.0 , 9.0 }; - const CGFloat dotted_dashed[] = { 9.0 , 6.0 , 3.0 , 3.0 }; +void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle ) +{ + if ( m_font.IsNull() ) + return; - switch ( pen.GetStyle() ) + EnsureIsValid(); +#if wxMAC_USE_CORE_TEXT + if ( UMAGetSystemVersion() >= 0x1050 ) + { + // default implementation takes care of rotation and calls non rotated DrawText afterwards + wxGraphicsContext::DrawText( str, x, y, angle ); + return; + } +#endif +#if wxMAC_USE_ATSU_TEXT + { + OSStatus status = noErr; + ATSUTextLayout atsuLayout; + UniCharCount chars = str.length(); + UniChar* ubuf = NULL; + +#if SIZEOF_WCHAR_T == 4 + wxMBConvUTF16 converter; +#if wxUSE_UNICODE + size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ); + ubuf = (UniChar*) malloc( unicharlen + 2 ); + converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ); +#else + const wxWCharBuffer wchar = str.wc_str( wxConvLocal ); + size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ); + ubuf = (UniChar*) malloc( unicharlen + 2 ); + converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ); +#endif + chars = unicharlen / 2; +#else +#if wxUSE_UNICODE + ubuf = (UniChar*) str.wc_str(); +#else + wxWCharBuffer wchar = str.wc_str( wxConvLocal ); + chars = wxWcslen( wchar.data() ); + ubuf = (UniChar*) wchar.data(); +#endif +#endif + + ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle()); + status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , + &chars , &style , &atsuLayout ); + + wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the rotated text") ); + + status = ::ATSUSetTransientFontMatching( atsuLayout , true ); + wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") ); + + int iAngle = int( angle * RAD2DEG ); + if ( abs(iAngle) > 0 ) + { + Fixed atsuAngle = IntToFixed( iAngle ); + ATSUAttributeTag atsuTags[] = + { + kATSULineRotationTag , + }; + ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = + { + sizeof( Fixed ) , + }; + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = + { + &atsuAngle , + }; + status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag), + atsuTags, atsuSizes, atsuValues ); + } + + { + ATSUAttributeTag atsuTags[] = { - case wxSOLID : - break; - - case wxDOT : - lengths = dotted; - count = WXSIZEOF(dotted); - break; - - case wxLONG_DASH : - lengths = dashed; - count = WXSIZEOF(dashed); - break; - - case wxSHORT_DASH : - lengths = short_dashed; - count = WXSIZEOF(short_dashed); - break; - - case wxDOT_DASH : - lengths = dotted_dashed; - count = WXSIZEOF(dotted_dashed); - break; - - case wxUSER_DASH : - wxDash *dashes; - count = pen.GetDashes( &dashes ); - if ((dashes != NULL) && (count > 0)) - { - userLengths = new CGFloat[count]; - for ( int i = 0; i < count; ++i ) - { - userLengths[i] = dashes[i] * dashUnit; - - if ( i % 2 == 1 && userLengths[i] < dashUnit + 2.0 ) - userLengths[i] = dashUnit + 2.0; - else if ( i % 2 == 0 && userLengths[i] < dashUnit ) - userLengths[i] = dashUnit; - } - } - lengths = userLengths; - break; - - case wxSTIPPLE : - { - CGFloat alphaArray[1] = { 1.0 }; - wxBitmap* bmp = pen.GetStipple(); - if ( bmp && bmp->Ok() ) - { - wxMacCFRefHolder patternSpace( CGColorSpaceCreatePattern( NULL ) ); - CGContextSetStrokeColorSpace( m_cgContext , patternSpace ); - wxMacCFRefHolder pattern( *( new ImagePattern( bmp , CGContextGetCTM( m_cgContext ) ) ) ); - CGContextSetStrokePattern( m_cgContext, pattern , alphaArray ); - } - } - break; - - default : - { - wxMacCFRefHolder patternSpace( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) ); - CGContextSetStrokeColorSpace( m_cgContext , patternSpace ); - wxMacCFRefHolder pattern( *( new HatchPattern( pen.GetStyle() , CGContextGetCTM( m_cgContext ) ) ) ); - - CGFloat colorArray[4] = { pen.GetColour().Red() / 255.0 , pen.GetColour().Green() / 255.0 , - pen.GetColour().Blue() / 255.0 , pen.GetColour().Alpha() / 255.0 }; - - CGContextSetStrokePattern( m_cgContext, pattern , colorArray ); - } - break; - } - - if ((lengths != NULL) && (count > 0)) + kATSUCGContextTag , + }; + ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = { - CGContextSetLineDash( m_cgContext , 0 , lengths , count ); - // force the line cap, otherwise we get artifacts (overlaps) and just solid lines - cap = kCGLineCapButt; - } - else + sizeof( CGContextRef ) , + }; + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = { - CGContextSetLineDash( m_cgContext , 0 , NULL , 0 ); - } - - CGContextSetLineCap( m_cgContext , cap ); - CGContextSetLineJoin( m_cgContext , join ); - - delete[] userLengths; + &m_cgContext , + }; + status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag), + atsuTags, atsuSizes, atsuValues ); } - - if ( fill && stroke ) - m_mode = kCGPathFillStroke; + + ATSUTextMeasurement textBefore, textAfter; + ATSUTextMeasurement ascent, descent; + + status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, + &textBefore , &textAfter, &ascent , &descent ); + + wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") ); + + Rect rect; + x += (int)(sin(angle) * FixedToInt(ascent)); + y += (int)(cos(angle) * FixedToInt(ascent)); + + status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, + IntToFixed(x) , IntToFixed(y) , &rect ); + wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") ); + + CGContextSaveGState(m_cgContext); + CGContextTranslateCTM(m_cgContext, x, y); + CGContextScaleCTM(m_cgContext, 1, -1); + status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, + IntToFixed(0) , IntToFixed(0) ); + + wxASSERT_MSG( status == noErr , wxT("couldn't draw the rotated text") ); + + CGContextRestoreGState(m_cgContext); + + ::ATSUDisposeTextLayout(atsuLayout); + +#if SIZEOF_WCHAR_T == 4 + free( ubuf ); +#endif + return; } +#endif +#if wxMAC_USE_CG_TEXT + // default implementation takes care of rotation and calls non rotated DrawText afterwards + wxGraphicsContext::DrawText( str, x, y, angle ); +#endif } -void wxMacCoreGraphicsContext::SetBrush( const wxBrush &brush ) +void wxMacCoreGraphicsContext::GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height, + wxDouble *descent, wxDouble *externalLeading ) const { - m_brush = brush; - if ( m_cgContext == NULL ) - return; + wxCHECK_RET( !m_font.IsNull(), wxT("wxDC(cg)::DoGetTextExtent - no valid font set") ); - bool fill = brush.GetStyle() != wxTRANSPARENT; - bool stroke = m_pen.GetStyle() != wxTRANSPARENT; + if ( width ) + *width = 0; + if ( height ) + *height = 0; + if ( descent ) + *descent = 0; + if ( externalLeading ) + *externalLeading = 0; + + if (str.empty()) + return; -#if 0 - // we can benchmark performance, should go into a setting later - CGContextSetShouldAntialias( m_cgContext , false ); +#if wxMAC_USE_CORE_TEXT + if ( UMAGetSystemVersion() >= 0x1050 ) + { + wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData(); + CTFontRef font = fref->GetCTFont(); + + wxMacCFStringHolder text(str, wxLocale::GetSystemEncoding() ); + CFStringRef keys[] = { kCTFontAttributeName }; + CFTypeRef values[] = { font }; + wxCFRef attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values, + WXSIZEOF( keys ), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks) ); + wxCFRef attrtext( CFAttributedStringCreate(kCFAllocatorDefault, text, attributes) ); + wxCFRef line( CTLineCreateWithAttributedString(attrtext) ); + + CGFloat w, a, d, l; + + w = CTLineGetTypographicBounds(line, &a, &d, &l) ; + + if ( height ) + *height = a+d+l; + if ( descent ) + *descent = d; + if ( externalLeading ) + *externalLeading = l; + if ( width ) + *width = w; + return; + } #endif - - if ( fill || stroke ) +#if wxMAC_USE_ATSU_TEXT { - // setup brushes - m_mode = kCGPathFill; // just a default - - if ( fill ) - { - if ( brush.GetStyle() == wxSOLID ) - { - CGContextSetRGBFillColor( m_cgContext , brush.GetColour().Red() / 255.0 , brush.GetColour().Green() / 255.0 , - brush.GetColour().Blue() / 255.0 , brush.GetColour().Alpha() / 255.0 ); - } - else if ( brush.IsHatch() ) - { - wxMacCFRefHolder patternSpace( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) ); - CGContextSetFillColorSpace( m_cgContext , patternSpace ); - wxMacCFRefHolder pattern( *( new HatchPattern( brush.GetStyle() , CGContextGetCTM( m_cgContext ) ) ) ); + OSStatus status = noErr; + + ATSUTextLayout atsuLayout; + UniCharCount chars = str.length(); + UniChar* ubuf = NULL; + +#if SIZEOF_WCHAR_T == 4 + wxMBConvUTF16 converter; +#if wxUSE_UNICODE + size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ); + ubuf = (UniChar*) malloc( unicharlen + 2 ); + converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ); +#else + const wxWCharBuffer wchar = str.wc_str( wxConvLocal ); + size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ); + ubuf = (UniChar*) malloc( unicharlen + 2 ); + converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ); +#endif + chars = unicharlen / 2; +#else +#if wxUSE_UNICODE + ubuf = (UniChar*) str.wc_str(); +#else + wxWCharBuffer wchar = str.wc_str( wxConvLocal ); + chars = wxWcslen( wchar.data() ); + ubuf = (UniChar*) wchar.data(); +#endif +#endif + + ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle()); + status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , + &chars , &style , &atsuLayout ); + + wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") ); + + ATSUTextMeasurement textBefore, textAfter; + ATSUTextMeasurement textAscent, textDescent; + + status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, + &textBefore , &textAfter, &textAscent , &textDescent ); + + if ( height ) + *height = FixedToInt(textAscent + textDescent); + if ( descent ) + *descent = FixedToInt(textDescent); + if ( externalLeading ) + *externalLeading = 0; + if ( width ) + *width = FixedToInt(textAfter - textBefore); + + ::ATSUDisposeTextLayout(atsuLayout); +#if SIZEOF_WCHAR_T == 4 + free( ubuf ) ; +#endif + return; + } +#endif +#if wxMAC_USE_CG_TEXT + // TODO core graphics text implementation here +#endif +} - CGFloat colorArray[4] = { brush.GetColour().Red() / 255.0 , brush.GetColour().Green() / 255.0 , - brush.GetColour().Blue() / 255.0 , brush.GetColour().Alpha() / 255.0 }; +void wxMacCoreGraphicsContext::GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const +{ + widths.Empty(); + widths.Add(0, text.length()); - CGContextSetFillPattern( m_cgContext, pattern , colorArray ); - } - else - { - // now brush is a bitmap - CGFloat alphaArray[1] = { 1.0 }; - wxBitmap* bmp = brush.GetStipple(); - if ( bmp && bmp->Ok() ) - { - wxMacCFRefHolder patternSpace( CGColorSpaceCreatePattern( NULL ) ); - CGContextSetFillColorSpace( m_cgContext , patternSpace ); - wxMacCFRefHolder pattern( *( new ImagePattern( bmp , CGContextGetCTM( m_cgContext ) ) ) ); - CGContextSetFillPattern( m_cgContext, pattern , alphaArray ); - } - } + if (text.empty()) + return; - m_mode = kCGPathFill; +#if wxMAC_USE_CORE_TEXT + { + wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData(); + CTFontRef font = fref->GetCTFont(); + + wxMacCFStringHolder t(text, wxLocale::GetSystemEncoding() ); + CFStringRef keys[] = { kCTFontAttributeName }; + CFTypeRef values[] = { font }; + wxCFRef attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values, + WXSIZEOF( keys ), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks) ); + wxCFRef attrtext( CFAttributedStringCreate(kCFAllocatorDefault, t, attributes) ); + wxCFRef line( CTLineCreateWithAttributedString(attrtext) ); + + int chars = text.length(); + for ( int pos = 0; pos < (int)chars; pos ++ ) + { + widths[pos] = CTLineGetOffsetForStringIndex( line, pos+1 , NULL )+0.5; } - - if ( fill && stroke ) - m_mode = kCGPathFillStroke; - else if ( stroke ) - m_mode = kCGPathStroke; + + return; + } +#endif +#if wxMAC_USE_ATSU_TEXT + { + ATSUTextLayout atsuLayout; + UniCharCount chars = text.length(); + UniChar* ubuf = NULL; + +#if SIZEOF_WCHAR_T == 4 + wxMBConvUTF16 converter; +#if wxUSE_UNICODE + size_t unicharlen = converter.WC2MB( NULL , text.wc_str() , 0 ); + ubuf = (UniChar*) malloc( unicharlen + 2 ); + converter.WC2MB( (char*) ubuf , text.wc_str(), unicharlen + 2 ); +#else + const wxWCharBuffer wchar = text.wc_str( wxConvLocal ); + size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ); + ubuf = (UniChar*) malloc( unicharlen + 2 ); + converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ); +#endif + chars = unicharlen / 2; +#else +#if wxUSE_UNICODE + ubuf = (UniChar*) text.wc_str(); +#else + wxWCharBuffer wchar = text.wc_str( wxConvLocal ); + chars = wxWcslen( wchar.data() ); + ubuf = (UniChar*) wchar.data(); +#endif +#endif + + ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle()); + ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , + &chars , &style , &atsuLayout ); + + for ( int pos = 0; pos < (int)chars; pos ++ ) + { + unsigned long actualNumberOfBounds = 0; + ATSTrapezoid glyphBounds; + + // We get a single bound, since the text should only require one. If it requires more, there is an issue + OSStatus result; + result = ATSUGetGlyphBounds( atsuLayout, 0, 0, kATSUFromTextBeginning, pos + 1, + kATSUseDeviceOrigins, 1, &glyphBounds, &actualNumberOfBounds ); + if (result != noErr || actualNumberOfBounds != 1 ) + return; + + widths[pos] = FixedToInt( glyphBounds.upperRight.x - glyphBounds.upperLeft.x ); + //unsigned char uch = s[i]; + } + + ::ATSUDisposeTextLayout(atsuLayout); +#if SIZEOF_WCHAR_T == 4 + free( ubuf ) ; +#endif } +#endif +#if wxMAC_USE_CG_TEXT + // TODO core graphics text implementation here +#endif } -// sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2 -void wxMacCoreGraphicsContext::SetLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, - const wxColour&c1, const wxColour&c2) +void * wxMacCoreGraphicsContext::GetNativeContext() { + return m_cgContext; } -// sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc) -// with radius r and color cColor -void wxMacCoreGraphicsContext::SetRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius, - const wxColour &oColor, const wxColour &cColor) +// concatenates this transform with the current transform of this context +void wxMacCoreGraphicsContext::ConcatTransform( const wxGraphicsMatrix& matrix ) { + if ( m_cgContext ) + CGContextConcatCTM( m_cgContext, *(CGAffineTransform*) matrix.GetNativeMatrix()); + else + m_windowTransform = CGAffineTransformConcat(m_windowTransform, *(CGAffineTransform*) matrix.GetNativeMatrix()); } +// sets the transform of this context +void wxMacCoreGraphicsContext::SetTransform( const wxGraphicsMatrix& matrix ) +{ + if ( m_cgContext ) + { + CGAffineTransform transform = CGContextGetCTM( m_cgContext ); + transform = CGAffineTransformInvert( transform ) ; + CGContextConcatCTM( m_cgContext, transform); + CGContextConcatCTM( m_cgContext, *(CGAffineTransform*) matrix.GetNativeMatrix()); + } + else + { + m_windowTransform = *(CGAffineTransform*) matrix.GetNativeMatrix(); + } +} -void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y ) +// gets the matrix of this context +wxGraphicsMatrix wxMacCoreGraphicsContext::GetTransform() const { - DrawText(str, x, y, 0.0); + wxGraphicsMatrix m = CreateMatrix(); + *((CGAffineTransform*) m.GetNativeMatrix()) = ( m_cgContext == NULL ? m_windowTransform : + CGContextGetCTM( m_cgContext )); + return m; } -void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle ) +// +// Renderer +// + +//----------------------------------------------------------------------------- +// wxMacCoreGraphicsRenderer declaration +//----------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxMacCoreGraphicsRenderer : public wxGraphicsRenderer { - EnsureIsValid(); - - OSStatus status = noErr; - ATSUTextLayout atsuLayout; - UniCharCount chars = str.length(); - UniChar* ubuf = NULL; +public : + wxMacCoreGraphicsRenderer() {} -#if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16 converter; -#if wxUSE_UNICODE - size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ); - ubuf = (UniChar*) malloc( unicharlen + 2 ); - converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ); -#else - const wxWCharBuffer wchar = str.wc_str( wxConvLocal ); - size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ); - ubuf = (UniChar*) malloc( unicharlen + 2 ); - converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ); -#endif - chars = unicharlen / 2; -#else -#if wxUSE_UNICODE - ubuf = (UniChar*) str.wc_str(); -#else - wxWCharBuffer wchar = str.wc_str( wxConvLocal ); - chars = wxWcslen( wchar.data() ); - ubuf = (UniChar*) wchar.data(); -#endif -#endif + virtual ~wxMacCoreGraphicsRenderer() {} - status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , - &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ); + // Context - wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the rotated text") ); + virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc); + virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc); - status = ::ATSUSetTransientFontMatching( atsuLayout , true ); - wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") ); + virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ); - int iAngle = int( angle * RAD2DEG ); - if ( abs(iAngle) > 0 ) - { - Fixed atsuAngle = IntToFixed( iAngle ); - ATSUAttributeTag atsuTags[] = - { - kATSULineRotationTag , - }; - ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = - { - sizeof( Fixed ) , - }; - ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = - { - &atsuAngle , - }; - status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag), - atsuTags, atsuSizes, atsuValues ); - } + virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ); - { - ATSUAttributeTag atsuTags[] = - { - kATSUCGContextTag , - }; - ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = - { - sizeof( CGContextRef ) , - }; - ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = - { - &m_cgContext , - }; - status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag), - atsuTags, atsuSizes, atsuValues ); - } + virtual wxGraphicsContext * CreateContext( wxWindow* window ); + + virtual wxGraphicsContext * CreateMeasuringContext(); - ATSUTextMeasurement textBefore, textAfter; - ATSUTextMeasurement ascent, descent; + // Path - status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, - &textBefore , &textAfter, &ascent , &descent ); + virtual wxGraphicsPath CreatePath(); - wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") ); + // Matrix - Rect rect; -/* - // TODO - if ( m_backgroundMode == wxSOLID ) - { - wxGraphicsPath* path = m_graphicContext->CreatePath(); - path->MoveToPoint( drawX , drawY ); - path->AddLineToPoint( - (int) (drawX + sin(angle / RAD2DEG) * FixedToInt(ascent + descent)) , - (int) (drawY + cos(angle / RAD2DEG) * FixedToInt(ascent + descent)) ); - path->AddLineToPoint( - (int) (drawX + sin(angle / RAD2DEG) * FixedToInt(ascent + descent ) + cos(angle / RAD2DEG) * FixedToInt(textAfter)) , - (int) (drawY + cos(angle / RAD2DEG) * FixedToInt(ascent + descent) - sin(angle / RAD2DEG) * FixedToInt(textAfter)) ); - path->AddLineToPoint( - (int) (drawX + cos(angle / RAD2DEG) * FixedToInt(textAfter)) , - (int) (drawY - sin(angle / RAD2DEG) * FixedToInt(textAfter)) ); - - m_graphicContext->FillPath( path , m_textBackgroundColour ); - delete path; - } -*/ - x += (int)(sin(angle / RAD2DEG) * FixedToInt(ascent)); - y += (int)(cos(angle / RAD2DEG) * FixedToInt(ascent)); + virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, + wxDouble tx=0.0, wxDouble ty=0.0); - status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, - IntToFixed(x) , IntToFixed(y) , &rect ); - wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") ); - CGContextSaveGState(m_cgContext); - CGContextTranslateCTM(m_cgContext, x, y); - CGContextScaleCTM(m_cgContext, 1, -1); - status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, - IntToFixed(0) , IntToFixed(0) ); + virtual wxGraphicsPen CreatePen(const wxPen& pen) ; - wxASSERT_MSG( status == noErr , wxT("couldn't draw the rotated text") ); + virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) ; - CGContextRestoreGState(m_cgContext); + // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2 + virtual wxGraphicsBrush CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, + const wxColour&c1, const wxColour&c2) ; - ::ATSUDisposeTextLayout(atsuLayout); + // sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc) + // with radius r and color cColor + virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius, + const wxColour &oColor, const wxColour &cColor) ; -#if SIZEOF_WCHAR_T == 4 - free( ubuf ); -#endif -} - -void wxMacCoreGraphicsContext::GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height, - wxDouble *descent, wxDouble *externalLeading ) const -{ - wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoGetTextExtent - no valid font set") ); + // sets the font + virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ; - OSStatus status = noErr; - - ATSUTextLayout atsuLayout; - UniCharCount chars = str.length(); - UniChar* ubuf = NULL; +private : + DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsRenderer) +} ; -#if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16 converter; -#if wxUSE_UNICODE - size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ); - ubuf = (UniChar*) malloc( unicharlen + 2 ); - converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ); -#else - const wxWCharBuffer wchar = str.wc_str( wxConvLocal ); - size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ); - ubuf = (UniChar*) malloc( unicharlen + 2 ); - converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ); -#endif - chars = unicharlen / 2; -#else -#if wxUSE_UNICODE - ubuf = (UniChar*) str.wc_str(); -#else - wxWCharBuffer wchar = str.wc_str( wxConvLocal ); - chars = wxWcslen( wchar.data() ); - ubuf = (UniChar*) wchar.data(); -#endif -#endif +//----------------------------------------------------------------------------- +// wxMacCoreGraphicsRenderer implementation +//----------------------------------------------------------------------------- - status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , - &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ); +IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsRenderer,wxGraphicsRenderer) - wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") ); +static wxMacCoreGraphicsRenderer gs_MacCoreGraphicsRenderer; - ATSUTextMeasurement textBefore, textAfter; - ATSUTextMeasurement textAscent, textDescent; +wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer() +{ + return &gs_MacCoreGraphicsRenderer; +} - status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, - &textBefore , &textAfter, &textAscent , &textDescent ); +wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( const wxWindowDC& dc ) +{ + const wxDCImpl* impl = dc.GetImpl(); + wxWindowDCImpl *win_impl = wxDynamicCast( impl, wxWindowDCImpl ); + if (win_impl) + return new wxMacCoreGraphicsContext( this, + (CGContextRef)(win_impl->GetWindow()->MacGetCGContextRef()) ); + + return NULL; +} - if ( height ) - *height = FixedToInt(textAscent + textDescent); - if ( descent ) - *descent = FixedToInt(textDescent); - if ( externalLeading ) - *externalLeading = 0; - if ( width ) - *width = FixedToInt(textAfter - textBefore); +wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( const wxMemoryDC& dc ) +{ + const wxDCImpl* impl = dc.GetImpl(); + wxMemoryDCImpl *mem_impl = wxDynamicCast( impl, wxMemoryDCImpl ); + if (mem_impl) + return new wxMacCoreGraphicsContext( this, + (CGContextRef)(mem_impl->GetGraphicsContext()->GetNativeContext()) ); + + return NULL; +} - ::ATSUDisposeTextLayout(atsuLayout); +wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContextFromNativeContext( void * context ) +{ + return new wxMacCoreGraphicsContext(this,(CGContextRef)context); } -void wxMacCoreGraphicsContext::GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const + +wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContextFromNativeWindow( void * window ) { - widths.Empty(); - widths.Add(0, text.length()); + return new wxMacCoreGraphicsContext(this,(WindowRef)window); +} - if (text.empty()) - return; +wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( wxWindow* window ) +{ + return new wxMacCoreGraphicsContext(this, window ); +} - ATSUTextLayout atsuLayout; - UniCharCount chars = text.length(); - UniChar* ubuf = NULL; +wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateMeasuringContext() +{ + return new wxMacCoreGraphicsContext(this); +} -#if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16 converter; -#if wxUSE_UNICODE - size_t unicharlen = converter.WC2MB( NULL , text.wc_str() , 0 ); - ubuf = (UniChar*) malloc( unicharlen + 2 ); - converter.WC2MB( (char*) ubuf , text.wc_str(), unicharlen + 2 ); -#else - const wxWCharBuffer wchar = text.wc_str( wxConvLocal ); - size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ); - ubuf = (UniChar*) malloc( unicharlen + 2 ); - converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ); -#endif - chars = unicharlen / 2; -#else -#if wxUSE_UNICODE - ubuf = (UniChar*) text.wc_str(); -#else - wxWCharBuffer wchar = text.wc_str( wxConvLocal ); - chars = wxWcslen( wchar.data() ); - ubuf = (UniChar*) wchar.data(); -#endif -#endif +// Path - ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , - &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ); +wxGraphicsPath wxMacCoreGraphicsRenderer::CreatePath() +{ + wxGraphicsPath m; + m.SetRefData( new wxMacCoreGraphicsPathData(this)); + return m; +} - for ( int pos = 0; pos < (int)chars; pos ++ ) - { - unsigned long actualNumberOfBounds = 0; - ATSTrapezoid glyphBounds; - - // We get a single bound, since the text should only require one. If it requires more, there is an issue - OSStatus result; - result = ATSUGetGlyphBounds( atsuLayout, 0, 0, kATSUFromTextBeginning, pos + 1, - kATSUseDeviceOrigins, 1, &glyphBounds, &actualNumberOfBounds ); - if (result != noErr || actualNumberOfBounds != 1 ) - return; - widths[pos] = FixedToInt( glyphBounds.upperRight.x - glyphBounds.upperLeft.x ); - //unsigned char uch = s[i]; - } +// Matrix - ::ATSUDisposeTextLayout(atsuLayout); +wxGraphicsMatrix wxMacCoreGraphicsRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d, + wxDouble tx, wxDouble ty) +{ + wxGraphicsMatrix m; + wxMacCoreGraphicsMatrixData* data = new wxMacCoreGraphicsMatrixData( this ); + data->Set( a,b,c,d,tx,ty ) ; + m.SetRefData(data); + return m; } -void wxMacCoreGraphicsContext::SetFont( const wxFont &font ) +wxGraphicsPen wxMacCoreGraphicsRenderer::CreatePen(const wxPen& pen) { - if ( m_macATSUIStyle ) + if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT ) + return wxNullGraphicsPen; + else { - ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle); - m_macATSUIStyle = NULL; + wxGraphicsPen p; + p.SetRefData(new wxMacCoreGraphicsPenData( this, pen )); + return p; } +} - if ( font.Ok() ) +wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateBrush(const wxBrush& brush ) +{ + if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT ) + return wxNullGraphicsBrush; + else { - m_font = font ; - OSStatus status; + wxGraphicsBrush p; + p.SetRefData(new wxMacCoreGraphicsBrushData( this, brush )); + return p; + } +} - status = ATSUCreateAndCopyStyle( (ATSUStyle) font.MacGetATSUStyle() , (ATSUStyle*) &m_macATSUIStyle ); +// sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2 +wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, + const wxColour&c1, const wxColour&c2) +{ + wxGraphicsBrush p; + wxMacCoreGraphicsBrushData* d = new wxMacCoreGraphicsBrushData( this ); + d->CreateLinearGradientBrush(x1, y1, x2, y2, c1, c2); + p.SetRefData(d); + return p; +} - wxASSERT_MSG( status == noErr, wxT("couldn't create ATSU style") ); +// sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc) +// with radius r and color cColor +wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius, + const wxColour &oColor, const wxColour &cColor) +{ + wxGraphicsBrush p; + wxMacCoreGraphicsBrushData* d = new wxMacCoreGraphicsBrushData( this ); + d->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor); + p.SetRefData(d); + return p; +} - // we need the scale here ... +// sets the font +wxGraphicsFont wxMacCoreGraphicsRenderer::CreateFont( const wxFont &font , const wxColour &col ) +{ + if ( font.Ok() ) + { + wxGraphicsFont p; + p.SetRefData(new wxMacCoreGraphicsFontData( this , font, col )); + return p; + } + else + return wxNullGraphicsFont; +} - Fixed atsuSize = IntToFixed( int( /*m_scaleY*/ 1 * font.MacGetFontSize()) ); - RGBColor atsuColor = MAC_WXCOLORREF( m_textForegroundColor.GetPixel() ); - ATSUAttributeTag atsuTags[] = - { - kATSUSizeTag , - kATSUColorTag , - }; - ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = - { - sizeof( Fixed ) , - sizeof( RGBColor ) , - }; - ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = - { - &atsuSize , - &atsuColor , - }; +// +// CoreGraphics Helper Methods +// - status = ::ATSUSetAttributes( - (ATSUStyle)m_macATSUIStyle, sizeof(atsuTags) / sizeof(ATSUAttributeTag) , - atsuTags, atsuSizes, atsuValues); +// Data Providers and Consumers - wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ); +size_t UMAPutBytesCFRefCallback( void *info, const void *bytes, size_t count ) +{ + CFMutableDataRef data = (CFMutableDataRef) info; + if ( data ) + { + CFDataAppendBytes( data, (const UInt8*) bytes, count ); } + return count; } -void * wxMacCoreGraphicsContext::GetNativeContext() +void wxMacReleaseCFDataProviderCallback(void *info, + const void *WXUNUSED(data), + size_t WXUNUSED(count)) { - return m_cgContext; + if ( info ) + CFRelease( (CFDataRef) info ); } -wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC &dc ) +void wxMacReleaseCFDataConsumerCallback( void *info ) { - return new wxMacCoreGraphicsContext((CGContextRef)dc.GetWindow()->MacGetCGContextRef() ); + if ( info ) + CFRelease( (CFDataRef) info ); } -wxGraphicsContext* wxGraphicsContext::Create( wxWindow * window ) +CGDataProviderRef wxMacCGDataProviderCreateWithCFData( CFDataRef data ) { - return new wxMacCoreGraphicsContext( window ); + if ( data == NULL ) + return NULL; + + return CGDataProviderCreateWithCFData( data ); } -wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context ) +CGDataConsumerRef wxMacCGDataConsumerCreateWithCFData( CFMutableDataRef data ) { - return new wxMacCoreGraphicsContext((CGContextRef)context); + if ( data == NULL ) + return NULL; + + return CGDataConsumerCreateWithCFData( data ); } -wxGraphicsContext* wxGraphicsContext::CreateFromNativeWindow( void * window ) +void wxMacReleaseMemoryBufferProviderCallback(void *info, const void *data, size_t WXUNUSED(size)) { - return new wxMacCoreGraphicsContext((WindowRef)window); + wxMemoryBuffer* membuf = (wxMemoryBuffer*) info ; + + wxASSERT( data == membuf->GetData() ) ; + + delete membuf ; } -#endif // wxMAC_USE_CORE_GRAPHICS +CGDataProviderRef wxMacCGDataProviderCreateWithMemoryBuffer( const wxMemoryBuffer& buf ) +{ + wxMemoryBuffer* b = new wxMemoryBuffer( buf ); + if ( b->GetDataLen() == 0 ) + return NULL; + + return CGDataProviderCreateWithData( b , (const void *) b->GetData() , b->GetDataLen() , + wxMacReleaseMemoryBufferProviderCallback ); +} \ No newline at end of file