#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"
#include "wx/mac/private.h"
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
-typedef float CGFloat;
-#endif
-
//-----------------------------------------------------------------------------
// constants
//-----------------------------------------------------------------------------
#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
{
wxASSERT( bmp && bmp->Ok() );
- Init( (CGImageRef) bmp->CGImageCreate() , transform );
+ Init( (CGImageRef) bmp->CreateCGImage() , transform );
}
// ImagePattern takes ownership of CGImageRef passed in
virtual void Render( CGContextRef ctxRef )
{
if (m_image != NULL)
- HIViewDrawCGImage( ctxRef, &m_imageBounds, m_image );
+ wxMacDrawCGImage( ctxRef, &m_imageBounds, m_image );
}
protected :
void StrokeLineSegments( CGContextRef ctxRef , const CGPoint pts[] , size_t count )
{
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
- if ( UMAGetSystemVersion() >= 0x1040 )
- {
- 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 )
{
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 ) ) ;
if ( bmp && bmp->Ok() )
{
m_colorSpace.Set( CGColorSpaceCreatePattern( NULL ) );
- m_pattern.Set( *( new ImagePattern( bmp , CGAffineTransformMakeTranslation( 0,0 ) ) ) );
+ m_pattern.Set( *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) );
m_patternColorComponents = new CGFloat[1] ;
m_patternColorComponents[0] = 1.0;
m_isPattern = true;
{
m_isPattern = true;
m_colorSpace.Set( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) );
- m_pattern.Set( *( new HatchPattern( pen.GetStyle() , CGAffineTransformMakeTranslation( 0,0 ) ) ) );
+ 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;
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
{
- CGContextSetStrokeColorWithColor( cg , m_color );
+ if ( context->GetLogicalFunction() == wxINVERT || context->GetLogicalFunction() == wxXOR )
+ {
+ CGContextSetRGBStrokeColor( cg , 1.0, 1.0 , 1.0, 1.0 );
+ }
+ else
+ CGContextSetStrokeColorWithColor( cg , m_color );
}
}
// 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<CGColorRef> m_color;
+ wxMacCFRefHolder<CGColorSpaceRef> m_colorSpace;
+
+ bool m_isPattern;
+ wxMacCFRefHolder<CGPatternRef> 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:
static void CalculateShadingValues (void *info, const CGFloat *in, CGFloat *out);
virtual void Init();
- wxMacCFRefHolder<CGColorRef> m_color;
- wxMacCFRefHolder<CGColorSpaceRef> m_colorSpace;
-
- bool m_isPattern;
- wxMacCFRefHolder<CGPatternRef> m_pattern;
- CGFloat* m_patternColorComponents;
+ wxMacCoreGraphicsColour m_cgColor;
bool m_isShading;
CGFunctionRef m_gradientFunction;
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 )
- {
- 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() , CGAffineTransformMakeTranslation( 0,0 ) ) ) );
-
- 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 , CGAffineTransformMakeTranslation( 0,0 ) ) ) );
- }
- }
}
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;
}
if ( m_isShading )
{
+ // nothing to set as shades are processed by clipping using the path and filling
}
else
{
- if ( m_isPattern )
- {
- CGContextSetFillColorSpace( cg , m_colorSpace );
- CGContextSetFillPattern( cg, m_pattern , m_patternColorComponents );
- }
- else
- {
- CGContextSetFillColorWithColor( cg, m_color );
- }
+ m_cgColor.Apply( cg );
}
}
{
m_macATSUIStyle = NULL;
+#if wxMAC_USE_CORE_TEXT
+#elif wxMAC_USE_ATSU_TEXT
OSStatus status;
status = ATSUCreateAndCopyStyle( (ATSUStyle) font.MacGetATSUStyle() , &m_macATSUIStyle );
// 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 ,
atsuTags, atsuSizes, atsuValues);
wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") );
+#elif WXMAC_USE_CG_TEXT
+#endif
}
wxMacCoreGraphicsFontData::~wxMacCoreGraphicsFontData()
{
+#if wxMAC_USE_CORE_TEXT
+#elif wxMAC_USE_ATSU_TEXT
if ( m_macATSUIStyle )
{
::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle);
m_macATSUIStyle = NULL;
}
+#elif WXMAC_USE_CG_TEXT
+#endif
}
//
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();
m_matrix = CGAffineTransformMake(a,b,c,d,tx,ty);
}
+// gets the component valuess of the matrix
+void wxMacCoreGraphicsMatrixData::Get(wxDouble* a, wxDouble* b, wxDouble* c,
+ wxDouble* d, wxDouble* tx, wxDouble* ty) const
+{
+ 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;
+}
+
// makes this the inverse matrix
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();
- 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()));
}
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 );
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 );
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();
virtual void * GetNativeContext();
+ bool SetLogicalFunction( int function );
//
// transformation
//
virtual void DrawPath( const wxGraphicsPath &path, int fillStyle = wxODDEVEN_RULE );
virtual bool ShouldOffset() const
- {
+ {
int penwidth = 0 ;
if ( !m_pen.IsNull() )
{
WindowRef m_windowRef;
bool m_releaseContext;
CGAffineTransform m_windowTransform;
+ wxDouble m_width;
+ wxDouble m_height;
wxMacCFRefHolder<HIShapeRef> m_clipRgn;
};
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)
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 ) ;
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 );
m_releaseContext = true;
if ( !HIShapeIsEmpty(m_clipRgn) )
{
- HIShapeReplacePathInCGContext( m_clipRgn, m_cgContext );
+ // the clip region is in device coordinates, so we convert this again to user coordinates
+ wxMacCFRefHolder<HIMutableShapeRef> 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 )
{
- HIShapeRef shape = HIShapeCreateWithQDRgn( (RgnHandle) region.GetWXHRGN() );
- HIShapeReplacePathInCGContext( shape, m_cgContext );
+ HIShapeReplacePathInCGContext( region.GetWXHRGN() , m_cgContext );
CGContextClip( m_cgContext );
- CFRelease( shape );
}
else
{
- m_clipRgn.Set(HIShapeCreateWithQDRgn( (RgnHandle) region.GetWXHRGN() ));
+ // 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);
}
}
}
else
{
+ // 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));
}
}
{
if ( m_cgContext )
{
+ // 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);
}
else
{
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 )
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 )
CGContextRestoreGState( m_cgContext );
CGContextRestoreGState( m_cgContext );
if ( m_releaseContext )
+ {
+#ifndef __LP64__
QDEndCGContext( GetWindowPort( m_windowRef ) , &m_cgContext);
+#endif
+ }
else
CGContextRelease(m_cgContext);
}
{
EnsureIsValid();
- CGImageRef image = (CGImageRef)( bmp.CGImageCreate() );
+ CGImageRef image = (CGImageRef)( bmp.CreateCGImage() );
HIRect r = CGRectMake( x , y , w , h );
- HIViewDrawCGImage( m_cgContext , &r , image );
+ 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);
+ */
+ }
+ else
+ {
+ ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->Apply(this);
+ wxMacDrawCGImage( m_cgContext , &r , image );
+ }
+ }
+ }
+ else
+ {
+ wxMacDrawCGImage( m_cgContext , &r , image );
+ }
CGImageRelease( image );
}
void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y )
{
+ if ( m_font.IsNull() )
+ return;
+
+ EnsureIsValid();
+#if wxMAC_USE_CORE_TEXT
+ // TODO core text implementation here
+#elif wxMAC_USE_ATSU_TEXT
DrawText(str, x, y, 0.0);
+#elif WXMAC_USE_CG_TEXT
+ // TODO core graphics text implementation here
+#endif
}
void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle )
return;
EnsureIsValid();
-
+#if wxMAC_USE_CORE_TEXT
+ // default implementation takes care of rotation and calls non rotated DrawText afterwards
+ wxGraphicsContext::DrawText( str, x, y, angle );
+#elif wxMAC_USE_ATSU_TEXT
OSStatus status = noErr;
ATSUTextLayout atsuLayout;
UniCharCount chars = str.length();
wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") );
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));
+ x += (int)(sin(angle) * FixedToInt(ascent));
+ y += (int)(cos(angle) * FixedToInt(ascent));
status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
IntToFixed(x) , IntToFixed(y) , &rect );
#if SIZEOF_WCHAR_T == 4
free( ubuf );
#endif
+#elif 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::GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
{
wxCHECK_RET( !m_font.IsNull(), wxT("wxDC(cg)::DoGetTextExtent - no valid font set") );
+ 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
+ // TODO core text implementation here
+#elif wxMAC_USE_ATSU_TEXT
OSStatus status = noErr;
ATSUTextLayout atsuLayout;
*width = FixedToInt(textAfter - textBefore);
::ATSUDisposeTextLayout(atsuLayout);
+#if SIZEOF_WCHAR_T == 4
+ free( ubuf ) ;
+#endif
+#elif WXMAC_USE_CG_TEXT
+ // TODO core graphics text implementation here
+#endif
}
void wxMacCoreGraphicsContext::GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const
if (text.empty())
return;
+#if wxMAC_USE_CORE_TEXT
+ // TODO core text implementation here
+#elif wxMAC_USE_ATSU_TEXT
ATSUTextLayout atsuLayout;
UniCharCount chars = text.length();
UniChar* ubuf = NULL;
}
::ATSUDisposeTextLayout(atsuLayout);
+#if SIZEOF_WCHAR_T == 4
+ free( ubuf ) ;
+#endif
+#elif WXMAC_USE_CG_TEXT
+ // TODO core graphics text implementation here
+#endif
}
void * wxMacCoreGraphicsContext::GetNativeContext()
virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window );
virtual wxGraphicsContext * CreateContext( wxWindow* window );
+
+ virtual wxGraphicsContext * CreateMeasuringContext();
// Path
wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( const wxWindowDC& dc)
{
- return new wxMacCoreGraphicsContext(this,(CGContextRef)dc.GetWindow()->MacGetCGContextRef() );
+ wxMemoryDC* mdc = wxDynamicCast(&dc, wxMemoryDC);
+ if ( mdc )
+ {
+ return new wxMacCoreGraphicsContext(this,
+ (CGContextRef)mdc->GetGraphicsContext()->GetNativeContext());
+ }
+ else
+ {
+ return new wxMacCoreGraphicsContext(this,(CGContextRef)dc.GetWindow()->MacGetCGContextRef() );
+ }
}
wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContextFromNativeContext( void * context )
return new wxMacCoreGraphicsContext(this, window );
}
+wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateMeasuringContext()
+{
+ return new wxMacCoreGraphicsContext(this);
+}
+
// Path
wxGraphicsPath wxMacCoreGraphicsRenderer::CreatePath()
return wxNullGraphicsFont;
}
-
-
-#endif // wxMAC_USE_CORE_GRAPHICS
projects / wxWidgets.git / blobdiff