X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9485f89b8c8d6160cedf8b9b4a7a4105a3624d1..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 b2bcb0788a..48cd16a9cf --- a/src/mac/carbon/graphics.cpp +++ b/src/mac/carbon/graphics.cpp @@ -11,8 +11,6 @@ #include "wx/wxprec.h" -#if wxUSE_GRAPHICS_CONTEXT && wxMAC_USE_CORE_GRAPHICS - #include "wx/graphics.h" #ifndef WX_PRECOMP @@ -20,6 +18,8 @@ #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" @@ -35,17 +35,6 @@ #include "wx/mac/private.h" -#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 -typedef float CGFloat; -#endif -#ifndef wxMAC_USE_CORE_GRAPHICS_BLEND_MODES -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - #define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 1 -#else - #define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 0 -#endif -#endif - //----------------------------------------------------------------------------- // constants //----------------------------------------------------------------------------- @@ -65,6 +54,20 @@ static const double RAD2DEG = 180.0 / M_PI; #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 @@ -111,7 +114,7 @@ public : { wxASSERT( bmp && bmp->Ok() ); - Init( (CGImageRef) bmp->CGImageCreate() , transform ); + Init( (CGImageRef) bmp->CreateCGImage() , transform ); } // ImagePattern takes ownership of CGImageRef passed in @@ -126,7 +129,7 @@ public : virtual void Render( CGContextRef ctxRef ) { if (m_image != NULL) - HIViewDrawCGImage( ctxRef, &m_imageBounds, m_image ); + wxMacDrawCGImage( ctxRef, &m_imageBounds, m_image ); } protected : @@ -168,22 +171,7 @@ public : void StrokeLineSegments( CGContextRef ctxRef , const CGPoint pts[] , size_t count ) { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if ( CGContextStrokeLineSegments!=NULL ) - { - CGContextStrokeLineSegments( ctxRef , pts , count ); - } - 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); - } + CGContextStrokeLineSegments( ctxRef , pts , count ); } virtual void Render( CGContextRef ctxRef ) @@ -297,7 +285,7 @@ wxMacCoreGraphicsPenData::wxMacCoreGraphicsPenData( wxGraphicsRenderer* renderer { Init(); - float components[4] = { pen.GetColour().Red() / 255.0 , pen.GetColour().Green() / 255.0 , + 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 ) ) ; @@ -478,6 +466,105 @@ void wxMacCoreGraphicsPenData::Apply( wxGraphicsContext* context ) // Brush // +static const char *gs_stripedback_xpm[] = { +/* columns rows colors chars-per-pixel */ +"4 4 2 1", +". c #F0F0F0", +"X c #ECECEC", +/* pixels */ +"....", +"....", +"XXXX", +"XXXX" +}; + +wxBitmap gs_stripedback_bmp( wxImage( (const char* const* ) gs_stripedback_xpm ), -1 ) ; + +// make sure we all use one class for all conversions from wx to native colour + +class wxMacCoreGraphicsColour +{ + 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; +} ; + +wxMacCoreGraphicsColour::~wxMacCoreGraphicsColour() +{ + delete[] m_patternColorComponents; +} + +void wxMacCoreGraphicsColour::Init() +{ + m_isPattern = false; + m_patternColorComponents = NULL; +} + +void wxMacCoreGraphicsColour::Apply( CGContextRef cgContext ) +{ + 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 ); + } +} + +wxMacCoreGraphicsColour::wxMacCoreGraphicsColour() +{ + Init(); +} + +wxMacCoreGraphicsColour::wxMacCoreGraphicsColour( const wxBrush &brush ) +{ + Init(); + if ( brush.GetStyle() == wxSOLID ) + { + 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 ) ) ) ); + } + } +} + class wxMacCoreGraphicsBrushData : public wxGraphicsObjectRefData { public: @@ -498,12 +585,7 @@ protected: static void CalculateShadingValues (void *info, const CGFloat *in, CGFloat *out); virtual void Init(); - wxMacCFRefHolder m_color; - wxMacCFRefHolder m_colorSpace; - - bool m_isPattern; - wxMacCFRefHolder m_pattern; - CGFloat* m_patternColorComponents; + wxMacCoreGraphicsColour m_cgColor; bool m_isShading; CGFunctionRef m_gradientFunction; @@ -532,64 +614,11 @@ void wxMacCoreGraphicsBrushData::CreateRadialGradientBrush( wxDouble xo, wxDoubl m_isShading = true ; } -wxMacCoreGraphicsBrushData::wxMacCoreGraphicsBrushData(wxGraphicsRenderer* renderer, const wxBrush &brush) : wxGraphicsObjectRefData( renderer ) +wxMacCoreGraphicsBrushData::wxMacCoreGraphicsBrushData(wxGraphicsRenderer* renderer, const wxBrush &brush) : wxGraphicsObjectRefData( renderer ), + m_cgColor( brush ) { Init(); - if ( brush.GetStyle() == wxSOLID ) - { - if ( brush.MacGetBrushKind() == kwxMacBrushTheme ) - { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if ( HIThemeBrushCreateCGColor != 0 ) - { - CGColorRef color ; - HIThemeBrushCreateCGColor( brush.MacGetTheme(), &color ); - m_color.Set( color ) ; - } - else -#endif - { - // as close as we can get, unfortunately < 10.4 things get difficult - RGBColor color; - GetThemeBrushAsColor( brush.MacGetTheme(), 32, true, &color ); - float components[4] = { (CGFloat) color.red / 65536, - (CGFloat) color.green / 65536, (CGFloat) color.blue / 65536, 1 } ; - m_color.Set( CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ) ; - } - } - else - { - float components[4] = { brush.GetColour().Red() / 255.0 , brush.GetColour().Green() / 255.0 , - brush.GetColour().Blue() / 255.0 , brush.GetColour().Alpha() / 255.0 } ; - m_color.Set( CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ) ; - } - } - 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 ) ) ) ); - } - } } wxMacCoreGraphicsBrushData::~wxMacCoreGraphicsBrushData() @@ -601,15 +630,12 @@ wxMacCoreGraphicsBrushData::~wxMacCoreGraphicsBrushData() CGFunctionRelease(m_gradientFunction); delete[] m_gradientComponents; - delete[] m_patternColorComponents; } void wxMacCoreGraphicsBrushData::Init() { - m_patternColorComponents = NULL; m_gradientFunction = NULL; m_shading = NULL; - m_isPattern = false; m_gradientComponents = NULL; m_isShading = false; } @@ -624,17 +650,7 @@ void wxMacCoreGraphicsBrushData::Apply( wxGraphicsContext* context ) } else { - if ( m_isPattern ) - { - CGAffineTransform matrix = CGContextGetCTM( cg ); - CGContextSetPatternPhase( cg, CGSizeMake(matrix.tx, matrix.ty) ); - CGContextSetFillColorSpace( cg , m_colorSpace ); - CGContextSetFillPattern( cg, m_pattern , m_patternColorComponents ); - } - else - { - CGContextSetFillColorWithColor( cg, m_color ); - } + m_cgColor.Apply( cg ); } } @@ -680,16 +696,37 @@ public: wxMacCoreGraphicsFontData( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col ); ~wxMacCoreGraphicsFontData(); +#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 }; wxMacCoreGraphicsFontData::wxMacCoreGraphicsFontData(wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col) : wxGraphicsObjectRefData( renderer ) { - m_macATSUIStyle = NULL; + m_colour = col; + m_underlined = font.GetUnderlined(); - OSStatus status; +#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 ); @@ -698,7 +735,8 @@ wxMacCoreGraphicsFontData::wxMacCoreGraphicsFontData(wxGraphicsRenderer* rendere // we need the scale here ... Fixed atsuSize = IntToFixed( int( 1 * font.MacGetFontSize()) ); - RGBColor atsuColor = MAC_WXCOLORREF( col.GetPixel() ); + RGBColor atsuColor ; + col.GetRGBColor( &atsuColor ); ATSUAttributeTag atsuTags[] = { kATSUSizeTag , @@ -720,15 +758,24 @@ wxMacCoreGraphicsFontData::wxMacCoreGraphicsFontData(wxGraphicsRenderer* rendere atsuTags, atsuSizes, atsuValues); wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ); +#endif +#if wxMAC_USE_CG_TEXT +#endif } wxMacCoreGraphicsFontData::~wxMacCoreGraphicsFontData() { +#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 } // @@ -851,23 +898,7 @@ void wxMacCoreGraphicsMatrixData::Invert() // returns true if the elements of the transformation matrix are equal ? bool wxMacCoreGraphicsMatrixData::IsEqual( const wxGraphicsMatrixData* t) const { - const CGAffineTransform* tm = (CGAffineTransform*) t->GetNativeMatrix(); -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if ( CGAffineTransformEqualToTransform!=NULL ) - { - return CGAffineTransformEqualToTransform(m_matrix, *((CGAffineTransform*) t->GetNativeMatrix())); - } - else -#endif - { - return ( - m_matrix.a == tm->a && - m_matrix.b == tm->b && - m_matrix.c == tm->c && - m_matrix.d == tm->d && - m_matrix.tx == tm->tx && - m_matrix.ty == tm->ty ) ; - } + return CGAffineTransformEqualToTransform(m_matrix, *((CGAffineTransform*) t->GetNativeMatrix())); } // return true if this is the identity matrix @@ -985,7 +1016,7 @@ public : 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) const {} + virtual void UnGetNativePath(void *WXUNUSED(p)) const {} // transforms each point of this path by the matrix virtual void Transform( const wxGraphicsMatrixData* matrix ); @@ -1106,18 +1137,7 @@ void wxMacCoreGraphicsPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wx bool wxMacCoreGraphicsPathData::Contains( wxDouble x, wxDouble y, int fillStyle) const { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if ( CGPathContainsPoint!=NULL ) - { - return CGPathContainsPoint( m_path, NULL, CGPointMake(x,y), fillStyle == wxODDEVEN_RULE ); - } - else -#endif - { - // TODO : implementation for 10.3 - CGRect bounds = CGPathGetBoundingBox( m_path ) ; - return CGRectContainsPoint( bounds, CGPointMake(x,y) ) == 1; - } + return CGPathContainsPoint( m_path, NULL, CGPointMake(x,y), fillStyle == wxODDEVEN_RULE ); } // @@ -1131,7 +1151,7 @@ bool wxMacCoreGraphicsPathData::Contains( wxDouble x, wxDouble y, int fillStyle) class WXDLLEXPORT wxMacCoreGraphicsContext : public wxGraphicsContext { public: - wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext ); + wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext, wxDouble width = 0, wxDouble height = 0 ); wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, WindowRef window ); @@ -1145,6 +1165,15 @@ public: 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(); @@ -1241,6 +1270,8 @@ private: WindowRef m_windowRef; bool m_releaseContext; CGAffineTransform m_windowTransform; + wxDouble m_width; + wxDouble m_height; wxMacCFRefHolder m_clipRgn; }; @@ -1263,20 +1294,44 @@ private: IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsContext, wxGraphicsContext) +class wxQuartzOffsetHelper +{ +public : + wxQuartzOffsetHelper( CGContextRef cg , bool offset ) + { + m_cg = cg; + m_offset = offset; + if ( m_offset ) + CGContextTranslateCTM( m_cg, 0.5, 0.5 ); + } + ~wxQuartzOffsetHelper( ) + { + if ( m_offset ) + CGContextTranslateCTM( m_cg, -0.5, -0.5 ); + } +public : + CGContextRef m_cg; + bool m_offset; +} ; + void wxMacCoreGraphicsContext::Init() { m_cgContext = NULL; m_releaseContext = false; m_windowRef = NULL; + m_width = 0; + m_height = 0; HIRect r = CGRectMake(0,0,0,0); m_clipRgn.Set(HIShapeCreateWithRect(&r)); } -wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext ) : wxGraphicsContext(renderer) +wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext, wxDouble width, wxDouble height ) : wxGraphicsContext(renderer) { Init(); SetNativeContext(cgcontext); + m_width = width; + m_height = height; } wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, WindowRef window ): wxGraphicsContext(renderer) @@ -1292,9 +1347,12 @@ wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer int originX , originY; originX = originY = 0; window->MacWindowToRootWindow( &originX , &originY ); - Rect bounds; - GetWindowBounds( m_windowRef, kWindowContentRgn, &bounds ); + 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 ) ; @@ -1316,11 +1374,46 @@ 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 = QDBeginCGContext( GetWindowPort( m_windowRef ) , &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 ); @@ -1340,6 +1433,8 @@ void wxMacCoreGraphicsContext::EnsureIsValid() } } +// TODO test whether the private CGContextSetCompositeOperation works under 10.3 (using NSCompositingModes) + bool wxMacCoreGraphicsContext::SetLogicalFunction( int function ) { if (m_logicalFunction == function) @@ -1352,25 +1447,14 @@ bool wxMacCoreGraphicsContext::SetLogicalFunction( int function ) if ( function == wxCOPY ) { retval = true; -#if wxMAC_USE_CORE_GRAPHICS_BLEND_MODES - if ( CGContextSetBlendMode != NULL ) - { - CGContextSetBlendMode( m_cgContext, kCGBlendModeNormal ); - CGContextSetShouldAntialias( m_cgContext, true ); - } -#endif + CGContextSetBlendMode( m_cgContext, kCGBlendModeNormal ); } else if ( function == wxINVERT || function == wxXOR ) { -#if wxMAC_USE_CORE_GRAPHICS_BLEND_MODES - if ( CGContextSetBlendMode != NULL ) - { - // change color to white - CGContextSetBlendMode( m_cgContext, kCGBlendModeExclusion ); - CGContextSetShouldAntialias( m_cgContext, false ); - retval = true; - } -#endif + // change color to white + CGContextSetBlendMode( m_cgContext, kCGBlendModeExclusion ); + CGContextSetShouldAntialias( m_cgContext, false ); + retval = true; } if (retval) @@ -1382,18 +1466,14 @@ void wxMacCoreGraphicsContext::Clip( const wxRegion ®ion ) { if( m_cgContext ) { - HIShapeRef shape = HIShapeCreateWithQDRgn( (RgnHandle) region.GetWXHRGN() ); - HIShapeReplacePathInCGContext( shape, m_cgContext ); + HIShapeReplacePathInCGContext( region.GetWXHRGN() , m_cgContext ); CGContextClip( m_cgContext ); - CFRelease( shape ); } 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 - wxMacCFRefHolder hishape ; - hishape.Set( HIShapeCreateWithQDRgn( (RgnHandle) region.GetWXHRGN() )); - HIMutableShapeRef mutableShape = HIShapeCreateMutableCopy( hishape ); + HIMutableShapeRef mutableShape = HIShapeCreateMutableCopy( region.GetWXHRGN() ); CGPoint transformedOrigin = CGPointApplyAffineTransform( CGPointZero, m_windowTransform ); HIShapeOffset( mutableShape, transformedOrigin.x, transformedOrigin.y ); @@ -1447,16 +1527,11 @@ void wxMacCoreGraphicsContext::StrokePath( const wxGraphicsPath &path ) EnsureIsValid(); - bool offset = ShouldOffset(); - if ( offset ) - CGContextTranslateCTM( m_cgContext, 0.5, 0.5 ); + wxQuartzOffsetHelper helper( m_cgContext , ShouldOffset() ); ((wxMacCoreGraphicsPenData*)m_pen.GetRefData())->Apply(this); CGContextAddPath( m_cgContext , (CGPathRef) path.GetNativePath() ); CGContextStrokePath( m_cgContext ); - - if ( offset ) - CGContextTranslateCTM( m_cgContext, -0.5, -0.5 ); } void wxMacCoreGraphicsContext::DrawPath( const wxGraphicsPath &path , int fillStyle ) @@ -1502,16 +1577,10 @@ void wxMacCoreGraphicsContext::DrawPath( const wxGraphicsPath &path , int fillSt if ( !m_pen.IsNull() ) ((wxMacCoreGraphicsPenData*)m_pen.GetRefData())->Apply(this); - bool offset = ShouldOffset(); - - if ( offset ) - CGContextTranslateCTM( m_cgContext, 0.5, 0.5 ); + wxQuartzOffsetHelper helper( m_cgContext , ShouldOffset() ); CGContextAddPath( m_cgContext , (CGPathRef) path.GetNativePath() ); CGContextDrawPath( m_cgContext , mode ); - - if ( offset ) - CGContextTranslateCTM( m_cgContext, -0.5, -0.5 ); } void wxMacCoreGraphicsContext::FillPath( const wxGraphicsPath &path , int fillStyle ) @@ -1551,7 +1620,11 @@ void wxMacCoreGraphicsContext::SetNativeContext( CGContextRef cg ) CGContextRestoreGState( m_cgContext ); CGContextRestoreGState( m_cgContext ); if ( m_releaseContext ) + { +#ifndef __LP64__ QDEndCGContext( GetWindowPort( m_windowRef ) , &m_cgContext); +#endif + } else CGContextRelease(m_cgContext); } @@ -1603,7 +1676,7 @@ void wxMacCoreGraphicsContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDo { EnsureIsValid(); - CGImageRef image = (CGImageRef)( bmp.CGImageCreate() ); + CGImageRef image = (CGImageRef)( bmp.CreateCGImage() ); HIRect r = CGRectMake( x , y , w , h ); if ( bmp.GetDepth() == 1 ) { @@ -1624,13 +1697,13 @@ void wxMacCoreGraphicsContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDo else { ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->Apply(this); - HIViewDrawCGImage( m_cgContext , &r , image ); + wxMacDrawCGImage( m_cgContext , &r , image ); } } } else { - HIViewDrawCGImage( m_cgContext , &r , image ); + wxMacDrawCGImage( m_cgContext , &r , image ); } CGImageRelease( image ); } @@ -1664,7 +1737,46 @@ void wxMacCoreGraphicsContext::PopState() void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y ) { - DrawText(str, x, y, 0.0); + 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 } void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle ) @@ -1673,111 +1785,127 @@ void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDoub return; EnsureIsValid(); - - OSStatus status = noErr; - ATSUTextLayout atsuLayout; - UniCharCount chars = str.length(); - UniChar* ubuf = NULL; - +#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; + 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 ); + 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 ); + 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; + chars = unicharlen / 2; #else #if wxUSE_UNICODE - ubuf = (UniChar*) str.wc_str(); + ubuf = (UniChar*) str.wc_str(); #else - wxWCharBuffer wchar = str.wc_str( wxConvLocal ); - chars = wxWcslen( wchar.data() ); - ubuf = (UniChar*) wchar.data(); + 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[] = - { - kATSUCGContextTag , - }; - ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = + + 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 ) { - sizeof( CGContextRef ) , - }; - ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = + 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 ); + } + { - &m_cgContext , - }; - status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag), - atsuTags, atsuSizes, atsuValues ); - } - - 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); - + 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 ); + } + + 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 ); + 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 } @@ -1786,59 +1914,108 @@ void wxMacCoreGraphicsContext::GetTextExtent( const wxString &str, wxDouble *wid { wxCHECK_RET( !m_font.IsNull(), wxT("wxDC(cg)::DoGetTextExtent - no valid font set") ); - OSStatus status = noErr; - - ATSUTextLayout atsuLayout; - UniCharCount chars = str.length(); - UniChar* ubuf = NULL; + if ( width ) + *width = 0; + if ( height ) + *height = 0; + if ( descent ) + *descent = 0; + if ( externalLeading ) + *externalLeading = 0; + + if (str.empty()) + return; +#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 wxMAC_USE_ATSU_TEXT + { + OSStatus status = noErr; + + ATSUTextLayout atsuLayout; + UniCharCount chars = str.length(); + UniChar* ubuf = NULL; + #if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16 converter; + 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 ); + 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 ); + 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; + chars = unicharlen / 2; #else #if wxUSE_UNICODE - ubuf = (UniChar*) str.wc_str(); + ubuf = (UniChar*) str.wc_str(); #else - wxWCharBuffer wchar = str.wc_str( wxConvLocal ); - chars = wxWcslen( wchar.data() ); - ubuf = (UniChar*) wchar.data(); + 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); + + 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 ) ; + free( ubuf ) ; +#endif + return; + } +#endif +#if wxMAC_USE_CG_TEXT + // TODO core graphics text implementation here #endif } @@ -1850,56 +2027,85 @@ void wxMacCoreGraphicsContext::GetPartialTextExtents(const wxString& text, wxArr if (text.empty()) return; - ATSUTextLayout atsuLayout; - UniCharCount chars = text.length(); - UniChar* ubuf = NULL; - +#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; + } + + return; + } +#endif +#if wxMAC_USE_ATSU_TEXT + { + ATSUTextLayout atsuLayout; + UniCharCount chars = text.length(); + UniChar* ubuf = NULL; + #if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16 converter; + 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 ); + 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 ); + 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; + chars = unicharlen / 2; #else #if wxUSE_UNICODE - ubuf = (UniChar*) text.wc_str(); + ubuf = (UniChar*) text.wc_str(); #else - wxWCharBuffer wchar = text.wc_str( wxConvLocal ); - chars = wxWcslen( wchar.data() ); - ubuf = (UniChar*) wchar.data(); + 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); + + 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 ) ; + free( ubuf ) ; +#endif + } +#endif +#if wxMAC_USE_CG_TEXT + // TODO core graphics text implementation here #endif } @@ -1960,6 +2166,7 @@ public : // Context virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc); + virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc); virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ); @@ -2012,18 +2219,26 @@ wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer() return &gs_MacCoreGraphicsRenderer; } -wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( const wxWindowDC& dc) +wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( const wxWindowDC& dc ) { - wxMemoryDC* mdc = wxDynamicCast(&dc, wxMemoryDC); - if ( mdc ) - { - return new wxMacCoreGraphicsContext(this, - (CGContextRef)mdc->GetGraphicsContext()->GetNativeContext()); - } - else - { - return new wxMacCoreGraphicsContext(this,(CGContextRef)dc.GetWindow()->MacGetCGContextRef() ); - } + 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; +} + +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; } wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContextFromNativeContext( void * context ) @@ -2129,6 +2344,67 @@ wxGraphicsFont wxMacCoreGraphicsRenderer::CreateFont( const wxFont &font , const return wxNullGraphicsFont; } +// +// CoreGraphics Helper Methods +// + +// Data Providers and Consumers + +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 wxMacReleaseCFDataProviderCallback(void *info, + const void *WXUNUSED(data), + size_t WXUNUSED(count)) +{ + if ( info ) + CFRelease( (CFDataRef) info ); +} + +void wxMacReleaseCFDataConsumerCallback( void *info ) +{ + if ( info ) + CFRelease( (CFDataRef) info ); +} + +CGDataProviderRef wxMacCGDataProviderCreateWithCFData( CFDataRef data ) +{ + if ( data == NULL ) + return NULL; + + return CGDataProviderCreateWithCFData( data ); +} + +CGDataConsumerRef wxMacCGDataConsumerCreateWithCFData( CFMutableDataRef data ) +{ + if ( data == NULL ) + return NULL; + + return CGDataConsumerCreateWithCFData( data ); +} + +void wxMacReleaseMemoryBufferProviderCallback(void *info, const void *data, size_t WXUNUSED(size)) +{ + 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