X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83b96a06cadb8367855ab848f053ca71e1ed7748..f49fd6d0cd050ccc55e1bcbb831e078eaac10feb:/src/mac/carbon/dccg.cpp?ds=sidebyside diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp old mode 100755 new mode 100644 index 845f0bf88e..23d903065e --- a/src/mac/carbon/dccg.cpp +++ b/src/mac/carbon/dccg.cpp @@ -34,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 @@ -111,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 ) { @@ -124,6 +124,9 @@ wxMacPortSetter::~wxMacPortSetter() { // m_dc->MacCleanupPort(&m_ph) ; } + +#endif + #endif //----------------------------------------------------------------------------- @@ -148,6 +151,10 @@ static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } // wxGraphicPath implementation //----------------------------------------------------------------------------- +#if !wxUSE_GRAPHICS_CONTEXT + +IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) + wxMacCGPath::wxMacCGPath() { m_path = CGPathCreateMutable() ; @@ -196,14 +203,14 @@ CGPathRef wxMacCGPath::GetPath() const return m_path ; } -void wxMacCGPath::AddArcToPoint( wxCoord x1, wxCoord y1 , wxCoord x2, wxCoord y2, wxCoord r ) +void wxMacCGPath::AddArcToPoint( wxCoord x1, wxCoord y1 , wxCoord x2, wxCoord y2, wxCoord r ) { - CGPathAddArcToPoint( m_path, NULL , x1, y1, x2, y2, 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 ) +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); + CGPathAddArc( m_path, NULL , x, y, r, startAngle, endAngle, clockwise); } //----------------------------------------------------------------------------- @@ -265,8 +272,8 @@ void wxMacCGContext::StrokePath( const wxGraphicPath *p ) width = 1 ; if ( m_pen.GetStyle() == wxTRANSPARENT ) width = 0 ; - - bool offset = ( width % 2 ) == 1 ; + + bool offset = ( width % 2 ) == 1 ; if ( offset ) CGContextTranslateCTM( m_cgContext, 0.5, 0.5 ); @@ -296,8 +303,8 @@ void wxMacCGContext::DrawPath( const wxGraphicPath *p , int fillStyle ) width = 1 ; if ( m_pen.GetStyle() == wxTRANSPARENT ) width = 0 ; - - bool offset = ( width % 2 ) == 1 ; + + bool offset = ( width % 2 ) == 1 ; if ( offset ) CGContextTranslateCTM( m_cgContext, 0.5, 0.5 ); @@ -376,7 +383,7 @@ void wxMacCGContext::SetNativeContext( CGContextRef cg ) m_cgContext = cg ; } -void wxMacCGContext::Translate( wxCoord dx , wxCoord dy ) +void wxMacCGContext::Translate( wxCoord dx , wxCoord dy ) { CGContextTranslateCTM( m_cgContext, dx, dy ); } @@ -386,17 +393,17 @@ 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 ) +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 ); + 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 , + 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 ); @@ -404,7 +411,7 @@ void wxMacCGContext::DrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, wxCo CGImageRelease( image ) ; } -void wxMacCGContext::DrawIcon( const wxIcon &icon, wxCoord x, wxCoord y, wxCoord w, wxCoord h ) +void wxMacCGContext::DrawIcon( const wxIcon &icon, wxCoord x, wxCoord y, wxCoord w, wxCoord h ) { CGRect r = CGRectMake( 0 , 0 , w , h ) ; CGContextSaveGState( m_cgContext ); @@ -420,12 +427,12 @@ void wxMacCGContext::PushState() CGContextSaveGState( m_cgContext ); } -void wxMacCGContext::PopState() +void wxMacCGContext::PopState() { CGContextRestoreGState( m_cgContext ); } -void wxMacCGContext::SetTextColor( const wxColour &col ) +void wxMacCGContext::SetTextColor( const wxColour &col ) { m_textForegroundColor = col ; } @@ -655,7 +662,7 @@ void wxMacCGContext::SetPen( const wxPen &pen ) 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 @@ -781,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 ) ; @@ -834,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() ) @@ -843,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 ) ; @@ -872,7 +879,7 @@ void wxMacCGContext::SetBrush( const wxBrush &brush ) } } -void wxMacCGContext::DrawText( const wxString &str, wxCoord x, wxCoord y, double angle ) +void wxMacCGContext::DrawText( const wxString &str, wxCoord x, wxCoord y, double angle ) { OSStatus status = noErr ; ATSUTextLayout atsuLayout ; @@ -999,14 +1006,14 @@ void wxMacCGContext::DrawText( const wxString &str, wxCoord x, wxCoord y, double free( ubuf ) ; #endif } - + void wxMacCGContext::GetTextExtent( const wxString &str, wxCoord *width, wxCoord *height, wxCoord *descent, wxCoord *externalLeading ) const { 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 ; @@ -1057,7 +1064,7 @@ void wxMacCGContext::GetTextExtent( const wxString &str, wxCoord *width, wxCoord ::ATSUDisposeTextLayout(atsuLayout); } -void wxMacCGContext::GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const +void wxMacCGContext::GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const { widths.Empty(); widths.Add(0, text.length()); @@ -1114,7 +1121,7 @@ void wxMacCGContext::GetPartialTextExtents(const wxString& text, wxArrayInt& wid ::ATSUDisposeTextLayout(atsuLayout); } -void wxMacCGContext::SetFont( const wxFont &font ) +void wxMacCGContext::SetFont( const wxFont &font ) { if ( m_macATSUIStyle ) { @@ -1307,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 ); @@ -1335,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 ); @@ -1500,7 +1498,7 @@ void wxDC::SetPen( const wxPen &pen ) { if ( m_pen == pen ) return ; - + m_pen = pen; if ( m_graphicContext ) { @@ -1595,7 +1593,7 @@ bool wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const 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 ; } @@ -1693,7 +1691,7 @@ void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, } bool fill = m_brush.GetStyle() != wxTRANSPARENT ; - + wxGraphicPath* path = m_graphicContext->CreatePath() ; m_graphicContext->PushState() ; m_graphicContext->Translate( xxc, yyc ) ; @@ -1910,8 +1908,8 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) penwidth = 1 ; if ( m_pen.GetStyle() == wxTRANSPARENT ) penwidth = 0 ; - - bool offset = ( penwidth % 2 ) == 1 ; + + bool offset = ( penwidth % 2 ) == 1 ; wxGraphicPath* path = m_graphicContext->CreatePath() ; // if we are offsetting the entire rectangle is moved 0.5, so the border line gets off by 1 @@ -1919,7 +1917,7 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) path->AddRectangle( xx , yy , ww-1 , hh-1 ) ; else path->AddRectangle( xx , yy , ww , hh ) ; - + m_graphicContext->DrawPath( path ) ; delete path ; } @@ -2002,7 +2000,7 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) hh = -hh; yy = yy - hh; } - + wxGraphicPath* path = m_graphicContext->CreatePath() ; m_graphicContext->PushState() ; m_graphicContext->Translate(xx + ww / 2, yy + hh / 2); @@ -2023,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 ; @@ -2037,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 ) @@ -2088,7 +2100,7 @@ bool wxDC::DoBlit( else { wxFAIL_MSG( wxT("Blitting is only supported from bitmap contexts, and only with wxCOPY logical operation.") ) ; - return false ; + return false ; } return true; @@ -2127,7 +2139,7 @@ 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") ); @@ -2137,7 +2149,7 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height } wxCoord h , d , e , w ; - + m_graphicContext->GetTextExtent( str, &w, &h, &d, &e ) ; if ( height ) @@ -2260,50 +2272,70 @@ void wxDC::Clear(void) } } +#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 wxDCBase::DeviceToLogicalX(wxCoord x) const + 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 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