X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1dcbbdcf92041ccf3efbc3bc2909d1dd0b7d0364..12cd5f34e72ba5e6e295936d2a74b9080552a331:/src/mac/carbon/dc.cpp?ds=sidebyside diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp index 6d995bb99f..95d6293c85 100644 --- a/src/mac/carbon/dc.cpp +++ b/src/mac/carbon/dc.cpp @@ -20,10 +20,15 @@ #include "wx/region.h" #include "wx/image.h" + #if __MSL__ >= 0x6000 #include "math.h" +using namespace std ; #endif +#include "wx/mac/private.h" + + #if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) #endif @@ -42,6 +47,10 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) const double M_PI = 3.14159265358979 ; #endif const double RAD2DEG = 180.0 / M_PI; +const short kEmulatedMode = -1 ; +const short kUnsupportedMode = -2 ; + +#define wxMAC_EXPERIMENTAL_PATTERN 0 //----------------------------------------------------------------------------- // Local functions @@ -55,6 +64,95 @@ static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } // wxDC //----------------------------------------------------------------------------- +// this function emulates all wx colour manipulations, used to verify the implementation +// by setting the mode in the blitting functions to kEmulatedMode + +void wxMacCalculateColour( int logical_func , const RGBColor &srcColor , RGBColor &dstColor ) ; +void wxMacCalculateColour( int logical_func , const RGBColor &srcColor , RGBColor &dstColor ) +{ + switch ( logical_func ) + { + case wxAND: // src AND dst + dstColor.red = dstColor.red & srcColor.red ; + dstColor.green = dstColor.green & srcColor.green ; + dstColor.blue = dstColor.blue & srcColor.blue ; + break ; + case wxAND_INVERT: // (NOT src) AND dst + dstColor.red = dstColor.red & ~srcColor.red ; + dstColor.green = dstColor.green & ~srcColor.green ; + dstColor.blue = dstColor.blue & ~srcColor.blue ; + break ; + case wxAND_REVERSE:// src AND (NOT dst) + dstColor.red = ~dstColor.red & srcColor.red ; + dstColor.green = ~dstColor.green & srcColor.green ; + dstColor.blue = ~dstColor.blue & srcColor.blue ; + break ; + case wxCLEAR: // 0 + dstColor.red = 0 ; + dstColor.green = 0 ; + dstColor.blue = 0 ; + break ; + case wxCOPY: // src + dstColor.red = srcColor.red ; + dstColor.green = srcColor.green ; + dstColor.blue = srcColor.blue ; + break ; + case wxEQUIV: // (NOT src) XOR dst + dstColor.red = dstColor.red ^ ~srcColor.red ; + dstColor.green = dstColor.green ^ ~srcColor.green ; + dstColor.blue = dstColor.blue ^ ~srcColor.blue ; + break ; + case wxINVERT: // NOT dst + dstColor.red = ~dstColor.red ; + dstColor.green = ~dstColor.green ; + dstColor.blue = ~dstColor.blue ; + break ; + case wxNAND: // (NOT src) OR (NOT dst) + dstColor.red = ~dstColor.red | ~srcColor.red ; + dstColor.green = ~dstColor.green | ~srcColor.green ; + dstColor.blue = ~dstColor.blue | ~srcColor.blue ; + break ; + case wxNOR: // (NOT src) AND (NOT dst) + dstColor.red = ~dstColor.red & ~srcColor.red ; + dstColor.green = ~dstColor.green & ~srcColor.green ; + dstColor.blue = ~dstColor.blue & ~srcColor.blue ; + break ; + case wxNO_OP: // dst + break ; + case wxOR: // src OR dst + dstColor.red = dstColor.red | srcColor.red ; + dstColor.green = dstColor.green | srcColor.green ; + dstColor.blue = dstColor.blue | srcColor.blue ; + break ; + case wxOR_INVERT: // (NOT src) OR dst + dstColor.red = dstColor.red | ~srcColor.red ; + dstColor.green = dstColor.green | ~srcColor.green ; + dstColor.blue = dstColor.blue | ~srcColor.blue ; + break ; + case wxOR_REVERSE: // src OR (NOT dst) + dstColor.red = ~dstColor.red | srcColor.red ; + dstColor.green = ~dstColor.green | srcColor.green ; + dstColor.blue = ~dstColor.blue | srcColor.blue ; + break ; + case wxSET: // 1 + dstColor.red = 0xFFFF ; + dstColor.green = 0xFFFF ; + dstColor.blue = 0xFFFF ; + break ; + case wxSRC_INVERT: // (NOT src) + dstColor.red = ~srcColor.red ; + dstColor.green = ~srcColor.green ; + dstColor.blue = ~srcColor.blue ; + break ; + case wxXOR: // src XOR dst + dstColor.red = dstColor.red ^ srcColor.red ; + dstColor.green = dstColor.green ^ srcColor.green ; + dstColor.blue = dstColor.blue ^ srcColor.blue ; + break ; + } + +} + wxDC::wxDC() { m_ok = FALSE; @@ -78,9 +176,6 @@ wxDC::wxDC() m_needComputeScaleX = FALSE; m_needComputeScaleY = FALSE; - m_maxX = m_maxY = -100000; - m_minY = m_minY = 100000; - m_macPort = NULL ; m_macMask = NULL ; m_ok = FALSE ; @@ -89,19 +184,19 @@ wxDC::wxDC() m_macBrushInstalled = false ; m_macPenInstalled = false ; - m_macLocalOrigin.h = m_macLocalOrigin.v = 0 ; + m_macLocalOrigin.x = m_macLocalOrigin.y = 0 ; m_macBoundaryClipRgn = NewRgn() ; m_macCurrentClipRgn = NewRgn() ; - SetRectRgn( m_macBoundaryClipRgn , -32000 , -32000 , 32000 , 32000 ) ; - SetRectRgn( m_macCurrentClipRgn , -32000 , -32000 , 32000 , 32000 ) ; + SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , -32000 , -32000 , 32000 , 32000 ) ; + SetRectRgn( (RgnHandle) m_macCurrentClipRgn , -32000 , -32000 , 32000 , 32000 ) ; m_pen = *wxBLACK_PEN; m_font = *wxNORMAL_FONT; m_brush = *wxWHITE_BRUSH; } wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) : - m_ph( dc->m_macPort ) + m_ph( (GrafPtr) dc->m_macPort ) { wxASSERT( dc->Ok() ) ; @@ -114,14 +209,12 @@ wxMacPortSetter::~wxMacPortSetter() wxDC::~wxDC(void) { - DisposeRgn( m_macBoundaryClipRgn ) ; - DisposeRgn( m_macCurrentClipRgn ) ; + DisposeRgn( (RgnHandle) m_macBoundaryClipRgn ) ; + DisposeRgn( (RgnHandle) m_macCurrentClipRgn ) ; } -void wxDC::MacSetupPort(AGAPortHelper* help) const +void wxDC::MacSetupPort(wxMacPortStateHelper* help) const { -// help->Setup( m_macPort ) ; - ::SetOrigin(-m_macLocalOrigin.h, -m_macLocalOrigin.v); - SetClip( m_macCurrentClipRgn); + SetClip( (RgnHandle) m_macCurrentClipRgn); m_macFontInstalled = false ; m_macBrushInstalled = false ; @@ -136,8 +229,8 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask wxMacPortSetter helper(this) ; - wxCoord xx = XLOG2DEV(x); - wxCoord yy = YLOG2DEV(y); + wxCoord xx = XLOG2DEVMAC(x); + wxCoord yy = YLOG2DEVMAC(y); wxCoord w = bmp.GetWidth(); wxCoord h = bmp.GetHeight(); wxCoord ww = XLOG2DEVREL(w); @@ -161,18 +254,18 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask if ( bmp.GetBitmapType() == kMacBitmapTypePict ) { Rect bitmaprect = { 0 , 0 , hh, ww }; ::OffsetRect( &bitmaprect, xx, yy ) ; - ::DrawPicture( bmp.GetPict(), &bitmaprect ) ; + ::DrawPicture( (PicHandle) bmp.GetPict(), &bitmaprect ) ; } else if ( bmp.GetBitmapType() == kMacBitmapTypeGrafWorld ) { - GWorldPtr bmapworld = bmp.GetHBITMAP(); + GWorldPtr bmapworld = MAC_WXHBITMAP( bmp.GetHBITMAP() ); PixMapHandle bmappixels ; // Set foreground and background colours (for bitmaps depth = 1) if(bmp.GetDepth() == 1) { - RGBColor fore = m_textForegroundColour.GetPixel(); - RGBColor back = m_textBackgroundColour.GetPixel(); + RGBColor fore = MAC_WXCOLORREF(m_textForegroundColour.GetPixel()); + RGBColor back = MAC_WXCOLORREF(m_textBackgroundColour.GetPixel()); RGBForeColor(&fore); RGBBackColor(&back); } @@ -194,21 +287,21 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask if ( useMask && bmp.GetMask() ) { - if( LockPixels(GetGWorldPixMap(bmp.GetMask()->GetMaskBitmap()))) + if( LockPixels(GetGWorldPixMap(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap())))) { CopyDeepMask ( GetPortBitMapForCopyBits(bmapworld), - GetPortBitMapForCopyBits(bmp.GetMask()->GetMaskBitmap()), - GetPortBitMapForCopyBits( m_macPort ), + GetPortBitMapForCopyBits(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap())), + GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ), &source, &source, &dest, mode, NULL ); - UnlockPixels(GetGWorldPixMap(bmp.GetMask()->GetMaskBitmap())); + UnlockPixels(GetGWorldPixMap(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap()))); } } else { CopyBits( GetPortBitMapForCopyBits( bmapworld ), - GetPortBitMapForCopyBits( m_macPort ), + GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ), &source, &dest, mode, NULL ) ; } UnlockPixels( bmappixels ) ; @@ -217,7 +310,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask { Rect bitmaprect = { 0 , 0 , bmp.GetHeight(), bmp.GetWidth() } ; OffsetRect( &bitmaprect, xx, yy ) ; - PlotCIconHandle( &bitmaprect , atNone , ttNone , bmp.GetHICON() ) ; + PlotCIconHandle( &bitmaprect , atNone , ttNone , MAC_WXHICON(bmp.GetHICON()) ) ; } m_macPenInstalled = false ; m_macBrushInstalled = false ; @@ -238,13 +331,13 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei wxCHECK_RET(Ok(), wxT("wxDC::DoSetClippingRegion Invalid DC")); wxCoord xx, yy, ww, hh; - xx = XLOG2DEV(x); - yy = YLOG2DEV(y); + xx = XLOG2DEVMAC(x); + yy = YLOG2DEVMAC(y); ww = XLOG2DEVREL(width); hh = YLOG2DEVREL(height); - SetRectRgn( m_macCurrentClipRgn , xx , yy , xx + ww , yy + hh ) ; - SectRgn( m_macCurrentClipRgn , m_macBoundaryClipRgn , m_macCurrentClipRgn ) ; + SetRectRgn( (RgnHandle) m_macCurrentClipRgn , xx , yy , xx + ww , yy + hh ) ; + SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; if( m_clipping ) { @@ -278,8 +371,8 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) region.GetBox( x, y, w, h ); wxCoord xx, yy, ww, hh; - xx = XLOG2DEV(x); - yy = YLOG2DEV(y); + xx = XLOG2DEVMAC(x); + yy = YLOG2DEVMAC(y); ww = XLOG2DEVREL(w); hh = YLOG2DEVREL(h); @@ -292,12 +385,12 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) } else { - CopyRgn( region.GetWXHRGN() , m_macCurrentClipRgn ) ; + CopyRgn( (RgnHandle) region.GetWXHRGN() , (RgnHandle) m_macCurrentClipRgn ) ; if ( xx != x || yy != y ) { - OffsetRgn( m_macCurrentClipRgn , xx - x , yy - y ) ; + OffsetRgn( (RgnHandle) m_macCurrentClipRgn , xx - x , yy - y ) ; } - SectRgn( m_macCurrentClipRgn , m_macBoundaryClipRgn , m_macCurrentClipRgn ) ; + SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; if( m_clipping ) { m_clipX1 = wxMax( m_clipX1 , xx ); @@ -320,7 +413,7 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) void wxDC::DestroyClippingRegion() { wxMacPortSetter helper(this) ; - CopyRgn( m_macBoundaryClipRgn , m_macCurrentClipRgn ) ; + CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; m_clipping = FALSE; } void wxDC::DoGetSize( int* width, int* height ) const @@ -420,15 +513,8 @@ void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) m_signX = (xLeftRight ? 1 : -1); m_signY = (yBottomUp ? -1 : 1); ComputeScaleAndOrigin(); -}/* - -void wxDC::CalcBoundingBox( long x, long y ) -{ - if (x < m_minX) m_minX = x; - if (y < m_minY) m_minY = y; - if (x > m_maxX) m_maxX = x; - if (y > m_maxY) m_maxY = y; -}*/ +} + wxSize wxDC::GetPPI() const { return wxSize(72, 72); @@ -531,7 +617,7 @@ bool wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const RGBColor colour; - GetCPixel( XLOG2DEV(x), YLOG2DEV(y), &colour ); + GetCPixel( XLOG2DEVMAC(x), YLOG2DEVMAC(y), &colour ); // Convert from Mac colour to wx col->Set( colour.red >> 8, @@ -553,10 +639,10 @@ void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) wxCoord offset = ( (m_pen.GetWidth() == 0 ? 1 : m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2; - wxCoord xx1 = XLOG2DEV(x1) - offset; - wxCoord yy1 = YLOG2DEV(y1) - offset; - wxCoord xx2 = XLOG2DEV(x2) - offset; - wxCoord yy2 = YLOG2DEV(y2) - offset; + wxCoord xx1 = XLOG2DEVMAC(x1) - offset; + wxCoord yy1 = YLOG2DEVMAC(y1) - offset; + wxCoord xx2 = XLOG2DEVMAC(x2) - offset; + wxCoord yy2 = YLOG2DEVMAC(y2) - offset; if ((m_pen.GetCap() == wxCAP_ROUND) && (m_pen.GetWidth() <= 1)) @@ -593,14 +679,14 @@ void wxDC::DoCrossHair( wxCoord x, wxCoord y ) int w = 0; int h = 0; GetSize( &w, &h ); - wxCoord xx = XLOG2DEV(x); - wxCoord yy = YLOG2DEV(y); + wxCoord xx = XLOG2DEVMAC(x); + wxCoord yy = YLOG2DEVMAC(y); MacInstallPen(); - ::MoveTo( 0, yy ); - ::LineTo( XLOG2DEVREL(w), yy ); - ::MoveTo( xx, 0 ); - ::LineTo( xx, YLOG2DEVREL(h) ); + ::MoveTo( XLOG2DEVMAC(0), yy ); + ::LineTo( XLOG2DEVMAC(w), yy ); + ::MoveTo( xx, YLOG2DEVMAC(0) ); + ::LineTo( xx, YLOG2DEVMAC(h) ); } } @@ -645,12 +731,12 @@ void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, { wxCHECK_RET(Ok(), wxT("wxDC::DoDrawArc Invalid DC")); - wxCoord xx1 = XLOG2DEV(x1); - wxCoord yy1 = YLOG2DEV(y1); - wxCoord xx2 = XLOG2DEV(x2); - wxCoord yy2 = YLOG2DEV(y2); - wxCoord xxc = XLOG2DEV(xc); - wxCoord yyc = YLOG2DEV(yc); + wxCoord xx1 = XLOG2DEVMAC(x1); + wxCoord yy1 = YLOG2DEVMAC(y1); + wxCoord xx2 = XLOG2DEVMAC(x2); + wxCoord yy2 = YLOG2DEVMAC(y2); + wxCoord xxc = XLOG2DEVMAC(xc); + wxCoord yyc = YLOG2DEVMAC(yc); double dx = xx1 - xxc; double dy = yy1 - yyc; double radius = sqrt((double)(dx*dx+dy*dy)); @@ -701,8 +787,8 @@ void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, Rect r; double angle = sa - ea; // Order important Mac in opposite direction to wx - wxCoord xx = XLOG2DEV(x); - wxCoord yy = YLOG2DEV(y); + wxCoord xx = XLOG2DEVMAC(x); + wxCoord yy = YLOG2DEVMAC(y); wxCoord ww = m_signX * XLOG2DEVREL(w); wxCoord hh = m_signY * YLOG2DEVREL(h); @@ -736,8 +822,8 @@ void wxDC::DoDrawPoint( wxCoord x, wxCoord y ) if (m_pen.GetStyle() != wxTRANSPARENT) { MacInstallPen() ; - wxCoord xx1 = XLOG2DEV(x); - wxCoord yy1 = YLOG2DEV(y); + wxCoord xx1 = XLOG2DEVMAC(x); + wxCoord yy1 = YLOG2DEVMAC(y); ::MoveTo(xx1,yy1); ::LineTo(xx1+1, yy1+1); @@ -759,14 +845,14 @@ void wxDC::DoDrawLines(int n, wxPoint points[], m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2 ; wxCoord x1, x2 , y1 , y2 ; - x1 = XLOG2DEV(points[0].x + xoffset); - y1 = YLOG2DEV(points[0].y + yoffset); + x1 = XLOG2DEVMAC(points[0].x + xoffset); + y1 = YLOG2DEVMAC(points[0].y + yoffset); ::MoveTo(x1 - offset, y1 - offset ); for (int i = 0; i < n-1; i++) { - x2 = XLOG2DEV(points[i+1].x + xoffset); - y2 = YLOG2DEV(points[i+1].y + yoffset); + x2 = XLOG2DEVMAC(points[i+1].x + xoffset); + y2 = YLOG2DEVMAC(points[i+1].y + yoffset); ::LineTo( x2 - offset, y2 - offset ); } } @@ -780,54 +866,46 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord x1, x2 , y1 , y2 ; + if ( m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT ) + return ; + + PolyHandle polygon = OpenPoly(); + + x1 = XLOG2DEVMAC(points[0].x + xoffset); + y1 = YLOG2DEVMAC(points[0].y + yoffset); + ::MoveTo(x1,y1); + + for (int i = 1; i < n; i++) + { + x2 = XLOG2DEVMAC(points[i].x + xoffset); + y2 = YLOG2DEVMAC(points[i].y + yoffset); + ::LineTo(x2, y2); + } + + // close the polyline if necessary + if ( x1 != x2 || y1 != y2 ) + { + ::LineTo(x1,y1 ) ; + } + + ClosePoly(); + if (m_brush.GetStyle() != wxTRANSPARENT) { - PolyHandle polygon = OpenPoly(); - - x1 = XLOG2DEV(points[0].x + xoffset); - y1 = YLOG2DEV(points[0].y + yoffset); - ::MoveTo(x1,y1); - - for (int i = 0; i < n-1; i++) - { - x2 = XLOG2DEV(points[i+1].x + xoffset); - y2 = YLOG2DEV(points[i+1].y + yoffset); - ::LineTo(x2, y2); - } - - ClosePoly(); MacInstallBrush(); ::PaintPoly( polygon ); - KillPoly( polygon ); } if (m_pen.GetStyle() != wxTRANSPARENT) { - PolyHandle polygon = OpenPoly(); - - x1 = XLOG2DEV(points[0].x + xoffset); - y1 = YLOG2DEV(points[0].y + yoffset); - ::MoveTo(x1,y1); - - for (int i = 0; i < n-1; i++) - { - x2 = XLOG2DEV(points[i+1].x + xoffset); - y2 = YLOG2DEV(points[i+1].y + yoffset); - ::LineTo(x2, y2); - } - - // return to origin to close path - ::LineTo(x1,y1); - - ClosePoly(); MacInstallPen() ; ::FramePoly( polygon ) ; - KillPoly( polygon ); } + KillPoly( polygon ); } void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) @@ -835,8 +913,8 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxCHECK_RET(Ok(), wxT("Invalid DC")); wxMacPortSetter helper(this) ; - wxCoord xx = XLOG2DEV(x); - wxCoord yy = YLOG2DEV(y); + wxCoord xx = XLOG2DEVMAC(x); + wxCoord yy = YLOG2DEVMAC(y); wxCoord ww = m_signX * XLOG2DEVREL(width); wxCoord hh = m_signY * YLOG2DEVREL(height); @@ -882,8 +960,8 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, if (radius < 0.0) radius = - radius * ((width < height) ? width : height); - wxCoord xx = XLOG2DEV(x); - wxCoord yy = YLOG2DEV(y); + wxCoord xx = XLOG2DEVMAC(x); + wxCoord yy = YLOG2DEVMAC(y); wxCoord ww = m_signX * XLOG2DEVREL(width); wxCoord hh = m_signY * YLOG2DEVREL(height); @@ -924,8 +1002,8 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxCHECK_RET(Ok(), wxT("Invalid DC")); wxMacPortSetter helper(this) ; - wxCoord xx = XLOG2DEV(x); - wxCoord yy = YLOG2DEV(y); + wxCoord xx = XLOG2DEVMAC(x); + wxCoord yy = YLOG2DEVMAC(y); wxCoord ww = m_signX * XLOG2DEVREL(width); wxCoord hh = m_signY * YLOG2DEVREL(height); @@ -975,82 +1053,222 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, { wxCHECK_MSG(Ok(), false, wxT("wxDC::DoBlit Illegal dc")); wxCHECK_MSG(source->Ok(), false, wxT("wxDC::DoBlit Illegal source DC")); - wxMacPortSetter helper(this) ; + + if ( logical_func == wxNO_OP ) + return TRUE ; - /* TODO: use the mask origin when drawing transparently */ if (xsrcMask == -1 && ysrcMask == -1) { xsrcMask = xsrc; ysrcMask = ysrc; } + // correct the parameter in case this dc does not have a mask at all + + if ( useMask && !source->m_macMask ) + useMask = false ; + + Rect srcrect , dstrect ; + srcrect.top = source->YLOG2DEVMAC(ysrc) ; + srcrect.left = source->XLOG2DEVMAC(xsrc) ; + srcrect.right = source->XLOG2DEVMAC(xsrc + width ) ; + srcrect.bottom = source->YLOG2DEVMAC(ysrc + height) ; + dstrect.top = YLOG2DEVMAC(ydest) ; + dstrect.left = XLOG2DEVMAC(xdest) ; + dstrect.bottom = YLOG2DEVMAC(ydest + height ) ; + dstrect.right = XLOG2DEVMAC(xdest + width ) ; + + short mode = kUnsupportedMode ; + bool invertDestinationFirst = false ; + switch ( logical_func ) + { + case wxAND: // src AND dst + mode = srcOr ; // ok + break ; + case wxAND_INVERT: // (NOT src) AND dst + mode = notSrcOr ; // ok + break ; + case wxAND_REVERSE:// src AND (NOT dst) + invertDestinationFirst = true ; + mode = srcOr ; + break ; + case wxCLEAR: // 0 + mode = kEmulatedMode ; + break ; + case wxCOPY: // src + mode = srcCopy ; // ok + break ; + case wxEQUIV: // (NOT src) XOR dst + mode = srcXor ; // ok + break ; + case wxINVERT: // NOT dst + mode = kEmulatedMode ; //or hilite ; + break ; + case wxNAND: // (NOT src) OR (NOT dst) + invertDestinationFirst = true ; + mode = srcBic ; + break ; + case wxNOR: // (NOT src) AND (NOT dst) + invertDestinationFirst = true ; + mode = notSrcOr ; + break ; + case wxNO_OP: // dst + mode = kEmulatedMode ; // this has already been handled upon entry + break ; + case wxOR: // src OR dst + mode = notSrcBic ; + break ; + case wxOR_INVERT: // (NOT src) OR dst + mode = srcBic ; + break ; + case wxOR_REVERSE: // src OR (NOT dst) + invertDestinationFirst = true ; + mode = notSrcBic ; + break ; + case wxSET: // 1 + mode = kEmulatedMode ; + break ; + case wxSRC_INVERT: // (NOT src) + mode = notSrcCopy ; // ok + break ; + case wxXOR: // src XOR dst + mode = notSrcXor ; // ok + break ; + + default : + break ; + + } + + if ( mode == kUnsupportedMode ) + { + wxFAIL_MSG("unsupported blitting mode" ) + return FALSE ; + } + CGrafPtr sourcePort = (CGrafPtr) source->m_macPort ; PixMapHandle bmappixels = GetGWorldPixMap( sourcePort ) ; - RGBColor white = { 0xFFFF, 0xFFFF,0xFFFF} ; - RGBColor black = { 0,0,0} ; - RGBColor forecolor = m_textForegroundColour.GetPixel(); - RGBColor backcolor = m_textBackgroundColour.GetPixel(); - RGBForeColor( &forecolor ) ; - RGBBackColor( &backcolor ) ; - if ( LockPixels(bmappixels) ) { - Rect srcrect , dstrect ; - srcrect.top = source->YLOG2DEV(ysrc) + source->m_macLocalOrigin.v ; - srcrect.left = source->XLOG2DEV(xsrc) + source->m_macLocalOrigin.h ; - srcrect.right = source->XLOG2DEV(xsrc + width ) + source->m_macLocalOrigin.v; - srcrect.bottom = source->YLOG2DEV(ysrc + height) + source->m_macLocalOrigin.h; - dstrect.top = YLOG2DEV(ydest) ; - dstrect.left = XLOG2DEV(xdest) ; - dstrect.bottom = YLOG2DEV(ydest + height ) ; - dstrect.right = XLOG2DEV(xdest + width ) ; - - short mode = (logical_func == wxCOPY ? srcCopy : - // logical_func == wxCLEAR ? WHITENESS : - // logical_func == wxSET ? BLACKNESS : - logical_func == wxINVERT ? hilite : - // logical_func == wxAND ? MERGECOPY : - logical_func == wxOR ? srcOr : - logical_func == wxSRC_INVERT ? notSrcCopy : - logical_func == wxXOR ? srcXor : - // logical_func == wxOR_REVERSE ? MERGEPAINT : - // logical_func == wxAND_REVERSE ? SRCERASE : - // logical_func == wxSRC_OR ? srcOr : - // logical_func == wxSRC_AND ? SRCAND : - srcCopy ); + wxMacPortSetter helper(this) ; + RGBColor tempColor ; + + if ( source->GetDepth() == 1 ) + { + RGBForeColor( &MAC_WXCOLORREF(m_textForegroundColour.GetPixel()) ) ; + RGBBackColor( &MAC_WXCOLORREF(m_textBackgroundColour.GetPixel()) ) ; + } + else + { + // the modes need this, otherwise we'll end up having really nice colors... + RGBColor white = { 0xFFFF, 0xFFFF,0xFFFF} ; + RGBColor black = { 0,0,0} ; + RGBForeColor( &black ) ; + RGBBackColor( &white ) ; + } if ( useMask && source->m_macMask ) { if ( mode == srcCopy ) { - if ( LockPixels( GetGWorldPixMap( source->m_macMask ) ) ) + if ( LockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ) { CopyMask( GetPortBitMapForCopyBits( sourcePort ) , - GetPortBitMapForCopyBits( source->m_macMask ) , - GetPortBitMapForCopyBits( m_macPort ) , + GetPortBitMapForCopyBits( MAC_WXHBITMAP(source->m_macMask) ) , + GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) , &srcrect, &srcrect , &dstrect ) ; - UnlockPixels( GetGWorldPixMap( source->m_macMask ) ) ; + UnlockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ; } } else { RgnHandle clipRgn = NewRgn() ; - - LockPixels( GetGWorldPixMap( source->m_macMask ) ) ; - BitMapToRegion( clipRgn , (BitMap*) *GetGWorldPixMap( source->m_macMask ) ) ; - UnlockPixels( GetGWorldPixMap( source->m_macMask ) ) ; - //OffsetRgn( clipRgn , -source->m_macMask->portRect.left , -source->m_macMask->portRect.top ) ; + LockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ; + BitMapToRegion( clipRgn , (BitMap*) *GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ; + UnlockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ; OffsetRgn( clipRgn , -srcrect.left + dstrect.left, -srcrect.top + dstrect.top ) ; - CopyBits( GetPortBitMapForCopyBits( sourcePort ) , - GetPortBitMapForCopyBits( m_macPort ) , - &srcrect, &dstrect, mode, clipRgn ) ; + if ( mode == kEmulatedMode ) + { + Pattern pat ; + ::PenPat(GetQDGlobalsBlack(&pat)); + if ( logical_func == wxSET ) + { + RGBColor col= { 0xFFFF, 0xFFFF, 0xFFFF } ; + ::RGBForeColor( &col ) ; + ::PaintRgn( clipRgn ) ; + } + else if ( logical_func == wxCLEAR ) + { + RGBColor col= { 0x0000, 0x0000, 0x0000 } ; + ::RGBForeColor( &col ) ; + ::PaintRgn( clipRgn ) ; + } + else if ( logical_func == wxINVERT ) + { + MacInvertRgn( clipRgn ) ; + } + else + { + for ( int y = 0 ; y < srcrect.right - srcrect.left ; ++y ) + { + for ( int x = 0 ; x < srcrect.bottom - srcrect.top ; ++x ) + { + Point dstPoint = { dstrect.top + y , dstrect.left + x } ; + Point srcPoint = { srcrect.top + y , srcrect.left + x } ; + if ( PtInRgn( dstPoint , clipRgn ) ) + { + RGBColor srcColor ; + RGBColor dstColor ; + + SetPort( (GrafPtr) sourcePort ) ; + GetCPixel( srcPoint.h , srcPoint.v , &srcColor) ; + SetPort( (GrafPtr) m_macPort ) ; + GetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ; + + wxMacCalculateColour( logical_func , srcColor , dstColor ) ; + SetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ; + } + } + } + // wxFAIL_MSG("unimplemented emulated mode") ; + } + } + else + { + if ( invertDestinationFirst ) + { + MacInvertRgn( clipRgn ) ; + } + CopyBits( GetPortBitMapForCopyBits( sourcePort ) , + GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) , + &srcrect, &dstrect, mode, clipRgn ) ; + } DisposeRgn( clipRgn ) ; } } else { - CopyBits( GetPortBitMapForCopyBits( sourcePort ) , - GetPortBitMapForCopyBits( m_macPort ) , - &srcrect, &dstrect, mode, NULL ) ; + if ( mode == kEmulatedMode ) + { + CopyBits( GetPortBitMapForCopyBits( sourcePort ) , + GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) , + &srcrect, &dstrect, mode, NULL ) ; + } + else + { + Pattern pat ; + ::PenPat(GetQDGlobalsBlack(&pat)); + if ( logical_func == wxSET ) + { + RGBColor col= { 0xFFFF, 0xFFFF, 0xFFFF } ; + ::RGBForeColor( &col ) ; + } + else + { + RGBColor col= { 0x0000, 0x0000, 0x0000 } ; + ::RGBForeColor( &col ) ; + } + ::PaintRect( &dstrect ) ; + } } UnlockPixels( bmappixels ) ; } @@ -1116,8 +1334,8 @@ void wxDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, // prepare to blit-with-rotate the bitmap to the DC wxImage image(src); - RGBColor colText = m_textForegroundColour.GetPixel(); - RGBColor colBack = m_textBackgroundColour.GetPixel(); + RGBColor colText = MAC_WXCOLORREF( m_textForegroundColour.GetPixel() ); + RGBColor colBack = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel() ); unsigned char *data = image.GetData(); @@ -1140,7 +1358,7 @@ void wxDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, textPixel = data[(srcY*w + srcX)*3] == 0; if ( textPixel || (m_backgroundMode == wxSOLID) ) { - SetCPixel(XLOG2DEV(x + dstX), YLOG2DEV(y + dstY), + SetCPixel(XLOG2DEVMAC(x + dstX), YLOG2DEVMAC(y + dstY), textPixel ? &colText : &colBack); } } @@ -1151,8 +1369,8 @@ void wxDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, #if 0 if ( m_font.GetUnderlined() ) { - ::MoveTo(XLOG2DEV(x + x4), YLOG2DEV(y + y4 + font->descent)); - ::LineTo(XLOG2DEV(x + x3), YLOG2DEV(y + y3 + font->descent)); + ::MoveTo(XLOG2DEVMAC(x + x4), YLOG2DEVMAC(y + y4 + font->descent)); + ::LineTo(XLOG2DEVMAC(x + x3), YLOG2DEVMAC(y + y3 + font->descent)); } #endif // 0 @@ -1165,8 +1383,8 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) wxCHECK_RET(Ok(), wxT("wxDC::DoDrawText Invalid DC")); wxMacPortSetter helper(this) ; - long xx = XLOG2DEV(x); - long yy = YLOG2DEV(y); + long xx = XLOG2DEVMAC(x); + long yy = YLOG2DEVMAC(y); // if (m_pen.GetStyle() != wxTRANSPARENT) { @@ -1352,7 +1570,8 @@ void wxDC::Clear(void) if (m_backgroundBrush.GetStyle() != wxTRANSPARENT) { - MacInstallBrush() ; + MacSetupBackgroundForCurrentPort( m_backgroundBrush ) ; + ::EraseRect( &rect ) ; } } @@ -1376,8 +1595,8 @@ void wxDC::MacInstallFont() const m_macBrushInstalled = false ; m_macPenInstalled = false ; - RGBColor forecolor = m_textForegroundColour.GetPixel(); - RGBColor backcolor = m_textBackgroundColour.GetPixel(); + RGBColor forecolor = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()); + RGBColor backcolor = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()); ::RGBForeColor( &forecolor ); ::RGBBackColor( &backcolor ); } @@ -1396,8 +1615,8 @@ void wxDC::MacInstallFont() const m_macBrushInstalled = false ; m_macPenInstalled = false ; - RGBColor forecolor = m_textForegroundColour.GetPixel(); - RGBColor backcolor = m_textBackgroundColour.GetPixel(); + RGBColor forecolor = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()); + RGBColor backcolor = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()); ::RGBForeColor( &forecolor ); ::RGBBackColor( &backcolor ); } @@ -1447,27 +1666,28 @@ void wxDC::MacInstallFont() const static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern) { - int thePatListID = sysPatListID; + // we have our own pattern list now + int thePatListID = 128; int theIndex; switch(hatchStyle) { case wxBDIAGONAL_HATCH: - theIndex = 34; // WCH: this is not good + theIndex = 2; break; case wxFDIAGONAL_HATCH: - theIndex = 26; + theIndex = 3; break; case wxCROSS_HATCH: - theIndex = 5; + theIndex = 4; break; case wxHORIZONTAL_HATCH: - theIndex = 25; + theIndex = 5; break; case wxVERTICAL_HATCH: theIndex = 6; break; case wxCROSSDIAG_HATCH: - theIndex = 4; // WCH: this is not good + theIndex = 7; break; default: theIndex = 1; // solid pattern @@ -1485,8 +1705,8 @@ void wxDC::MacInstallPen() const // if ( m_macPenInstalled ) // return ; - RGBColor forecolor = m_pen.GetColour().GetPixel(); - RGBColor backcolor = m_backgroundBrush.GetColour().GetPixel(); + RGBColor forecolor = MAC_WXCOLORREF( m_pen.GetColour().GetPixel()); + RGBColor backcolor = MAC_WXCOLORREF( m_backgroundBrush.GetColour().GetPixel()); ::RGBForeColor( &forecolor ); ::RGBBackColor( &backcolor ); @@ -1512,7 +1732,46 @@ void wxDC::MacInstallPen() const } else { - ::PenPat(GetQDGlobalsBlack(&blackColor)); + Pattern pat = *GetQDGlobalsBlack(&blackColor) ; + switch( penStyle ) + { + case wxDOT : + for ( int i = 0 ; i < 8 ; ++i ) + { + pat.pat[i] = 0xCC ; + } + break ; + case wxLONG_DASH : + for ( int i = 0 ; i < 8 ; ++i ) + { + pat.pat[i] = 0xFE ; + } + break ; + case wxSHORT_DASH : + for ( int i = 0 ; i < 8 ; ++i ) + { + pat.pat[i] = 0xEE ; + } + break ; + case wxDOT_DASH : + for ( int i = 0 ; i < 8 ; ++i ) + { + pat.pat[i] = 0x6F ; + } + break ; + case wxUSER_DASH : + { + wxDash* dash ; + int number = m_pen.GetDashes(&dash) ; + // right now we don't allocate larger pixmaps + for ( int i = 0 ; i < 8 ; ++i ) + { + pat.pat[i] = dash[0] ; + } + } + break ; + } + ::PenPat(&pat); } short mode = patCopy ; @@ -1521,11 +1780,11 @@ void wxDC::MacInstallPen() const switch( m_logicalFunction ) { - case wxCOPY: // src - mode = patCopy ; + case wxCOPY: // only foreground color, leave background (thus not patCopy) + mode = patOr ; break ; case wxINVERT: // NOT dst - ::PenPat(GetQDGlobalsBlack(&blackColor)); +// ::PenPat(GetQDGlobalsBlack(&blackColor)); mode = patXor ; break ; case wxXOR: // src XOR dst @@ -1561,37 +1820,42 @@ void wxDC::MacInstallPen() const m_macFontInstalled = false ; } -int wxDC::MacSetupBackgroundForCurrentPort(const wxBrush& background ) +void wxDC::MacSetupBackgroundForCurrentPort(const wxBrush& background ) { Pattern whiteColor ; - if ( background.IsMacTheme() ) - { - SetThemeBackground( background.GetMacTheme() , wxDisplayDepth() , true ) ; - } - else if ( background.IsMacThemeBackground() ) - { - Rect originBox = { 0,0,1,1 } ; - ::ApplyThemeBackground( background.GetMacThemeBackground() , &originBox ,kThemeStateActive , - wxDisplayDepth() , true ) ; - } - else - { - ::RGBBackColor( &background.GetColour().GetPixel() ); - int brushStyle = background.GetStyle(); - if (brushStyle == wxSOLID) - ::BackPat(GetQDGlobalsWhite(&whiteColor)); - else if (IS_HATCH(brushStyle)) - { - Pattern pat ; - wxMacGetHatchPattern(brushStyle, &pat); - ::BackPat(&pat); - } - else - { - ::BackPat(GetQDGlobalsWhite(&whiteColor)); - } - } - return 0 ; + switch( background.MacGetBrushKind() ) + { + case kwxMacBrushTheme : + { + ::SetThemeBackground( background.GetMacTheme() , wxDisplayDepth() , true ) ; + break ; + } + case kwxMacBrushThemeBackground : + { + Rect extent ; + ThemeBackgroundKind bg = background.GetMacThemeBackground( &extent ) ; + ::ApplyThemeBackground( bg , &extent ,kThemeStateActive , wxDisplayDepth() , true ) ; + break ; + } + case kwxMacBrushColour : + { + ::RGBBackColor( &MAC_WXCOLORREF( background.GetColour().GetPixel()) ); + int brushStyle = background.GetStyle(); + if (brushStyle == wxSOLID) + ::BackPat(GetQDGlobalsWhite(&whiteColor)); + else if (IS_HATCH(brushStyle)) + { + Pattern pat ; + wxMacGetHatchPattern(brushStyle, &pat); + ::BackPat(&pat); + } + else + { + ::BackPat(GetQDGlobalsWhite(&whiteColor)); + } + break ; + } + } } void wxDC::MacInstallBrush() const @@ -1603,8 +1867,10 @@ void wxDC::MacInstallBrush() const // return ; // foreground + + bool backgroundTransparent = (GetBackgroundMode() == wxTRANSPARENT) ; - ::RGBForeColor( &m_brush.GetColour().GetPixel() ); + ::RGBForeColor( &MAC_WXCOLORREF( m_brush.GetColour().GetPixel()) ); int brushStyle = m_brush.GetStyle(); if (brushStyle == wxSOLID) @@ -1615,27 +1881,111 @@ void wxDC::MacInstallBrush() const wxMacGetHatchPattern(brushStyle, &pat); ::PenPat(&pat); } - else + else if ( m_brush.GetStyle() == wxSTIPPLE || m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE ) { - ::PenPat(GetQDGlobalsBlack(&blackColor)); - } + // we force this in order to be compliant with wxMSW + backgroundTransparent = false ; + // for these the text fore (and back for MASK_OPAQUE) colors are used + wxBitmap* bitmap = m_brush.GetStipple() ; + int width = bitmap->GetWidth() ; + int height = bitmap->GetHeight() ; + GWorldPtr gw = NULL ; + + if ( m_brush.GetStyle() == wxSTIPPLE ) + gw = MAC_WXHBITMAP(bitmap->GetHBITMAP()) ; + else + gw = MAC_WXHBITMAP(bitmap->GetMask()->GetMaskBitmap()) ; + + PixMapHandle gwpixmaphandle = GetGWorldPixMap( gw ) ; + LockPixels( gwpixmaphandle ) ; + + bool isMonochrome = !IsPortColor( gw ) ; + + if ( !isMonochrome ) + { + if ( (**gwpixmaphandle).pixelSize == 1 ) + isMonochrome = true ; + } - - // background - - MacSetupBackgroundForCurrentPort( m_backgroundBrush ) ; - - // todo : + if ( isMonochrome ) + { + ::RGBForeColor( &MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ); + + BitMap* gwbitmap = (BitMap*) *gwpixmaphandle ; // since the color depth is 1 it is a BitMap + UInt8 *gwbits = (UInt8*) gwbitmap->baseAddr ; + int alignment = gwbitmap->rowBytes & 0x7FFF ; + + if( width == 8 && height == 8 ) + { + Pattern pat ; + for ( int i = 0 ; i < 8 ; ++i ) + { + pat.pat[i] = gwbits[i*alignment+0] ; + } + UnlockPixels( GetGWorldPixMap( gw ) ) ; + ::PenPat( &pat ) ; + } + else + { + #if wxMAC_EXPERIMENTAL_PATTERN + // this will be the code to handle power of 2 patterns, we will have to arrive at a nice + // caching scheme before putting this into production + Handle image; + long imageSize; + PixPatHandle pixpat = NewPixPat() ; + + CopyPixMap(gwpixmaphandle, (**pixpat).patMap); + imageSize = GetPixRowBytes((**pixpat).patMap) * + ((**(**pixpat).patMap).bounds.bottom - + (**(**pixpat).patMap).bounds.top); + + PtrToHand( (**gwpixmaphandle).baseAddr, &image, imageSize ); + (**pixpat).patData = image; + CTabHandle ctable = ((**((**pixpat).patMap)).pmTable) ; + ColorSpecPtr ctspec = (ColorSpecPtr) &(**ctable).ctTable ; + if ( ctspec[0].rgb.red == 0x0000 ) + { + ctspec[1].rgb = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()) ; + ctspec[0].rgb = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ; + } + else + { + ctspec[0].rgb = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()) ; + ctspec[1].rgb = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ; + } + ::CTabChanged( ctable ) ; + ::PenPixPat(pixpat); +#endif + } + } + else + { + } + UnlockPixels( gwpixmaphandle ) ; + } + else + { + ::PenPat(GetQDGlobalsBlack(&blackColor)); + } + + if ( !backgroundTransparent ) + ::RGBBackColor( &MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()) ) ; short mode = patCopy ; switch( m_logicalFunction ) { case wxCOPY: // src - mode = patCopy ; + if ( backgroundTransparent ) + mode = patOr ; + else + mode = patCopy ; break ; case wxINVERT: // NOT dst - ::PenPat(GetQDGlobalsBlack(&blackColor)); + if ( !backgroundTransparent ) + { + ::PenPat(GetQDGlobalsBlack(&blackColor)); + } mode = patXor ; break ; case wxXOR: // src XOR dst