X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc8f7aeed2c56f2fc5b100421dcde767a1e5981c..4cbcfb73a037462ccf4d54b3e50c58e37cc61aa9:/src/mac/carbon/dccg.cpp diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp index 606b97fcca..a91add9cef 100755 --- a/src/mac/carbon/dccg.cpp +++ b/src/mac/carbon/dccg.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "dc.h" -#endif - #include "wx/wxprec.h" #include "wx/dc.h" @@ -34,15 +30,8 @@ using namespace std ; #endif #include "wx/mac/private.h" -#include -#include -#include -#include -#include -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) -#endif //----------------------------------------------------------------------------- // constants @@ -139,6 +128,10 @@ static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } // also coordinate conversions should be moved to native matrix ops //----------------------------------------------------------------------------- +// we always stock two context states, one at entry, to be able to preserve the +// state we were called with, the other one after changing to HI Graphics orientation +// (this one is used for getting back clippings etc) + wxMacCGPath::wxMacCGPath() { m_path = CGPathCreateMutable() ; @@ -160,6 +153,11 @@ void wxMacCGPath::AddLineToPoint( wxCoord x1 , wxCoord y1 ) CGPathAddLineToPoint( m_path , NULL , x1 , y1 ) ; } +void wxMacCGPath::AddQuadCurveToPoint( wxCoord cx1, wxCoord cy1, wxCoord x1, wxCoord y1 ) +{ + CGPathAddQuadCurveToPoint( m_path , NULL , cx1 , cy1 , x1 , y1 ); +} + void wxMacCGPath::AddRectangle( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) { CGRect cgRect = { { x , y } , { w , h } } ; @@ -182,9 +180,6 @@ CGPathRef wxMacCGPath::GetPath() const return m_path ; } -// we always stock two context states, one at entry, the other one after -// changing to HI Graphics orientation (this one is used for getting back clippings etc) - wxMacCGContext::wxMacCGContext( CGrafPtr port ) { m_qdPort = port ; @@ -226,9 +221,7 @@ void wxMacCGContext::Clip( const wxRegion ®ion ) void wxMacCGContext::StrokePath( const wxGraphicPath *p ) { const wxMacCGPath* path = dynamic_cast< const wxMacCGPath*>( p ) ; - CGContextBeginPath( m_cgContext ) ; CGContextAddPath( m_cgContext , path->GetPath() ) ; - CGContextClosePath( m_cgContext ) ; CGContextStrokePath( m_cgContext ) ; } @@ -243,9 +236,7 @@ void wxMacCGContext::DrawPath( const wxGraphicPath *p , int fillStyle ) else if ( mode == kCGPathFillStroke ) mode = kCGPathEOFillStroke ; } - CGContextBeginPath( m_cgContext ) ; CGContextAddPath( m_cgContext , path->GetPath() ) ; - CGContextClosePath( m_cgContext ) ; CGContextDrawPath( m_cgContext , mode ) ; } @@ -302,11 +293,217 @@ CGContextRef wxMacCGContext::GetNativeContext() void wxMacCGContext::SetNativeContext( CGContextRef cg ) { - wxASSERT( m_cgContext == NULL ) ; + // we allow either setting or clearing but not replacing + wxASSERT( m_cgContext == NULL || cg == NULL ) ; + if ( cg ) + CGContextSaveGState( cg ) ; m_cgContext = cg ; - CGContextSaveGState( m_cgContext ) ; } +#pragma mark - + +// Experimental support for dashes and patterned brushes +// uncomment the following lines to enable it + +// #define _NEW_GC_DASHES_ +// #define _NEW_GC_SUPPORT_ + +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4 +#define kCGColorSpaceGenericRGB CFSTR("kCGColorSpaceGenericRGB") +#endif + +void EstablishPatternColorSpace( + CGContextRef ctxRef, + bool useMultibit, + bool useFill ) +{ + CGColorSpaceRef baseSpace, patternSpace; + + if (ctxRef == NULL) + return; + + baseSpace = NULL; + patternSpace = NULL; + + if (useMultibit) + { + patternSpace = CGColorSpaceCreatePattern( NULL ); + + if (useFill) + CGContextSetFillColorSpace( ctxRef, patternSpace ); + else + CGContextSetStrokeColorSpace( ctxRef, patternSpace ); + } + else + { + baseSpace = CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB ); + patternSpace = CGColorSpaceCreatePattern( baseSpace ); + + if (useFill) + CGContextSetFillColorSpace( ctxRef, patternSpace ); + else + CGContextSetStrokeColorSpace( ctxRef, patternSpace ); + } + + // NB: the context owns these now, and this code is finished with them + if (patternSpace != NULL) + CGColorSpaceRelease( patternSpace ); + if (baseSpace != NULL) + CGColorSpaceRelease( baseSpace ); +} + +void ImagePatternRender( + void *info, + CGContextRef ctxRef ) +{ + if (ctxRef == NULL) + return; + + CGImageRef imageRef = (CGImageRef)info; + if (imageRef != NULL) + { + CGRect boundsR = CGRectMake( 0.0, 0.0, (float)CGImageGetWidth( imageRef ), (float)CGImageGetHeight( imageRef ) ); + CGContextDrawImage( ctxRef, boundsR, imageRef ); + } +} + +void ImagePatternDispose( + void *info ) +{ + CGImageRef imageRef = (CGImageRef)info; + if (imageRef != NULL) + CGImageRelease( imageRef ); +} + +// specifies the struct version value and the callback functions for draw and release +static const CGPatternCallbacks sImagePatternCallback = { 0, &ImagePatternRender, &ImagePatternDispose }; + +long CreatePatternFromBitmap( + CGPatternRef *patternRef, + const wxBitmap *rasterInfo, + bool useMultibit ) +{ + CGRect boundsR; + CGImageRef imageRef; + long errorStatus, widthV, heightV, depthV; + + if (patternRef == NULL) + return (-1); + + *patternRef = NULL; + imageRef = NULL; + errorStatus = 0; + + if ((rasterInfo == NULL) || !rasterInfo->Ok()) + errorStatus = (-2); + + if (errorStatus == 0) + { + // build a usable bounding CGRect from the wxBitmap's bounds wxRect + widthV = rasterInfo->GetWidth(); + heightV = rasterInfo->GetHeight(); + if ((widthV <= 0) || (heightV <= 0)) + errorStatus = (-3); + } + + if (errorStatus == 0) + { + depthV = rasterInfo->GetDepth(); +// isColored = (depthV > 1); + + // FIXME: this is often <= 0 - why??? +// if (depthV <= 1) +// errorStatus = (-4); + } + + if (errorStatus == 0) + { + imageRef = (CGImageRef)(rasterInfo->CGImageCreate()); + if (imageRef == NULL) + errorStatus = (-5); + } + + if (errorStatus == 0) + { + // FIXME: switch when this routine belongs to a DC class... + boundsR = CGRectMake( 0.0, 0.0, (float)widthV, (float)heightV ); +// boundsR = CGRectMake( 0.0, 0.0, (float)XLOG2DEVREL( widthV ), (float)XLOG2DEVREL( heightV ) ); + + *patternRef = CGPatternCreate( + (void*)imageRef, + boundsR, + CGAffineTransformIdentity, + boundsR.size.width, + boundsR.size.height, + kCGPatternTilingNoDistortion, + (int)useMultibit, + &sImagePatternCallback ); + + if (*patternRef == (CGPatternRef)NULL) + errorStatus = (-6); + } + + return errorStatus; +} + +long CreatePatternFromDashes( + CGPatternRef *patternRef, + const wxDash *sourceDash, + int count, + bool useMultibit ) +{ + long errorStatus; + + if (patternRef == NULL) + return (-1); + + *patternRef = NULL; + if ((sourceDash == NULL) || (count <= 0)) + return (-2); + + wxBitmap dashBits( (char*)sourceDash, 8, count, 1 ); + errorStatus = CreatePatternFromBitmap( patternRef, &dashBits, useMultibit ); + + return errorStatus; +} + +long CreatePatternFromBrush( + CGPatternRef *patternRef, + const wxBrush &sourceBrush, + bool useMultibit ) +{ + long errorStatus; + + if (patternRef == NULL) + return (-1); + + *patternRef = NULL; + errorStatus = CreatePatternFromBitmap( patternRef, sourceBrush.GetStipple(), useMultibit ); + + return errorStatus; +} + +long CreatePatternFromPen( + CGPatternRef *patternRef, + const wxPen &sourcePen, + bool useMultibit ) +{ + long errorStatus; + + if (patternRef == NULL) + return (-1); + + *patternRef = NULL; + errorStatus = CreatePatternFromBitmap( patternRef, sourcePen.GetStipple(), useMultibit ); + + return errorStatus; +} + +// ------------ +#pragma mark - + +// FIXME: the NEW_GC_SUPPORT part this routine is unfinished and needs lots of work !! +// void wxMacCGContext::SetPen( const wxPen &pen ) { m_pen = pen ; @@ -330,8 +527,55 @@ void wxMacCGContext::SetPen( const wxPen &pen ) } if ( stroke ) { +#if defined(_NEW_GC_SUPPORT_) + // new candidate + { + CGPatternRef patternRef; + float alphaArray[1]; + long result; + bool hasSetPattern, useMultibit; + + hasSetPattern = false; + useMultibit = true; + result = CreatePatternFromPen( &patternRef, pen, useMultibit ); + if (result == 0) + { + EstablishPatternColorSpace( m_cgContext, useMultibit, false ); + + alphaArray[0] = 1.0; + CGContextSetStrokePattern( m_cgContext, patternRef, alphaArray ); + CGPatternRelease( patternRef ); + + hasSetPattern = true; + +//wxLogDebug( wxT("CreatePatternFromPen succeeded!") ); + } + + // NB: the (-2) result is from wxPen instances that don't have a stipple wxBitmap + if (result < (-2)) + wxLogDebug( wxT("CreatePatternFromPen failed: result [%ld]"), result ); + + if (!hasSetPattern) + { + RGBColor col; + +#if 1 + col = MAC_WXCOLORREF( pen.GetColour().GetPixel() ); +#else + GetThemeBrushAsColor( pen.MacGetTheme(), 32, true, &col ); +#endif + + CGContextSetRGBStrokeColor( + m_cgContext, (float) col.red / 65536.0, + (float) col.green / 65536.0, (float) col.blue / 65536.0, 1.0 ); + } + } + +#else + // original implementation RGBColor col = MAC_WXCOLORREF( pen.GetColour().GetPixel() ) ; CGContextSetRGBStrokeColor( m_cgContext , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ; +#endif CGLineCap cap ; switch( pen.GetCap() ) @@ -369,10 +613,83 @@ void wxMacCGContext::SetPen( const wxPen &pen ) } CGContextSetLineJoin( m_cgContext , join ) ; - CGContextSetLineWidth( m_cgContext , pen.GetWidth() == 0 ? 0.1 : pen.GetWidth() /* TODO * m_dc->m_scaleX */ ) ; + /* TODO * m_dc->m_scaleX */ + float penWidth = pen.GetWidth(); + if (penWidth <= 0.0) + penWidth = 0.1; + CGContextSetLineWidth( m_cgContext , penWidth ) ; m_mode = kCGPathStroke ; int count = 0 ; + +#if defined(_NEW_GC_DASHES_) + const char *dashData = NULL ; + char *userDashData = NULL ; + float alphaArray[1]; + + const char dotted[] = { 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55 }; + const char dashed[] = { 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00 }; + const char short_dashed[] = { 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00 }; + const char dotted_dashed[] = { 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0x00 }; + + switch (pen.GetStyle()) + { + case wxSOLID: + // default, undashed pen + break; + + case wxDOT: + dashData = dotted; + count = WXSIZEOF(dotted); + break; + case wxLONG_DASH: + dashData = dashed; + count = WXSIZEOF(dashed); + break; + case wxSHORT_DASH: + dashData = short_dashed; + count = WXSIZEOF(short_dashed); + break; + case wxDOT_DASH: + dashData = dotted_dashed; + count = WXSIZEOF(dotted_dashed); + break; + case wxUSER_DASH: + count = pen.GetDashes( (wxDash**)&userDashData ); + dashData = userDashData; + break; + + default : + break; + } + + if ((dashData != NULL) && (count > 0)) + { + CGPatternRef patternRef; + RGBColor col; + long result; + bool useMultibit; + + useMultibit = true; + result = CreatePatternFromDashes( &patternRef, (const wxDash*)dashData, count, useMultibit ); + if (result == 0) + { + col = MAC_WXCOLORREF( pen.GetColour().GetPixel() ); + CGContextSetRGBStrokeColor( + m_cgContext, (float) col.red / 65536.0, + (float) col.green / 65536.0, (float) col.blue / 65536.0, 1.0 ); + + EstablishPatternColorSpace( m_cgContext, useMultibit, false ); + + alphaArray[0] = 1.0; + CGContextSetStrokePattern( m_cgContext, patternRef, alphaArray ); + CGPatternRelease( patternRef ); + } + + if (result != 0) + wxLogDebug( wxT("CreatePatternFromDashes failed: result [%ld]"), result ); + } +#else const float *lengths = NULL ; float *userLengths = NULL ; @@ -404,11 +721,18 @@ void wxMacCGContext::SetPen( const wxPen &pen ) case wxUSER_DASH : wxDash *dashes ; count = pen.GetDashes( &dashes ) ; - if ( count >0 ) + if ((dashes != NULL) && (count > 0)) { userLengths = new float[count] ; for( int i = 0 ; i < count ; ++i ) - userLengths[i] = dashes[i] ; + { + userLengths[i] = (float)dashes[i] ; + if (userLengths[i] <= 0.0) + { + userLengths[i] = 1.0; +// wxLogDebug( wxT("wxMacCGContext::SetPen - bad dash length[%d] [%.2f]"), i, (float)dashes[i] ); + } + } } lengths = userLengths ; break ; @@ -416,20 +740,28 @@ void wxMacCGContext::SetPen( const wxPen &pen ) break ; } - CGContextSetLineDash( m_cgContext , 0 , lengths , count ) ; - delete[] userLengths ; - // we need to change the cap, otherwise everything overlaps - // and we get solid lines - if ( count > 0 ) + if ((lengths != NULL) && (count > 0)) + { + // we need to change the cap, otherwise everything overlaps + // and we get solid lines + CGContextSetLineDash( m_cgContext , 0 , lengths , count ) ; CGContextSetLineCap( m_cgContext , kCGLineCapButt ) ; + } + else + { + CGContextSetLineDash( m_cgContext , 0 , NULL , 0 ) ; + } + + delete[] userLengths ; +#endif } if ( fill && stroke ) { m_mode = kCGPathFillStroke ; } - } } + void wxMacCGContext::SetBrush( const wxBrush &brush ) { m_brush = brush ; @@ -443,16 +775,64 @@ void wxMacCGContext::SetBrush( const wxBrush &brush ) // we can benchmark performance, should go into a setting later CGContextSetShouldAntialias( m_cgContext , false ) ; #endif + if ( fill | stroke ) { - // setup brushes m_mode = kCGPathFill ; // just a default if ( fill ) { +#if defined(_NEW_GC_SUPPORT_) + // new candidate + { + CGPatternRef patternRef; + float alphaArray[1]; + long result; + bool hasSetPattern, useMultibit; + + hasSetPattern = false; + useMultibit = true; + result = CreatePatternFromBrush( &patternRef, brush, useMultibit ); + if (result == 0) + { + EstablishPatternColorSpace( m_cgContext, useMultibit, true ); + + alphaArray[0] = 1.0; + CGContextSetFillPattern( m_cgContext, patternRef, alphaArray ); + CGPatternRelease( patternRef ); + + hasSetPattern = true; + +//wxLogDebug( wxT("CreatePatternFromBrush succeeded!") ); + } + + // NB: the (-2) result is from wxBrush instances that don't have a stipple wxBitmap + if (result < (-2)) + wxLogDebug( wxT("CreatePatternFromBrush failed: result [%ld]"), result ); + + if (!hasSetPattern) + { + RGBColor col; + +#if 1 + col = MAC_WXCOLORREF( brush.GetColour().GetPixel() ); +#else + GetThemeBrushAsColor( brush.MacGetTheme(), 32, true, &col ); +#endif + + CGContextSetRGBFillColor( + m_cgContext, (float) col.red / 65536.0, + (float) col.green / 65536.0, (float) col.blue / 65536.0, 1.0 ); + } + } + +#else + // original implementation RGBColor col = MAC_WXCOLORREF( brush.GetColour().GetPixel() ) ; CGContextSetRGBFillColor( m_cgContext , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ; +#endif + m_mode = kCGPathFill ; } if ( stroke ) @@ -463,72 +843,9 @@ void wxMacCGContext::SetBrush( const wxBrush &brush ) { m_mode = kCGPathFillStroke ; } - } } -// snippets from Sketch Sample from Apple : - -#define kGenericRGBProfilePathStr "/System/Library/ColorSync/Profiles/Generic RGB Profile.icc" -/* - This function locates, opens, and returns the profile reference for the calibrated - Generic RGB color space. It is up to the caller to call CMCloseProfile when done - with the profile reference this function returns. -*/ -CMProfileRef wxMacOpenGenericProfile(void) -{ - static CMProfileRef cachedRGBProfileRef = NULL; - - // we only create the profile reference once - if (cachedRGBProfileRef == NULL) - { - CMProfileLocation loc; - - loc.locType = cmPathBasedProfile; - strcpy(loc.u.pathLoc.path, kGenericRGBProfilePathStr); - - verify_noerr( CMOpenProfile(&cachedRGBProfileRef, &loc) ); - } - - if (cachedRGBProfileRef) - { - // clone the profile reference so that the caller has their own reference, not our cached one - CMCloneProfileRef(cachedRGBProfileRef); - } - - return cachedRGBProfileRef; -} - -/* - Return the generic RGB color space. This is a 'get' function and the caller should - not release the returned value unless the caller retains it first. Usually callers - of this routine will immediately use the returned colorspace with CoreGraphics - so they typically do not need to retain it themselves. - - This function creates the generic RGB color space once and hangs onto it so it can - return it whenever this function is called. -*/ - -CGColorSpaceRef wxMacGetGenericRGBColorSpace() -{ - static CGColorSpaceRef genericRGBColorSpace = NULL; - - if (genericRGBColorSpace == NULL) - { - CMProfileRef genericRGBProfile = wxMacOpenGenericProfile(); - - if (genericRGBProfile) - { - genericRGBColorSpace = CGColorSpaceCreateWithPlatformColorSpace(genericRGBProfile); - wxASSERT_MSG( genericRGBColorSpace != NULL, wxT("couldn't create the generic RGB color space") ) ; - - // we opened the profile so it is up to us to close it - CMCloseProfile(genericRGBProfile); - } - } - return genericRGBColorSpace; -} - void AddEllipticArcToPath(CGContextRef c, CGPoint center, float a, float b, float fromDegree , float toDegree ) { CGContextSaveGState(c); @@ -617,7 +934,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask wxCoord ww = XLOG2DEVREL(w); wxCoord hh = YLOG2DEVREL(h); - CGContextRef cg = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ; + CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; CGImageRef image = (CGImageRef)( bmp.CGImageCreate() ) ; HIRect r = CGRectMake( xx , yy , ww , hh ) ; HIViewDrawCGImage( cg , &r , image ) ; @@ -636,7 +953,7 @@ void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) wxCoord ww = XLOG2DEVREL(w); wxCoord hh = YLOG2DEVREL(h); - CGContextRef cg = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ; + CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; CGRect r = CGRectMake( 00 , 00 , ww , hh ) ; CGContextSaveGState(cg); CGContextTranslateCTM(cg, xx , yy + hh ); @@ -655,7 +972,7 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei ww = XLOG2DEVREL(width); hh = YLOG2DEVREL(height); - CGContextRef cgContext = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ; + CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; CGRect clipRect = CGRectMake( xx ,yy , ww, hh ) ; CGContextClipToRect( cgContext , clipRect ) ; @@ -732,11 +1049,11 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) void wxDC::DestroyClippingRegion() { // CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; - CGContextRef cgContext = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ; + CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; CGContextRestoreGState( cgContext ); CGContextSaveGState( cgContext ); - SetPen( m_pen ) ; - SetBrush( m_brush ) ; + m_graphicContext->SetPen( m_pen ) ; + m_graphicContext->SetBrush( m_brush ) ; m_clipping = FALSE; } @@ -988,23 +1305,6 @@ void wxDC::DoCrossHair( wxCoord x, wxCoord y ) CalcBoundingBox(x+w, y+h); } -/* -* To draw arcs properly the angles need to be converted from the WX style: -* Angles start on the +ve X axis and go anti-clockwise (As you would draw on -* a normal axis on paper). -* TO -* the Mac style: -* Angles start on the +ve y axis and go clockwise. -*/ - -static double wxConvertWXangleToMACangle(double angle) -{ - double newAngle = 90 - angle ; - if ( newAngle < 0 ) - newAngle += 360 ; - return newAngle ; -} - void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc ) @@ -1024,33 +1324,38 @@ void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, double dy = yy1 - yyc; double radius = sqrt((double)(dx*dx+dy*dy)); wxCoord rad = (wxCoord)radius; - double radius1, radius2; + double sa, ea; if (xx1 == xx2 && yy1 == yy2) { - radius1 = 0.0; - radius2 = 360.0; + sa = 0.0; + ea = 360.0; } else if (radius == 0.0) { - radius1 = radius2 = 0.0; + sa = ea = 0.0; } else { - radius1 = (xx1 - xxc == 0) ? + sa = (xx1 - xxc == 0) ? (yy1 - yyc < 0) ? 90.0 : -90.0 : -atan2(double(yy1-yyc), double(xx1-xxc)) * RAD2DEG; - radius2 = (xx2 - xxc == 0) ? + ea = (xx2 - xxc == 0) ? (yy2 - yyc < 0) ? 90.0 : -90.0 : -atan2(double(yy2-yyc), double(xx2-xxc)) * RAD2DEG; } - wxCoord alpha2 = wxCoord(radius2 - radius1); - wxCoord alpha1 = wxCoord(wxConvertWXangleToMACangle(radius1)); - if( (xx1 > xx2) || (yy1 > yy2) ) { - alpha2 *= -1; - } + + bool fill = m_brush.GetStyle() != wxTRANSPARENT ; wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ; CGContextRef ctx = mctx->GetNativeContext() ; - AddEllipticArcToPath( ctx , CGPointMake( xxc , yyc ) , rad , rad , alpha1 , alpha2 ) ; + CGContextSaveGState( ctx ) ; + CGContextTranslateCTM( ctx, xxc , yyc ); + CGContextScaleCTM( ctx , 1 , -1 ) ; + if ( fill ) + CGContextMoveToPoint( ctx , 0 , 0 ) ; + CGContextAddArc( ctx, 0, 0 , rad , DegToRad(sa), DegToRad(ea), 0); + if ( fill ) + CGContextAddLineToPoint( ctx , 0 , 0 ) ; + CGContextRestoreGState( ctx ) ; CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; } @@ -1062,10 +1367,6 @@ void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, if ( m_logicalFunction != wxCOPY ) return ; - double angle = sa - ea; // Order important Mac in opposite direction to wx - // we have to make sure that the filling is always counter-clockwise - if ( angle > 0 ) - angle -= 360 ; wxCoord xx = XLOG2DEVMAC(x); wxCoord yy = YLOG2DEVMAC(y); wxCoord ww = m_signX * XLOG2DEVREL(w); @@ -1073,11 +1374,22 @@ void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, // handle -ve width and/or height if (ww < 0) { ww = -ww; xx = xx - ww; } if (hh < 0) { hh = -hh; yy = yy - hh; } - sa = wxConvertWXangleToMACangle(sa); + + bool fill = m_brush.GetStyle() != wxTRANSPARENT ; + wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ; CGContextRef ctx = mctx->GetNativeContext() ; - AddEllipticArcToPath( ctx , CGPointMake( xx + ww / 2 , yy + hh / 2 ) , ww / 2 , hh / 2 , sa , angle) ; - CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; + + CGContextSaveGState( ctx ) ; + CGContextTranslateCTM( ctx, xx + ww / 2, yy + hh / 2); + CGContextScaleCTM( ctx , 1 * ww / 2 , -1 * hh / 2 ) ; + if ( fill ) + CGContextMoveToPoint( ctx , 0 , 0 ) ; + CGContextAddArc( ctx, 0, 0, 1, DegToRad(sa), DegToRad(ea), 0); + if ( fill ) + CGContextAddLineToPoint( ctx , 0 , 0 ) ; + CGContextRestoreGState( ctx ) ; + CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; } void wxDC::DoDrawPoint( wxCoord x, wxCoord y ) @@ -1110,6 +1422,65 @@ void wxDC::DoDrawLines(int n, wxPoint points[], delete path ; } +#if wxUSE_SPLINES +void wxDC::DoDrawSpline(wxList *points) +{ + wxCHECK_RET(Ok(), wxT("Invalid DC")); + + if ( m_logicalFunction != wxCOPY ) + return ; + + wxGraphicPath* path = m_graphicContext->CreatePath() ; + + wxList::compatibility_iterator node = points->GetFirst(); + if (node == wxList::compatibility_iterator()) + // empty list + return; + + wxPoint *p = (wxPoint *)node->GetData(); + + wxCoord x1 = p->x; + wxCoord y1 = p->y; + + node = node->GetNext(); + p = (wxPoint *)node->GetData(); + + wxCoord x2 = p->x; + wxCoord y2 = p->y; + wxCoord cx1 = ( x1 + x2 ) / 2; + wxCoord cy1 = ( y1 + y2 ) / 2; + + path->MoveToPoint( XLOG2DEVMAC( x1 ) , XLOG2DEVMAC( y1 ) ) ; + path->AddLineToPoint( XLOG2DEVMAC( cx1 ) , XLOG2DEVMAC( cy1 ) ) ; + +#if !wxUSE_STL + while ((node = node->GetNext()) != NULL) +#else + while ((node = node->GetNext())) +#endif // !wxUSE_STL + { + p = (wxPoint *)node->GetData(); + x1 = x2; + y1 = y2; + x2 = p->x; + y2 = p->y; + wxCoord cx4 = (x1 + x2) / 2; + wxCoord cy4 = (y1 + y2) / 2; + + path->AddQuadCurveToPoint( XLOG2DEVMAC( x1 ) , XLOG2DEVMAC( y1 ) , + XLOG2DEVMAC( cx4 ) , XLOG2DEVMAC( cy4 ) ) ; + + cx1 = cx4; + cy1 = cy4; + } + + path->AddLineToPoint( XLOG2DEVMAC( x2 ) , XLOG2DEVMAC( y2 ) ) ; + + m_graphicContext->StrokePath( path ) ; + delete path ; +} +#endif + void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle ) @@ -1238,25 +1609,12 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ; CGContextRef ctx = mctx->GetNativeContext() ; - if ( width == height ) - { - CGContextBeginPath(ctx); - CGContextAddArc(ctx , - xx + ww / 2, - yy + hh / 2, - ww / 2, - 0, - 2 * M_PI, - 0 ) ; - CGContextClosePath(ctx); - - CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; - } - else - { - AddEllipticArcToPath( ctx , CGPointMake( xx + ww / 2 , yy + hh / 2 ) , ww / 2 , hh / 2 , 0 , 360) ; - CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; - } + CGContextSaveGState( ctx ) ; + CGContextTranslateCTM( ctx, xx + ww / 2, yy + hh / 2); + CGContextScaleCTM( ctx , ww / 2 , hh / 2 ) ; + CGContextAddArc( ctx, 0, 0, 1, 0 , 2*M_PI , 0); + CGContextRestoreGState( ctx ) ; + CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; } bool wxDC::CanDrawBitmap(void) const @@ -1321,7 +1679,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, } if ( blit.Ok() ) { - CGContextRef cg = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ; + CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; CGImageRef image = (CGImageRef)( blit.CGImageCreate() ) ; HIRect r = CGRectMake( xxdest , yydest , wwdest , hhdest ) ; HIViewDrawCGImage( cg , &r , image ) ; @@ -1358,7 +1716,7 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, UniCharCount chars = str.Length() ; UniChar* ubuf = NULL ; #if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16BE converter ; + wxMBConvUTF16 converter ; #if wxUSE_UNICODE size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ; ubuf = (UniChar*) malloc( unicharlen + 2 ) ; @@ -1387,10 +1745,11 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the rotated text") ); - int iAngle = int( angle ); - + status = ::ATSUSetTransientFontMatching( atsuLayout , true ) ; + wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") ); + int iAngle = int( angle ); if ( abs(iAngle) > 0 ) { Fixed atsuAngle = IntToFixed( iAngle ) ; @@ -1410,7 +1769,7 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, atsuTags, atsuSizes, atsuValues ) ; } { - CGContextRef cgContext = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ; + CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; ATSUAttributeTag atsuTags[] = { kATSUCGContextTag , @@ -1465,13 +1824,13 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, IntToFixed(drawX) , IntToFixed(drawY) , &rect ); wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") ); - CGContextSaveGState((wxMacCGContext*)(m_graphicContext)->GetNativeContext()); - CGContextTranslateCTM((wxMacCGContext*)(m_graphicContext)->GetNativeContext(), drawX, drawY); - CGContextScaleCTM((wxMacCGContext*)(m_graphicContext)->GetNativeContext(), 1, -1); + CGContextSaveGState(((wxMacCGContext*)(m_graphicContext))->GetNativeContext()); + CGContextTranslateCTM(((wxMacCGContext*)(m_graphicContext))->GetNativeContext(), drawX, drawY); + CGContextScaleCTM(((wxMacCGContext*)(m_graphicContext))->GetNativeContext(), 1, -1); status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, IntToFixed(0) , IntToFixed(0) ); wxASSERT_MSG( status == noErr , wxT("couldn't draw the rotated text") ); - CGContextRestoreGState( (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ) ; + CGContextRestoreGState( ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ) ; CalcBoundingBox(XDEV2LOG(rect.left), YDEV2LOG(rect.top) ); CalcBoundingBox(XDEV2LOG(rect.right), YDEV2LOG(rect.bottom) ); @@ -1517,7 +1876,7 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh UniCharCount chars = str.Length() ; UniChar* ubuf = NULL ; #if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16BE converter ; + wxMBConvUTF16 converter ; #if wxUSE_UNICODE size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ; ubuf = (UniChar*) malloc( unicharlen + 2 ) ; @@ -1589,7 +1948,7 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con UniCharCount chars = text.Length() ; UniChar* ubuf = NULL ; #if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16BE converter ; + wxMBConvUTF16 converter ; #if wxUSE_UNICODE size_t unicharlen = converter.WC2MB( NULL , text.wc_str() , 0 ) ; ubuf = (UniChar*) malloc( unicharlen + 2 ) ; @@ -1615,7 +1974,7 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; - for ( int pos = 0; pos < chars; pos ++ ) { + for ( int pos = 0; pos < (int)chars; pos ++ ) { unsigned long actualNumberOfBounds = 0; ATSTrapezoid glyphBounds; @@ -1656,7 +2015,7 @@ void wxDC::Clear(void) if ( m_backgroundBrush.Ok() && m_backgroundBrush.GetStyle() != wxTRANSPARENT) { HIRect rect = CGRectMake( -10000 , -10000 , 20000 , 20000 ) ; - CGContextRef cg = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ; + CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; switch( m_backgroundBrush.MacGetBrushKind() ) { case kwxMacBrushTheme : @@ -1664,7 +2023,7 @@ void wxDC::Clear(void) #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 if ( HIThemeSetFill != 0 ) { - HIThemeSetFill( m_backgroundBrush.MacGetTheme() , cg ) ; + HIThemeSetFill( m_backgroundBrush.MacGetTheme(), NULL, cg, kHIThemeOrientationNormal ); CGContextFillRect(cg, rect); } @@ -1672,14 +2031,15 @@ void wxDC::Clear(void) #endif { RGBColor color; - GetThemeBrushAsColor( m_backgroundBrush.MacGetTheme() , 32, true, &color ); - CGContextSetRGBFillColor( cg , (float) color.red / 65536, + GetThemeBrushAsColor( m_backgroundBrush.MacGetTheme(), 32, true, &color ); + CGContextSetRGBFillColor( cg, (float) color.red / 65536, (float) color.green / 65536, (float) color.blue / 65536, 1 ); CGContextFillRect( cg, rect ); } + // reset to normal value RGBColor col = MAC_WXCOLORREF( GetBrush().GetColour().GetPixel() ) ; - CGContextSetRGBFillColor( cg , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ; + CGContextSetRGBFillColor( cg, col.red / 65536.0, col.green / 65536.0, col.blue / 65536.0, 1.0 ); } break ; case kwxMacBrushThemeBackground :