X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83b445a666eb7e7fb99d2966dd247b7d5e8b4362..453091c26978d6da004ab46c78c719d7f9444ae3:/src/mac/carbon/dccg.cpp diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp old mode 100755 new mode 100644 index 5e659d94a7..23d903065e --- a/src/mac/carbon/dccg.cpp +++ b/src/mac/carbon/dccg.cpp @@ -17,16 +17,12 @@ #ifndef WX_PRECOMP #include "wx/log.h" - #include "wx/app.h" #include "wx/dcmemory.h" - #include "wx/dcprint.h" #include "wx/region.h" - #include "wx/image.h" #endif #include "wx/mac/uma.h" - #ifdef __MSL__ #if __MSL__ >= 0x6000 #include "math.h" @@ -38,7 +34,6 @@ #include "wx/mac/private.h" -IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) #ifndef wxMAC_USE_CORE_GRAPHICS_BLEND_MODES #define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 0 @@ -58,12 +53,9 @@ const double M_PI = 3.14159265358979 ; #endif #endif -const double RAD2DEG = 180.0 / M_PI; -const short kEmulatedMode = -1 ; -const short kUnsupportedMode = -2 ; - -extern TECObjectRef s_TECNativeCToUnicode ; +static const double RAD2DEG = 180.0 / M_PI; +#ifndef __LP64__ // TODO: update // The textctrl implementation still needs that (needs what?) for the non-HIView implementation @@ -118,6 +110,7 @@ wxMacWindowStateSaver::~wxMacWindowStateSaver() // minimal implementation only used for appearance drawing < 10.3 +#ifndef wxMAC_USE_CORE_GRAPHICS wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) : m_ph( (GrafPtr) dc->m_macPort ) { @@ -132,12 +125,14 @@ wxMacPortSetter::~wxMacPortSetter() // m_dc->MacCleanupPort(&m_ph) ; } +#endif + +#endif + //----------------------------------------------------------------------------- // Local functions //----------------------------------------------------------------------------- -static inline double dmin(double a, double b) { return a < b ? a : b; } -static inline double dmax(double a, double b) { return a > b ? a : b; } static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } //----------------------------------------------------------------------------- @@ -152,6 +147,14 @@ static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } // state we were called with, the other one after changing to HI Graphics orientation // (this one is used for getting back clippings etc) +//----------------------------------------------------------------------------- +// wxGraphicPath implementation +//----------------------------------------------------------------------------- + +#if !wxUSE_GRAPHICS_CONTEXT + +IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) + wxMacCGPath::wxMacCGPath() { m_path = CGPathCreateMutable() ; @@ -200,16 +203,34 @@ CGPathRef wxMacCGPath::GetPath() const return m_path ; } +void wxMacCGPath::AddArcToPoint( wxCoord x1, wxCoord y1 , wxCoord x2, wxCoord y2, wxCoord r ) +{ + CGPathAddArcToPoint( m_path, NULL , x1, y1, x2, y2, r); +} + +void wxMacCGPath::AddArc( wxCoord x, wxCoord y, wxCoord r, double startAngle, double endAngle, bool clockwise ) +{ + CGPathAddArc( m_path, NULL , x, y, r, startAngle, endAngle, clockwise); +} + +//----------------------------------------------------------------------------- +// wxGraphicContext implementation +//----------------------------------------------------------------------------- + wxMacCGContext::wxMacCGContext( CGrafPtr port ) { m_qdPort = port ; m_cgContext = NULL ; + m_mode = kCGPathFill; + m_macATSUIStyle = NULL ; } wxMacCGContext::wxMacCGContext( CGContextRef cgcontext ) { m_qdPort = NULL ; m_cgContext = cgcontext ; + m_mode = kCGPathFill; + m_macATSUIStyle = NULL ; CGContextSaveGState( m_cgContext ) ; CGContextSaveGState( m_cgContext ) ; } @@ -218,6 +239,8 @@ wxMacCGContext::wxMacCGContext() { m_qdPort = NULL ; m_cgContext = NULL ; + m_mode = kCGPathFill; + m_macATSUIStyle = NULL ; } wxMacCGContext::~wxMacCGContext() @@ -228,9 +251,10 @@ wxMacCGContext::~wxMacCGContext() CGContextRestoreGState( m_cgContext ) ; CGContextRestoreGState( m_cgContext ) ; } - +#ifndef __LP64__ if ( m_qdPort ) - CGContextRelease( m_cgContext ) ; + QDEndCGContext( m_qdPort, &m_cgContext ) ; +#endif } @@ -242,8 +266,23 @@ void wxMacCGContext::Clip( const wxRegion ®ion ) void wxMacCGContext::StrokePath( const wxGraphicPath *p ) { const wxMacCGPath* path = dynamic_cast< const wxMacCGPath*>( p ) ; + + int width = m_pen.GetWidth(); + if ( width == 0 ) + width = 1 ; + if ( m_pen.GetStyle() == wxTRANSPARENT ) + width = 0 ; + + bool offset = ( width % 2 ) == 1 ; + + if ( offset ) + CGContextTranslateCTM( m_cgContext, 0.5, 0.5 ); + CGContextAddPath( m_cgContext , path->GetPath() ) ; CGContextStrokePath( m_cgContext ) ; + + if ( offset ) + CGContextTranslateCTM( m_cgContext, -0.5, -0.5 ); } void wxMacCGContext::DrawPath( const wxGraphicPath *p , int fillStyle ) @@ -259,8 +298,22 @@ void wxMacCGContext::DrawPath( const wxGraphicPath *p , int fillStyle ) mode = kCGPathEOFillStroke ; } + int width = m_pen.GetWidth(); + if ( width == 0 ) + width = 1 ; + if ( m_pen.GetStyle() == wxTRANSPARENT ) + width = 0 ; + + bool offset = ( width % 2 ) == 1 ; + + if ( offset ) + CGContextTranslateCTM( m_cgContext, 0.5, 0.5 ); + CGContextAddPath( m_cgContext , path->GetPath() ) ; CGContextDrawPath( m_cgContext , mode ) ; + + if ( offset ) + CGContextTranslateCTM( m_cgContext, -0.5, -0.5 ); } void wxMacCGContext::FillPath( const wxGraphicPath *p , const wxColor &fillColor , int fillStyle ) @@ -300,8 +353,11 @@ CGContextRef wxMacCGContext::GetNativeContext() if ( m_cgContext == NULL ) { Rect bounds ; + OSStatus status = noErr; +#ifndef __LP64__ GetPortBounds( (CGrafPtr) m_qdPort , &bounds ) ; - OSStatus status = CreateCGContextForPort((CGrafPtr) m_qdPort , &m_cgContext) ; + status = QDBeginCGContext((CGrafPtr) m_qdPort , &m_cgContext) ; +#endif CGContextSaveGState( m_cgContext ) ; wxASSERT_MSG( status == noErr , wxT("Cannot nest wxDCs on the same window") ) ; @@ -327,6 +383,60 @@ void wxMacCGContext::SetNativeContext( CGContextRef cg ) m_cgContext = cg ; } +void wxMacCGContext::Translate( wxCoord dx , wxCoord dy ) +{ + CGContextTranslateCTM( m_cgContext, dx, dy ); +} + +void wxMacCGContext::Scale( wxCoord xScale , wxCoord yScale ) +{ + CGContextScaleCTM( m_cgContext , xScale , yScale ) ; +} + +void wxMacCGContext::DrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, wxCoord w, wxCoord h ) +{ + CGImageRef image = (CGImageRef)( bmp.CGImageCreate() ) ; + HIRect r = CGRectMake( 0 , 0 , w , h ); + + CGContextSaveGState( m_cgContext ); + CGContextTranslateCTM( m_cgContext, x , y + h ); + CGContextScaleCTM( m_cgContext, 1, -1 ); + + // in case image is a mask, set the foreground color + CGContextSetRGBFillColor( m_cgContext , m_textForegroundColor.Red() / 255.0 , m_textForegroundColor.Green() / 255.0 , + m_textForegroundColor.Blue() / 255.0 , m_textForegroundColor.Alpha() / 255.0 ) ; + CGContextDrawImage( m_cgContext, r, image ); + CGContextRestoreGState( m_cgContext ); + + CGImageRelease( image ) ; +} + +void wxMacCGContext::DrawIcon( const wxIcon &icon, wxCoord x, wxCoord y, wxCoord w, wxCoord h ) +{ + CGRect r = CGRectMake( 0 , 0 , w , h ) ; + CGContextSaveGState( m_cgContext ); + CGContextTranslateCTM( m_cgContext, x , y + h ); + CGContextScaleCTM( m_cgContext, 1, -1 ); + PlotIconRefInContext( m_cgContext , &r , kAlignNone , kTransformNone , + NULL , kPlotIconRefNormalFlags , MAC_WXHICON( icon.GetHICON() ) ) ; + CGContextRestoreGState( m_cgContext ) ; +} + +void wxMacCGContext::PushState() +{ + CGContextSaveGState( m_cgContext ); +} + +void wxMacCGContext::PopState() +{ + CGContextRestoreGState( m_cgContext ); +} + +void wxMacCGContext::SetTextColor( const wxColour &col ) +{ + m_textForegroundColor = col ; +} + #pragma mark - #pragma mark wxMacCGPattern, ImagePattern, HatchPattern classes @@ -372,7 +482,7 @@ const CGPatternCallbacks wxMacCGPattern::ms_Callbacks = { 0, &wxMacCGPattern::_R class ImagePattern : public wxMacCGPattern { public : - ImagePattern( const wxBitmap* bmp , CGAffineTransform transform ) + ImagePattern( const wxBitmap* bmp , const CGAffineTransform& transform ) { wxASSERT( bmp && bmp->Ok() ) ; @@ -380,7 +490,7 @@ public : } // ImagePattern takes ownership of CGImageRef passed in - ImagePattern( CGImageRef image , CGAffineTransform transform ) + ImagePattern( CGImageRef image , const CGAffineTransform& transform ) { if ( image ) CFRetain( image ) ; @@ -395,7 +505,7 @@ public : } protected : - void Init( CGImageRef image, CGAffineTransform transform ) + void Init( CGImageRef image, const CGAffineTransform& transform ) { m_image = image ; if ( m_image ) @@ -408,7 +518,7 @@ protected : } } - ~ImagePattern() + virtual ~ImagePattern() { if ( m_image ) CGImageRelease( m_image ) ; @@ -421,7 +531,7 @@ protected : class HatchPattern : public wxMacCGPattern { public : - HatchPattern( int hatchstyle, CGAffineTransform transform ) + HatchPattern( int hatchstyle, const CGAffineTransform& transform ) { m_hatch = hatchstyle ; m_imageBounds = CGRectMake( 0.0, 0.0, 8.0 , 8.0 ) ; @@ -523,7 +633,7 @@ public : } protected : - ~HatchPattern() {} + virtual ~HatchPattern() {} CGRect m_imageBounds ; int m_hatch ; @@ -545,14 +655,14 @@ void wxMacCGContext::SetPen( const wxPen &pen ) CGContextSetShouldAntialias( m_cgContext , false ) ; #endif - if ( fill | stroke ) + if ( fill || stroke ) { // set up brushes m_mode = kCGPathFill ; // just a default if ( stroke ) { - CGContextSetRGBStrokeColor( m_cgContext , pen.GetColour().Red() / 255.0 , pen.GetColour().Green() / 255.0 , + CGContextSetRGBStrokeColor( m_cgContext , pen.GetColour().Red() / 255.0 , pen.GetColour().Green() / 255.0 , pen.GetColour().Blue() / 255.0 , pen.GetColour().Alpha() / 255.0 ) ; // TODO: * m_dc->m_scaleX @@ -678,7 +788,7 @@ void wxMacCGContext::SetPen( const wxPen &pen ) CGContextSetStrokeColorSpace( m_cgContext , patternSpace ) ; wxMacCFRefHolder pattern( *( new HatchPattern( pen.GetStyle() , CGContextGetCTM( m_cgContext ) ) ) ); - CGFloat colorArray[4] = { pen.GetColour().Red() / 255.0 , pen.GetColour().Green() / 255.0 , + CGFloat colorArray[4] = { pen.GetColour().Red() / 255.0 , pen.GetColour().Green() / 255.0 , pen.GetColour().Blue() / 255.0 , pen.GetColour().Alpha() / 255.0 } ; CGContextSetStrokePattern( m_cgContext, pattern , colorArray ) ; @@ -722,7 +832,7 @@ void wxMacCGContext::SetBrush( const wxBrush &brush ) CGContextSetShouldAntialias( m_cgContext , false ) ; #endif - if ( fill | stroke ) + if ( fill || stroke ) { // setup brushes m_mode = kCGPathFill ; // just a default @@ -731,7 +841,7 @@ void wxMacCGContext::SetBrush( const wxBrush &brush ) { if ( brush.GetStyle() == wxSOLID ) { - CGContextSetRGBFillColor( m_cgContext , brush.GetColour().Red() / 255.0 , brush.GetColour().Green() / 255.0 , + CGContextSetRGBFillColor( m_cgContext , brush.GetColour().Red() / 255.0 , brush.GetColour().Green() / 255.0 , brush.GetColour().Blue() / 255.0 , brush.GetColour().Alpha() / 255.0 ) ; } else if ( brush.IsHatch() ) @@ -740,7 +850,7 @@ void wxMacCGContext::SetBrush( const wxBrush &brush ) CGContextSetFillColorSpace( m_cgContext , patternSpace ) ; wxMacCFRefHolder pattern( *( new HatchPattern( brush.GetStyle() , CGContextGetCTM( m_cgContext ) ) ) ); - CGFloat colorArray[4] = { brush.GetColour().Red() / 255.0 , brush.GetColour().Green() / 255.0 , + CGFloat colorArray[4] = { brush.GetColour().Red() / 255.0 , brush.GetColour().Green() / 255.0 , brush.GetColour().Blue() / 255.0 , brush.GetColour().Alpha() / 255.0 } ; CGContextSetFillPattern( m_cgContext, pattern , colorArray ) ; @@ -769,157 +879,407 @@ void wxMacCGContext::SetBrush( const wxBrush &brush ) } } -void AddEllipticArcToPath(CGContextRef c, CGPoint center, CGFloat a, CGFloat b, CGFloat fromDegree , CGFloat toDegree ) -{ - CGContextSaveGState(c); - CGContextTranslateCTM(c, center.x, center.y); - CGContextScaleCTM(c, a, b); - CGContextMoveToPoint(c, 1, 0); - CGContextAddArc(c, 0, 0, 1, DegToRad(fromDegree), DegToRad(toDegree), 0); - CGContextClosePath(c); - CGContextRestoreGState(c); -} - -void AddRoundedRectToPath(CGContextRef c, CGRect rect, CGFloat ovalWidth, - CGFloat ovalHeight) +void wxMacCGContext::DrawText( const wxString &str, wxCoord x, wxCoord y, double angle ) { - CGFloat fw, fh; - if (ovalWidth == 0 || ovalHeight == 0) - { - CGContextAddRect(c, rect); - return; - } + OSStatus status = noErr ; + ATSUTextLayout atsuLayout ; + UniCharCount chars = str.length() ; + UniChar* ubuf = NULL ; - CGContextSaveGState(c); - CGContextTranslateCTM(c, CGRectGetMinX(rect), CGRectGetMinY(rect)); - CGContextScaleCTM(c, ovalWidth, ovalHeight); +#if SIZEOF_WCHAR_T == 4 + wxMBConvUTF16 converter ; +#if wxUSE_UNICODE + size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ; + ubuf = (UniChar*) malloc( unicharlen + 2 ) ; + converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ; +#else + const wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; + size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; + ubuf = (UniChar*) malloc( unicharlen + 2 ) ; + converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ; +#endif + chars = unicharlen / 2 ; +#else +#if wxUSE_UNICODE + ubuf = (UniChar*) str.wc_str() ; +#else + wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; + chars = wxWcslen( wchar.data() ) ; + ubuf = (UniChar*) wchar.data() ; +#endif +#endif - fw = CGRectGetWidth(rect) / ovalWidth; - fh = CGRectGetHeight(rect) / ovalHeight; + status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , + &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; - CGContextMoveToPoint(c, fw, fh / 2); - CGContextAddArcToPoint(c, fw, fh, fw / 2, fh, 1); - CGContextAddArcToPoint(c, 0, fh, 0, fh / 2, 1); - CGContextAddArcToPoint(c, 0, 0, fw / 2, 0, 1); - CGContextAddArcToPoint(c, fw, 0, fw, fh / 2, 1); - CGContextClosePath(c); - CGContextRestoreGState(c); -} + wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the rotated text") ); -#pragma mark - + status = ::ATSUSetTransientFontMatching( atsuLayout , true ) ; + wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") ); -wxDC::wxDC() -{ - m_ok = false ; - m_colour = true; - m_mm_to_pix_x = mm2pt; - m_mm_to_pix_y = mm2pt; + int iAngle = int( angle ); + 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 ) ; + } - m_externalDeviceOriginX = 0; - m_externalDeviceOriginY = 0; - m_logicalScaleX = 1.0; - m_logicalScaleY = 1.0; - m_userScaleX = 1.0; - m_userScaleY = 1.0; - m_scaleX = 1.0; - m_scaleY = 1.0; - m_needComputeScaleX = - m_needComputeScaleY = false; + { + 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 ) ; + } - m_macPort = 0 ; - m_macLocalOrigin.x = - m_macLocalOrigin.y = 0 ; + ATSUTextMeasurement textBefore, textAfter ; + ATSUTextMeasurement ascent, descent ; - m_pen = *wxBLACK_PEN; - m_font = *wxNORMAL_FONT; - m_brush = *wxWHITE_BRUSH; + status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, + &textBefore , &textAfter, &ascent , &descent ); - m_macATSUIStyle = NULL ; - m_graphicContext = NULL ; -} + wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") ); -wxDC::~wxDC() -{ - if ( m_macATSUIStyle ) + Rect rect ; +/* + // TODO + if ( m_backgroundMode == wxSOLID ) { - ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle); - m_macATSUIStyle = NULL ; - } + wxGraphicPath* 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)) ) ; - delete m_graphicContext ; -} + m_graphicContext->FillPath( path , m_textBackgroundColour ) ; + delete path ; + } +*/ + x += (int)(sin(angle / RAD2DEG) * FixedToInt(ascent)); + y += (int)(cos(angle / RAD2DEG) * FixedToInt(ascent)); -void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask ) -{ - wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawBitmap - invalid DC") ); - wxCHECK_RET( bmp.Ok(), wxT("wxDC(cg)::DoDrawBitmap - invalid bitmap") ); + status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, + IntToFixed(x) , IntToFixed(y) , &rect ); + wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") ); - wxCoord xx = XLOG2DEVMAC(x); - wxCoord yy = YLOG2DEVMAC(y); - wxCoord w = bmp.GetWidth(); - wxCoord h = bmp.GetHeight(); - wxCoord ww = XLOG2DEVREL(w); - wxCoord hh = YLOG2DEVREL(h); + CGContextSaveGState(m_cgContext); + CGContextTranslateCTM(m_cgContext, x, y); + CGContextScaleCTM(m_cgContext, 1, -1); + status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, + IntToFixed(0) , IntToFixed(0) ); - CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; - CGImageRef image = (CGImageRef)( bmp.CGImageCreate() ) ; - HIRect r = CGRectMake( xx , yy , ww , hh ) ; - HIViewDrawCGImage( cg , &r , image ) ; - CGImageRelease( image ) ; -} + wxASSERT_MSG( status == noErr , wxT("couldn't draw the rotated text") ); -void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) -{ - wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawIcon - invalid DC") ); - wxCHECK_RET( icon.Ok(), wxT("wxDC(cg)::DoDrawIcon - invalid icon") ); + CGContextRestoreGState(m_cgContext) ; - wxCoord xx = XLOG2DEVMAC(x); - wxCoord yy = YLOG2DEVMAC(y); - wxCoord w = icon.GetWidth(); - wxCoord h = icon.GetHeight(); - wxCoord ww = XLOG2DEVREL(w); - wxCoord hh = YLOG2DEVREL(h); + ::ATSUDisposeTextLayout(atsuLayout); - CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; - CGRect r = CGRectMake( 00 , 00 , ww , hh ) ; - CGContextSaveGState( cg ); - CGContextTranslateCTM( cg, xx , yy + hh ); - CGContextScaleCTM( cg, 1, -1 ); - PlotIconRefInContext( cg , &r , kAlignNone , kTransformNone , - NULL , kPlotIconRefNormalFlags , MAC_WXHICON( icon.GetHICON() ) ) ; - CGContextRestoreGState( cg ) ; +#if SIZEOF_WCHAR_T == 4 + free( ubuf ) ; +#endif } -void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) +void wxMacCGContext::GetTextExtent( const wxString &str, wxCoord *width, wxCoord *height, + wxCoord *descent, wxCoord *externalLeading ) const { - wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoSetClippingRegion - invalid DC") ); - - wxCoord xx, yy, ww, hh; - xx = XLOG2DEVMAC(x); - yy = YLOG2DEVMAC(y); - ww = XLOG2DEVREL(width); - hh = YLOG2DEVREL(height); - - CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; - CGRect clipRect = CGRectMake( xx , yy , ww, hh ) ; - CGContextClipToRect( cgContext , clipRect ) ; + wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoGetTextExtent - no valid font set") ) ; -// SetRectRgn( (RgnHandle) m_macCurrentClipRgn , xx , yy , xx + ww , yy + hh ) ; -// SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; + OSStatus status = noErr ; - if ( m_clipping ) - { - m_clipX1 = wxMax( m_clipX1, xx ); - m_clipY1 = wxMax( m_clipY1, yy ); - m_clipX2 = wxMin( m_clipX2, (xx + ww) ); - m_clipY2 = wxMin( m_clipY2, (yy + hh) ); - } - else - { - m_clipping = true; + ATSUTextLayout atsuLayout ; + UniCharCount chars = str.length() ; + UniChar* ubuf = NULL ; - m_clipX1 = xx; - m_clipY1 = yy; +#if SIZEOF_WCHAR_T == 4 + wxMBConvUTF16 converter ; +#if wxUSE_UNICODE + size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ; + ubuf = (UniChar*) malloc( unicharlen + 2 ) ; + converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ; +#else + const wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; + size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; + ubuf = (UniChar*) malloc( unicharlen + 2 ) ; + converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ; +#endif + chars = unicharlen / 2 ; +#else +#if wxUSE_UNICODE + ubuf = (UniChar*) str.wc_str() ; +#else + wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; + chars = wxWcslen( wchar.data() ) ; + ubuf = (UniChar*) wchar.data() ; +#endif +#endif + + status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , + &chars , (ATSUStyle*) &m_macATSUIStyle , &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); +} + +void wxMacCGContext::GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const +{ + widths.Empty(); + widths.Add(0, text.length()); + + if (text.empty()) + return ; + + ATSUTextLayout atsuLayout ; + UniCharCount chars = text.length() ; + UniChar* ubuf = NULL ; + +#if SIZEOF_WCHAR_T == 4 + wxMBConvUTF16 converter ; +#if wxUSE_UNICODE + size_t unicharlen = converter.WC2MB( NULL , text.wc_str() , 0 ) ; + ubuf = (UniChar*) malloc( unicharlen + 2 ) ; + converter.WC2MB( (char*) ubuf , text.wc_str(), unicharlen + 2 ) ; +#else + const wxWCharBuffer wchar = text.wc_str( wxConvLocal ) ; + size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; + ubuf = (UniChar*) malloc( unicharlen + 2 ) ; + converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ; +#endif + chars = unicharlen / 2 ; +#else +#if wxUSE_UNICODE + ubuf = (UniChar*) text.wc_str() ; +#else + wxWCharBuffer wchar = text.wc_str( wxConvLocal ) ; + chars = wxWcslen( wchar.data() ) ; + ubuf = (UniChar*) wchar.data() ; +#endif +#endif + + ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , + &chars , (ATSUStyle*) &m_macATSUIStyle , &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); +} + +void wxMacCGContext::SetFont( const wxFont &font ) +{ + if ( m_macATSUIStyle ) + { + ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle); + m_macATSUIStyle = NULL ; + } + + if ( font.Ok() ) + { + OSStatus status ; + + status = ATSUCreateAndCopyStyle( (ATSUStyle) font.MacGetATSUStyle() , (ATSUStyle*) &m_macATSUIStyle ) ; + + wxASSERT_MSG( status == noErr, wxT("couldn't create ATSU style") ) ; + + // we need the scale here ... + + Fixed atsuSize = IntToFixed( int( /*m_scaleY*/ 1 * font.MacGetFontSize()) ) ; + RGBColor atsuColor = MAC_WXCOLORREF( m_textForegroundColor.GetPixel() ) ; + ATSUAttributeTag atsuTags[] = + { + kATSUSizeTag , + kATSUColorTag , + } ; + ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = + { + sizeof( Fixed ) , + sizeof( RGBColor ) , + } ; + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = + { + &atsuSize , + &atsuColor , + } ; + + status = ::ATSUSetAttributes( + (ATSUStyle)m_macATSUIStyle, sizeof(atsuTags) / sizeof(ATSUAttributeTag) , + atsuTags, atsuSizes, atsuValues); + + wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ) ; + } +} + + +#pragma mark - + +wxDC::wxDC() +{ + m_ok = false ; + m_colour = true; + m_mm_to_pix_x = mm2pt; + m_mm_to_pix_y = mm2pt; + + m_externalDeviceOriginX = 0; + m_externalDeviceOriginY = 0; + m_logicalScaleX = 1.0; + m_logicalScaleY = 1.0; + m_userScaleX = 1.0; + m_userScaleY = 1.0; + m_scaleX = 1.0; + m_scaleY = 1.0; + m_needComputeScaleX = + m_needComputeScaleY = false; + + m_macPort = 0 ; + m_macLocalOrigin.x = + m_macLocalOrigin.y = 0 ; + + m_pen = *wxBLACK_PEN; + m_font = *wxNORMAL_FONT; + m_brush = *wxWHITE_BRUSH; + + m_macATSUIStyle = NULL ; + m_graphicContext = NULL ; +} + +wxDC::~wxDC() +{ + if ( m_macATSUIStyle ) + { + ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle); + m_macATSUIStyle = NULL ; + } + + delete m_graphicContext ; +} + +void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask ) +{ + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawBitmap - invalid DC") ); + wxCHECK_RET( bmp.Ok(), wxT("wxDC(cg)::DoDrawBitmap - invalid bitmap") ); + + wxCoord xx = XLOG2DEVMAC(x); + wxCoord yy = YLOG2DEVMAC(y); + wxCoord w = bmp.GetWidth(); + wxCoord h = bmp.GetHeight(); + wxCoord ww = XLOG2DEVREL(w); + wxCoord hh = YLOG2DEVREL(h); + + if ( bmp.GetDepth()==1 ) + { + wxGraphicPath* path = m_graphicContext->CreatePath() ; + path->AddRectangle( xx , yy , ww , hh ) ; + m_graphicContext->FillPath( path , m_textBackgroundColour, wxODDEVEN_RULE) ; + delete path; + m_graphicContext->DrawBitmap( bmp, xx , yy , ww , hh ) ; + } + else + { + m_graphicContext->DrawBitmap( bmp, xx , yy , ww , hh ) ; + } +} + +void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) +{ + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawIcon - invalid DC") ); + wxCHECK_RET( icon.Ok(), wxT("wxDC(cg)::DoDrawIcon - invalid icon") ); + + wxCoord xx = XLOG2DEVMAC(x); + wxCoord yy = YLOG2DEVMAC(y); + wxCoord w = icon.GetWidth(); + wxCoord h = icon.GetHeight(); + wxCoord ww = XLOG2DEVREL(w); + wxCoord hh = YLOG2DEVREL(h); + + m_graphicContext->DrawIcon( icon , xx, yy, ww, hh ) ; +} + +void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) +{ + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoSetClippingRegion - invalid DC") ); + + wxCoord xx, yy, ww, hh; + xx = XLOG2DEVMAC(x); + yy = YLOG2DEVMAC(y); + ww = XLOG2DEVREL(width); + hh = YLOG2DEVREL(height); + + CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; + CGRect clipRect = CGRectMake( xx , yy , ww, hh ) ; + CGContextClipToRect( cgContext , clipRect ) ; + +// SetRectRgn( (RgnHandle) m_macCurrentClipRgn , xx , yy , xx + ww , yy + hh ) ; +// SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; + + if ( m_clipping ) + { + m_clipX1 = wxMax( m_clipX1, xx ); + m_clipY1 = wxMax( m_clipY1, yy ); + m_clipX2 = wxMin( m_clipX2, (xx + ww) ); + m_clipY2 = wxMin( m_clipY2, (yy + hh) ); + } + else + { + m_clipping = true; + + m_clipX1 = xx; + m_clipY1 = yy; m_clipX2 = xx + ww; m_clipY2 = yy + hh; } @@ -954,13 +1314,6 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) } else { -#if 0 - CopyRgn( (RgnHandle) region.GetWXHRGN() , (RgnHandle) m_macCurrentClipRgn ) ; - if ( xx != x || yy != y ) - OffsetRgn( (RgnHandle) m_macCurrentClipRgn , xx - x , yy - y ) ; - SectRgn( (RgnHandle)m_macCurrentClipRgn , (RgnHandle)m_macBoundaryClipRgn , (RgnHandle)m_macCurrentClipRgn ) ; -#endif - if ( m_clipping ) { m_clipX1 = wxMax( m_clipX1, xx ); @@ -982,8 +1335,6 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) void wxDC::DestroyClippingRegion() { -// CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; - CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; CGContextRestoreGState( cgContext ); CGContextSaveGState( cgContext ); @@ -1012,7 +1363,9 @@ void wxDC::SetTextForeground( const wxColour &col ) if ( col != m_textForegroundColour ) { m_textForegroundColour = col; - MacInstallFont() ; + m_graphicContext->SetTextColor( col ); + // in the current implementation the font contains the text color + m_graphicContext->SetFont(m_font); } } @@ -1137,7 +1490,8 @@ void wxDC::SetBackgroundMode( int mode ) void wxDC::SetFont( const wxFont &font ) { m_font = font; - MacInstallFont() ; + if ( m_graphicContext ) + m_graphicContext->SetFont( font ) ; } void wxDC::SetPen( const wxPen &pen ) @@ -1156,12 +1510,11 @@ void wxDC::SetPen( const wxPen &pen ) { // we have to compensate for moved device origins etc. otherwise patterned pens are standing still // eg when using a wxScrollWindow and scrolling around - CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; int origX = XLOG2DEVMAC( 0 ) ; int origY = YLOG2DEVMAC( 0 ) ; - CGContextTranslateCTM( cgContext, origX, origY ); + m_graphicContext->Translate( origX , origY ) ; m_graphicContext->SetPen( m_pen ) ; - CGContextTranslateCTM( cgContext, -origX, -origY ); + m_graphicContext->Translate( -origX , -origY ) ; } } } @@ -1182,12 +1535,11 @@ void wxDC::SetBrush( const wxBrush &brush ) { // we have to compensate for moved device origins etc. otherwise patterned brushes are standing still // eg when using a wxScrollWindow and scrolling around - CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; int origX = XLOG2DEVMAC(0) ; int origY = YLOG2DEVMAC(0) ; - CGContextTranslateCTM( cgContext, origX, origY ); + m_graphicContext->Translate( origX , origY ) ; m_graphicContext->SetBrush( m_brush ) ; - CGContextTranslateCTM( cgContext, -origX, -origY ); + m_graphicContext->Translate( -origX , -origY ) ; } } } @@ -1232,16 +1584,16 @@ bool wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const { wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoGetPixel - invalid DC") ); - wxMacPortSaver helper((CGrafPtr)m_macPort) ; RGBColor colour; - +#ifndef __LP64__ + wxMacPortSaver helper((CGrafPtr)m_macPort) ; // NB: GetCPixel is a deprecated QD call, and a slow one at that GetCPixel( XLOG2DEVMAC(x) + m_macLocalOriginInPort.x - m_macLocalOrigin.x, YLOG2DEVMAC(y) + m_macLocalOriginInPort.y - m_macLocalOrigin.y, &colour ); - +#endif // convert from Mac colour to wx - col->Set( colour.red >> 8, colour.green >> 8, colour.blue >> 8 ); + *col = colour; return true ; } @@ -1339,18 +1691,19 @@ void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, } bool fill = m_brush.GetStyle() != wxTRANSPARENT ; - wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ; - CGContextRef ctx = mctx->GetNativeContext() ; - CGContextSaveGState( ctx ) ; - CGContextTranslateCTM( ctx, xxc , yyc ); - CGContextScaleCTM( ctx , 1 , -1 ) ; + + wxGraphicPath* path = m_graphicContext->CreatePath() ; + m_graphicContext->PushState() ; + m_graphicContext->Translate( xxc, yyc ) ; + m_graphicContext->Scale( 1, -1 ) ; if ( fill ) - CGContextMoveToPoint( ctx , 0 , 0 ) ; - CGContextAddArc( ctx, 0, 0 , rad , DegToRad(sa), DegToRad(ea), 0 ); + path->MoveToPoint( 0, 0 ) ; + path->AddArc( 0, 0, rad , DegToRad(sa) , DegToRad(ea), false ) ; if ( fill ) - CGContextAddLineToPoint( ctx , 0 , 0 ) ; - CGContextRestoreGState( ctx ) ; - CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; + path->AddLineToPoint( 0, 0 ) ; + m_graphicContext->DrawPath( path ) ; + m_graphicContext->PopState() ; + delete path ; } void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, @@ -1380,19 +1733,18 @@ void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, bool fill = m_brush.GetStyle() != wxTRANSPARENT ; - wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ; - CGContextRef ctx = mctx->GetNativeContext() ; - - CGContextSaveGState( ctx ) ; - CGContextTranslateCTM( ctx, xx + ww / 2, yy + hh / 2 ); - CGContextScaleCTM( ctx , 1 * ww / 2 , -1 * hh / 2 ) ; + wxGraphicPath* path = m_graphicContext->CreatePath() ; + m_graphicContext->PushState() ; + m_graphicContext->Translate( xx + ww / 2, yy + hh / 2 ) ; + m_graphicContext->Scale( 1 * ww / 2 , -1 * hh / 2 ) ; if ( fill ) - CGContextMoveToPoint( ctx , 0 , 0 ) ; - CGContextAddArc( ctx, 0, 0, 1, DegToRad( sa ), DegToRad( ea ), 0 ); + path->MoveToPoint( 0, 0 ) ; + path->AddArc( 0, 0, 1 , DegToRad(sa) , DegToRad(ea), false ) ; if ( fill ) - CGContextAddLineToPoint( ctx , 0 , 0 ) ; - CGContextRestoreGState( ctx ) ; - CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; + path->AddLineToPoint( 0, 0 ) ; + m_graphicContext->DrawPath( path ) ; + m_graphicContext->PopState() ; + delete path ; } void wxDC::DoDrawPoint( wxCoord x, wxCoord y ) @@ -1551,8 +1903,21 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) yy = yy - hh; } + int penwidth = m_pen.GetWidth(); + if ( penwidth == 0 ) + penwidth = 1 ; + if ( m_pen.GetStyle() == wxTRANSPARENT ) + penwidth = 0 ; + + bool offset = ( penwidth % 2 ) == 1 ; + wxGraphicPath* path = m_graphicContext->CreatePath() ; - path->AddRectangle( xx , yy , ww , hh ) ; + // if we are offsetting the entire rectangle is moved 0.5, so the border line gets off by 1 + if ( offset ) + path->AddRectangle( xx , yy , ww-1 , hh-1 ) ; + else + path->AddRectangle( xx , yy , ww , hh ) ; + m_graphicContext->DrawPath( path ) ; delete path ; } @@ -1589,10 +1954,23 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, yy = yy - hh; } - wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ; - CGContextRef ctx = mctx->GetNativeContext() ; - AddRoundedRectToPath( ctx , CGRectMake( xx , yy , ww , hh ) , radius , radius ) ; - CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; + wxGraphicPath* path = m_graphicContext->CreatePath() ; + if ( radius == 0) + { + path->AddRectangle( xx , yy , ww , hh ) ; + m_graphicContext->DrawPath( path ) ; + } + else + { + path->MoveToPoint( xx + ww, yy + hh / 2); + path->AddArcToPoint(xx + ww, yy + hh, xx + ww / 2,yy + hh, radius); + path->AddArcToPoint(xx , yy + hh, xx , yy + hh / 2, radius); + path->AddArcToPoint(xx , yy , xx + ww / 2, yy , radius); + path->AddArcToPoint(xx + ww, yy , xx + ww, yy + hh / 2, radius); + path->CloseSubpath(); + m_graphicContext->DrawPath( path ) ; + } + delete path ; } void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) @@ -1623,14 +2001,14 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) yy = yy - hh; } - wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ; - CGContextRef ctx = mctx->GetNativeContext() ; - 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() ) ; + wxGraphicPath* path = m_graphicContext->CreatePath() ; + m_graphicContext->PushState() ; + m_graphicContext->Translate(xx + ww / 2, yy + hh / 2); + m_graphicContext->Scale(ww / 2 , hh / 2); + path->AddArc( 0, 0, 1, 0 , 2 * M_PI , false ) ; + m_graphicContext->DrawPath( path ) ; + m_graphicContext->PopState() ; + delete path ; } bool wxDC::CanDrawBitmap() const @@ -1643,8 +2021,22 @@ bool wxDC::DoBlit( wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask, wxCoord xsrcMask, wxCoord ysrcMask ) { - wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoBlit - invalid DC") ); - wxCHECK_MSG( source->Ok(), false, wxT("wxDC(cg)::DoBlit - invalid source DC") ); + return DoStretchBlit( xdest, ydest, width, height, + source, xsrc, ysrc, width, height, + logical_func, useMask, + xsrcMask, ysrcMask ); +} + +bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest, + wxCoord dstWidth, wxCoord dstHeight, + wxDC *source, + wxCoord xsrc, wxCoord ysrc, + wxCoord srcWidth, wxCoord srcHeight, + int logical_func = wxCOPY, bool useMask = false, + wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); +{ + wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoStretchBlit - invalid DC") ); + wxCHECK_MSG( source->Ok(), false, wxT("wxDC(cg)::DoStretchBlit - invalid source DC") ); if ( logical_func == wxNO_OP ) return true ; @@ -1657,13 +2049,13 @@ bool wxDC::DoBlit( wxCoord yysrc = source->YLOG2DEVMAC(ysrc) ; wxCoord xxsrc = source->XLOG2DEVMAC(xsrc) ; - wxCoord wwsrc = source->XLOG2DEVREL(width) ; - wxCoord hhsrc = source->YLOG2DEVREL(height) ; + wxCoord wwsrc = source->XLOG2DEVREL(srcWidth) ; + wxCoord hhsrc = source->YLOG2DEVREL(srcHeight) ; wxCoord yydest = YLOG2DEVMAC(ydest) ; wxCoord xxdest = XLOG2DEVMAC(xdest) ; - wxCoord wwdest = XLOG2DEVREL(width) ; - wxCoord hhdest = YLOG2DEVREL(height) ; + wxCoord wwdest = XLOG2DEVREL(dstWidth) ; + wxCoord hhdest = YLOG2DEVREL(dstHeight) ; wxMemoryDC* memdc = dynamic_cast(source) ; if ( memdc && logical_func == wxCOPY ) @@ -1684,6 +2076,7 @@ bool wxDC::DoBlit( if ( xxsrc >= 0 && yysrc >= 0 ) { wxRect subrect( xxsrc, yysrc, wwsrc , hhsrc ) ; + // TODO we perhaps could add a DrawSubBitmap call to dc for performance reasons blit = blit.GetSubBitmap( subrect ) ; } else @@ -1701,21 +2094,13 @@ bool wxDC::DoBlit( if ( blit.Ok() ) { - CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; - CGImageRef image = (CGImageRef)( blit.CGImageCreate() ) ; - HIRect r = CGRectMake( xxdest , yydest , wwdest , hhdest ) ; - HIViewDrawCGImage( cg , &r , image ) ; - CGImageRelease( image ) ; + m_graphicContext->DrawBitmap( blit, xxdest , yydest , wwdest , hhdest ) ; } } else { -#if 0 - CGContextRef cg = (wxMacCGContext*)(source->GetGraphicContext())->GetNativeContext() ; - void *data = CGBitmapContextGetData( cg ) ; -#endif - - return false ; // wxFAIL_MSG( wxT("Blitting is only supported from bitmap contexts") ) ; + wxFAIL_MSG( wxT("Blitting is only supported from bitmap contexts, and only with wxCOPY logical operation.") ) ; + return false ; } return true; @@ -1725,143 +2110,17 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, double angle) { wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawRotatedText - invalid DC") ); - wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoDrawRotatedText - no valid font set") ); +// wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoDrawRotatedText - no valid font set") ); if ( str.length() == 0 ) return ; if ( m_logicalFunction != wxCOPY ) return ; - OSStatus status = noErr ; - ATSUTextLayout atsuLayout ; - UniCharCount chars = str.length() ; - UniChar* ubuf = NULL ; - -#if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16 converter ; -#if wxUSE_UNICODE - size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ; - ubuf = (UniChar*) malloc( unicharlen + 2 ) ; - converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ; -#else - const wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; - size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; - ubuf = (UniChar*) malloc( unicharlen + 2 ) ; - converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ; -#endif - chars = unicharlen / 2 ; -#else -#if wxUSE_UNICODE - ubuf = (UniChar*) str.wc_str() ; -#else - wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; - chars = wxWcslen( wchar.data() ) ; - ubuf = (UniChar*) wchar.data() ; -#endif -#endif - int drawX = XLOG2DEVMAC(x) ; int drawY = YLOG2DEVMAC(y) ; - status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , - &chars , (ATSUStyle*) &m_macATSUIStyle , &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 ); - 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 ) ; - } - - { - CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; - ATSUAttributeTag atsuTags[] = - { - kATSUCGContextTag , - } ; - ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = - { - sizeof( CGContextRef ) , - } ; - ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = - { - &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 ; - - if ( m_backgroundMode == wxSOLID ) - { - wxGraphicPath* 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 ; - } - - drawX += (int)(sin(angle / RAD2DEG) * FixedToInt(ascent)); - drawY += (int)(cos(angle / RAD2DEG) * FixedToInt(ascent)); - - status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, - 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); - 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() ) ; - - CalcBoundingBox(XDEV2LOG(rect.left), YDEV2LOG(rect.top) ); - CalcBoundingBox(XDEV2LOG(rect.right), YDEV2LOG(rect.bottom) ); - - ::ATSUDisposeTextLayout(atsuLayout); - -#if SIZEOF_WCHAR_T == 4 - free( ubuf ) ; -#endif + m_graphicContext->DrawText( str, drawX ,drawY , angle ) ; } void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) @@ -1880,82 +2139,31 @@ bool wxDC::CanGetTextExtent() const void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height, wxCoord *descent, wxCoord *externalLeading , - wxFont *theFont ) const + const wxFont *theFont ) const { wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoGetTextExtent - invalid DC") ); - wxFont formerFont = m_font ; if ( theFont ) { - // work around the const-ness - *((wxFont*)(&m_font)) = *theFont ; - MacInstallFont() ; + m_graphicContext->SetFont( *theFont ) ; } - if ( str.empty() ) - return ; + wxCoord h , d , e , w ; - wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoGetTextExtent - no valid font set") ) ; - - OSStatus status = noErr ; - ATSUTextLayout atsuLayout ; - UniCharCount chars = str.length() ; - UniChar* ubuf = NULL ; - -#if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16 converter ; -#if wxUSE_UNICODE - size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ; - ubuf = (UniChar*) malloc( unicharlen + 2 ) ; - converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ; -#else - const wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; - size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; - ubuf = (UniChar*) malloc( unicharlen + 2 ) ; - converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ; -#endif - chars = unicharlen / 2 ; -#else -#if wxUSE_UNICODE - ubuf = (UniChar*) str.wc_str() ; -#else - wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; - chars = wxWcslen( wchar.data() ) ; - ubuf = (UniChar*) wchar.data() ; -#endif -#endif - - status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , - &chars , (ATSUStyle*) &m_macATSUIStyle , &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 ); + m_graphicContext->GetTextExtent( str, &w, &h, &d, &e ) ; if ( height ) - *height = YDEV2LOGREL( FixedToInt(textAscent + textDescent) ) ; + *height = YDEV2LOGREL( h ) ; if ( descent ) - *descent =YDEV2LOGREL( FixedToInt(textDescent) ); + *descent =YDEV2LOGREL( d); if ( externalLeading ) - *externalLeading = 0 ; + *externalLeading = YDEV2LOGREL( e); if ( width ) - *width = XDEV2LOGREL( FixedToInt(textAfter - textBefore) ) ; - - ::ATSUDisposeTextLayout(atsuLayout); - -#if SIZEOF_WCHAR_T == 4 - free( ubuf ) ; -#endif + *width = XDEV2LOGREL( w ) ; if ( theFont ) { - // work around the constness - *((wxFont*)(&m_font)) = formerFont ; - MacInstallFont() ; + m_graphicContext->SetFont( m_font ) ; } } @@ -1963,60 +2171,10 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con { wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoGetPartialTextExtents - invalid DC") ); - widths.Empty(); - widths.Add(0, text.length()); - - if (text.empty()) - return false; - - ATSUTextLayout atsuLayout ; - UniCharCount chars = text.length() ; - UniChar* ubuf = NULL ; + m_graphicContext->GetPartialTextExtents( text, widths ) ; + for ( size_t i = 0 ; i < widths.GetCount() ; ++i ) + widths[i] = XDEV2LOGREL( widths[i] ); -#if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16 converter ; -#if wxUSE_UNICODE - size_t unicharlen = converter.WC2MB( NULL , text.wc_str() , 0 ) ; - ubuf = (UniChar*) malloc( unicharlen + 2 ) ; - converter.WC2MB( (char*) ubuf , text.wc_str(), unicharlen + 2 ) ; -#else - const wxWCharBuffer wchar = text.wc_str( wxConvLocal ) ; - size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; - ubuf = (UniChar*) malloc( unicharlen + 2 ) ; - converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ; -#endif - chars = unicharlen / 2 ; -#else -#if wxUSE_UNICODE - ubuf = (UniChar*) text.wc_str() ; -#else - wxWCharBuffer wchar = text.wc_str( wxConvLocal ) ; - chars = wxWcslen( wchar.data() ) ; - ubuf = (UniChar*) wchar.data() ; -#endif -#endif - - OSStatus status; - status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , - &chars , (ATSUStyle*) &m_macATSUIStyle , &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 false; - - widths[pos] = XDEV2LOGREL(FixedToInt( glyphBounds.upperRight.x - glyphBounds.upperLeft.x )); - //unsigned char uch = s[i]; - } - - ::ATSUDisposeTextLayout(atsuLayout); return true; } @@ -2114,94 +2272,70 @@ void wxDC::Clear(void) } } -void wxDC::MacInstallFont() const -{ - wxCHECK_RET( Ok(), wxT("wxDC(cg)::MacInstallFont - invalid DC") ); - - if ( m_macATSUIStyle ) - { - ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle); - m_macATSUIStyle = NULL ; - } - - if ( m_font.Ok() ) - { - OSStatus status ; - - status = ATSUCreateAndCopyStyle( (ATSUStyle) m_font.MacGetATSUStyle() , (ATSUStyle*) &m_macATSUIStyle ) ; - - wxASSERT_MSG( status == noErr, wxT("couldn't create ATSU style") ) ; - - Fixed atsuSize = IntToFixed( int(m_scaleY * m_font.MacGetFontSize()) ) ; - RGBColor atsuColor = MAC_WXCOLORREF( m_textForegroundColour.GetPixel() ) ; - ATSUAttributeTag atsuTags[] = - { - kATSUSizeTag , - kATSUColorTag , - } ; - ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = - { - sizeof( Fixed ) , - sizeof( RGBColor ) , - } ; - ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = - { - &atsuSize , - &atsuColor , - } ; - - status = ::ATSUSetAttributes( - (ATSUStyle)m_macATSUIStyle, sizeof(atsuTags) / sizeof(ATSUAttributeTag) , - atsuTags, atsuSizes, atsuValues); - - wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ) ; - } -} +#endif #pragma mark - // --------------------------------------------------------------------------- // coordinates transformations // --------------------------------------------------------------------------- +/* + wxCoord XLOG2DEVMAC(wxCoord x) const + { + long new_x = x - m_logicalOriginX; + if (new_x > 0) + return (wxCoord)((double)new_x * m_scaleX + 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x; + else + return (wxCoord)((double)new_x * m_scaleX - 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x; + } + + wxCoord YLOG2DEVMAC(wxCoord y) const + { + long new_y = y - m_logicalOriginY; + if (new_y > 0) + return (wxCoord)((double)new_y * m_scaleY + 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y; + else + return (wxCoord)((double)new_y * m_scaleY - 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y; + } -wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const +wxCoord wxDC::DeviceToLogicalX(wxCoord x) const { - return ((wxDC *)this)->XDEV2LOG(x); + return wxRound((double)(x - m_deviceOriginX) / m_scaleX) * m_signX + m_logicalOriginX; } -wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const +wxCoord wxDC::DeviceToLogicalY(wxCoord y) const { - return ((wxDC *)this)->YDEV2LOG(y); + return wxRound((double)(y - m_deviceOriginY) / m_scaleY) * m_signY + m_logicalOriginY; } -wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const +wxCoord wxDC::DeviceToLogicalXRel(wxCoord x) const { - return ((wxDC *)this)->XDEV2LOGREL(x); + return wxRound((double)(x) / m_scaleX); } -wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const +wxCoord wxDC::DeviceToLogicalYRel(wxCoord y) const { - return ((wxDC *)this)->YDEV2LOGREL(y); + return wxRound((double)(y) / m_scaleY); } -wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const +wxCoord wxDC::LogicalToDeviceX(wxCoord x) const { - return ((wxDC *)this)->XLOG2DEV(x); + return wxRound((double)(x - m_logicalOriginX) * m_scaleX) * m_signX + m_deviceOriginX; } -wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const +wxCoord wxDC::LogicalToDeviceY(wxCoord y) const { - return ((wxDC *)this)->YLOG2DEV(y); + return wxRound((double)(y - m_logicalOriginY) * m_scaleY) * m_signY + m_deviceOriginY; } -wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const +wxCoord wxDC::LogicalToDeviceXRel(wxCoord x) const { - return ((wxDC *)this)->XLOG2DEVREL(x); + return wxRound((double)(x) * m_scaleX); } -wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const +wxCoord wxDC::LogicalToDeviceYRel(wxCoord y) const { - return ((wxDC *)this)->YLOG2DEVREL(y); + return wxRound((double)(y) * m_scaleY); } - +*/ // TODO #endif // wxMAC_USE_CORE_GRAPHICS