X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbe4a80c57a77b249ef32117efe9fd923066f958..0c1cc9483ecba053bc9a0983a4a8d48898e334f2:/src/mac/carbon/graphics.cpp diff --git a/src/mac/carbon/graphics.cpp b/src/mac/carbon/graphics.cpp index 85795be8c3..80e114ea8b 100644 --- a/src/mac/carbon/graphics.cpp +++ b/src/mac/carbon/graphics.cpp @@ -12,6 +12,7 @@ #include "wx/wxprec.h" #include "wx/graphics.h" +#include "wx/private/graphics.h" #ifndef WX_PRECOMP #include "wx/dcclient.h" @@ -22,8 +23,6 @@ #include "wx/icon.h" #endif -#include "wx/mac/uma.h" - #ifdef __MSL__ #if __MSL__ >= 0x6000 #include "math.h" @@ -33,7 +32,38 @@ #endif #endif -#include "wx/mac/private.h" +#ifdef __WXMAC__ + #include "wx/mac/uma.h" +#else + #include "CoreServices/CoreServices.h" + #include "ApplicationServices/ApplicationServices.h" + #include "wx/mac/corefoundation/cfstring.h" + #include "wx/cocoa/dcclient.h" +#endif + +#ifdef __WXCOCOA__ + +CGColorSpaceRef wxMacGetGenericRGBColorSpace() +{ + static wxCFRef genericRGBColorSpace; + + if (genericRGBColorSpace == NULL) + { + genericRGBColorSpace.reset( CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB ) ); + } + + return genericRGBColorSpace; +} + +int UMAGetSystemVersion() +{ + return 0x1050; +} + + +#define wxMAC_USE_CORE_TEXT 1 + +#endif //----------------------------------------------------------------------------- // constants @@ -56,10 +86,10 @@ static const double RAD2DEG = 180.0 / M_PI; OSStatus wxMacDrawCGImage( CGContextRef inContext, - const HIRect * inBounds, - CGImageRef inImage) + const CGRect * inBounds, + CGImageRef inImage) { -#ifdef __LP64__ +#if defined( __LP64__ ) || defined(__WXCOCOA__) // todo flip CGContextDrawImage(inContext, *inBounds, inImage ); return noErr; @@ -68,6 +98,40 @@ OSStatus wxMacDrawCGImage( #endif } +CGColorRef wxMacCreateCGColor( const wxColour& col ) +{ + CGColorRef retval = 0; +#ifdef __WXMAC__ + retval = col.CreateCGColor(); +#else +// TODO add conversion NSColor - CGColorRef (obj-c) +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + if ( CGColorCreateGenericRGB ) + retval = CGColorCreateGenericRGB( col.Red() / 255.0 , col.Green() / 255.0, col.Blue() / 255.0, col.Alpha() / 255.0 ); + else +#endif + { + CGFloat components[4] = { col.Red() / 255.0, col.Green() / 255.0, col.Blue() / 255.0, col.Alpha() / 255.0 } ; + retval = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ; + } + +#endif + return retval; +} + +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 && defined(wxMAC_USE_CORE_TEXT) + +CTFontRef wxMacCreateCTFont( const wxFont& font ) +{ +#ifdef __WXMAC__ + return wxCFRetain((CTFontRef) font.MacGetCTFont()); +#else + return CTFontCreateWithName( wxCFStringRef( font.GetFaceName(), wxLocale::GetSystemEncoding() ) , font.GetPointSize() , NULL ); +#endif +} + +#endif + // CGPattern wrapper class: always allocate on heap, never call destructor class wxMacCoreGraphicsPattern @@ -113,8 +177,9 @@ public : ImagePattern( const wxBitmap* bmp , const CGAffineTransform& transform ) { wxASSERT( bmp && bmp->Ok() ); - +#ifdef __WXMAC__ Init( (CGImageRef) bmp->CreateCGImage() , transform ); +#endif } // ImagePattern takes ownership of CGImageRef passed in @@ -264,8 +329,8 @@ public: protected : CGLineCap m_cap; - wxMacCFRefHolder m_color; - wxMacCFRefHolder m_colorSpace; + wxCFRef m_color; + wxCFRef m_colorSpace; CGLineJoin m_join; CGFloat m_width; @@ -276,7 +341,7 @@ protected : bool m_isPattern; - wxMacCFRefHolder m_pattern; + wxCFRef m_pattern; CGFloat* m_patternColorComponents; }; @@ -285,9 +350,7 @@ wxMacCoreGraphicsPenData::wxMacCoreGraphicsPenData( wxGraphicsRenderer* renderer { Init(); - 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 ) ) ; + m_color.reset( wxMacCreateCGColor( pen.GetColour() ) ) ; // TODO: * m_dc->m_scaleX m_width = pen.GetWidth(); @@ -390,8 +453,8 @@ wxMacCoreGraphicsPenData::wxMacCoreGraphicsPenData( wxGraphicsRenderer* renderer wxBitmap* bmp = pen.GetStipple(); if ( bmp && bmp->Ok() ) { - m_colorSpace.Set( CGColorSpaceCreatePattern( NULL ) ); - m_pattern.Set( *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) ); + m_colorSpace.reset( CGColorSpaceCreatePattern( NULL ) ); + m_pattern.reset( (CGPatternRef) *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) ); m_patternColorComponents = new CGFloat[1] ; m_patternColorComponents[0] = 1.0; m_isPattern = true; @@ -402,8 +465,8 @@ wxMacCoreGraphicsPenData::wxMacCoreGraphicsPenData( wxGraphicsRenderer* renderer default : { m_isPattern = true; - m_colorSpace.Set( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) ); - m_pattern.Set( *( new HatchPattern( pen.GetStyle() , CGAffineTransformMakeScale( 1,-1 ) ) ) ); + m_colorSpace.reset( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) ); + m_pattern.reset( (CGPatternRef) *( 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; @@ -488,15 +551,15 @@ class wxMacCoreGraphicsColour wxMacCoreGraphicsColour(); wxMacCoreGraphicsColour(const wxBrush &brush); ~wxMacCoreGraphicsColour(); - + void Apply( CGContextRef cgContext ); protected: void Init(); - wxMacCFRefHolder m_color; - wxMacCFRefHolder m_colorSpace; - + wxCFRef m_color; + wxCFRef m_colorSpace; + bool m_isPattern; - wxMacCFRefHolder m_pattern; + wxCFRef m_pattern; CGFloat* m_patternColorComponents; } ; @@ -526,7 +589,7 @@ void wxMacCoreGraphicsColour::Apply( CGContextRef cgContext ) } } -wxMacCoreGraphicsColour::wxMacCoreGraphicsColour() +wxMacCoreGraphicsColour::wxMacCoreGraphicsColour() { Init(); } @@ -536,13 +599,13 @@ wxMacCoreGraphicsColour::wxMacCoreGraphicsColour( const wxBrush &brush ) Init(); if ( brush.GetStyle() == wxSOLID ) { - m_color.Set( brush.GetColour().CreateCGColor() ); + m_color.reset( wxMacCreateCGColor( brush.GetColour() )); } else if ( brush.IsHatch() ) { m_isPattern = true; - m_colorSpace.Set( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) ); - m_pattern.Set( *( new HatchPattern( brush.GetStyle() , CGAffineTransformMakeScale( 1,-1 ) ) ) ); + m_colorSpace.reset( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) ); + m_pattern.reset( (CGPatternRef) *( new HatchPattern( brush.GetStyle() , CGAffineTransformMakeScale( 1,-1 ) ) ) ); m_patternColorComponents = new CGFloat[4] ; m_patternColorComponents[0] = brush.GetColour().Red() / 255.0; @@ -559,8 +622,8 @@ wxMacCoreGraphicsColour::wxMacCoreGraphicsColour( const wxBrush &brush ) 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 ) ) ) ); + m_colorSpace.reset( CGColorSpaceCreatePattern( NULL ) ); + m_pattern.reset( (CGPatternRef) *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) ); } } } @@ -703,7 +766,7 @@ public: CTFontRef GetCTFont() const { return m_ctFont ; } #endif wxColour GetColour() const { return m_colour ; } - + bool GetUnderlined() const { return m_underlined ; } private : wxColour m_colour; @@ -722,7 +785,7 @@ wxMacCoreGraphicsFontData::wxMacCoreGraphicsFontData(wxGraphicsRenderer* rendere m_underlined = font.GetUnderlined(); #if wxMAC_USE_CORE_TEXT - m_ctFont.reset( wxCFRetain((CTFontRef) font.MacGetCTFont()) ); + m_ctFont.reset( wxMacCreateCTFont( font ) ); #endif #if wxMAC_USE_ATSU_TEXT OSStatus status = noErr; @@ -778,6 +841,27 @@ wxMacCoreGraphicsFontData::~wxMacCoreGraphicsFontData() #endif } +class wxMacCoreGraphicsBitmapData : public wxGraphicsObjectRefData +{ +public: + wxMacCoreGraphicsBitmapData( wxGraphicsRenderer* renderer, CGImageRef bitmap ); + ~wxMacCoreGraphicsBitmapData(); + + virtual CGImageRef GetBitmap() { return m_bitmap; } +private : + CGImageRef m_bitmap; +}; + +wxMacCoreGraphicsBitmapData::wxMacCoreGraphicsBitmapData( wxGraphicsRenderer* renderer, CGImageRef bitmap ) : wxGraphicsObjectRefData( renderer ) +{ + m_bitmap = bitmap; +} + +wxMacCoreGraphicsBitmapData::~wxMacCoreGraphicsBitmapData() +{ + CGImageRelease( m_bitmap ); +} + // // Graphics Matrix // @@ -805,7 +889,7 @@ public : // 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(); @@ -1169,7 +1253,7 @@ public: virtual void GetSize( wxDouble* width, wxDouble* height); virtual void StartPage( wxDouble width, wxDouble height ); - + virtual void EndPage(); virtual void Flush(); @@ -1227,7 +1311,7 @@ public: virtual void DrawPath( const wxGraphicsPath &path, int fillStyle = wxODDEVEN_RULE ); virtual bool ShouldOffset() const - { + { int penwidth = 0 ; if ( !m_pen.IsNull() ) { @@ -1256,6 +1340,8 @@ public: virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ); + virtual void DrawBitmap( const wxGraphicsBitmap &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 ); @@ -1273,7 +1359,7 @@ private: wxDouble m_width; wxDouble m_height; - wxMacCFRefHolder m_clipRgn; + wxCFRef m_clipRgn; }; //----------------------------------------------------------------------------- @@ -1321,9 +1407,8 @@ void wxMacCoreGraphicsContext::Init() m_windowRef = NULL; m_width = 0; m_height = 0; - - HIRect r = CGRectMake(0,0,0,0); - m_clipRgn.Set(HIShapeCreateWithRect(&r)); + CGRect r = CGRectMake(0,0,0,0); + m_clipRgn.reset(HIShapeCreateWithRect(&r)); } wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext, wxDouble width, wxDouble height ) : wxGraphicsContext(renderer) @@ -1343,14 +1428,15 @@ wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer 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__ +#if defined( __LP64__ ) || defined(__WXCOCOA__) #else + m_windowRef = (WindowRef) window->MacGetTopLevelWindowRef(); + window->MacWindowToRootWindow( &originX , &originY ); GetWindowBounds( m_windowRef, kWindowContentRgn, &bounds ); #endif m_windowTransform = CGAffineTransformMakeTranslation( 0 , bounds.bottom - bounds.top ); @@ -1388,12 +1474,12 @@ void wxMacCoreGraphicsContext::StartPage( wxDouble width, wxDouble height ) 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); @@ -1408,29 +1494,31 @@ void wxMacCoreGraphicsContext::EnsureIsValid() { if ( !m_cgContext ) { - OSStatus status = -#ifndef __LP64__ + OSStatus status = +#if ! ( defined( __LP64__ ) || defined(__WXCOCOA__) ) QDBeginCGContext( GetWindowPort( m_windowRef ) , &m_cgContext ); #else paramErr; #endif - wxASSERT_MSG( status == noErr , wxT("Cannot nest wxDCs on the same window") ); + if ( status != noErr ) + { + wxFAIL_MSG("Cannot nest wxDCs on the same window"); + } CGContextConcatCTM( m_cgContext, m_windowTransform ); - CGContextSaveGState( m_cgContext ); - m_releaseContext = true; - if ( !HIShapeIsEmpty(m_clipRgn) ) - { + 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 ) ); + wxCFRef hishape( 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 ); - } + HIShapeReplacePathInCGContext( hishape, m_cgContext ); + CGContextClip( m_cgContext ); + } + CGContextSaveGState( m_cgContext ); + } } // TODO test whether the private CGContextSetCompositeOperation works under 10.3 (using NSCompositingModes) @@ -1441,12 +1529,12 @@ bool wxMacCoreGraphicsContext::SetLogicalFunction( int function ) return true; EnsureIsValid(); - + bool retval = false; bool shouldAntiAlias = true; CGBlendMode mode = kCGBlendModeNormal; - -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + +#if defined(__WXMAC__) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 ) if ( UMAGetSystemVersion() >= 0x1050 ) { retval = true; @@ -1462,7 +1550,7 @@ bool wxMacCoreGraphicsContext::SetLogicalFunction( int function ) case wxXOR : mode = kCGBlendModeXOR; shouldAntiAlias = false; - break; + break; default : retval = false; break; @@ -1483,7 +1571,7 @@ bool wxMacCoreGraphicsContext::SetLogicalFunction( int function ) retval = true; } } - + if (retval) { m_logicalFunction = function; @@ -1495,6 +1583,7 @@ bool wxMacCoreGraphicsContext::SetLogicalFunction( int function ) void wxMacCoreGraphicsContext::Clip( const wxRegion ®ion ) { +#ifdef __WXMAC__ if( m_cgContext ) { HIShapeReplacePathInCGContext( region.GetWXHRGN() , m_cgContext ); @@ -1505,27 +1594,28 @@ void wxMacCoreGraphicsContext::Clip( const wxRegion ®ion ) // 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); + m_clipRgn.reset(mutableShape); } +#endif } // clips drawings to the rect void wxMacCoreGraphicsContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) { - HIRect r = CGRectMake( x , y , w , h ); + CGRect r = CGRectMake( x , y , w , h ); if ( m_cgContext ) { CGContextClipToRect( m_cgContext, r ); } else { - // the clipping itself must be stored as device coordinates, otherwise + // 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)); + m_clipRgn.reset(HIShapeCreateWithRect(&r)); } } @@ -1546,8 +1636,8 @@ void wxMacCoreGraphicsContext::ResetClip() } else { - HIRect r = CGRectMake(0,0,0,0); - m_clipRgn.Set(HIShapeCreateWithRect(&r)); + CGRect r = CGRectMake(0,0,0,0); + m_clipRgn.reset(HIShapeCreateWithRect(&r)); } } @@ -1652,7 +1742,7 @@ void wxMacCoreGraphicsContext::SetNativeContext( CGContextRef cg ) CGContextRestoreGState( m_cgContext ); if ( m_releaseContext ) { -#ifndef __LP64__ +#if ! ( defined( __LP64__ ) || defined(__WXCOCOA__) ) QDEndCGContext( GetWindowPort( m_windowRef ) , &m_cgContext); #endif } @@ -1674,6 +1764,7 @@ void wxMacCoreGraphicsContext::SetNativeContext( CGContextRef cg ) { CGContextRetain(m_cgContext); CGContextSaveGState( m_cgContext ); + CGContextSetTextMatrix( m_cgContext, CGAffineTransformIdentity ); CGContextSaveGState( m_cgContext ); m_releaseContext = false; } @@ -1705,11 +1796,17 @@ void wxMacCoreGraphicsContext::Rotate( wxDouble angle ) void wxMacCoreGraphicsContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) { - EnsureIsValid(); + wxGraphicsBitmap bitmap = GetRenderer()->CreateBitmap(bmp); + DrawBitmap(bitmap, x, y, w, h); +} - CGImageRef image = (CGImageRef)( bmp.CreateCGImage() ); - HIRect r = CGRectMake( x , y , w , h ); - if ( bmp.GetDepth() == 1 ) +void wxMacCoreGraphicsContext::DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +{ + EnsureIsValid(); +#ifdef __WXMAC__ + CGImageRef image = static_cast(bmp.GetRefData())->GetBitmap(); + CGRect 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() ) @@ -1732,11 +1829,14 @@ void wxMacCoreGraphicsContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDo } } } + /* else { wxMacDrawCGImage( m_cgContext , &r , image ); } CGImageRelease( image ); + */ +#endif } void wxMacCoreGraphicsContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) @@ -1747,8 +1847,10 @@ void wxMacCoreGraphicsContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDoubl CGContextSaveGState( m_cgContext ); CGContextTranslateCTM( m_cgContext, x , y + h ); CGContextScaleCTM( m_cgContext, 1, -1 ); +#ifdef __WXMAC__ PlotIconRefInContext( m_cgContext , &r , kAlignNone , kTransformNone , NULL , kPlotIconRefNormalFlags , MAC_WXHICON( icon.GetHICON() ) ); +#endif CGContextRestoreGState( m_cgContext ); } @@ -1770,7 +1872,7 @@ void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDoub { if ( m_font.IsNull() ) return; - + EnsureIsValid(); #if wxMAC_USE_CORE_TEXT if ( UMAGetSystemVersion() >= 0x1050 ) @@ -1778,24 +1880,25 @@ void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDoub wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData(); wxCFStringRef text(str, wxLocale::GetSystemEncoding() ); CTFontRef font = fref->GetCTFont(); - CGColorRef col = fref->GetColour().GetPixel(); + CGColorRef col = wxMacCreateCGColor( fref->GetColour() ); CTUnderlineStyle ustyle = fref->GetUnderlined() ? kCTUnderlineStyleSingle : kCTUnderlineStyleNone ; - wxCFRef underlined( CFNumberCreate(NULL, kCFNumberSInt32Type, &ustyle) ); - CFStringRef keys[] = { kCTFontAttributeName , kCTForegroundColorAttributeName, kCTUnderlineStyleAttributeName }; + 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, + 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); + CFRelease( col ); return; } #endif @@ -1834,12 +1937,12 @@ void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDoub ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle()); status = ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 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 ) { @@ -1859,7 +1962,7 @@ void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDoub status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag), atsuTags, atsuSizes, atsuValues ); } - + { ATSUAttributeTag atsuTags[] = { @@ -1876,35 +1979,35 @@ void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDoub 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); - + return; } #endif @@ -1927,7 +2030,7 @@ void wxMacCoreGraphicsContext::GetTextExtent( const wxString &str, wxDouble *wid *descent = 0; if ( externalLeading ) *externalLeading = 0; - + if (str.empty()) return; @@ -1940,15 +2043,15 @@ void wxMacCoreGraphicsContext::GetTextExtent( const wxString &str, wxDouble *wid wxCFStringRef text(str, wxLocale::GetSystemEncoding() ); CFStringRef keys[] = { kCTFontAttributeName }; CFTypeRef values[] = { font }; - wxCFRef attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values, + 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 ) @@ -1963,23 +2066,26 @@ void wxMacCoreGraphicsContext::GetTextExtent( const wxString &str, wxDouble *wid #if wxMAC_USE_ATSU_TEXT { OSStatus status = noErr; - + ATSUTextLayout atsuLayout; wxMacUniCharBuffer unibuf( str ); UniCharCount chars = unibuf.GetChars(); - + ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle()); status = ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 , &chars , &style , &atsuLayout ); - + wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") ); - + + status = ::ATSUSetTransientFontMatching( atsuLayout , true ); + wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") ); + ATSUTextMeasurement textBefore, textAfter; ATSUTextMeasurement textAscent, textDescent; - + status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, &textBefore , &textAfter, &textAscent , &textDescent ); - + if ( height ) *height = FixedToInt(textAscent + textDescent); if ( descent ) @@ -1988,7 +2094,7 @@ void wxMacCoreGraphicsContext::GetTextExtent( const wxString &str, wxDouble *wid *externalLeading = 0; if ( width ) *width = FixedToInt(textAfter - textBefore); - + ::ATSUDisposeTextLayout(atsuLayout); return; @@ -2011,50 +2117,56 @@ void wxMacCoreGraphicsContext::GetPartialTextExtents(const wxString& text, wxArr { wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData(); CTFontRef font = fref->GetCTFont(); - + wxCFStringRef t(text, wxLocale::GetSystemEncoding() ); CFStringRef keys[] = { kCTFontAttributeName }; CFTypeRef values[] = { font }; - wxCFRef attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values, + 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 { + OSStatus status = noErr; ATSUTextLayout atsuLayout; wxMacUniCharBuffer unibuf( text ); UniCharCount chars = unibuf.GetChars(); - + ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle()); - ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 , + status = ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 , &chars , &style , &atsuLayout ); - + + wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") ); + + status = ::ATSUSetTransientFontMatching( atsuLayout , true ); + wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") ); + 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); } #endif @@ -2127,7 +2239,7 @@ public : virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ); virtual wxGraphicsContext * CreateContext( wxWindow* window ); - + virtual wxGraphicsContext * CreateMeasuringContext(); // Path @@ -2156,6 +2268,11 @@ public : // sets the font virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ; + // create a native bitmap representation + virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) ; + + // create a native bitmap representation + virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) ; private : DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsRenderer) } ; @@ -2173,25 +2290,42 @@ wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer() return &gs_MacCoreGraphicsRenderer; } +#ifdef __WXCOCOA__ +extern CGContextRef wxMacGetContextFromCurrentNSContext() ; +#endif + 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()) ); - + { + int w, h; + win_impl->GetSize( &w, &h ); + CGContextRef cgctx = 0; +#ifdef __WXMAC__ + cgctx = (CGContextRef)(win_impl->GetWindow()->MacGetCGContextRef()); +#else + cgctx = wxMacGetContextFromCurrentNSContext() ; +#endif + return new wxMacCoreGraphicsContext( this, cgctx, (wxDouble) w, (wxDouble) h ); + } return NULL; } wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( const wxMemoryDC& dc ) { +#ifdef __WXMAC__ const wxDCImpl* impl = dc.GetImpl(); wxMemoryDCImpl *mem_impl = wxDynamicCast( impl, wxMemoryDCImpl ); if (mem_impl) - return new wxMacCoreGraphicsContext( this, - (CGContextRef)(mem_impl->GetGraphicsContext()->GetNativeContext()) ); - + { + int w, h; + mem_impl->GetSize( &w, &h ); + return new wxMacCoreGraphicsContext( this, + (CGContextRef)(mem_impl->GetGraphicsContext()->GetNativeContext()), (wxDouble) w, (wxDouble) h ); + } +#endif return NULL; } @@ -2262,6 +2396,34 @@ wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateBrush(const wxBrush& brush ) } } +wxGraphicsBitmap wxMacCoreGraphicsRenderer::CreateBitmap( const wxBitmap& bmp ) +{ + if ( bmp.Ok() ) + { + wxGraphicsBitmap p; +#ifdef __WXMAC__ + p.SetRefData(new wxMacCoreGraphicsBitmapData( this , bmp.CreateCGImage() ) ); +#endif + return p; + } + else + return wxNullGraphicsBitmap; +} + +wxGraphicsBitmap wxMacCoreGraphicsRenderer::CreateSubBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +{ + CGImageRef img = static_cast(bmp.GetRefData())->GetBitmap(); + if ( img ) + { + wxGraphicsBitmap p; + CGImageRef subimg = CGImageCreateWithImageInRect(img,CGRectMake( x , y , w , h )); + p.SetRefData(new wxMacCoreGraphicsBitmapData( this , subimg ) ); + return p; + } + else + return wxNullGraphicsBitmap; +} + // 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) @@ -2344,7 +2506,10 @@ CGDataConsumerRef wxMacCGDataConsumerCreateWithCFData( CFMutableDataRef data ) return CGDataConsumerCreateWithCFData( data ); } -void wxMacReleaseMemoryBufferProviderCallback(void *info, const void *data, size_t WXUNUSED(size)) +void +wxMacReleaseMemoryBufferProviderCallback(void *info, + const void * WXUNUSED_UNLESS_DEBUG(data), + size_t WXUNUSED(size)) { wxMemoryBuffer* membuf = (wxMemoryBuffer*) info ; @@ -2358,7 +2523,7 @@ CGDataProviderRef wxMacCGDataProviderCreateWithMemoryBuffer( const wxMemoryBuffe 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 +}