X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d0d84554854a19db991ba64e7e034e1fc898ef0..acd32ffcdb319f162633c20e0202db3f8542998a:/src/common/dcgraph.cpp diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp index 42742a48b9..9e5e2b81fd 100644 --- a/src/common/dcgraph.cpp +++ b/src/common/dcgraph.cpp @@ -30,7 +30,7 @@ #include "wx/dcclient.h" -#ifdef __WXOSX__ +#ifdef __WXOSX_OR_COCOA__ #ifdef __WXOSX_IPHONE__ #include #else @@ -53,6 +53,43 @@ static inline double DegToRad(double deg) return (deg * M_PI) / 180.0; } +static bool TranslateRasterOp(wxRasterOperationMode function, wxCompositionMode *op) +{ + switch ( function ) + { + case wxCOPY: // (default) src + *op = wxCOMPOSITION_SOURCE; // + break; + case wxOR: // src OR dst + *op = wxCOMPOSITION_ADD; + break; + case wxNO_OP: // dst + *op = wxCOMPOSITION_DEST; // ignore the source + break; + case wxCLEAR: // 0 + *op = wxCOMPOSITION_CLEAR;// clear dst + break; + case wxXOR: // src XOR dst + *op = wxCOMPOSITION_XOR; + break; + + case wxAND: // src AND dst + case wxAND_INVERT: // (NOT src) AND dst + case wxAND_REVERSE:// src AND (NOT dst) + case wxEQUIV: // (NOT src) XOR dst + case wxINVERT: // NOT dst + case wxNAND: // (NOT src) OR (NOT dst) + case wxNOR: // (NOT src) AND (NOT dst) + case wxOR_INVERT: // (NOT src) OR dst + case wxOR_REVERSE: // src OR (NOT dst) + case wxSET: // 1 + case wxSRC_INVERT: // NOT src + default: + return false; + } + return true; +} + //----------------------------------------------------------------------------- // wxDC bridge class //----------------------------------------------------------------------------- @@ -168,23 +205,34 @@ wxGCDCImpl::~wxGCDCImpl() delete m_graphicContext; } -void wxGCDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool WXUNUSED(useMask) ) +void wxGCDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, + bool useMask ) { wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawBitmap - invalid DC") ); wxCHECK_RET( bmp.IsOk(), wxT("wxGCDC(cg)::DoDrawBitmap - invalid bitmap") ); + int w = bmp.GetWidth(); + int h = bmp.GetHeight(); if ( bmp.GetDepth() == 1 ) { m_graphicContext->SetPen(*wxTRANSPARENT_PEN); m_graphicContext->SetBrush( wxBrush( m_textBackgroundColour , wxSOLID ) ); - m_graphicContext->DrawRectangle( x , y , bmp.GetWidth() , bmp.GetHeight() ); + m_graphicContext->DrawRectangle( x, y, w, h ); m_graphicContext->SetBrush( wxBrush( m_textForegroundColour , wxSOLID ) ); - m_graphicContext->DrawBitmap( bmp, x , y , bmp.GetWidth() , bmp.GetHeight() ); + m_graphicContext->DrawBitmap( bmp, x, y, w, h ); m_graphicContext->SetBrush( m_graphicContext->CreateBrush(m_brush)); m_graphicContext->SetPen( m_graphicContext->CreatePen(m_pen)); } - else - m_graphicContext->DrawBitmap( bmp, x , y , bmp.GetWidth() , bmp.GetHeight() ); + else // not a monochrome bitmap, handle it normally + { + // make a copy in case we need to remove its mask, if we don't modify + // it the copy is cheap as bitmaps are reference-counted + wxBitmap bmpCopy(bmp); + if ( !useMask && bmp.GetMask() ) + bmpCopy.SetMask(NULL); + + m_graphicContext->DrawBitmap( bmpCopy, x, y, w, h ); + } } void wxGCDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) @@ -217,7 +265,7 @@ void wxGCDCImpl::EndPage() void wxGCDCImpl::Flush() { -#ifdef __WXOSX__ +#ifdef __WXOSX_OR_COCOA__ CGContextFlush( (CGContextRef) m_graphicContext->GetNativeContext() ); #endif } @@ -325,7 +373,7 @@ void wxGCDCImpl::SetTextBackground( const wxColour &col ) m_textBackgroundColour = col; } -void wxGCDCImpl::SetMapMode( int mode ) +void wxGCDCImpl::SetMapMode( wxMappingMode mode ) { switch (mode) { @@ -371,13 +419,13 @@ void wxGCDCImpl::ComputeScaleAndOrigin() if ( m_graphicContext ) { m_matrixCurrent = m_graphicContext->CreateMatrix(); - + // the logical origin sets the origin to have new coordinates - m_matrixCurrent.Translate( m_deviceOriginX - m_logicalOriginX * m_signX * m_scaleX, + m_matrixCurrent.Translate( m_deviceOriginX - m_logicalOriginX * m_signX * m_scaleX, m_deviceOriginY-m_logicalOriginY * m_signY * m_scaleY); - + m_matrixCurrent.Scale( m_scaleX * m_signX, m_scaleY * m_signY ); - + m_graphicContext->SetTransform( m_matrixOriginal ); m_graphicContext->ConcatTransform( m_matrixCurrent ); } @@ -439,20 +487,27 @@ void wxGCDCImpl::SetBackground( const wxBrush &brush ) return; } -void wxGCDCImpl::SetLogicalFunction( int function ) +void wxGCDCImpl::SetLogicalFunction( wxRasterOperationMode function ) { if (m_logicalFunction == function) return; m_logicalFunction = function; - if ( m_graphicContext->SetLogicalFunction( function ) ) - m_logicalFunctionSupported=true; + + wxCompositionMode mode; + m_logicalFunctionSupported = TranslateRasterOp( function, &mode); + if (m_logicalFunctionSupported) + m_logicalFunctionSupported = m_graphicContext->SetCompositionMode(mode); + + if (mode == wxCOMPOSITION_XOR) + m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE); else - m_logicalFunctionSupported=false; + m_graphicContext->SetAntialiasMode(wxANTIALIAS_DEFAULT); } bool wxGCDCImpl::DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), - const wxColour& WXUNUSED(col), int WXUNUSED(style)) + const wxColour& WXUNUSED(col), + wxFloodFillStyle WXUNUSED(style)) { return false; } @@ -663,8 +718,8 @@ void wxGCDCImpl::DoDrawSpline(const wxPointList *points) #endif // wxUSE_SPLINES void wxGCDCImpl::DoDrawPolygon( int n, wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - int fillStyle ) + wxCoord xoffset, wxCoord yoffset, + wxPolygonFillMode fillStyle ) { wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawPolygon - invalid DC") ); @@ -695,7 +750,7 @@ void wxGCDCImpl::DoDrawPolyPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, - int fillStyle) + wxPolygonFillMode fillStyle) { wxASSERT(n > 1); wxGraphicsPath path = m_graphicContext->CreatePath(); @@ -790,7 +845,8 @@ bool wxGCDCImpl::CanDrawBitmap() const bool wxGCDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask, + wxDC *source, wxCoord xsrc, wxCoord ysrc, + wxRasterOperationMode logical_func , bool useMask, wxCoord xsrcMask, wxCoord ysrcMask ) { return DoStretchBlit( xdest, ydest, width, height, @@ -801,7 +857,7 @@ bool wxGCDCImpl::DoBlit( bool wxGCDCImpl::DoStretchBlit( wxCoord xdest, wxCoord ydest, wxCoord dstWidth, wxCoord dstHeight, wxDC *source, wxCoord xsrc, wxCoord ysrc, wxCoord srcWidth, wxCoord srcHeight, - int logical_func , bool WXUNUSED(useMask), + wxRasterOperationMode logical_func , bool useMask, wxCoord xsrcMask, wxCoord ysrcMask ) { wxCHECK_MSG( IsOk(), false, wxT("wxGCDC(cg)::DoStretchBlit - invalid DC") ); @@ -809,51 +865,71 @@ bool wxGCDCImpl::DoStretchBlit( if ( logical_func == wxNO_OP ) return true; - else if ( !m_graphicContext->SetLogicalFunction( logical_func ) ) - + + wxCompositionMode mode; + if ( !TranslateRasterOp(logical_func, &mode) ) { - wxFAIL_MSG( wxT("Blitting is only supported with wxCOPY logical operation.") ); + wxFAIL_MSG( wxT("Blitting is not supported with this logical operation.") ); return false; } - if (xsrcMask == -1 && ysrcMask == -1) + bool retval = true; + + wxCompositionMode formerMode = m_graphicContext->GetCompositionMode(); + if (m_graphicContext->SetCompositionMode(mode)) { - xsrcMask = xsrc; - ysrcMask = ysrc; - } + wxAntialiasMode formerAa = m_graphicContext->GetAntialiasMode(); + if (mode == wxCOMPOSITION_XOR) + { + m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE); + } + + if (xsrcMask == -1 && ysrcMask == -1) + { + xsrcMask = xsrc; + ysrcMask = ysrc; + } - wxRect subrect(source->LogicalToDeviceX(xsrc), - source->LogicalToDeviceY(ysrc), - source->LogicalToDeviceXRel(srcWidth), - source->LogicalToDeviceYRel(srcHeight)); + wxRect subrect(source->LogicalToDeviceX(xsrc), + source->LogicalToDeviceY(ysrc), + source->LogicalToDeviceXRel(srcWidth), + source->LogicalToDeviceYRel(srcHeight)); - // if needed clip the subrect down to the size of the source DC - wxCoord sw, sh; - source->GetSize(&sw, &sh); - sw = source->LogicalToDeviceXRel(sw); - sh = source->LogicalToDeviceYRel(sh); - if (subrect.x + subrect.width > sw) - subrect.width = sw - subrect.x; - if (subrect.y + subrect.height > sh) - subrect.height = sh - subrect.y; + // if needed clip the subrect down to the size of the source DC + wxCoord sw, sh; + source->GetSize(&sw, &sh); + sw = source->LogicalToDeviceXRel(sw); + sh = source->LogicalToDeviceYRel(sh); + if (subrect.x + subrect.width > sw) + subrect.width = sw - subrect.x; + if (subrect.y + subrect.height > sh) + subrect.height = sh - subrect.y; - wxBitmap blit = source->GetAsBitmap( &subrect ); + wxBitmap blit = source->GetAsBitmap( &subrect ); - if ( blit.IsOk() ) - { - m_graphicContext->DrawBitmap( blit, xdest, ydest, - dstWidth, dstHeight); - } - else - { - wxFAIL_MSG( wxT("Cannot Blit. Unable to get contents of DC as bitmap.") ); - return false; - } + if ( blit.IsOk() ) + { + if ( !useMask && blit.GetMask() ) + blit.SetMask(NULL); - // reset logical function - m_graphicContext->SetLogicalFunction( m_logicalFunction ); + m_graphicContext->DrawBitmap( blit, xdest, ydest, + dstWidth, dstHeight); + } + else + { + wxFAIL_MSG( wxT("Cannot Blit. Unable to get contents of DC as bitmap.") ); + retval = false; + } + + if (mode == wxCOMPOSITION_XOR) + { + m_graphicContext->SetAntialiasMode(formerAa); + } + } + // reset composition + m_graphicContext->SetCompositionMode(formerMode); - return true; + return retval; } void wxGCDCImpl::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, @@ -874,7 +950,7 @@ void wxGCDCImpl::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, void wxGCDCImpl::DoDrawText(const wxString& str, wxCoord x, wxCoord y) { - wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawRotatedText - invalid DC") ); + wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawText - invalid DC") ); if ( str.length() == 0 ) return;