X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46bed958efcb93847daa9b281089541568cb3dd2..53a410d1b242fce6ef061c7e6d24f54f8e38664d:/src/mac/carbon/dccg.cpp diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp index b75b1288c3..0f878d2911 100755 --- a/src/mac/carbon/dccg.cpp +++ b/src/mac/carbon/dccg.cpp @@ -27,6 +27,8 @@ #ifdef __MSL__ #if __MSL__ >= 0x6000 #include "math.h" + // in case our functions were defined outside std, we make it known all the same + namespace std { } using namespace std ; #endif #endif @@ -56,15 +58,15 @@ extern TECObjectRef s_TECNativeCToUnicode ; wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) : wxMacPortSaver( (GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) ) { - m_newPort =(GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) ; + m_newPort = (GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) ; m_formerClip = NewRgn() ; m_newClip = NewRgn() ; GetClip( m_formerClip ) ; - + if ( win ) { // guard against half constructed objects, this just leads to a empty clip - if( win->GetPeer() ) + if ( win->GetPeer() ) { int x = 0 , y = 0; win->MacWindowToRootWindow( &x,&y ) ; @@ -90,7 +92,7 @@ wxMacWindowStateSaver::wxMacWindowStateSaver( const wxWindow* win ) : wxMacWindowClipper( win ) { // the port is already set at this point - m_newPort =(GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) ; + m_newPort = (GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) ; GetThemeDrawingState( &m_themeDrawingState ) ; } @@ -109,6 +111,7 @@ wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) : m_dc = dc ; // dc->MacSetupPort(&m_ph) ; } + wxMacPortSetter::~wxMacPortSetter() { // m_dc->MacCleanupPort(&m_ph) ; @@ -210,6 +213,7 @@ wxMacCGContext::~wxMacCGContext() CGContextRestoreGState( m_cgContext ) ; CGContextRestoreGState( m_cgContext ) ; } + if ( m_qdPort ) CGContextRelease( m_cgContext ) ; } @@ -217,7 +221,7 @@ wxMacCGContext::~wxMacCGContext() void wxMacCGContext::Clip( const wxRegion ®ion ) { -// ClipCGContextToRegion ( m_cgContext, &bounds , (RgnHandle) dc->m_macCurrentClipRgn ) ; +// ClipCGContextToRegion ( m_cgContext, &bounds , (RgnHandle) dc->m_macCurrentClipRgn ) ; } void wxMacCGContext::StrokePath( const wxGraphicPath *p ) @@ -231,6 +235,7 @@ void wxMacCGContext::DrawPath( const wxGraphicPath *p , int fillStyle ) { const wxMacCGPath* path = dynamic_cast< const wxMacCGPath*>( p ) ; CGPathDrawingMode mode = m_mode ; + if ( fillStyle == wxODDEVEN_RULE ) { if ( mode == kCGPathFill ) @@ -238,6 +243,7 @@ void wxMacCGContext::DrawPath( const wxGraphicPath *p , int fillStyle ) else if ( mode == kCGPathFillStroke ) mode = kCGPathEOFillStroke ; } + CGContextAddPath( m_cgContext , path->GetPath() ) ; CGContextDrawPath( m_cgContext , mode ) ; } @@ -268,6 +274,7 @@ wxGraphicPath* wxMacCGContext::CreatePath() // anything with paths CGContextRef cg = GetNativeContext() ; cg = NULL ; + return new wxMacCGPath() ; } @@ -275,7 +282,7 @@ wxGraphicPath* wxMacCGContext::CreatePath() CGContextRef wxMacCGContext::GetNativeContext() { - if( m_cgContext == NULL ) + if ( m_cgContext == NULL ) { Rect bounds ; GetPortBounds( (CGrafPtr) m_qdPort , &bounds ) ; @@ -283,6 +290,7 @@ CGContextRef wxMacCGContext::GetNativeContext() CGContextSaveGState( m_cgContext ) ; wxASSERT_MSG( status == noErr , wxT("Cannot nest wxDCs on the same window") ) ; + CGContextTranslateCTM( m_cgContext , 0 , bounds.bottom - bounds.top ) ; CGContextScaleCTM( m_cgContext , 1 , -1 ) ; @@ -290,6 +298,7 @@ CGContextRef wxMacCGContext::GetNativeContext() SetPen( m_pen ) ; SetBrush( m_brush ) ; } + return m_cgContext ; } @@ -297,6 +306,7 @@ void wxMacCGContext::SetNativeContext( CGContextRef cg ) { // we allow either setting or clearing but not replacing wxASSERT( m_cgContext == NULL || cg == NULL ) ; + if ( cg ) CGContextSaveGState( cg ) ; m_cgContext = cg ; @@ -309,34 +319,33 @@ void wxMacCGContext::SetNativeContext( CGContextRef cg ) class wxMacCGPattern { public : - wxMacCGPattern() - { - } - + wxMacCGPattern() {} + // is guaranteed to be called only with a non-Null CGContextRef - virtual void Render( CGContextRef ctxRef ) = 0 ; + virtual void Render( CGContextRef ctxRef ) = 0 ; operator CGPatternRef() const { return m_patternRef ; } + protected : virtual ~wxMacCGPattern() { - // as this is called only when our m_patternRef is been released, don't release - // it again + // as this is called only when our m_patternRef is been released; + // don't release it again } - + static void _Render( void *info, CGContextRef ctxRef ) { wxMacCGPattern* self = (wxMacCGPattern*) info ; if ( self && ctxRef ) self->Render( ctxRef ) ; } - + static void _Dispose( void *info ) { wxMacCGPattern* self = (wxMacCGPattern*) info ; delete self ; } - + CGPatternRef m_patternRef ; static const CGPatternCallbacks ms_Callbacks ; @@ -347,9 +356,10 @@ const CGPatternCallbacks wxMacCGPattern::ms_Callbacks = { 0, &wxMacCGPattern::_R class ImagePattern : public wxMacCGPattern { public : - ImagePattern( const wxBitmap* bmp , CGAffineTransform transform ) + ImagePattern( const wxBitmap* bmp , CGAffineTransform transform ) { wxASSERT( bmp && bmp->Ok() ) ; + Init( (CGImageRef) bmp->CGImageCreate() , transform ) ; } @@ -357,13 +367,12 @@ public : ImagePattern( CGImageRef image , CGAffineTransform transform ) { if ( image ) - { CFRetain( image ) ; - } + Init( image , transform ) ; } - virtual void Render( CGContextRef ctxRef ) + virtual void Render( CGContextRef ctxRef ) { if (m_image != NULL) HIViewDrawCGImage( ctxRef, &m_imageBounds, m_image ); @@ -381,12 +390,13 @@ protected : kCGPatternTilingNoDistortion, true , &wxMacCGPattern::ms_Callbacks ) ; } } - + ~ImagePattern() { if ( m_image ) CGImageRelease( m_image ) ; } + CGImageRef m_image ; CGRect m_imageBounds ; } ; @@ -414,7 +424,8 @@ public : #endif { CGContextBeginPath (ctxRef); - for (size_t i = 0; i < count; i += 2) { + for (size_t i = 0; i < count; i += 2) + { CGContextMoveToPoint(ctxRef, pts[i].x, pts[i].y); CGContextAddLineToPoint(ctxRef, pts[i+1].x, pts[i+1].y); } @@ -422,67 +433,80 @@ public : } } - virtual void Render( CGContextRef ctxRef ) + virtual void Render( CGContextRef ctxRef ) { - switch( m_hatch ) + switch ( m_hatch ) { case wxBDIAGONAL_HATCH : { - CGPoint pts[] = { + CGPoint pts[] = + { { 8.0 , 0.0 } , { 0.0 , 8.0 } }; StrokeLineSegments( ctxRef , pts , 2 ) ; } break ; + case wxCROSSDIAG_HATCH : { - CGPoint pts[] = { + CGPoint pts[] = + { { 0.0 , 0.0 } , { 8.0 , 8.0 } , { 8.0 , 0.0 } , { 0.0 , 8.0 } }; StrokeLineSegments( ctxRef , pts , 4 ) ; } break ; + case wxFDIAGONAL_HATCH : { - CGPoint pts[] = { + CGPoint pts[] = + { { 0.0 , 0.0 } , { 8.0 , 8.0 } }; StrokeLineSegments( ctxRef , pts , 2 ) ; } break ; + case wxCROSS_HATCH : { - CGPoint pts[] = { + CGPoint pts[] = + { { 0.0 , 4.0 } , { 8.0 , 4.0 } , { 4.0 , 0.0 } , { 4.0 , 8.0 } , }; StrokeLineSegments( ctxRef , pts , 4 ) ; } break ; + case wxHORIZONTAL_HATCH : { - CGPoint pts[] = { + CGPoint pts[] = + { { 0.0 , 4.0 } , { 8.0 , 4.0 } , }; StrokeLineSegments( ctxRef , pts , 2 ) ; } break ; + case wxVERTICAL_HATCH : { - CGPoint pts[] = { + CGPoint pts[] = + { { 4.0 , 0.0 } , { 4.0 , 8.0 } , }; StrokeLineSegments( ctxRef , pts , 2 ) ; } break ; + + default: + break; } } protected : - ~HatchPattern() - { - } + ~HatchPattern() {} + int m_hatch ; CGRect m_imageBounds ; } ; @@ -492,6 +516,7 @@ void wxMacCGContext::SetPen( const wxPen &pen ) m_pen = pen ; if ( m_cgContext == NULL ) return ; + bool fill = m_brush.GetStyle() != wxTRANSPARENT ; bool stroke = pen.GetStyle() != wxTRANSPARENT ; @@ -499,60 +524,62 @@ void wxMacCGContext::SetPen( const wxPen &pen ) // we can benchmark performance, should go into a setting later CGContextSetShouldAntialias( m_cgContext , false ) ; #endif + if ( fill | stroke ) { - // setup brushes + // set up brushes m_mode = kCGPathFill ; // just a default - if ( fill ) - { - m_mode = kCGPathFill ; - } if ( stroke ) { RGBColor col = MAC_WXCOLORREF( pen.GetColour().GetPixel() ) ; CGContextSetRGBStrokeColor( m_cgContext , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ; - /* TODO * m_dc->m_scaleX */ + // TODO * m_dc->m_scaleX float penWidth = pen.GetWidth(); if (penWidth <= 0.0) penWidth = 0.1; CGContextSetLineWidth( m_cgContext , penWidth ) ; CGLineCap cap ; - switch( pen.GetCap() ) + switch ( pen.GetCap() ) { case wxCAP_ROUND : cap = kCGLineCapRound ; break ; + case wxCAP_PROJECTING : cap = kCGLineCapSquare ; break ; + case wxCAP_BUTT : cap = kCGLineCapButt ; break ; + default : cap = kCGLineCapButt ; break ; } CGLineJoin join ; - switch( pen.GetJoin() ) + switch ( pen.GetJoin() ) { case wxJOIN_BEVEL : join = kCGLineJoinBevel ; break ; + case wxJOIN_MITER : join = kCGLineJoinMiter ; break ; + case wxJOIN_ROUND : join = kCGLineJoinRound ; break ; + default : join = kCGLineJoinMiter ; break; } - CGContextSetLineJoin( m_cgContext , join ) ; m_mode = kCGPathStroke ; int count = 0 ; @@ -567,27 +594,31 @@ void wxMacCGContext::SetPen( const wxPen &pen ) const float dashed[] = { 19.0 , 9.0 }; const float dotted_dashed[] = { 9.0 , 6.0 , 3.0 , 3.0 }; - - switch( pen.GetStyle() ) + switch ( pen.GetStyle() ) { case wxSOLID : break ; + case wxDOT : lengths = dotted ; count = WXSIZEOF(dotted); break ; + case wxLONG_DASH : lengths = dashed ; count = WXSIZEOF(dashed) ; break ; + case wxSHORT_DASH : lengths = short_dashed ; count = WXSIZEOF(short_dashed) ; break ; + case wxDOT_DASH : lengths = dotted_dashed ; count = WXSIZEOF(dotted_dashed); break ; + case wxUSER_DASH : wxDash *dashes ; count = pen.GetDashes( &dashes ) ; @@ -606,6 +637,7 @@ void wxMacCGContext::SetPen( const wxPen &pen ) } lengths = userLengths ; break ; + case wxSTIPPLE : { float alphaArray[1] = { 1.0 } ; @@ -619,6 +651,7 @@ void wxMacCGContext::SetPen( const wxPen &pen ) } } break ; + default : { wxMacCFRefHolder patternSpace( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) ) ; @@ -643,14 +676,15 @@ void wxMacCGContext::SetPen( const wxPen &pen ) { CGContextSetLineDash( m_cgContext , 0 , NULL , 0 ) ; } + CGContextSetLineCap( m_cgContext , cap ) ; + CGContextSetLineJoin( m_cgContext , join ) ; delete[] userLengths ; } + if ( fill && stroke ) - { m_mode = kCGPathFillStroke ; - } } } @@ -704,16 +738,14 @@ void wxMacCGContext::SetBrush( const wxBrush &brush ) CGContextSetFillPattern( m_cgContext, pattern , alphaArray ) ; } } + m_mode = kCGPathFill ; } - if ( stroke ) - { - m_mode = kCGPathStroke ; - } + if ( fill && stroke ) - { m_mode = kCGPathFillStroke ; - } + else if ( stroke ) + m_mode = kCGPathStroke ; } } @@ -737,6 +769,7 @@ void AddRoundedRectToPath(CGContextRef c, CGRect rect, float ovalWidth, CGContextAddRect(c, rect); return; } + CGContextSaveGState(c); CGContextTranslateCTM(c, CGRectGetMinX(rect), CGRectGetMinY(rect)); CGContextScaleCTM(c, ovalWidth, ovalHeight); @@ -753,8 +786,8 @@ void AddRoundedRectToPath(CGContextRef c, CGRect rect, float ovalWidth, wxDC::wxDC() { - m_ok = FALSE; - m_colour = TRUE; + m_ok = false; + m_colour = true; m_mm_to_pix_x = mm2pt; m_mm_to_pix_y = mm2pt; @@ -766,10 +799,10 @@ wxDC::wxDC() m_userScaleY = 1.0; m_scaleX = 1.0; m_scaleY = 1.0; - m_needComputeScaleX = FALSE; - m_needComputeScaleY = FALSE; + m_needComputeScaleX = false; + m_needComputeScaleY = false; - m_ok = FALSE ; + m_ok = false ; m_macPort = 0 ; m_macLocalOrigin.x = m_macLocalOrigin.y = 0 ; @@ -778,13 +811,12 @@ wxDC::wxDC() m_brush = *wxWHITE_BRUSH; m_macATSUIStyle = NULL ; - m_graphicContext = NULL ; } -wxDC::~wxDC(void) +wxDC::~wxDC() { - if( m_macATSUIStyle ) + if ( m_macATSUIStyle ) { ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle); m_macATSUIStyle = NULL ; @@ -797,6 +829,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask { wxCHECK_RET( Ok(), wxT("invalid window dc") ); wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap") ); + wxCoord xx = XLOG2DEVMAC(x); wxCoord yy = YLOG2DEVMAC(y); wxCoord w = bmp.GetWidth(); @@ -826,7 +859,7 @@ void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; CGRect r = CGRectMake( 00 , 00 , ww , hh ) ; CGContextSaveGState(cg); - CGContextTranslateCTM(cg, xx , yy + hh ); + CGContextTranslateCTM( cg, xx , yy + hh ); CGContextScaleCTM(cg, 1, -1); PlotIconRefInContext( cg , &r , kAlignNone , kTransformNone , NULL , kPlotIconRefNormalFlags , MAC_WXHICON( icon.GetHICON() ) ) ; @@ -836,6 +869,7 @@ void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { wxCHECK_RET(Ok(), wxT("wxDC::DoSetClippingRegion Invalid DC")); + wxCoord xx, yy, ww, hh; xx = XLOG2DEVMAC(x); yy = YLOG2DEVMAC(y); @@ -848,7 +882,8 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei // SetRectRgn( (RgnHandle) m_macCurrentClipRgn , xx , yy , xx + ww , yy + hh ) ; // SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; - if( m_clipping ) + + if ( m_clipping ) { m_clipX1 = wxMax( m_clipX1 , xx ); m_clipY1 = wxMax( m_clipY1 , yy ); @@ -857,12 +892,13 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei } else { - m_clipping = TRUE; + m_clipping = true; m_clipX1 = xx; m_clipY1 = yy; m_clipX2 = xx + ww; m_clipY2 = yy + hh; } + // TODO as soon as we don't reset the context for each operation anymore // we have to update the context as well } @@ -875,6 +911,7 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) DestroyClippingRegion(); return; } + wxCoord x, y, w, h; region.GetBox( x, y, w, h ); wxCoord xx, yy, ww, hh; @@ -882,6 +919,7 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) 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 ) @@ -890,15 +928,14 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) } else { - /* +#if 0 CopyRgn( (RgnHandle) region.GetWXHRGN() , (RgnHandle) m_macCurrentClipRgn ) ; if ( xx != x || yy != y ) - { OffsetRgn( (RgnHandle) m_macCurrentClipRgn , xx - x , yy - y ) ; - } SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; - */ - if( m_clipping ) +#endif + + if ( m_clipping ) { m_clipX1 = wxMax( m_clipX1 , xx ); m_clipY1 = wxMax( m_clipY1 , yy ); @@ -907,7 +944,7 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) } else { - m_clipping = TRUE; + m_clipping = true; m_clipX1 = xx; m_clipY1 = yy; m_clipX2 = xx + ww; @@ -924,21 +961,24 @@ void wxDC::DestroyClippingRegion() CGContextSaveGState( cgContext ); m_graphicContext->SetPen( m_pen ) ; m_graphicContext->SetBrush( m_brush ) ; - m_clipping = FALSE; + m_clipping = false; } void wxDC::DoGetSizeMM( int* width, int* height ) const { - int w = 0; - int h = 0; + int w = 0, h = 0; + 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) ); + if (width) + *width = long( double(w) / (m_scaleX * m_mm_to_pix_x) ); + if (height) + *height = long( double(h) / (m_scaleY * m_mm_to_pix_y) ); } void wxDC::SetTextForeground( const wxColour &col ) { wxCHECK_RET(Ok(), wxT("Invalid DC")); + if ( col != m_textForegroundColour ) { m_textForegroundColour = col; @@ -949,6 +989,7 @@ void wxDC::SetTextForeground( const wxColour &col ) void wxDC::SetTextBackground( const wxColour &col ) { wxCHECK_RET(Ok(), wxT("Invalid DC")); + m_textBackgroundColour = col; } @@ -957,26 +998,31 @@ void wxDC::SetMapMode( int mode ) switch (mode) { case wxMM_TWIPS: - SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y ); + SetLogicalScale( twips2mm * m_mm_to_pix_x, twips2mm * m_mm_to_pix_y ); break; + case wxMM_POINTS: - SetLogicalScale( pt2mm*m_mm_to_pix_x, pt2mm*m_mm_to_pix_y ); + SetLogicalScale( pt2mm * m_mm_to_pix_x, pt2mm * m_mm_to_pix_y ); break; + case wxMM_METRIC: SetLogicalScale( m_mm_to_pix_x, m_mm_to_pix_y ); break; + case wxMM_LOMETRIC: - SetLogicalScale( m_mm_to_pix_x/10.0, m_mm_to_pix_y/10.0 ); + SetLogicalScale( m_mm_to_pix_x / 10.0, m_mm_to_pix_y / 10.0 ); break; - default: + case wxMM_TEXT: + default: SetLogicalScale( 1.0, 1.0 ); break; } + if (mode != wxMM_TEXT) { - m_needComputeScaleX = TRUE; - m_needComputeScaleY = TRUE; + m_needComputeScaleX = + m_needComputeScaleY = true; } } @@ -1036,12 +1082,14 @@ void wxDC::ComputeScaleAndOrigin() m_scaleY = m_logicalScaleY * m_userScaleY; m_deviceOriginX = m_externalDeviceOriginX; m_deviceOriginY = m_externalDeviceOriginY; + // CMB: if scale has changed call SetPen to recalulate the line width if (m_scaleX != origScaleX || m_scaleY != origScaleY) { // this is a bit artificial, but we need to force wxDC to think // the pen has changed - wxPen pen(GetPen()); + wxPen pen( GetPen() ); + m_pen = wxNullPen; SetPen(pen); } @@ -1066,6 +1114,7 @@ void wxDC::SetPen( const wxPen &pen ) { if ( m_pen == pen ) return ; + m_pen = pen; if ( m_graphicContext ) { @@ -1091,6 +1140,7 @@ void wxDC::SetBrush( const wxBrush &brush ) { if (m_brush == brush) return; + m_brush = brush; if ( m_graphicContext ) { @@ -1116,6 +1166,7 @@ void wxDC::SetBackground( const wxBrush &brush ) { if (m_backgroundBrush == brush) return; + m_backgroundBrush = brush; if (!m_backgroundBrush.Ok()) return; @@ -1125,6 +1176,7 @@ void wxDC::SetLogicalFunction( int function ) { if (m_logicalFunction == function) return; + m_logicalFunction = function ; } @@ -1141,15 +1193,18 @@ bool wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const { wxCHECK_MSG( Ok(), false, wxT("wxDC::DoGetPixel Invalid DC") ); wxCHECK_MSG( Ok(), false, wxT("wxDC::DoGetPixel Invalid DC") ); + wxMacPortSaver helper((CGrafPtr)m_macPort) ; RGBColor colour; + + // NB: GetCPixel is a deprecated QD call, and a slow one at that GetCPixel( XLOG2DEVMAC(x) + m_macLocalOriginInPort.x - m_macLocalOrigin.x, YLOG2DEVMAC(y) + m_macLocalOriginInPort.y - m_macLocalOrigin.y, &colour ); - // Convert from Mac colour to wx - col->Set( colour.red >> 8, - colour.green >> 8, - colour.blue >> 8); + + // convert from Mac colour to wx + col->Set( colour.red >> 8, colour.green >> 8, colour.blue >> 8 ); + return true ; } @@ -1218,10 +1273,11 @@ void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, 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; + wxCoord rad = (wxCoord)radius; double sa, ea; if (xx1 == xx2 && yy1 == yy2) { @@ -1269,9 +1325,18 @@ void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, 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; } + if (ww < 0) + { + ww = -ww; + xx = xx - ww; + } + if (hh < 0) + { + hh = -hh; + yy = yy - hh; + } bool fill = m_brush.GetStyle() != wxTRANSPARENT ; @@ -1293,6 +1358,7 @@ void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, void wxDC::DoDrawPoint( wxCoord x, wxCoord y ) { wxCHECK_RET(Ok(), wxT("Invalid DC")); + DoDrawLine( x , y , x + 1 , y + 1 ) ; } @@ -1300,7 +1366,7 @@ void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) { wxCHECK_RET(Ok(), wxT("Invalid DC")); - + if ( m_logicalFunction != wxCOPY ) return ; @@ -1316,6 +1382,7 @@ void wxDC::DoDrawLines(int n, wxPoint points[], path->AddLineToPoint( x2 , y2 ) ; } + m_graphicContext->StrokePath( path ) ; delete path ; } @@ -1379,18 +1446,18 @@ void wxDC::DoDrawSpline(wxList *points) } #endif -void wxDC::DoDrawPolygon(int n, wxPoint points[], +void wxDC::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle ) { wxCHECK_RET(Ok(), wxT("Invalid DC")); - wxCoord x1, x2 , y1 , y2 ; - if ( n== 0 || (m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT ) ) + + if ( n <= 0 || (m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT ) ) return ; - if ( m_logicalFunction != wxCOPY ) return ; + wxCoord x1, x2 , y1 , y2 ; x2 = x1 = XLOG2DEVMAC(points[0].x + xoffset); y2 = y1 = YLOG2DEVMAC(points[0].y + yoffset); @@ -1403,12 +1470,13 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], path->AddLineToPoint( x2 , y2 ) ; } + if ( x1 != x2 || y1 != y2 ) - { path->AddLineToPoint( x1,y1 ) ; - } + path->CloseSubpath() ; m_graphicContext->DrawPath( path , fillStyle ) ; + delete path ; } @@ -1423,9 +1491,11 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) 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) return; + // CMB: handle -ve width and/or height if (ww < 0) { @@ -1437,6 +1507,7 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) hh = -hh; yy = yy - hh; } + wxGraphicPath* path = m_graphicContext->CreatePath() ; path->AddRectangle( xx , yy , ww , hh ) ; m_graphicContext->DrawPath( path ) ; @@ -1452,16 +1523,17 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, if ( m_logicalFunction != wxCOPY ) return ; - if (radius < 0.0) radius = - radius * ((width < height) ? width : 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) return; + // CMB: handle -ve width and/or height if (ww < 0) { @@ -1473,6 +1545,7 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, hh = -hh; yy = yy - hh; } + wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ; CGContextRef ctx = mctx->GetNativeContext() ; AddRoundedRectToPath( ctx , CGRectMake( xx , yy , ww , hh ) , 16 ,16 ) ; @@ -1493,6 +1566,7 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) // CMB: draw nothing if transformed w or h is 0 if (ww == 0 || hh == 0) return; + // CMB: handle -ve width and/or height if (ww < 0) { @@ -1526,11 +1600,14 @@ 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")); + if ( logical_func == wxNO_OP ) - return TRUE ; + return true ; + if (xsrcMask == -1 && ysrcMask == -1) { - xsrcMask = xsrc; ysrcMask = ysrc; + xsrcMask = xsrc; + ysrcMask = ysrc; } wxCoord yysrc = source->YLOG2DEVMAC(ysrc) ; @@ -1575,6 +1652,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, blit = wxNullBitmap ; } } + if ( blit.Ok() ) { CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; @@ -1583,47 +1661,46 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, HIViewDrawCGImage( cg , &r , image ) ; CGImageRelease( image ) ; } - } else { - /* +#if 0 CGContextRef cg = (wxMacCGContext*)(source->GetGraphicContext())->GetNativeContext() ; void *data = CGBitmapContextGetData( cg ) ; - */ - return FALSE ; // wxFAIL_MSG( wxT("Blitting is only supported from bitmap contexts") ) ; +#endif + + return false ; // wxFAIL_MSG( wxT("Blitting is only supported from bitmap contexts") ) ; } - return TRUE; + + return true; } void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, double angle) { wxCHECK_RET( Ok(), wxT("wxDC::DoDrawRotatedText Invalid window dc") ); + wxCHECK_RET( m_macATSUIStyle != NULL , wxT("No valid font set") ) ; if ( str.Length() == 0 ) return ; - if ( m_logicalFunction != wxCOPY ) return ; - wxCHECK_RET( m_macATSUIStyle != NULL , wxT("No valid font set") ) ; - OSStatus status = noErr ; ATSUTextLayout atsuLayout ; UniCharCount chars = str.Length() ; UniChar* ubuf = NULL ; #if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16 converter ; + wxMBConvUTF16 converter ; #if wxUSE_UNICODE - size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ; - ubuf = (UniChar*) malloc( unicharlen + 2 ) ; - converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ; + size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ; + ubuf = (UniChar*) malloc( unicharlen + 2 ) ; + converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ; #else const wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; - size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; - ubuf = (UniChar*) malloc( unicharlen + 2 ) ; - converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ; + size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; + ubuf = (UniChar*) malloc( unicharlen + 2 ) ; + converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ; #endif chars = unicharlen / 2 ; #else @@ -1666,6 +1743,7 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags)/sizeof(ATSUAttributeTag), atsuTags, atsuSizes, atsuValues ) ; } + { CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; ATSUAttributeTag atsuTags[] = @@ -1734,6 +1812,7 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, CalcBoundingBox(XDEV2LOG(rect.right), YDEV2LOG(rect.bottom) ); ::ATSUDisposeTextLayout(atsuLayout); + #if SIZEOF_WCHAR_T == 4 free( ubuf ) ; #endif @@ -1742,12 +1821,14 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) { wxCHECK_RET(Ok(), wxT("wxDC::DoDrawText Invalid DC")); + DoDrawRotatedText( strtext , x , y , 0.0 ) ; } bool wxDC::CanGetTextExtent() const { wxCHECK_MSG(Ok(), false, wxT("Invalid DC")); + return true ; } @@ -1756,6 +1837,7 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh wxFont *theFont ) const { wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxFont formerFont = m_font ; if ( theFont ) { @@ -1774,16 +1856,16 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh UniCharCount chars = str.Length() ; UniChar* ubuf = NULL ; #if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16 converter ; + wxMBConvUTF16 converter ; #if wxUSE_UNICODE - size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ; - ubuf = (UniChar*) malloc( unicharlen + 2 ) ; - converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ; + size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ; + ubuf = (UniChar*) malloc( unicharlen + 2 ) ; + converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ; #else const wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; - size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; - ubuf = (UniChar*) malloc( unicharlen + 2 ) ; - converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ; + size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; + ubuf = (UniChar*) malloc( unicharlen + 2 ) ; + converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ; #endif chars = unicharlen / 2 ; #else @@ -1796,7 +1878,6 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh #endif #endif - status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; @@ -1831,7 +1912,6 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh } } - bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const { wxCHECK_MSG(Ok(), false, wxT("Invalid DC")); @@ -1868,26 +1948,26 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con #endif #endif - OSStatus status; + OSStatus status; status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; - for ( int pos = 0; pos < (int)chars; pos ++ ) { - unsigned long actualNumberOfBounds = 0; - ATSTrapezoid glyphBounds; - - // We get a single bound, since the text should only require one. If it requires more, there is an issue - OSStatus result; - result = ATSUGetGlyphBounds( atsuLayout, 0, 0, kATSUFromTextBeginning, pos + 1, kATSUseDeviceOrigins, 1, &glyphBounds, &actualNumberOfBounds ); - if (result != noErr || actualNumberOfBounds != 1 ) - { - return false; - } - - widths[pos] = XDEV2LOGREL(FixedToInt( glyphBounds.upperRight.x - glyphBounds.upperLeft.x )); - //unsigned char uch = s[i]; - - } + for ( int pos = 0; pos < (int)chars; pos ++ ) + { + unsigned long actualNumberOfBounds = 0; + ATSTrapezoid glyphBounds; + + // We get a single bound, since the text should only require one. If it requires more, there is an issue + OSStatus result; + result = ATSUGetGlyphBounds( atsuLayout, 0, 0, kATSUFromTextBeginning, pos + 1, + kATSUseDeviceOrigins, 1, &glyphBounds, &actualNumberOfBounds ); + if (result != noErr || actualNumberOfBounds != 1 ) + return false; + + widths[pos] = XDEV2LOGREL(FixedToInt( glyphBounds.upperRight.x - glyphBounds.upperLeft.x )); + //unsigned char uch = s[i]; + } + ::ATSUDisposeTextLayout(atsuLayout); return true; } @@ -1896,6 +1976,7 @@ wxCoord wxDC::GetCharWidth(void) const { wxCoord width ; DoGetTextExtent(wxT("g") , &width , NULL , NULL , NULL , NULL ) ; + return width ; } @@ -1903,6 +1984,7 @@ wxCoord wxDC::GetCharHeight(void) const { wxCoord height ; DoGetTextExtent(wxT("g") , NULL , &height , NULL , NULL , NULL ) ; + return height ; } @@ -1910,7 +1992,7 @@ void wxDC::Clear(void) { wxCHECK_RET(Ok(), wxT("Invalid DC")); - if ( m_backgroundBrush.Ok() && m_backgroundBrush.GetStyle() != wxTRANSPARENT) + if (m_backgroundBrush.Ok() && m_backgroundBrush.GetStyle() != wxTRANSPARENT) { HIRect rect = CGRectMake( -10000 , -10000 , 20000 , 20000 ) ; CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; @@ -1928,21 +2010,23 @@ void wxDC::Clear(void) else #endif { - RGBColor color; + RGBColor color; GetThemeBrushAsColor( m_backgroundBrush.MacGetTheme(), 32, true, &color ); CGContextSetRGBFillColor( cg, (float) color.red / 65536, - (float) color.green / 65536, (float) color.blue / 65536, 1 ); - CGContextFillRect( cg, rect ); + (float) color.green / 65536, (float) color.blue / 65536, 1 ); + CGContextFillRect( cg, rect ); } // reset to normal value RGBColor col = MAC_WXCOLORREF( GetBrush().GetColour().GetPixel() ) ; CGContextSetRGBFillColor( cg, col.red / 65536.0, col.green / 65536.0, col.blue / 65536.0, 1.0 ); } - break ; + break ; + case kwxMacBrushThemeBackground : { wxFAIL_MSG( wxT("There shouldn't be theme backgrounds under Quartz") ) ; + #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 if ( UMAGetSystemVersion() >= 0x1030 ) { @@ -1956,23 +2040,25 @@ void wxDC::Clear(void) HIThemeApplyBackground( &rect , &drawInfo, cg , kHIThemeOrientationNormal) ; } - else #endif - { - } } - break ; + break ; + case kwxMacBrushColour : - { - RGBColor col = MAC_WXCOLORREF( m_backgroundBrush.GetColour().GetPixel()) ; - CGContextSetRGBFillColor( cg , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ; - CGContextFillRect(cg, rect); + { + RGBColor col = MAC_WXCOLORREF( m_backgroundBrush.GetColour().GetPixel()) ; + CGContextSetRGBFillColor( cg , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ; + CGContextFillRect(cg, rect); - // reset to normal value - col = MAC_WXCOLORREF( GetBrush().GetColour().GetPixel() ) ; - CGContextSetRGBFillColor( cg , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ; - } - break ; + // reset to normal value + col = MAC_WXCOLORREF( GetBrush().GetColour().GetPixel() ) ; + CGContextSetRGBFillColor( cg , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ; + } + break ; + + default : + wxFAIL_MSG( wxT("unknown brush kind") ) ; + break ; } } } @@ -1981,7 +2067,7 @@ void wxDC::MacInstallFont() const { wxCHECK_RET(Ok(), wxT("Invalid DC")); - if( m_macATSUIStyle ) + if ( m_macATSUIStyle ) { ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle); m_macATSUIStyle = NULL ; @@ -2005,10 +2091,9 @@ void wxDC::MacInstallFont() const sizeof( Fixed ) , sizeof( RGBColor ) , } ; - // Boolean kTrue = true ; - // Boolean kFalse = false ; - - // ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal; + // Boolean kTrue = true ; + // Boolean kFalse = false ; + // ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal; ATSUAttributeValuePtr atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = { &atsuSize ,