X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03e11df5470fd64d9d9a669d0b50b84c2d714736..573ac9dc6e94c0256089700d2fafac486c957b5a:/src/mac/dc.cpp diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp index cbce6e301a..95d6293c85 100644 --- a/src/mac/dc.cpp +++ b/src/mac/dc.cpp @@ -16,11 +16,19 @@ #include "wx/dc.h" #include "wx/app.h" #include "wx/mac/uma.h" +#include "wx/dcmemory.h" +#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 @@ -35,28 +43,124 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) #define twips2mm 0.0176388888889 #define mm2pt 2.83464566929 #define pt2mm 0.352777777778 +#ifndef __DARWIN__ +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 +//----------------------------------------------------------------------------- -long wxDC::m_macCurrentPortId = 1 ; +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; } //----------------------------------------------------------------------------- // 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; - m_optimize = FALSE; - m_autoSetting = FALSE; m_colour = TRUE; - m_clipping = FALSE; m_mm_to_pix_x = mm2pt; m_mm_to_pix_y = mm2pt; - m_logicalOriginX = 0; - m_logicalOriginY = 0; - m_deviceOriginX = 0; - m_deviceOriginY = 0; m_internalDeviceOriginX = 0; m_internalDeviceOriginY = 0; m_externalDeviceOriginX = 0; @@ -69,28 +173,9 @@ wxDC::wxDC() m_scaleX = 1.0; m_scaleY = 1.0; - m_mappingMode = wxMM_TEXT; m_needComputeScaleX = FALSE; m_needComputeScaleY = FALSE; - m_signX = 1; // default x-axis left to right - m_signY = 1; // default y-axis top down - - m_maxX = m_maxY = -100000; - m_minY = m_minY = 100000; - - m_logicalFunction = wxCOPY; -// m_textAlignment = wxALIGN_TOP_LEFT; - m_backgroundMode = wxTRANSPARENT; - - m_textForegroundColour = *wxBLACK; - m_textBackgroundColour = *wxWHITE; - m_pen = *wxBLACK_PEN; - m_font = *wxNORMAL_FONT; - m_brush = *wxTRANSPARENT_BRUSH; - m_backgroundBrush = *wxWHITE_BRUSH; - -// m_palette = wxAPP_COLOURMAP; m_macPort = NULL ; m_macMask = NULL ; m_ok = FALSE ; @@ -99,45 +184,37 @@ wxDC::wxDC() m_macBrushInstalled = false ; m_macPenInstalled = false ; - m_macPortId = 0 ; - m_macLocalOrigin.h = m_macLocalOrigin.v = 0 ; - m_macClipRect.left = -32000 ; - m_macClipRect.top = -32000 ; - m_macClipRect.right = 32000 ; - m_macClipRect.bottom = 32000 ; - ::GetPort( &m_macOrigPort ) ; -}; + m_macLocalOrigin.x = m_macLocalOrigin.y = 0 ; + m_macBoundaryClipRgn = NewRgn() ; + m_macCurrentClipRgn = NewRgn() ; -wxDC::~wxDC(void) + 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( (GrafPtr) dc->m_macPort ) { - if ( !m_macPortHelper.IsCleared() ) - { - GrafPtr port ; - GetPort( &port ) ; - SetPort( m_macPortHelper.GetCurrentPort() ) ; - SetOrigin( 0 , 0 ) ; - SetPort( port ) ; - } - /* - if ( m_macPort ) - { - ::SetPort( m_macPort ) ; - ::SetOrigin( 0 , 0 ) ; - ::ClipRect( &m_macPort->portRect ) ; - ::PenNormal() ; - ::SetPort( m_macOrigPort ) ; - } - */ - ++m_macCurrentPortId ; -}; + wxASSERT( dc->Ok() ) ; + + dc->MacSetupPort(&m_ph) ; +} -void wxDC::MacSetupPort() const +wxMacPortSetter::~wxMacPortSetter() +{ +} + +wxDC::~wxDC(void) +{ + DisposeRgn( (RgnHandle) m_macBoundaryClipRgn ) ; + DisposeRgn( (RgnHandle) m_macCurrentClipRgn ) ; +} +void wxDC::MacSetupPort(wxMacPortStateHelper* help) const { - AGAPortHelper* help = (AGAPortHelper*) &m_macPortHelper ; - help->Setup( m_macPort ) ; - m_macPortId = ++m_macCurrentPortId ; - ::SetOrigin(-m_macLocalOrigin.h, -m_macLocalOrigin.v); - ::ClipRect(&m_macClipRect); + SetClip( (RgnHandle) m_macCurrentClipRgn); m_macFontInstalled = false ; m_macBrushInstalled = false ; @@ -146,157 +223,204 @@ void wxDC::MacSetupPort() const void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask ) { - float scale = 1.0 ; - - if (!Ok()) - return; - MacVerifySetup() ; - - long xx1 = XLOG2DEV(x); - long yy1 = YLOG2DEV(y); - - { - wxBitmapRefData * bmap = (wxBitmapRefData*) ( bmp.GetRefData()) ; - - if ( bmap ) - { - if ( bmap->m_bitmapType == kMacBitmapTypePict ) - { - Rect bitmaprect = { 0 , 0 , int(bmap->m_height * scale) , int(bmap->m_width * scale)} ; - ::OffsetRect( &bitmaprect , xx1 , yy1 ) ; - ::DrawPicture( bmap->m_hPict , &bitmaprect ) ; - } - else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld ) - { - if ( bmap->m_hBitmap ) - { - GWorldPtr bmapworld = bmap->m_hBitmap ; - PixMapHandle bmappixels ; - RGBColor white = { 0xFFFF, 0xFFFF,0xFFFF} ; - RGBColor black = { 0,0,0} ; - RGBForeColor( &black ) ; - RGBBackColor( &white ) ; - - bmappixels = GetGWorldPixMap( bmapworld ) ; - if ( LockPixels(bmappixels) ) - { - Rect source , dest ; - source.top = 0 ; - source.left = 0 ; - source.right = bmap->m_width ; - source.bottom = bmap->m_height ; - dest.top = YLOG2DEV(y) ; - dest.left = XLOG2DEV(x) ; - dest.bottom = YLOG2DEV(y + bmap->m_height * scale) ; - dest.right = XLOG2DEV(x + bmap->m_width * scale ) ; - - if ( useMask && bmp.GetMask() ) - { - if ( LockPixels( GetGWorldPixMap( bmp.GetMask()->GetMaskBitmap( ) ) ) ) - { - CopyMask( GetPortBitMapForCopyBits( bmapworld ) , GetPortBitMapForCopyBits( bmp.GetMask()->GetMaskBitmap( ) ) , - GetPortBitMapForCopyBits( m_macPort ) , - &source, &source , &dest ) ; - UnlockPixels( GetGWorldPixMap( bmp.GetMask()->GetMaskBitmap( ) ) ) ; - } - } - else - CopyBits( GetPortBitMapForCopyBits( bmapworld ) , GetPortBitMapForCopyBits( m_macPort ), - &source, &dest, srcCopy, NULL ) ; - - UnlockPixels( bmappixels ) ; - } - m_macPenInstalled = false ; - m_macBrushInstalled = false ; - m_macFontInstalled = false ; - } - } + wxCHECK_RET( Ok(), wxT("invalid window dc") ); + + wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap") ); + + wxMacPortSetter helper(this) ; + + wxCoord xx = XLOG2DEVMAC(x); + wxCoord yy = YLOG2DEVMAC(y); + wxCoord w = bmp.GetWidth(); + wxCoord h = bmp.GetHeight(); + wxCoord ww = XLOG2DEVREL(w); + wxCoord hh = YLOG2DEVREL(h); + + // Set up drawing mode + short mode = (m_logicalFunction == wxCOPY ? srcCopy : + //m_logicalFunction == wxCLEAR ? WHITENESS : + //m_logicalFunction == wxSET ? BLACKNESS : + m_logicalFunction == wxINVERT ? hilite : + //m_logicalFunction == wxAND ? MERGECOPY : + m_logicalFunction == wxOR ? srcOr : + m_logicalFunction == wxSRC_INVERT ? notSrcCopy : + m_logicalFunction == wxXOR ? srcXor : + m_logicalFunction == wxOR_REVERSE ? notSrcOr : + //m_logicalFunction == wxAND_REVERSE ? SRCERASE : + //m_logicalFunction == wxSRC_OR ? srcOr : + //m_logicalFunction == wxSRC_AND ? SRCAND : + srcCopy ); + + if ( bmp.GetBitmapType() == kMacBitmapTypePict ) { + Rect bitmaprect = { 0 , 0 , hh, ww }; + ::OffsetRect( &bitmaprect, xx, yy ) ; + ::DrawPicture( (PicHandle) bmp.GetPict(), &bitmaprect ) ; } - } + else if ( bmp.GetBitmapType() == kMacBitmapTypeGrafWorld ) + { + GWorldPtr bmapworld = MAC_WXHBITMAP( bmp.GetHBITMAP() ); + PixMapHandle bmappixels ; + + // Set foreground and background colours (for bitmaps depth = 1) + if(bmp.GetDepth() == 1) + { + RGBColor fore = MAC_WXCOLORREF(m_textForegroundColour.GetPixel()); + RGBColor back = MAC_WXCOLORREF(m_textBackgroundColour.GetPixel()); + RGBForeColor(&fore); + RGBBackColor(&back); + } + else + { + RGBColor white = { 0xFFFF, 0xFFFF,0xFFFF} ; + RGBColor black = { 0,0,0} ; + RGBForeColor( &black ) ; + RGBBackColor( &white ) ; + } + + bmappixels = GetGWorldPixMap( bmapworld ) ; + + wxCHECK_RET(LockPixels(bmappixels), + wxT("DoDrawBitmap: Unable to lock pixels")); + + Rect source = { 0, 0, h, w }; + Rect dest = { yy, xx, yy + hh, xx + ww }; + + if ( useMask && bmp.GetMask() ) + { + if( LockPixels(GetGWorldPixMap(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap())))) + { + CopyDeepMask + ( + GetPortBitMapForCopyBits(bmapworld), + GetPortBitMapForCopyBits(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap())), + GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ), + &source, &source, &dest, mode, NULL + ); + UnlockPixels(GetGWorldPixMap(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap()))); + } + } + else { + CopyBits( GetPortBitMapForCopyBits( bmapworld ), + GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ), + &source, &dest, mode, NULL ) ; + } + UnlockPixels( bmappixels ) ; + } + else if ( bmp.GetBitmapType() == kMacBitmapTypeIcon ) + { + Rect bitmaprect = { 0 , 0 , bmp.GetHeight(), bmp.GetWidth() } ; + OffsetRect( &bitmaprect, xx, yy ) ; + PlotCIconHandle( &bitmaprect , atNone , ttNone , MAC_WXHICON(bmp.GetHICON()) ) ; + } + m_macPenInstalled = false ; + m_macBrushInstalled = false ; + m_macFontInstalled = false ; + } void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) { - if (!Ok()) - return; - MacVerifySetup() ; - - long xx1 = XLOG2DEV(x); - long yy1 = YLOG2DEV(y); - - { - wxIconRefData * iconref = (wxIconRefData*) ( icon.GetRefData()) ; - - if ( iconref && iconref->m_ok && iconref->m_hIcon ) - { - Rect bitmaprect = { 0 , 0 , iconref->m_height , iconref->m_width } ; - OffsetRect( &bitmaprect , xx1 , yy1 ) ; - PlotCIconHandle( &bitmaprect , atNone , ttNone , iconref->m_hIcon ) ; - } - } -}; - + wxCHECK_RET(Ok(), wxT("Invalid dc wxDC::DoDrawIcon")); + + wxCHECK_RET(icon.Ok(), wxT("Invalid icon wxDC::DoDrawIcon")); + + DoDrawBitmap( icon , x , y , icon.GetMask() != NULL ) ; +} void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { - MacVerifySetup() ; - if( m_clipping ) - { - m_clipX1 = wxMax( m_clipX1 , x ) ; - m_clipY1 = wxMax( m_clipY1 ,y ); - m_clipX2 = wxMin( m_clipX2, (x + width)); - m_clipY2 = wxMin( m_clipY2,(y + height)); - - } - else - { - m_clipping = TRUE; - m_clipX1 = x; - m_clipY1 = y; - m_clipX2 = x + width; - m_clipY2 = y + height; - } - - long x1 = XLOG2DEV(m_clipX1); - long y1 = YLOG2DEV(m_clipY1); - long x2 = XLOG2DEV(m_clipX2); - long y2 = YLOG2DEV(m_clipY2); - - Rect clip = { y1 , x1 , y2 , x2 } ; - - ::ClipRect( &clip ) ; + wxCHECK_RET(Ok(), wxT("wxDC::DoSetClippingRegion Invalid DC")); + wxCoord xx, yy, ww, hh; -}; + xx = XLOG2DEVMAC(x); + yy = YLOG2DEVMAC(y); + ww = XLOG2DEVREL(width); + hh = YLOG2DEVREL(height); + 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; + } + +} void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) { - wxCHECK_RET( Ok(), wxT("invalid window dc") ); + wxCHECK_RET( Ok(), wxT("invalid window dc") ) ; - MacVerifySetup() ; + wxMacPortSetter helper(this) ; if (region.Empty()) { DestroyClippingRegion(); return; } + wxCoord x, y, w, h; + region.GetBox( x, y, w, h ); wxCoord xx, yy, ww, hh; - region.GetBox( xx, yy, ww, hh ); - wxDC::DoSetClippingRegion( xx, yy, ww, hh ); + + xx = XLOG2DEVMAC(x); + yy = YLOG2DEVMAC(y); + ww = XLOG2DEVREL(w); + hh = YLOG2DEVREL(h); + + // if we have a scaling that we cannot map onto native regions + // we must use the box + + if ( ww != w || hh != h ) + { + wxDC::DoSetClippingRegion( x, y, w, h ); + } + else + { + 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 ) ; + 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; + } + } + } -void wxDC::DestroyClippingRegion(void) +void wxDC::DestroyClippingRegion() { - MacVerifySetup() ; + wxMacPortSetter helper(this) ; + CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; m_clipping = FALSE; -// Rect clip = { -32000 , -32000 , 32000 , 32000 } ; - ::ClipRect(&m_macClipRect); -}; - +} void wxDC::DoGetSize( int* width, int* height ) const { *width = m_maxX-m_minX; *height = m_maxY-m_minY; -}; - +} void wxDC::DoGetSizeMM( int* width, int* height ) const { int w = 0; @@ -304,22 +428,19 @@ void wxDC::DoGetSizeMM( int* width, int* height ) const GetSize( &w, &h ); *width = long( double(w) / (m_scaleX*m_mm_to_pix_x) ); *height = long( double(h) / (m_scaleY*m_mm_to_pix_y) ); -}; - +} void wxDC::SetTextForeground( const wxColour &col ) { - if (!Ok()) return; - m_textForegroundColour = col; - m_macFontInstalled = false ; -}; - + wxCHECK_RET(Ok(), wxT("Invalid DC")); + m_textForegroundColour = col; + m_macFontInstalled = false ; +} void wxDC::SetTextBackground( const wxColour &col ) { - if (!Ok()) return; - m_textBackgroundColour = col; - m_macFontInstalled = false ; -}; - + wxCHECK_RET(Ok(), wxT("Invalid DC")); + m_textBackgroundColour = col; + m_macFontInstalled = false ; +} void wxDC::SetMapMode( int mode ) { switch (mode) @@ -340,73 +461,60 @@ void wxDC::SetMapMode( int mode ) case wxMM_TEXT: SetLogicalScale( 1.0, 1.0 ); break; - }; + } if (mode != wxMM_TEXT) { m_needComputeScaleX = TRUE; m_needComputeScaleY = TRUE; - }; -}; - + } +} void wxDC::SetUserScale( double x, double y ) { // allow negative ? -> no m_userScaleX = x; m_userScaleY = y; ComputeScaleAndOrigin(); -}; - +} void wxDC::SetLogicalScale( double x, double y ) { // allow negative ? m_logicalScaleX = x; m_logicalScaleY = y; ComputeScaleAndOrigin(); -}; - +} void wxDC::SetLogicalOrigin( wxCoord x, wxCoord y ) { m_logicalOriginX = x * m_signX; // is this still correct ? m_logicalOriginY = y * m_signY; ComputeScaleAndOrigin(); -}; - +} void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y ) { m_externalDeviceOriginX = x; m_externalDeviceOriginY = y; ComputeScaleAndOrigin(); -}; -/* +} + +#if 0 void wxDC::SetInternalDeviceOrigin( long x, long y ) { m_internalDeviceOriginX = x; m_internalDeviceOriginY = y; ComputeScaleAndOrigin(); -}; - +} void wxDC::GetInternalDeviceOrigin( long *x, long *y ) { if (x) *x = m_internalDeviceOriginX; if (y) *y = m_internalDeviceOriginY; -}; -*/ +} +#endif 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); @@ -417,7 +525,7 @@ int wxDC::GetDepth() const return wxDisplayDepth() ; } -void wxDC::ComputeScaleAndOrigin(void) +void wxDC::ComputeScaleAndOrigin() { // CMB: copy scale to see if it changes double origScaleX = m_scaleX; @@ -439,8 +547,7 @@ void wxDC::ComputeScaleAndOrigin(void) m_pen = tempPen; SetPen(* pen); } -}; - +} void wxDC::SetPalette( const wxPalette& palette ) { } @@ -452,39 +559,22 @@ void wxDC::SetBackgroundMode( int mode ) void wxDC::SetFont( const wxFont &font ) { - if (!Ok()) - return; - - MacVerifySetup() ; - - m_font = font; - m_macFontInstalled = false ; + m_font = font; + m_macFontInstalled = false ; } void wxDC::SetPen( const wxPen &pen ) { - if (!Ok() ) - return; - - MacVerifySetup() ; - if ( m_pen == pen ) return ; m_pen = pen; -/* - if (!m_pen.Ok()) - return; -*/ + m_macPenInstalled = false ; } void wxDC::SetBrush( const wxBrush &brush ) { - if (!Ok() ) - return; - MacVerifySetup() ; - if (m_brush == brush) return; @@ -494,10 +584,6 @@ void wxDC::SetBrush( const wxBrush &brush ) void wxDC::SetBackground( const wxBrush &brush ) { - if (!Ok()) - return; - MacVerifySetup() ; - if (m_backgroundBrush == brush) return; @@ -526,86 +612,248 @@ void wxDC::DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, bool wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const { - return true ; + wxCHECK_MSG( Ok(), false, wxT("wxDC::DoGetPixel Invalid DC") ); + wxMacPortSetter helper(this) ; + + RGBColor colour; + + GetCPixel( XLOG2DEVMAC(x), YLOG2DEVMAC(y), &colour ); + + // Convert from Mac colour to wx + col->Set( colour.red >> 8, + colour.green >> 8, + colour.blue >> 8); + + return true ; } void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) { - if (!Ok()) - return; + wxCHECK_RET(Ok(), wxT("Invalid DC")); - MacVerifySetup() ; + wxMacPortSetter helper(this) ; if (m_pen.GetStyle() != wxTRANSPARENT) { MacInstallPen() ; - int offset = (m_pen.GetWidth() - 1) / 2 ; - long xx1 = XLOG2DEV(x1); - long yy1 = YLOG2DEV(y1); - long xx2 = XLOG2DEV(x2); - long yy2 = YLOG2DEV(y2); - - ::MoveTo(xx1 - offset ,yy1 - offset); - ::LineTo(xx2 - offset , yy2 - offset ); - }; + wxCoord offset = ( (m_pen.GetWidth() == 0 ? 1 : + m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2; + + 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)) + { + // Implement LAST_NOT for MAC at least for + // orthogonal lines. RR. + if (xx1 == xx2) + { + if (yy1 < yy2) + yy2--; + if (yy1 > yy2) + yy2++; + } + if (yy1 == yy2) + { + if (xx1 < xx2) + xx2--; + if (xx1 > xx2) + xx2++; + } + } + + ::MoveTo(xx1, yy1); + ::LineTo(xx2, yy2); + } } void wxDC::DoCrossHair( wxCoord x, wxCoord y ) { + wxCHECK_RET( Ok(), wxT("wxDC::DoCrossHair Invalid window dc") ); + + if (m_pen.GetStyle() != wxTRANSPARENT) + { + int w = 0; + int h = 0; + GetSize( &w, &h ); + wxCoord xx = XLOG2DEVMAC(x); + wxCoord yy = YLOG2DEVMAC(y); + + MacInstallPen(); + ::MoveTo( XLOG2DEVMAC(0), yy ); + ::LineTo( XLOG2DEVMAC(w), yy ); + ::MoveTo( xx, YLOG2DEVMAC(0) ); + ::LineTo( xx, YLOG2DEVMAC(h) ); + } +} + +/* + * To draw arcs properly the angles need to be converted from the WX style: + * Angles start on the +ve X axis and go anti-clockwise (As you would draw on + * a normal axis on paper). + * TO + * the Mac style: + * Angles start on the +ve y axis and go clockwise. + * To achive this I work out which quadrant the angle lies in then map this to + * the equivalent quadrant on the Mac. (Sin and Cos values reveal which + * quadrant you are in). + */ +static double wxConvertWXangleToMACangle(double angle) +{ + double sin_a, cos_a; + + sin_a = sin(angle / RAD2DEG); + cos_a = cos(angle / RAD2DEG); + + if( (sin_a >= 0.0) && (cos_a >= 0.0) ) { + angle = acos(sin_a) * RAD2DEG; + } + else if( (sin_a >= 0.0) && (cos_a <= 0.0) ) { + sin_a *= -1; + angle = acos(sin_a) * RAD2DEG + 180; + } + else if( (sin_a <= 0.0) && (cos_a >= 0.0) ) { + angle = acos(sin_a) * RAD2DEG + 180; + } + else if( (sin_a < 0.0) && (cos_a < 0.0) ) { + sin_a *= -1; + angle = acos(sin_a) * RAD2DEG + 180; + } + return angle; } void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc ) { + wxCHECK_RET(Ok(), wxT("wxDC::DoDrawArc Invalid DC")); + + 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)); + wxCoord rad = (wxCoord)radius; + double radius1, radius2; + + if (xx1 == xx2 && yy1 == yy2) + { + radius1 = 0.0; + radius2 = 360.0; + } + else if (radius == 0.0) + { + radius1 = radius2 = 0.0; + } + else + { + radius1 = (xx1 - xxc == 0) ? + (yy1 - yyc < 0) ? 90.0 : -90.0 : + -atan2(double(yy1-yyc), double(xx1-xxc)) * RAD2DEG; + radius2 = (xx2 - xxc == 0) ? + (yy2 - yyc < 0) ? 90.0 : -90.0 : + -atan2(double(yy2-yyc), double(xx2-xxc)) * RAD2DEG; + } + wxCoord alpha2 = wxCoord(radius2 - radius1); + wxCoord alpha1 = wxCoord(wxConvertWXangleToMACangle(radius1)); + if( (xx1 > xx2) || (yy1 > yy2) ) { + alpha2 *= -1; + } + + Rect r = { yyc - rad, xxc - rad, yyc + rad, xxc + rad }; + + if(m_brush.GetStyle() != wxTRANSPARENT) { + MacInstallBrush(); + PaintArc(&r, alpha1, alpha2); + } + if(m_pen.GetStyle() != wxTRANSPARENT) { + MacInstallPen(); + FrameArc(&r, alpha1, alpha2); + } } void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, double sa, double ea ) { + wxCHECK_RET(Ok(), wxT("wxDC::DoDrawEllepticArc Invalid DC")); + + Rect r; + double angle = sa - ea; // Order important Mac in opposite direction to wx + + wxCoord xx = XLOG2DEVMAC(x); + wxCoord yy = YLOG2DEVMAC(y); + wxCoord ww = m_signX * XLOG2DEVREL(w); + wxCoord hh = m_signY * YLOG2DEVREL(h); + + // handle -ve width and/or height + if (ww < 0) { ww = -ww; xx = xx - ww; } + if (hh < 0) { hh = -hh; yy = yy - hh; } + + sa = wxConvertWXangleToMACangle(sa); + + r.top = yy; + r.left = xx; + r.bottom = yy + hh; + r.right = xx + ww; + + if(m_brush.GetStyle() != wxTRANSPARENT) { + MacInstallBrush(); + PaintArc(&r, (short)sa, (short)angle); + } + if(m_pen.GetStyle() != wxTRANSPARENT) { + MacInstallPen(); + FrameArc(&r, (short)sa, (short)angle); + } } void wxDC::DoDrawPoint( wxCoord x, wxCoord y ) { - if (!Ok()) - return; + wxCHECK_RET(Ok(), wxT("Invalid DC")); - MacVerifySetup() ; + wxMacPortSetter helper(this) ; if (m_pen.GetStyle() != wxTRANSPARENT) { MacInstallPen() ; - long xx1 = XLOG2DEV(x); - long yy1 = YLOG2DEV(y); + wxCoord xx1 = XLOG2DEVMAC(x); + wxCoord yy1 = YLOG2DEVMAC(y); ::MoveTo(xx1,yy1); ::LineTo(xx1+1, yy1+1); - }; + } } void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) { - if (!Ok()) - return; - MacVerifySetup() ; + wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxMacPortSetter helper(this) ; if (m_pen.GetStyle() == wxTRANSPARENT) return; MacInstallPen() ; - int offset = (m_pen.GetWidth() - 1 ) / 2 ; - long x1, x2 , y1 , y2 ; - x1 = XLOG2DEV(points[0].x + xoffset); - y1 = YLOG2DEV(points[0].y + yoffset); - ::MoveTo(x1 - offset ,y1 - offset ); + wxCoord offset = ( (m_pen.GetWidth() == 0 ? 1 : + m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2 ; + + wxCoord x1, x2 , y1 , y2 ; + 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); - ::LineTo(x2 - offset , y2 - offset ); + x2 = XLOG2DEVMAC(points[i+1].x + xoffset); + y2 = YLOG2DEVMAC(points[i+1].y + yoffset); + ::LineTo( x2 - offset, y2 - offset ); } } @@ -613,48 +861,62 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle ) { - if (!Ok()) - return; - MacVerifySetup() ; - - PolyHandle polygon = OpenPoly() ; - long x1, x2 , y1 , y2 ; - x1 = XLOG2DEV(points[0].x + xoffset); - y1 = YLOG2DEV(points[0].y + yoffset); - ::MoveTo(x1,y1); + wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxMacPortSetter helper(this) ; + + wxCoord x1, x2 , y1 , y2 ; - 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); - } + 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); - ClosePoly() ; - if (m_brush.GetStyle() != wxTRANSPARENT) + for (int i = 1; i < n; i++) { - MacInstallBrush() ; - ::PaintPoly( polygon ) ; - }; + 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) + { + + MacInstallBrush(); + ::PaintPoly( polygon ); + + } if (m_pen.GetStyle() != wxTRANSPARENT) { + MacInstallPen() ; ::FramePoly( polygon ) ; - }; - KillPoly( polygon ) ; + + } + KillPoly( polygon ); } -void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) +void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - if (!Ok()) - return; - MacVerifySetup() ; - - long xx = XLOG2DEV(x); - long yy = YLOG2DEV(y); - long ww = m_signX * XLOG2DEVREL(width); - long hh = m_signY * YLOG2DEVREL(height); + wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxMacPortSetter helper(this) ; + + wxCoord xx = XLOG2DEVMAC(x); + wxCoord yy = YLOG2DEVMAC(y); + wxCoord ww = m_signX * XLOG2DEVREL(width); + wxCoord hh = m_signY * YLOG2DEVREL(height); // CMB: draw nothing if transformed w or h is 0 if (ww == 0 || hh == 0) @@ -679,30 +941,29 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { MacInstallBrush() ; ::PaintRect( &rect ) ; - }; + } if (m_pen.GetStyle() != wxTRANSPARENT) { MacInstallPen() ; ::FrameRect( &rect ) ; - }; + } } void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius) { - if (!Ok()) - return; - MacVerifySetup() ; + wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxMacPortSetter helper(this) ; - if (radius < 0.0) - radius = - radius * ((width < height) ? width : height); + if (radius < 0.0) + radius = - radius * ((width < height) ? width : height); - long xx = XLOG2DEV(x); - long yy = YLOG2DEV(y); - long ww = m_signX * XLOG2DEVREL(width); - long hh = m_signY * YLOG2DEVREL(height); + wxCoord xx = XLOG2DEVMAC(x); + wxCoord yy = YLOG2DEVMAC(y); + wxCoord ww = m_signX * XLOG2DEVREL(width); + wxCoord hh = m_signY * YLOG2DEVREL(height); // CMB: draw nothing if transformed w or h is 0 if (ww == 0 || hh == 0) @@ -727,25 +988,24 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, { MacInstallBrush() ; ::PaintRoundRect( &rect , int(radius * 2) , int(radius * 2) ) ; - }; + } if (m_pen.GetStyle() != wxTRANSPARENT) { MacInstallPen() ; ::FrameRoundRect( &rect , int(radius * 2) , int(radius * 2) ) ; - }; + } } void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - if (!Ok()) - return; - MacVerifySetup() ; + wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxMacPortSetter helper(this) ; - long xx = XLOG2DEV(x); - long yy = YLOG2DEV(y); - long ww = m_signX * XLOG2DEVREL(width); - long hh = m_signY * YLOG2DEVREL(height); + wxCoord xx = XLOG2DEVMAC(x); + wxCoord yy = YLOG2DEVMAC(y); + wxCoord ww = m_signX * XLOG2DEVREL(width); + wxCoord hh = m_signY * YLOG2DEVREL(height); // CMB: draw nothing if transformed w or h is 0 if (ww == 0 || hh == 0) @@ -770,244 +1030,245 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { MacInstallBrush() ; ::PaintOval( &rect ) ; - }; + } if (m_pen.GetStyle() != wxTRANSPARENT) { MacInstallPen() ; ::FrameOval( &rect ) ; - }; -} - -// ----------------------------------- spline code ---------------------------------------- - -static void wx_quadratic_spline(double a1, double b1, double a2, double b2, - double a3, double b3, double a4, double b4); -static void wx_clear_stack(void); -static int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, double *x3, - double *y3, double *x4, double *y4); -static void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, - double x4, double y4); -static bool wx_spline_add_point(double x, double y); -static void wx_spline_draw_point_array(wxDC *dc); - -static wxList wx_spline_point_list; - -#define half(z1, z2) ((z1+z2)/2.0) -#define THRESHOLD 5 - -/* iterative version */ - -static void wx_quadratic_spline(double a1, double b1, double a2, double b2, double a3, double b3, double a4, - double b4) -{ - register double xmid, ymid; - double x1, y1, x2, y2, x3, y3, x4, y4; - - wx_clear_stack(); - wx_spline_push(a1, b1, a2, b2, a3, b3, a4, b4); - - while (wx_spline_pop(&x1, &y1, &x2, &y2, &x3, &y3, &x4, &y4)) { - xmid = (double)half(x2, x3); - ymid = (double)half(y2, y3); - if (fabs(x1 - xmid) < THRESHOLD && fabs(y1 - ymid) < THRESHOLD && - fabs(xmid - x4) < THRESHOLD && fabs(ymid - y4) < THRESHOLD) { - wx_spline_add_point( x1, y1 ); - wx_spline_add_point( xmid, ymid ); - } else { - wx_spline_push(xmid, ymid, (double)half(xmid, x3), (double)half(ymid, y3), - (double)half(x3, x4), (double)half(y3, y4), x4, y4); - wx_spline_push(x1, y1, (double)half(x1, x2), (double)half(y1, y2), - (double)half(x2, xmid), (double)half(y2, ymid), xmid, ymid); } - } -} - -/* utilities used by spline drawing routines */ - -typedef struct wx_spline_stack_struct { - double x1, y1, x2, y2, x3, y3, x4, y4; -} Stack; - -#define SPLINE_STACK_DEPTH 20 -static Stack wx_spline_stack[SPLINE_STACK_DEPTH]; -static Stack *wx_stack_top; -static int wx_stack_count; - -static void wx_clear_stack(void) -{ - wx_stack_top = wx_spline_stack; - wx_stack_count = 0; } -static void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4) -{ - wx_stack_top->x1 = x1; - wx_stack_top->y1 = y1; - wx_stack_top->x2 = x2; - wx_stack_top->y2 = y2; - wx_stack_top->x3 = x3; - wx_stack_top->y3 = y3; - wx_stack_top->x4 = x4; - wx_stack_top->y4 = y4; - wx_stack_top++; - wx_stack_count++; -} -static int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, - double *x3, double *y3, double *x4, double *y4) + +bool wxDC::CanDrawBitmap(void) const { - if (wx_stack_count == 0) - return (0); - wx_stack_top--; - wx_stack_count--; - *x1 = wx_stack_top->x1; - *y1 = wx_stack_top->y1; - *x2 = wx_stack_top->x2; - *y2 = wx_stack_top->y2; - *x3 = wx_stack_top->x3; - *y3 = wx_stack_top->y3; - *x4 = wx_stack_top->x4; - *y4 = wx_stack_top->y4; - return (1); + return true ; } -static bool wx_spline_add_point(double x, double y) -{ - wxPoint *point = new wxPoint ; - point->x = (int) x; - point->y = (int) y; - wx_spline_point_list.Append((wxObject*)point); - return TRUE; -} -static void wx_spline_draw_point_array(wxDC *dc) -{ - dc->DrawLines(&wx_spline_point_list, 0, 0 ); - wxNode *node = wx_spline_point_list.First(); - while (node) - { - wxPoint *point = (wxPoint *)node->Data(); - delete point; - delete node; - node = wx_spline_point_list.First(); - } -} - -void wxDC::DoDrawSpline(wxList *points) +bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, + wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask, + wxCoord xsrcMask, wxCoord ysrcMask ) { - wxPoint *p; - double cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4; - double x1, y1, x2, y2; - - wxNode *node = points->First(); - p = (wxPoint *)node->Data(); - - x1 = p->x; - y1 = p->y; - - node = node->Next(); - p = (wxPoint *)node->Data(); - - x2 = p->x; - y2 = p->y; - cx1 = (double)((x1 + x2) / 2); - cy1 = (double)((y1 + y2) / 2); - cx2 = (double)((cx1 + x2) / 2); - cy2 = (double)((cy1 + y2) / 2); - - wx_spline_add_point(x1, y1); + wxCHECK_MSG(Ok(), false, wxT("wxDC::DoBlit Illegal dc")); + wxCHECK_MSG(source->Ok(), false, wxT("wxDC::DoBlit Illegal source DC")); + + if ( logical_func == wxNO_OP ) + return TRUE ; - while ((node = node->Next()) != NULL) + if (xsrcMask == -1 && ysrcMask == -1) { - p = (wxPoint *)node->Data(); - x1 = x2; - y1 = y2; - x2 = p->x; - y2 = p->y; - cx4 = (double)(x1 + x2) / 2; - cy4 = (double)(y1 + y2) / 2; - cx3 = (double)(x1 + cx4) / 2; - cy3 = (double)(y1 + cy4) / 2; - - wx_quadratic_spline(cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4); - - cx1 = cx4; - cy1 = cy4; - cx2 = (double)(cx1 + x2) / 2; - cy2 = (double)(cy1 + y2) / 2; + xsrcMask = xsrc; ysrcMask = ysrc; } - wx_spline_add_point( cx1, cy1 ); - wx_spline_add_point( x2, y2 ); - - wx_spline_draw_point_array( this ); -} - - + // correct the parameter in case this dc does not have a mask at all -bool wxDC::CanDrawBitmap(void) const -{ - return true ; -} + 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 ; -bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask ) -{ - if (!Ok()) return FALSE; - MacVerifySetup() ; + } + 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) ; - srcrect.left = source->XLOG2DEV(xsrc) ; - srcrect.right = source->XLOG2DEV(xsrc + width ) ; - srcrect.bottom = source->YLOG2DEV(ysrc + height) ; - 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 ) { - wxASSERT( mode == srcCopy ) ; - if ( LockPixels( GetGWorldPixMap( source->m_macMask ) ) ) - { - CopyMask( GetPortBitMapForCopyBits( sourcePort ) , GetPortBitMapForCopyBits( source->m_macMask ) , - GetPortBitMapForCopyBits( m_macPort ) , - &srcrect, &srcrect , &dstrect ) ; - UnlockPixels( GetGWorldPixMap( source->m_macMask ) ) ; - } + if ( mode == srcCopy ) + { + if ( LockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ) + { + CopyMask( GetPortBitMapForCopyBits( sourcePort ) , + GetPortBitMapForCopyBits( MAC_WXHBITMAP(source->m_macMask) ) , + GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) , + &srcrect, &srcrect , &dstrect ) ; + UnlockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ; + } + } + else + { + RgnHandle clipRgn = NewRgn() ; + 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 ) ; + 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 ) ; } @@ -1020,17 +1281,110 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, } void wxDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, - double angle) + double angle) { + wxCHECK_RET( Ok(), wxT("wxDC::DoDrawRotatedText Invalid window dc") ); + + if (angle == 0.0) + { + DrawText(text, x, y); + return; + } + + MacInstallFont(); + + // the size of the text + wxCoord w, h; + GetTextExtent(text, &w, &h); + + // draw the string normally + wxBitmap src(w, h); + wxMemoryDC dc; + dc.SelectObject(src); + dc.SetFont(GetFont()); + dc.SetBackground(*wxWHITE_BRUSH); + dc.SetBrush(*wxBLACK_BRUSH); + dc.Clear(); + dc.DrawText(text, 0, 0); + dc.SetFont(wxNullFont); + dc.SelectObject(wxNullBitmap); + + wxMacPortSetter helper(this) ; + + // Calculate the size of the rotated bounding box. + double rad = DegToRad(angle); + double dx = cos(rad); + double dy = sin(rad); + + // the rectngle vertices are counted clockwise with the first one being at + // (0, 0) (or, rather, at (x, y)) + double x2 = w * dx; + double y2 = -w * dy; // y axis points to the bottom, hence minus + double x4 = h * dy; + double y4 = h * dx; + double x3 = x4 + x2; + double y3 = y4 + y2; + + // calc max and min + wxCoord maxX = (wxCoord)(dmax(x2, dmax(x3, x4)) + 0.5); + wxCoord maxY = (wxCoord)(dmax(y2, dmax(y3, y4)) + 0.5); + wxCoord minX = (wxCoord)(dmin(x2, dmin(x3, x4)) - 0.5); + wxCoord minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5); + + // prepare to blit-with-rotate the bitmap to the DC + wxImage image(src); + + RGBColor colText = MAC_WXCOLORREF( m_textForegroundColour.GetPixel() ); + RGBColor colBack = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel() ); + + unsigned char *data = image.GetData(); + + wxCoord dstX, dstY; + double r, angleOrig; + bool textPixel; + + // paint pixel by pixel + for ( wxCoord srcX = 0; srcX < w; srcX++ ) + { + for ( wxCoord srcY = 0; srcY < h; srcY++ ) + { + // transform source coords to dest coords + r = sqrt( (double)(srcX * srcX + srcY * srcY) ); + angleOrig = atan2((double)srcY, (double)srcX) - rad; + dstX = (wxCoord)(r * cos(angleOrig) + 0.5); + dstY = (wxCoord)(r * sin(angleOrig) + 0.5); + + // black pixel? + textPixel = data[(srcY*w + srcX)*3] == 0; + if ( textPixel || (m_backgroundMode == wxSOLID) ) + { + SetCPixel(XLOG2DEVMAC(x + dstX), YLOG2DEVMAC(y + dstY), + textPixel ? &colText : &colBack); + } + } + } + + // it would be better to draw with non underlined font and draw the line + // manually here (it would be more straight...) +#if 0 + if ( m_font.GetUnderlined() ) + { + ::MoveTo(XLOG2DEVMAC(x + x4), YLOG2DEVMAC(y + y4 + font->descent)); + ::LineTo(XLOG2DEVMAC(x + x3), YLOG2DEVMAC(y + y3 + font->descent)); + } +#endif // 0 + + // update the bounding box + CalcBoundingBox(x + minX, y + minY); + CalcBoundingBox(x + maxX, y + maxY); } void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) { - if (!Ok()) - return; - MacVerifySetup() ; + 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) { @@ -1092,10 +1446,9 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) } } -bool wxDC::CanGetTextExtent(void) const +bool wxDC::CanGetTextExtent() const { - if ( !Ok() ) - return false ; + wxCHECK_MSG(Ok(), false, wxT("Invalid DC")); return true ; } @@ -1104,10 +1457,8 @@ void wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he wxCoord *descent, wxCoord *externalLeading , wxFont *theFont ) const { - if (!Ok()) - return; - - MacVerifySetup() ; + wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxMacPortSetter helper(this) ; wxFont formerFont = m_font ; @@ -1186,25 +1537,22 @@ void wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he wxCoord wxDC::GetCharWidth(void) const { - if (!Ok()) - return 1; + wxCHECK_MSG(Ok(), 1, wxT("Invalid DC")); - MacVerifySetup() ; + wxMacPortSetter helper(this) ; MacInstallFont() ; - FontInfo fi ; - ::GetFontInfo( &fi ) ; + int width = ::TextWidth( "n" , 0 , 1 ) ; - return YDEV2LOGREL((fi.descent + fi.ascent) / 2) ; + return YDEV2LOGREL(width) ; } wxCoord wxDC::GetCharHeight(void) const { - if (!Ok()) - return 1; + wxCHECK_MSG(Ok(), 1, wxT("Invalid DC")); - MacVerifySetup() ; + wxMacPortSetter helper(this) ; MacInstallFont() ; @@ -1216,26 +1564,23 @@ wxCoord wxDC::GetCharHeight(void) const void wxDC::Clear(void) { - if (!Ok()) - return; - MacVerifySetup() ; + wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxMacPortSetter helper(this) ; Rect rect = { -32767 , -32767 , 32767 , 32767 } ; if (m_backgroundBrush.GetStyle() != wxTRANSPARENT) { - MacInstallBrush() ; + MacSetupBackgroundForCurrentPort( m_backgroundBrush ) ; + ::EraseRect( &rect ) ; - }; + } } void wxDC::MacInstallFont() const { - if (!Ok()) - return; - MacVerifySetup() ; - - if ( m_macFontInstalled ) - return ; + wxCHECK_RET(Ok(), wxT("Invalid DC")); +// if ( m_macFontInstalled ) +// return ; Pattern blackColor ; wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ; @@ -1250,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 ); } @@ -1270,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 ); } @@ -1321,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 @@ -1352,22 +1698,24 @@ static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern) void wxDC::MacInstallPen() const { - if (!Ok()) - return; - MacVerifySetup() ; + wxCHECK_RET(Ok(), wxT("Invalid DC")); Pattern blackColor; - if ( m_macPenInstalled ) - return ; +// 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 ); ::PenNormal() ; - int penWidth = m_pen.GetWidth(); + int penWidth = m_pen.GetWidth() * (int) m_scaleX ; + + // null means only one pixel, at whatever resolution + if ( penWidth == 0 ) + penWidth = 1 ; ::PenSize(penWidth, penWidth); int penStyle = m_pen.GetStyle(); @@ -1384,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 ; @@ -1393,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 @@ -1433,21 +1820,57 @@ void wxDC::MacInstallPen() const m_macFontInstalled = false ; } +void wxDC::MacSetupBackgroundForCurrentPort(const wxBrush& background ) +{ + Pattern whiteColor ; + 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 { - if (!Ok()) - return; - MacVerifySetup() ; - Pattern blackColor, whiteColor ; - if ( m_macBrushInstalled ) - return ; + wxCHECK_RET(Ok(), wxT("Invalid DC")); + + Pattern blackColor ; +// if ( m_macBrushInstalled ) +// return ; // foreground + + bool backgroundTransparent = (GetBackgroundMode() == wxTRANSPARENT) ; - RGBColor forecolor = m_brush.GetColour().GetPixel(); - RGBColor backcolor = m_backgroundBrush.GetColour().GetPixel(); - ::RGBForeColor( &forecolor ); - ::RGBBackColor( &backcolor ); + ::RGBForeColor( &MAC_WXCOLORREF( m_brush.GetColour().GetPixel()) ); int brushStyle = m_brush.GetStyle(); if (brushStyle == wxSOLID) @@ -1458,39 +1881,111 @@ void wxDC::MacInstallBrush() const wxMacGetHatchPattern(brushStyle, &pat); ::PenPat(&pat); } - else - { - ::PenPat(GetQDGlobalsBlack(&blackColor)); - } - - - // background - - brushStyle = m_backgroundBrush.GetStyle(); - if (brushStyle == wxSOLID) - ::BackPat(GetQDGlobalsWhite(&whiteColor)); - else if (IS_HATCH(brushStyle)) + else if ( m_brush.GetStyle() == wxSTIPPLE || m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE ) { - Pattern pat ; - wxMacGetHatchPattern(brushStyle, &pat); - ::BackPat(&pat); + // 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 ; + } + + + 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 - { - ::BackPat(GetQDGlobalsWhite(&whiteColor)); + else + { + ::PenPat(GetQDGlobalsBlack(&blackColor)); } - short mode = patCopy ; - - // todo : + 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