X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01b5ab3367bc503021b7b39e4162f2e8fd8022f1..8f3f46357d164211b7d7d251e2ada835003f325e:/src/mac/carbon/dccg.cpp?ds=sidebyside diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp index 24a5331756..01514f90f2 100755 --- a/src/mac/carbon/dccg.cpp +++ b/src/mac/carbon/dccg.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dc.cpp +// Name: src/mac/carbon/dccg.cpp // Purpose: wxDC class // Author: Stefan Csomor // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -15,32 +15,34 @@ #if wxMAC_USE_CORE_GRAPHICS -#include "wx/app.h" -#include "wx/mac/uma.h" -#include "wx/dcmemory.h" -#include "wx/dcprint.h" -#include "wx/region.h" -#include "wx/image.h" -#include "wx/log.h" +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/dcmemory.h" + #include "wx/region.h" +#endif +#include "wx/mac/uma.h" #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 { } + namespace std { } using namespace std ; #endif #endif #include "wx/mac/private.h" -IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) #ifndef wxMAC_USE_CORE_GRAPHICS_BLEND_MODES #define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 0 #endif +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 +typedef float CGFloat ; +#endif + //----------------------------------------------------------------------------- // constants //----------------------------------------------------------------------------- @@ -51,20 +53,17 @@ const double M_PI = 3.14159265358979 ; #endif #endif -const double RAD2DEG = 180.0 / M_PI; -const short kEmulatedMode = -1 ; -const short kUnsupportedMode = -2 ; - -extern TECObjectRef s_TECNativeCToUnicode ; +static const double RAD2DEG = 180.0 / M_PI; +#ifndef __LP64__ // TODO: update // The textctrl implementation still needs that (needs what?) for the non-HIView implementation // wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) : - wxMacPortSaver( (GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) ) + 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 ) ; @@ -76,6 +75,7 @@ wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) : { int x = 0 , y = 0; win->MacWindowToRootWindow( &x, &y ) ; + // get area including focus rect CopyRgn( (RgnHandle) ((wxWindow*)win)->MacGetVisibleRegion(true).GetWXHRGN() , m_newClip ) ; if ( !EmptyRgn( m_newClip ) ) @@ -86,7 +86,7 @@ wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) : } } -wxMacWindowClipper::~wxMacWindowClipper() +wxMacWindowClipper::~wxMacWindowClipper() { SetPort( m_newPort ) ; SetClip( m_formerClip ) ; @@ -98,11 +98,11 @@ 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 ) ; } -wxMacWindowStateSaver::~wxMacWindowStateSaver() +wxMacWindowStateSaver::~wxMacWindowStateSaver() { SetPort( m_newPort ) ; SetThemeDrawingState( m_themeDrawingState , true ) ; @@ -110,6 +110,7 @@ wxMacWindowStateSaver::~wxMacWindowStateSaver() // minimal implementation only used for appearance drawing < 10.3 +#ifndef wxMAC_USE_CORE_GRAPHICS wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) : m_ph( (GrafPtr) dc->m_macPort ) { @@ -124,12 +125,14 @@ wxMacPortSetter::~wxMacPortSetter() // m_dc->MacCleanupPort(&m_ph) ; } +#endif + +#endif + //----------------------------------------------------------------------------- // Local functions //----------------------------------------------------------------------------- -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; } //----------------------------------------------------------------------------- @@ -144,6 +147,14 @@ static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } // state we were called with, the other one after changing to HI Graphics orientation // (this one is used for getting back clippings etc) +//----------------------------------------------------------------------------- +// wxGraphicPath implementation +//----------------------------------------------------------------------------- + +#if !wxUSE_GRAPHICS_CONTEXT + +IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) + wxMacCGPath::wxMacCGPath() { m_path = CGPathCreateMutable() ; @@ -160,7 +171,7 @@ void wxMacCGPath::MoveToPoint( wxCoord x1 , wxCoord y1 ) CGPathMoveToPoint( m_path , NULL , x1 , y1 ) ; } -void wxMacCGPath::AddLineToPoint( wxCoord x1 , wxCoord y1 ) +void wxMacCGPath::AddLineToPoint( wxCoord x1 , wxCoord y1 ) { CGPathAddLineToPoint( m_path , NULL , x1 , y1 ) ; } @@ -187,21 +198,39 @@ void wxMacCGPath::CloseSubpath() CGPathCloseSubpath( m_path ) ; } -CGPathRef wxMacCGPath::GetPath() const +CGPathRef wxMacCGPath::GetPath() const { return m_path ; } -wxMacCGContext::wxMacCGContext( CGrafPtr port ) +void wxMacCGPath::AddArcToPoint( wxCoord x1, wxCoord y1 , wxCoord x2, wxCoord y2, wxCoord r ) +{ + CGPathAddArcToPoint( m_path, NULL , x1, y1, x2, y2, r); +} + +void wxMacCGPath::AddArc( wxCoord x, wxCoord y, wxCoord r, double startAngle, double endAngle, bool clockwise ) +{ + CGPathAddArc( m_path, NULL , x, y, r, startAngle, endAngle, clockwise); +} + +//----------------------------------------------------------------------------- +// wxGraphicContext implementation +//----------------------------------------------------------------------------- + +wxMacCGContext::wxMacCGContext( CGrafPtr port ) { m_qdPort = port ; m_cgContext = NULL ; + m_mode = kCGPathFill; + m_macATSUIStyle = NULL ; } wxMacCGContext::wxMacCGContext( CGContextRef cgcontext ) { m_qdPort = NULL ; m_cgContext = cgcontext ; + m_mode = kCGPathFill; + m_macATSUIStyle = NULL ; CGContextSaveGState( m_cgContext ) ; CGContextSaveGState( m_cgContext ) ; } @@ -210,9 +239,11 @@ wxMacCGContext::wxMacCGContext() { m_qdPort = NULL ; m_cgContext = NULL ; + m_mode = kCGPathFill; + m_macATSUIStyle = NULL ; } -wxMacCGContext::~wxMacCGContext() +wxMacCGContext::~wxMacCGContext() { if ( m_cgContext ) { @@ -220,9 +251,10 @@ wxMacCGContext::~wxMacCGContext() CGContextRestoreGState( m_cgContext ) ; CGContextRestoreGState( m_cgContext ) ; } - +#ifndef __LP64__ if ( m_qdPort ) - CGContextRelease( m_cgContext ) ; + QDEndCGContext( m_qdPort, &m_cgContext ) ; +#endif } @@ -231,14 +263,29 @@ void wxMacCGContext::Clip( const wxRegion ®ion ) // ClipCGContextToRegion ( m_cgContext, &bounds , (RgnHandle) dc->m_macCurrentClipRgn ) ; } -void wxMacCGContext::StrokePath( const wxGraphicPath *p ) +void wxMacCGContext::StrokePath( const wxGraphicPath *p ) { const wxMacCGPath* path = dynamic_cast< const wxMacCGPath*>( p ) ; + + int width = m_pen.GetWidth(); + if ( width == 0 ) + width = 1 ; + if ( m_pen.GetStyle() == wxTRANSPARENT ) + width = 0 ; + + bool offset = ( width % 2 ) == 1 ; + + if ( offset ) + CGContextTranslateCTM( m_cgContext, 0.5, 0.5 ); + CGContextAddPath( m_cgContext , path->GetPath() ) ; CGContextStrokePath( m_cgContext ) ; + + if ( offset ) + CGContextTranslateCTM( m_cgContext, -0.5, -0.5 ); } -void wxMacCGContext::DrawPath( const wxGraphicPath *p , int fillStyle ) +void wxMacCGContext::DrawPath( const wxGraphicPath *p , int fillStyle ) { const wxMacCGPath* path = dynamic_cast< const wxMacCGPath*>( p ) ; CGPathDrawingMode mode = m_mode ; @@ -251,72 +298,143 @@ void wxMacCGContext::DrawPath( const wxGraphicPath *p , int fillStyle ) mode = kCGPathEOFillStroke ; } + int width = m_pen.GetWidth(); + if ( width == 0 ) + width = 1 ; + if ( m_pen.GetStyle() == wxTRANSPARENT ) + width = 0 ; + + bool offset = ( width % 2 ) == 1 ; + + if ( offset ) + CGContextTranslateCTM( m_cgContext, 0.5, 0.5 ); + CGContextAddPath( m_cgContext , path->GetPath() ) ; CGContextDrawPath( m_cgContext , mode ) ; + + if ( offset ) + CGContextTranslateCTM( m_cgContext, -0.5, -0.5 ); } -void wxMacCGContext::FillPath( const wxGraphicPath *p , const wxColor &fillColor , int fillStyle ) +void wxMacCGContext::FillPath( const wxGraphicPath *p , const wxColor &fillColor , int fillStyle ) { const wxMacCGPath* path = dynamic_cast< const wxMacCGPath*>( p ) ; CGContextSaveGState( m_cgContext ) ; - + RGBColor col = MAC_WXCOLORREF( fillColor.GetPixel() ) ; CGContextSetRGBFillColor( m_cgContext , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ; CGPathDrawingMode mode = kCGPathFill ; if ( fillStyle == wxODDEVEN_RULE ) mode = kCGPathEOFill ; - + CGContextBeginPath( m_cgContext ) ; CGContextAddPath( m_cgContext , path->GetPath() ) ; CGContextClosePath( m_cgContext ) ; CGContextDrawPath( m_cgContext , mode ) ; - + CGContextRestoreGState( m_cgContext ) ; } - -wxGraphicPath* wxMacCGContext::CreatePath() -{ + +wxGraphicPath* wxMacCGContext::CreatePath() +{ // make sure that we now have a real cgref, before doing // anything with paths CGContextRef cg = GetNativeContext() ; cg = NULL ; - return new wxMacCGPath() ; + return new wxMacCGPath() ; } // in case we only got a QDPort only create a cgref now -CGContextRef wxMacCGContext::GetNativeContext() -{ +CGContextRef wxMacCGContext::GetNativeContext() +{ if ( m_cgContext == NULL ) { Rect bounds ; + OSStatus status = noErr; +#ifndef __LP64__ GetPortBounds( (CGrafPtr) m_qdPort , &bounds ) ; - OSStatus status = CreateCGContextForPort((CGrafPtr) m_qdPort , &m_cgContext) ; + status = QDBeginCGContext((CGrafPtr) m_qdPort , &m_cgContext) ; +#endif 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 ) ; - + CGContextSaveGState( m_cgContext ) ; SetPen( m_pen ) ; SetBrush( m_brush ) ; } - return m_cgContext ; + return m_cgContext ; } -void wxMacCGContext::SetNativeContext( CGContextRef cg ) -{ +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 ; + m_cgContext = cg ; +} + +void wxMacCGContext::Translate( wxCoord dx , wxCoord dy ) +{ + CGContextTranslateCTM( m_cgContext, dx, dy ); +} + +void wxMacCGContext::Scale( wxCoord xScale , wxCoord yScale ) +{ + CGContextScaleCTM( m_cgContext , xScale , yScale ) ; +} + +void wxMacCGContext::DrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, wxCoord w, wxCoord h ) +{ + CGImageRef image = (CGImageRef)( bmp.CGImageCreate() ) ; + HIRect r = CGRectMake( 0 , 0 , w , h ); + + CGContextSaveGState( m_cgContext ); + CGContextTranslateCTM( m_cgContext, x , y + h ); + CGContextScaleCTM( m_cgContext, 1, -1 ); + + // in case image is a mask, set the foreground color + CGContextSetRGBFillColor( m_cgContext , m_textForegroundColor.Red() / 255.0 , m_textForegroundColor.Green() / 255.0 , + m_textForegroundColor.Blue() / 255.0 , m_textForegroundColor.Alpha() / 255.0 ) ; + CGContextDrawImage( m_cgContext, r, image ); + CGContextRestoreGState( m_cgContext ); + + CGImageRelease( image ) ; +} + +void wxMacCGContext::DrawIcon( const wxIcon &icon, wxCoord x, wxCoord y, wxCoord w, wxCoord h ) +{ + CGRect r = CGRectMake( 0 , 0 , w , h ) ; + CGContextSaveGState( m_cgContext ); + CGContextTranslateCTM( m_cgContext, x , y + h ); + CGContextScaleCTM( m_cgContext, 1, -1 ); + PlotIconRefInContext( m_cgContext , &r , kAlignNone , kTransformNone , + NULL , kPlotIconRefNormalFlags , MAC_WXHICON( icon.GetHICON() ) ) ; + CGContextRestoreGState( m_cgContext ) ; +} + +void wxMacCGContext::PushState() +{ + CGContextSaveGState( m_cgContext ); +} + +void wxMacCGContext::PopState() +{ + CGContextRestoreGState( m_cgContext ); +} + +void wxMacCGContext::SetTextColor( const wxColour &col ) +{ + m_textForegroundColor = col ; } #pragma mark - @@ -364,22 +482,22 @@ const CGPatternCallbacks wxMacCGPattern::ms_Callbacks = { 0, &wxMacCGPattern::_R class ImagePattern : public wxMacCGPattern { public : - ImagePattern( const wxBitmap* bmp , CGAffineTransform transform ) + ImagePattern( const wxBitmap* bmp , const CGAffineTransform& transform ) { wxASSERT( bmp && bmp->Ok() ) ; Init( (CGImageRef) bmp->CGImageCreate() , transform ) ; } - + // ImagePattern takes ownership of CGImageRef passed in - ImagePattern( CGImageRef image , CGAffineTransform transform ) + ImagePattern( CGImageRef image , const CGAffineTransform& transform ) { if ( image ) CFRetain( image ) ; Init( image , transform ) ; } - + virtual void Render( CGContextRef ctxRef ) { if (m_image != NULL) @@ -387,40 +505,42 @@ public : } protected : - void Init( CGImageRef image, CGAffineTransform transform ) + void Init( CGImageRef image, const CGAffineTransform& transform ) { m_image = image ; if ( m_image ) { - m_imageBounds = CGRectMake( 0.0, 0.0, (float)CGImageGetWidth( m_image ), (float)CGImageGetHeight( m_image ) ) ; - m_patternRef = CGPatternCreate( this , m_imageBounds, transform , - m_imageBounds.size.width, m_imageBounds.size.height, - kCGPatternTilingNoDistortion, true , &wxMacCGPattern::ms_Callbacks ) ; + m_imageBounds = CGRectMake( 0.0, 0.0, (CGFloat)CGImageGetWidth( m_image ), (CGFloat)CGImageGetHeight( m_image ) ) ; + m_patternRef = CGPatternCreate( + this , m_imageBounds, transform , + m_imageBounds.size.width, m_imageBounds.size.height, + kCGPatternTilingNoDistortion, true , &wxMacCGPattern::ms_Callbacks ) ; } } - ~ImagePattern() + virtual ~ImagePattern() { if ( m_image ) CGImageRelease( m_image ) ; } - CGImageRef m_image ; - CGRect m_imageBounds ; + CGImageRef m_image ; + CGRect m_imageBounds ; } ; class HatchPattern : public wxMacCGPattern { public : - HatchPattern( int hatchstyle, CGAffineTransform transform ) + HatchPattern( int hatchstyle, const CGAffineTransform& transform ) { m_hatch = hatchstyle ; m_imageBounds = CGRectMake( 0.0, 0.0, 8.0 , 8.0 ) ; - m_patternRef = CGPatternCreate( this , m_imageBounds, transform , - m_imageBounds.size.width, m_imageBounds.size.height, - kCGPatternTilingNoDistortion, false , &wxMacCGPattern::ms_Callbacks ) ; + m_patternRef = CGPatternCreate( + this , m_imageBounds, transform , + m_imageBounds.size.width, m_imageBounds.size.height, + kCGPatternTilingNoDistortion, false , &wxMacCGPattern::ms_Callbacks ) ; } - + void StrokeLineSegments( CGContextRef ctxRef , const CGPoint pts[] , size_t count ) { #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 @@ -449,7 +569,7 @@ public : { CGPoint pts[] = { - { 8.0 , 0.0 } , { 0.0 , 8.0 } + { 8.0 , 0.0 } , { 0.0 , 8.0 } }; StrokeLineSegments( ctxRef , pts , 2 ) ; } @@ -459,8 +579,8 @@ public : { CGPoint pts[] = { - { 0.0 , 0.0 } , { 8.0 , 8.0 } , - { 8.0 , 0.0 } , { 0.0 , 8.0 } + { 0.0 , 0.0 } , { 8.0 , 8.0 } , + { 8.0 , 0.0 } , { 0.0 , 8.0 } }; StrokeLineSegments( ctxRef , pts , 4 ) ; } @@ -470,7 +590,7 @@ public : { CGPoint pts[] = { - { 0.0 , 0.0 } , { 8.0 , 8.0 } + { 0.0 , 0.0 } , { 8.0 , 8.0 } }; StrokeLineSegments( ctxRef , pts , 2 ) ; } @@ -480,8 +600,8 @@ public : { CGPoint pts[] = { - { 0.0 , 4.0 } , { 8.0 , 4.0 } , - { 4.0 , 0.0 } , { 4.0 , 8.0 } , + { 0.0 , 4.0 } , { 8.0 , 4.0 } , + { 4.0 , 0.0 } , { 4.0 , 8.0 } , }; StrokeLineSegments( ctxRef , pts , 4 ) ; } @@ -491,7 +611,7 @@ public : { CGPoint pts[] = { - { 0.0 , 4.0 } , { 8.0 , 4.0 } , + { 0.0 , 4.0 } , { 8.0 , 4.0 } , }; StrokeLineSegments( ctxRef , pts , 2 ) ; } @@ -501,7 +621,7 @@ public : { CGPoint pts[] = { - { 4.0 , 0.0 } , { 4.0 , 8.0 } , + { 4.0 , 0.0 } , { 4.0 , 8.0 } , }; StrokeLineSegments( ctxRef , pts , 2 ) ; } @@ -511,13 +631,13 @@ public : break; } } - + protected : - ~HatchPattern() {} + virtual ~HatchPattern() {} CGRect m_imageBounds ; int m_hatch ; -} ; +}; #pragma mark - @@ -529,28 +649,28 @@ void wxMacCGContext::SetPen( const wxPen &pen ) bool fill = m_brush.GetStyle() != wxTRANSPARENT ; bool stroke = pen.GetStyle() != wxTRANSPARENT ; - + #if 0 - // we can benchmark performance, should go into a setting later + // we can benchmark performance; should go into a setting eventually CGContextSetShouldAntialias( m_cgContext , false ) ; #endif - if ( fill | stroke ) + if ( fill || stroke ) { // set up brushes m_mode = kCGPathFill ; // just a default 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 ) ; + CGContextSetRGBStrokeColor( m_cgContext , pen.GetColour().Red() / 255.0 , pen.GetColour().Green() / 255.0 , + pen.GetColour().Blue() / 255.0 , pen.GetColour().Alpha() / 255.0 ) ; - // TODO * m_dc->m_scaleX - float penWidth = pen.GetWidth(); + // TODO: * m_dc->m_scaleX + CGFloat penWidth = pen.GetWidth(); if (penWidth <= 0.0) penWidth = 0.1; CGContextSetLineWidth( m_cgContext , penWidth ) ; - + CGLineCap cap ; switch ( pen.GetCap() ) { @@ -588,21 +708,21 @@ void wxMacCGContext::SetPen( const wxPen &pen ) default : join = kCGLineJoinMiter ; - break; + break; } m_mode = kCGPathStroke ; int count = 0 ; - - const float *lengths = NULL ; - float *userLengths = NULL ; - const float dashUnit = penWidth < 1.0 ? 1.0 : penWidth; - - const float dotted[] = { dashUnit , dashUnit + 2.0 }; - const float short_dashed[] = { 9.0 , 6.0 }; - const float dashed[] = { 19.0 , 9.0 }; - const float dotted_dashed[] = { 9.0 , 6.0 , 3.0 , 3.0 }; + const CGFloat *lengths = NULL ; + CGFloat *userLengths = NULL ; + + const CGFloat dashUnit = penWidth < 1.0 ? 1.0 : penWidth; + + const CGFloat dotted[] = { dashUnit , dashUnit + 2.0 }; + const CGFloat short_dashed[] = { 9.0 , 6.0 }; + const CGFloat dashed[] = { 19.0 , 9.0 }; + const CGFloat dotted_dashed[] = { 9.0 , 6.0 , 3.0 , 3.0 }; switch ( pen.GetStyle() ) { @@ -634,7 +754,7 @@ void wxMacCGContext::SetPen( const wxPen &pen ) count = pen.GetDashes( &dashes ) ; if ((dashes != NULL) && (count > 0)) { - userLengths = new float[count] ; + userLengths = new CGFloat[count] ; for ( int i = 0 ; i < count ; ++i ) { userLengths[i] = dashes[i] * dashUnit ; @@ -650,9 +770,9 @@ void wxMacCGContext::SetPen( const wxPen &pen ) case wxSTIPPLE : { - float alphaArray[1] = { 1.0 } ; + CGFloat alphaArray[1] = { 1.0 } ; wxBitmap* bmp = pen.GetStipple() ; - if ( bmp && bmp->Ok() ) + if ( bmp && bmp->Ok() ) { wxMacCFRefHolder patternSpace( CGColorSpaceCreatePattern( NULL ) ) ; CGContextSetStrokeColorSpace( m_cgContext , patternSpace ) ; @@ -667,13 +787,13 @@ void wxMacCGContext::SetPen( const wxPen &pen ) wxMacCFRefHolder patternSpace( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) ) ; CGContextSetStrokeColorSpace( m_cgContext , patternSpace ) ; wxMacCFRefHolder pattern( *( new HatchPattern( pen.GetStyle() , CGContextGetCTM( m_cgContext ) ) ) ); - - RGBColor col = MAC_WXCOLORREF( pen.GetColour().GetPixel() ) ; - float colorArray[4] = { col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 } ; - + + CGFloat colorArray[4] = { pen.GetColour().Red() / 255.0 , pen.GetColour().Green() / 255.0 , + pen.GetColour().Blue() / 255.0 , pen.GetColour().Alpha() / 255.0 } ; + CGContextSetStrokePattern( m_cgContext, pattern , colorArray ) ; } - break ; + break ; } if ((lengths != NULL) && (count > 0)) @@ -682,7 +802,7 @@ void wxMacCGContext::SetPen( const wxPen &pen ) // force the line cap, otherwise we get artifacts (overlaps) and just solid lines cap = kCGLineCapButt ; } - else + else { CGContextSetLineDash( m_cgContext , 0 , NULL , 0 ) ; } @@ -712,7 +832,7 @@ void wxMacCGContext::SetBrush( const wxBrush &brush ) CGContextSetShouldAntialias( m_cgContext , false ) ; #endif - if ( fill | stroke ) + if ( fill || stroke ) { // setup brushes m_mode = kCGPathFill ; // just a default @@ -721,8 +841,8 @@ void wxMacCGContext::SetBrush( const wxBrush &brush ) { if ( brush.GetStyle() == wxSOLID ) { - RGBColor col = MAC_WXCOLORREF( brush.GetColour().GetPixel() ) ; - CGContextSetRGBFillColor( m_cgContext , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ; + CGContextSetRGBFillColor( m_cgContext , brush.GetColour().Red() / 255.0 , brush.GetColour().Green() / 255.0 , + brush.GetColour().Blue() / 255.0 , brush.GetColour().Alpha() / 255.0 ) ; } else if ( brush.IsHatch() ) { @@ -730,17 +850,17 @@ void wxMacCGContext::SetBrush( const wxBrush &brush ) CGContextSetFillColorSpace( m_cgContext , patternSpace ) ; wxMacCFRefHolder pattern( *( new HatchPattern( brush.GetStyle() , CGContextGetCTM( m_cgContext ) ) ) ); - RGBColor col = MAC_WXCOLORREF( brush.GetColour().GetPixel() ) ; - float colorArray[4] = { col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 } ; - + CGFloat colorArray[4] = { brush.GetColour().Red() / 255.0 , brush.GetColour().Green() / 255.0 , + brush.GetColour().Blue() / 255.0 , brush.GetColour().Alpha() / 255.0 } ; + CGContextSetFillPattern( m_cgContext, pattern , colorArray ) ; } else { // now brush is a bitmap - float alphaArray[1] = { 1.0 } ; + CGFloat alphaArray[1] = { 1.0 } ; wxBitmap* bmp = brush.GetStipple() ; - if ( bmp && bmp->Ok() ) + if ( bmp && bmp->Ok() ) { wxMacCFRefHolder patternSpace( CGColorSpaceCreatePattern( NULL ) ) ; CGContextSetFillColorSpace( m_cgContext , patternSpace ) ; @@ -759,128 +879,378 @@ void wxMacCGContext::SetBrush( const wxBrush &brush ) } } -void AddEllipticArcToPath(CGContextRef c, CGPoint center, float a, float b, float fromDegree , float toDegree ) -{ - CGContextSaveGState(c); - CGContextTranslateCTM(c, center.x, center.y); - CGContextScaleCTM(c, a, b); - CGContextMoveToPoint(c, 1, 0); - CGContextAddArc(c, 0, 0, 1, DegToRad(fromDegree), DegToRad(toDegree), 0); - CGContextClosePath(c); - CGContextRestoreGState(c); -} - -void AddRoundedRectToPath(CGContextRef c, CGRect rect, float ovalWidth, - float ovalHeight) +void wxMacCGContext::DrawText( const wxString &str, wxCoord x, wxCoord y, double angle ) { - float fw, fh; - if (ovalWidth == 0 || ovalHeight == 0) - { - CGContextAddRect(c, rect); - return; - } + OSStatus status = noErr ; + ATSUTextLayout atsuLayout ; + UniCharCount chars = str.length() ; + UniChar* ubuf = NULL ; - CGContextSaveGState(c); - CGContextTranslateCTM(c, CGRectGetMinX(rect), CGRectGetMinY(rect)); - CGContextScaleCTM(c, ovalWidth, ovalHeight); +#if SIZEOF_WCHAR_T == 4 + 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 ) ; +#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 ) ; +#endif + chars = unicharlen / 2 ; +#else +#if wxUSE_UNICODE + ubuf = (UniChar*) str.wc_str() ; +#else + wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; + chars = wxWcslen( wchar.data() ) ; + ubuf = (UniChar*) wchar.data() ; +#endif +#endif - fw = CGRectGetWidth(rect) / ovalWidth; - fh = CGRectGetHeight(rect) / ovalHeight; + status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , + &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; - CGContextMoveToPoint(c, fw, fh / 2); - CGContextAddArcToPoint(c, fw, fh, fw / 2, fh, 1); - CGContextAddArcToPoint(c, 0, fh, 0, fh / 2, 1); - CGContextAddArcToPoint(c, 0, 0, fw / 2, 0, 1); - CGContextAddArcToPoint(c, fw, 0, fw, fh / 2, 1); - CGContextClosePath(c); - CGContextRestoreGState(c); -} + wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the rotated text") ); -#pragma mark - + status = ::ATSUSetTransientFontMatching( atsuLayout , true ) ; + wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") ); -wxDC::wxDC() -{ - m_ok = false ; - m_colour = true; - m_mm_to_pix_x = mm2pt; - m_mm_to_pix_y = mm2pt; + int iAngle = int( angle ); + if ( abs(iAngle) > 0 ) + { + Fixed atsuAngle = IntToFixed( iAngle ) ; + ATSUAttributeTag atsuTags[] = + { + kATSULineRotationTag , + } ; + ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = + { + sizeof( Fixed ) , + } ; + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = + { + &atsuAngle , + } ; + status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag), + atsuTags, atsuSizes, atsuValues ) ; + } - m_externalDeviceOriginX = 0; - m_externalDeviceOriginY = 0; - m_logicalScaleX = 1.0; - m_logicalScaleY = 1.0; - m_userScaleX = 1.0; - m_userScaleY = 1.0; - m_scaleX = 1.0; - m_scaleY = 1.0; - m_needComputeScaleX = - m_needComputeScaleY = false; + { + ATSUAttributeTag atsuTags[] = + { + kATSUCGContextTag , + } ; + ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = + { + sizeof( CGContextRef ) , + } ; + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = + { + &m_cgContext , + } ; + status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag), + atsuTags, atsuSizes, atsuValues ) ; + } - m_macPort = 0 ; - m_macLocalOrigin.x = - m_macLocalOrigin.y = 0 ; + ATSUTextMeasurement textBefore, textAfter ; + ATSUTextMeasurement ascent, descent ; - m_pen = *wxBLACK_PEN; - m_font = *wxNORMAL_FONT; - m_brush = *wxWHITE_BRUSH; + status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, + &textBefore , &textAfter, &ascent , &descent ); - m_macATSUIStyle = NULL ; - m_graphicContext = NULL ; -} + wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") ); -wxDC::~wxDC() -{ - if ( m_macATSUIStyle ) + Rect rect ; +/* + // TODO + if ( m_backgroundMode == wxSOLID ) { - ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle); - m_macATSUIStyle = NULL ; - } + wxGraphicPath* path = m_graphicContext->CreatePath() ; + path->MoveToPoint( drawX , drawY ) ; + path->AddLineToPoint( + (int) (drawX + sin(angle / RAD2DEG) * FixedToInt(ascent + descent)) , + (int) (drawY + cos(angle / RAD2DEG) * FixedToInt(ascent + descent)) ) ; + path->AddLineToPoint( + (int) (drawX + sin(angle / RAD2DEG) * FixedToInt(ascent + descent ) + cos(angle / RAD2DEG) * FixedToInt(textAfter)) , + (int) (drawY + cos(angle / RAD2DEG) * FixedToInt(ascent + descent) - sin(angle / RAD2DEG) * FixedToInt(textAfter)) ) ; + path->AddLineToPoint( + (int) (drawX + cos(angle / RAD2DEG) * FixedToInt(textAfter)) , + (int) (drawY - sin(angle / RAD2DEG) * FixedToInt(textAfter)) ) ; - delete m_graphicContext ; -} + m_graphicContext->FillPath( path , m_textBackgroundColour ) ; + delete path ; + } +*/ + x += (int)(sin(angle / RAD2DEG) * FixedToInt(ascent)); + y += (int)(cos(angle / RAD2DEG) * FixedToInt(ascent)); -void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask ) -{ - wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawBitmap - invalid DC") ); - wxCHECK_RET( bmp.Ok(), wxT("wxDC(cg)::DoDrawBitmap - invalid bitmap") ); + status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, + IntToFixed(x) , IntToFixed(y) , &rect ); + wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") ); - wxCoord xx = XLOG2DEVMAC(x); - wxCoord yy = YLOG2DEVMAC(y); - wxCoord w = bmp.GetWidth(); - wxCoord h = bmp.GetHeight(); - wxCoord ww = XLOG2DEVREL(w); - wxCoord hh = YLOG2DEVREL(h); + CGContextSaveGState(m_cgContext); + CGContextTranslateCTM(m_cgContext, x, y); + CGContextScaleCTM(m_cgContext, 1, -1); + status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, + IntToFixed(0) , IntToFixed(0) ); - CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; - CGImageRef image = (CGImageRef)( bmp.CGImageCreate() ) ; - HIRect r = CGRectMake( xx , yy , ww , hh ) ; - HIViewDrawCGImage( cg , &r , image ) ; - CGImageRelease( image ) ; -} + wxASSERT_MSG( status == noErr , wxT("couldn't draw the rotated text") ); -void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) -{ - wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawIcon - invalid DC") ); - wxCHECK_RET( icon.Ok(), wxT("wxDC(cg)::DoDrawIcon - invalid icon") ); + CGContextRestoreGState(m_cgContext) ; - wxCoord xx = XLOG2DEVMAC(x); - wxCoord yy = YLOG2DEVMAC(y); - wxCoord w = icon.GetWidth(); - wxCoord h = icon.GetHeight(); - wxCoord ww = XLOG2DEVREL(w); - wxCoord hh = YLOG2DEVREL(h); + ::ATSUDisposeTextLayout(atsuLayout); - CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; - CGRect r = CGRectMake( 00 , 00 , ww , hh ) ; - CGContextSaveGState( cg ); - CGContextTranslateCTM( cg, xx , yy + hh ); - CGContextScaleCTM( cg, 1, -1 ); - PlotIconRefInContext( cg , &r , kAlignNone , kTransformNone , - NULL , kPlotIconRefNormalFlags , MAC_WXHICON( icon.GetHICON() ) ) ; - CGContextRestoreGState( cg ) ; +#if SIZEOF_WCHAR_T == 4 + free( ubuf ) ; +#endif } - -void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) + +void wxMacCGContext::GetTextExtent( const wxString &str, wxCoord *width, wxCoord *height, + wxCoord *descent, wxCoord *externalLeading ) const +{ + wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoGetTextExtent - no valid font set") ) ; + + OSStatus status = noErr ; + + ATSUTextLayout atsuLayout ; + UniCharCount chars = str.length() ; + UniChar* ubuf = NULL ; + +#if SIZEOF_WCHAR_T == 4 + 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 ) ; +#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 ) ; +#endif + chars = unicharlen / 2 ; +#else +#if wxUSE_UNICODE + ubuf = (UniChar*) str.wc_str() ; +#else + wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; + chars = wxWcslen( wchar.data() ) ; + ubuf = (UniChar*) wchar.data() ; +#endif +#endif + + status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , + &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; + + wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") ); + + ATSUTextMeasurement textBefore, textAfter ; + ATSUTextMeasurement textAscent, textDescent ; + + status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, + &textBefore , &textAfter, &textAscent , &textDescent ); + + if ( height ) + *height = FixedToInt(textAscent + textDescent) ; + if ( descent ) + *descent = FixedToInt(textDescent) ; + if ( externalLeading ) + *externalLeading = 0 ; + if ( width ) + *width = FixedToInt(textAfter - textBefore) ; + + ::ATSUDisposeTextLayout(atsuLayout); +} + +void wxMacCGContext::GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const +{ + widths.Empty(); + widths.Add(0, text.length()); + + if (text.empty()) + return ; + + ATSUTextLayout atsuLayout ; + UniCharCount chars = text.length() ; + UniChar* ubuf = NULL ; + +#if SIZEOF_WCHAR_T == 4 + wxMBConvUTF16 converter ; +#if wxUSE_UNICODE + size_t unicharlen = converter.WC2MB( NULL , text.wc_str() , 0 ) ; + ubuf = (UniChar*) malloc( unicharlen + 2 ) ; + converter.WC2MB( (char*) ubuf , text.wc_str(), unicharlen + 2 ) ; +#else + const wxWCharBuffer wchar = text.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 ) ; +#endif + chars = unicharlen / 2 ; +#else +#if wxUSE_UNICODE + ubuf = (UniChar*) text.wc_str() ; +#else + wxWCharBuffer wchar = text.wc_str( wxConvLocal ) ; + chars = wxWcslen( wchar.data() ) ; + ubuf = (UniChar*) wchar.data() ; +#endif +#endif + + ::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 ; + + widths[pos] = FixedToInt( glyphBounds.upperRight.x - glyphBounds.upperLeft.x ); + //unsigned char uch = s[i]; + } + + ::ATSUDisposeTextLayout(atsuLayout); +} + +void wxMacCGContext::SetFont( const wxFont &font ) +{ + if ( m_macATSUIStyle ) + { + ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle); + m_macATSUIStyle = NULL ; + } + + if ( font.Ok() ) + { + OSStatus status ; + + status = ATSUCreateAndCopyStyle( (ATSUStyle) font.MacGetATSUStyle() , (ATSUStyle*) &m_macATSUIStyle ) ; + + wxASSERT_MSG( status == noErr, wxT("couldn't create ATSU style") ) ; + + // we need the scale here ... + + Fixed atsuSize = IntToFixed( int( /*m_scaleY*/ 1 * font.MacGetFontSize()) ) ; + RGBColor atsuColor = MAC_WXCOLORREF( m_textForegroundColor.GetPixel() ) ; + ATSUAttributeTag atsuTags[] = + { + kATSUSizeTag , + kATSUColorTag , + } ; + ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = + { + sizeof( Fixed ) , + sizeof( RGBColor ) , + } ; + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = + { + &atsuSize , + &atsuColor , + } ; + + status = ::ATSUSetAttributes( + (ATSUStyle)m_macATSUIStyle, sizeof(atsuTags) / sizeof(ATSUAttributeTag) , + atsuTags, atsuSizes, atsuValues); + + wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ) ; + } +} + + +#pragma mark - + +wxDC::wxDC() +{ + m_ok = false ; + m_colour = true; + m_mm_to_pix_x = mm2pt; + m_mm_to_pix_y = mm2pt; + + m_externalDeviceOriginX = 0; + m_externalDeviceOriginY = 0; + m_logicalScaleX = 1.0; + m_logicalScaleY = 1.0; + m_userScaleX = 1.0; + m_userScaleY = 1.0; + m_scaleX = 1.0; + m_scaleY = 1.0; + m_needComputeScaleX = + m_needComputeScaleY = false; + + m_macPort = 0 ; + m_macLocalOrigin.x = + m_macLocalOrigin.y = 0 ; + + m_pen = *wxBLACK_PEN; + m_font = *wxNORMAL_FONT; + m_brush = *wxWHITE_BRUSH; + + m_macATSUIStyle = NULL ; + m_graphicContext = NULL ; +} + +wxDC::~wxDC() +{ + if ( m_macATSUIStyle ) + { + ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle); + m_macATSUIStyle = NULL ; + } + + delete m_graphicContext ; +} + +void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask ) +{ + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawBitmap - invalid DC") ); + wxCHECK_RET( bmp.Ok(), wxT("wxDC(cg)::DoDrawBitmap - invalid bitmap") ); + + wxCoord xx = XLOG2DEVMAC(x); + wxCoord yy = YLOG2DEVMAC(y); + wxCoord w = bmp.GetWidth(); + wxCoord h = bmp.GetHeight(); + wxCoord ww = XLOG2DEVREL(w); + wxCoord hh = YLOG2DEVREL(h); + + if ( bmp.GetDepth()==1 ) + { + wxGraphicPath* path = m_graphicContext->CreatePath() ; + path->AddRectangle( xx , yy , ww , hh ) ; + m_graphicContext->FillPath( path , m_textBackgroundColour, wxODDEVEN_RULE) ; + delete path; + m_graphicContext->DrawBitmap( bmp, xx , yy , ww , hh ) ; + } + else + { + m_graphicContext->DrawBitmap( bmp, xx , yy , ww , hh ) ; + } +} + +void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) +{ + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawIcon - invalid DC") ); + wxCHECK_RET( icon.Ok(), wxT("wxDC(cg)::DoDrawIcon - invalid icon") ); + + wxCoord xx = XLOG2DEVMAC(x); + wxCoord yy = YLOG2DEVMAC(y); + wxCoord w = icon.GetWidth(); + wxCoord h = icon.GetHeight(); + wxCoord ww = XLOG2DEVREL(w); + wxCoord hh = YLOG2DEVREL(h); + + m_graphicContext->DrawIcon( icon , xx, yy, ww, hh ) ; +} + +void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoSetClippingRegion - invalid DC") ); @@ -944,13 +1314,6 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) } else { -#if 0 - CopyRgn( (RgnHandle) region.GetWXHRGN() , (RgnHandle) m_macCurrentClipRgn ) ; - if ( xx != x || yy != y ) - OffsetRgn( (RgnHandle) m_macCurrentClipRgn , xx - x , yy - y ) ; - SectRgn( (RgnHandle)m_macCurrentClipRgn , (RgnHandle)m_macBoundaryClipRgn , (RgnHandle)m_macCurrentClipRgn ) ; -#endif - if ( m_clipping ) { m_clipX1 = wxMax( m_clipX1, xx ); @@ -972,10 +1335,8 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) void wxDC::DestroyClippingRegion() { -// CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; - CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; - CGContextRestoreGState( cgContext ); + CGContextRestoreGState( cgContext ); CGContextSaveGState( cgContext ); m_graphicContext->SetPen( m_pen ) ; @@ -1002,7 +1363,9 @@ void wxDC::SetTextForeground( const wxColour &col ) if ( col != m_textForegroundColour ) { m_textForegroundColour = col; - MacInstallFont() ; + m_graphicContext->SetTextColor( col ); + // in the current implementation the font contains the text color + m_graphicContext->SetFont(m_font); } } @@ -1090,7 +1453,7 @@ wxSize wxDC::GetPPI() const int wxDC::GetDepth() const { - return 32 ; + return 32; } void wxDC::ComputeScaleAndOrigin() @@ -1111,7 +1474,7 @@ void wxDC::ComputeScaleAndOrigin() wxPen pen( GetPen() ); m_pen = wxNullPen; - SetPen(pen); + SetPen( pen ); } } @@ -1127,14 +1490,15 @@ void wxDC::SetBackgroundMode( int mode ) void wxDC::SetFont( const wxFont &font ) { m_font = font; - MacInstallFont() ; + if ( m_graphicContext ) + m_graphicContext->SetFont( font ) ; } void wxDC::SetPen( const wxPen &pen ) { if ( m_pen == pen ) return ; - + m_pen = pen; if ( m_graphicContext ) { @@ -1146,12 +1510,11 @@ void wxDC::SetPen( const wxPen &pen ) { // we have to compensate for moved device origins etc. otherwise patterned pens are standing still // eg when using a wxScrollWindow and scrolling around - CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; - int origX = XLOG2DEVMAC(0) ; - int origY = YLOG2DEVMAC(0) ; - CGContextTranslateCTM( cgContext, origX, origY ); + int origX = XLOG2DEVMAC( 0 ) ; + int origY = YLOG2DEVMAC( 0 ) ; + m_graphicContext->Translate( origX , origY ) ; m_graphicContext->SetPen( m_pen ) ; - CGContextTranslateCTM( cgContext, -origX, -origY ); + m_graphicContext->Translate( -origX , -origY ) ; } } } @@ -1172,12 +1535,11 @@ void wxDC::SetBrush( const wxBrush &brush ) { // we have to compensate for moved device origins etc. otherwise patterned brushes are standing still // eg when using a wxScrollWindow and scrolling around - CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; int origX = XLOG2DEVMAC(0) ; int origY = YLOG2DEVMAC(0) ; - CGContextTranslateCTM( cgContext, origX, origY ); + m_graphicContext->Translate( origX , origY ) ; m_graphicContext->SetBrush( m_brush ) ; - CGContextTranslateCTM( cgContext, -origX, -origY ); + m_graphicContext->Translate( -origX , -origY ) ; } } } @@ -1186,7 +1548,7 @@ void wxDC::SetBackground( const wxBrush &brush ) { if (m_backgroundBrush == brush) return; - + m_backgroundBrush = brush; if (!m_backgroundBrush.Ok()) return; @@ -1222,14 +1584,14 @@ bool wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const { wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoGetPixel - invalid DC") ); - wxMacPortSaver helper((CGrafPtr)m_macPort) ; RGBColor colour; - +#ifndef __LP64__ + wxMacPortSaver helper((CGrafPtr)m_macPort) ; // NB: GetCPixel is a deprecated QD call, and a slow one at that - GetCPixel( - XLOG2DEVMAC(x) + m_macLocalOriginInPort.x - m_macLocalOrigin.x, + GetCPixel( + XLOG2DEVMAC(x) + m_macLocalOriginInPort.x - m_macLocalOrigin.x, YLOG2DEVMAC(y) + m_macLocalOriginInPort.y - m_macLocalOrigin.y, &colour ); - +#endif // convert from Mac colour to wx col->Set( colour.red >> 8, colour.green >> 8, colour.blue >> 8 ); @@ -1243,7 +1605,7 @@ void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) #if !wxMAC_USE_CORE_GRAPHICS_BLEND_MODES if ( m_logicalFunction != wxCOPY ) return ; -#endif +#endif wxCoord xx1 = XLOG2DEVMAC(x1) ; wxCoord yy1 = YLOG2DEVMAC(y1) ; @@ -1267,7 +1629,7 @@ void wxDC::DoCrossHair( wxCoord x, wxCoord y ) if ( m_logicalFunction != wxCOPY ) return ; - + int w = 0, h = 0; GetSize( &w, &h ); @@ -1329,18 +1691,19 @@ void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, } bool fill = m_brush.GetStyle() != wxTRANSPARENT ; - wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ; - CGContextRef ctx = mctx->GetNativeContext() ; - CGContextSaveGState( ctx ) ; - CGContextTranslateCTM( ctx, xxc , yyc ); - CGContextScaleCTM( ctx , 1 , -1 ) ; + + wxGraphicPath* path = m_graphicContext->CreatePath() ; + m_graphicContext->PushState() ; + m_graphicContext->Translate( xxc, yyc ) ; + m_graphicContext->Scale( 1, -1 ) ; if ( fill ) - CGContextMoveToPoint( ctx , 0 , 0 ) ; - CGContextAddArc( ctx, 0, 0 , rad , DegToRad(sa), DegToRad(ea), 0 ); + path->MoveToPoint( 0, 0 ) ; + path->AddArc( 0, 0, rad , DegToRad(sa) , DegToRad(ea), false ) ; if ( fill ) - CGContextAddLineToPoint( ctx , 0 , 0 ) ; - CGContextRestoreGState( ctx ) ; - CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; + path->AddLineToPoint( 0, 0 ) ; + m_graphicContext->DrawPath( path ) ; + m_graphicContext->PopState() ; + delete path ; } void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, @@ -1370,19 +1733,18 @@ void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, bool fill = m_brush.GetStyle() != wxTRANSPARENT ; - wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ; - CGContextRef ctx = mctx->GetNativeContext() ; - - CGContextSaveGState( ctx ) ; - CGContextTranslateCTM( ctx, xx + ww / 2, yy + hh / 2 ); - CGContextScaleCTM( ctx , 1 * ww / 2 , -1 * hh / 2 ) ; + wxGraphicPath* path = m_graphicContext->CreatePath() ; + m_graphicContext->PushState() ; + m_graphicContext->Translate( xx + ww / 2, yy + hh / 2 ) ; + m_graphicContext->Scale( 1 * ww / 2 , -1 * hh / 2 ) ; if ( fill ) - CGContextMoveToPoint( ctx , 0 , 0 ) ; - CGContextAddArc( ctx, 0, 0, 1, DegToRad(sa), DegToRad(ea), 0 ); + path->MoveToPoint( 0, 0 ) ; + path->AddArc( 0, 0, 1 , DegToRad(sa) , DegToRad(ea), false ) ; if ( fill ) - CGContextAddLineToPoint( ctx , 0 , 0 ) ; - CGContextRestoreGState( ctx ) ; - CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; + path->AddLineToPoint( 0, 0 ) ; + m_graphicContext->DrawPath( path ) ; + m_graphicContext->PopState() ; + delete path ; } void wxDC::DoDrawPoint( wxCoord x, wxCoord y ) @@ -1400,7 +1762,7 @@ void wxDC::DoDrawLines(int n, wxPoint points[], #if !wxMAC_USE_CORE_GRAPHICS_BLEND_MODES if ( m_logicalFunction != wxCOPY ) return ; -#endif +#endif wxCoord x1, x2 , y1 , y2 ; x1 = XLOG2DEVMAC(points[0].x + xoffset); @@ -1426,30 +1788,30 @@ void wxDC::DoDrawSpline(wxList *points) if ( m_logicalFunction != wxCOPY ) return ; - + wxGraphicPath* path = m_graphicContext->CreatePath() ; - + wxList::compatibility_iterator node = points->GetFirst(); if (node == wxList::compatibility_iterator()) // empty list return; - + wxPoint *p = (wxPoint *)node->GetData(); - + wxCoord x1 = p->x; wxCoord y1 = p->y; - + node = node->GetNext(); p = (wxPoint *)node->GetData(); - + wxCoord x2 = p->x; wxCoord y2 = p->y; wxCoord cx1 = ( x1 + x2 ) / 2; wxCoord cy1 = ( y1 + y2 ) / 2; - - path->MoveToPoint( XLOG2DEVMAC( x1 ) , XLOG2DEVMAC( y1 ) ) ; - path->AddLineToPoint( XLOG2DEVMAC( cx1 ) , XLOG2DEVMAC( cy1 ) ) ; - + + path->MoveToPoint( XLOG2DEVMAC( x1 ) , YLOG2DEVMAC( y1 ) ) ; + path->AddLineToPoint( XLOG2DEVMAC( cx1 ) , YLOG2DEVMAC( cy1 ) ) ; + #if !wxUSE_STL while ((node = node->GetNext()) != NULL) #else @@ -1464,15 +1826,16 @@ void wxDC::DoDrawSpline(wxList *points) wxCoord cx4 = (x1 + x2) / 2; wxCoord cy4 = (y1 + y2) / 2; - path->AddQuadCurveToPoint( XLOG2DEVMAC( x1 ) , XLOG2DEVMAC( y1 ) , - XLOG2DEVMAC( cx4 ) , XLOG2DEVMAC( cy4 ) ) ; + path->AddQuadCurveToPoint( + XLOG2DEVMAC( x1 ) , YLOG2DEVMAC( y1 ) , + XLOG2DEVMAC( cx4 ) , YLOG2DEVMAC( cy4 ) ) ; cx1 = cx4; cy1 = cy4; } - - path->AddLineToPoint( XLOG2DEVMAC( x2 ) , XLOG2DEVMAC( y2 ) ) ; - + + path->AddLineToPoint( XLOG2DEVMAC( x2 ) , YLOG2DEVMAC( y2 ) ) ; + m_graphicContext->StrokePath( path ) ; delete path ; } @@ -1492,7 +1855,7 @@ void wxDC::DoDrawPolygon( int n, wxPoint points[], wxCoord x1, x2 , y1 , y2 ; x2 = x1 = XLOG2DEVMAC(points[0].x + xoffset); y2 = y1 = YLOG2DEVMAC(points[0].y + yoffset); - + wxGraphicPath* path = m_graphicContext->CreatePath() ; path->MoveToPoint( x1 , y1 ) ; for (int i = 1; i < n; i++) @@ -1540,8 +1903,21 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) yy = yy - hh; } + int penwidth = m_pen.GetWidth(); + if ( penwidth == 0 ) + penwidth = 1 ; + if ( m_pen.GetStyle() == wxTRANSPARENT ) + penwidth = 0 ; + + bool offset = ( penwidth % 2 ) == 1 ; + wxGraphicPath* path = m_graphicContext->CreatePath() ; - path->AddRectangle( xx , yy , ww , hh ) ; + // if we are offsetting the entire rectangle is moved 0.5, so the border line gets off by 1 + if ( offset ) + path->AddRectangle( xx , yy , ww-1 , hh-1 ) ; + else + path->AddRectangle( xx , yy , ww , hh ) ; + m_graphicContext->DrawPath( path ) ; delete path ; } @@ -1578,10 +1954,23 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, yy = yy - hh; } - wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ; - CGContextRef ctx = mctx->GetNativeContext() ; - AddRoundedRectToPath( ctx , CGRectMake( xx , yy , ww , hh ) , 16 ,16 ) ; - CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; + wxGraphicPath* path = m_graphicContext->CreatePath() ; + if ( radius == 0) + { + path->AddRectangle( xx , yy , ww , hh ) ; + m_graphicContext->DrawPath( path ) ; + } + else + { + path->MoveToPoint( xx + ww, yy + hh / 2); + path->AddArcToPoint(xx + ww, yy + hh, xx + ww / 2,yy + hh, radius); + path->AddArcToPoint(xx , yy + hh, xx , yy + hh / 2, radius); + path->AddArcToPoint(xx , yy , xx + ww / 2, yy , radius); + path->AddArcToPoint(xx + ww, yy , xx + ww, yy + hh / 2, radius); + path->CloseSubpath(); + m_graphicContext->DrawPath( path ) ; + } + delete path ; } void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) @@ -1595,6 +1984,7 @@ void wxDC::DoDrawEllipse(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; @@ -1610,25 +2000,26 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) hh = -hh; yy = yy - hh; } - - wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ; - CGContextRef ctx = mctx->GetNativeContext() ; - CGContextSaveGState( ctx ) ; - CGContextTranslateCTM( ctx, xx + ww / 2, yy + hh / 2 ); - CGContextScaleCTM( ctx , ww / 2 , hh / 2 ) ; - CGContextAddArc( ctx, 0, 0, 1, 0 , 2 * M_PI , 0 ); - CGContextRestoreGState( ctx ) ; - CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; + + wxGraphicPath* path = m_graphicContext->CreatePath() ; + m_graphicContext->PushState() ; + m_graphicContext->Translate(xx + ww / 2, yy + hh / 2); + m_graphicContext->Scale(ww / 2 , hh / 2); + path->AddArc( 0, 0, 1, 0 , 2 * M_PI , false ) ; + m_graphicContext->DrawPath( path ) ; + m_graphicContext->PopState() ; + delete path ; } -bool wxDC::CanDrawBitmap(void) const +bool wxDC::CanDrawBitmap() const { return true ; } -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 ) +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 ) { wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoBlit - invalid DC") ); wxCHECK_MSG( source->Ok(), false, wxT("wxDC(cg)::DoBlit - invalid source DC") ); @@ -1646,12 +2037,12 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxCoord xxsrc = source->XLOG2DEVMAC(xsrc) ; wxCoord wwsrc = source->XLOG2DEVREL(width) ; wxCoord hhsrc = source->YLOG2DEVREL(height) ; - + wxCoord yydest = YLOG2DEVMAC(ydest) ; wxCoord xxdest = XLOG2DEVMAC(xdest) ; wxCoord wwdest = XLOG2DEVREL(width) ; wxCoord hhdest = YLOG2DEVREL(height) ; - + wxMemoryDC* memdc = dynamic_cast(source) ; if ( memdc && logical_func == wxCOPY ) { @@ -1661,7 +2052,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxCoord bmpwidth = blit.GetWidth(); wxCoord bmpheight = blit.GetHeight(); - + if ( xxsrc != 0 || yysrc != 0 || bmpwidth != wwsrc || bmpheight != hhsrc ) { wwsrc = wxMin( wwsrc , bmpwidth - xxsrc ) ; @@ -1671,6 +2062,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, if ( xxsrc >= 0 && yysrc >= 0 ) { wxRect subrect( xxsrc, yysrc, wwsrc , hhsrc ) ; + // TODO we perhaps could add a DrawSubBitmap call to dc for performance reasons blit = blit.GetSubBitmap( subrect ) ; } else @@ -1688,21 +2080,13 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, if ( blit.Ok() ) { - CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; - CGImageRef image = (CGImageRef)( blit.CGImageCreate() ) ; - HIRect r = CGRectMake( xxdest , yydest , wwdest , hhdest ) ; - HIViewDrawCGImage( cg , &r , image ) ; - CGImageRelease( image ) ; + m_graphicContext->DrawBitmap( blit, xxdest , yydest , wwdest , hhdest ) ; } } else { -#if 0 - CGContextRef cg = (wxMacCGContext*)(source->GetGraphicContext())->GetNativeContext() ; - void *data = CGBitmapContextGetData( cg ) ; -#endif - - return false ; // wxFAIL_MSG( wxT("Blitting is only supported from bitmap contexts") ) ; + wxFAIL_MSG( wxT("Blitting is only supported from bitmap contexts, and only with wxCOPY logical operation.") ) ; + return false ; } return true; @@ -1712,145 +2096,17 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, double angle) { wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawRotatedText - invalid DC") ); - wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoDrawRotatedText - no valid font set") ); +// wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoDrawRotatedText - no valid font set") ); - if ( str.Length() == 0 ) + if ( str.length() == 0 ) return ; if ( m_logicalFunction != wxCOPY ) return ; - OSStatus status = noErr ; - ATSUTextLayout atsuLayout ; - UniCharCount chars = str.Length() ; - UniChar* ubuf = NULL ; - -#if SIZEOF_WCHAR_T == 4 - 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 ) ; -#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 ) ; -#endif - chars = unicharlen / 2 ; -#else -#if wxUSE_UNICODE - ubuf = (UniChar*) str.wc_str() ; -#else - wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; - chars = wxWcslen( wchar.data() ) ; - ubuf = (UniChar*) wchar.data() ; -#endif -#endif - int drawX = XLOG2DEVMAC(x) ; int drawY = YLOG2DEVMAC(y) ; - status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , - &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; - - wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the rotated text") ); - - status = ::ATSUSetTransientFontMatching( atsuLayout , true ) ; - wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") ); - - int iAngle = int( angle ); - if ( abs(iAngle) > 0 ) - { - Fixed atsuAngle = IntToFixed( iAngle ) ; - ATSUAttributeTag atsuTags[] = - { - kATSULineRotationTag , - } ; - ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = - { - sizeof( Fixed ) , - } ; - ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = - { - &atsuAngle , - } ; - status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag), - atsuTags, atsuSizes, atsuValues ) ; - } - - { - CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; - ATSUAttributeTag atsuTags[] = - { - kATSUCGContextTag , - } ; - ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = - { - sizeof( CGContextRef ) , - } ; - ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = - { - &cgContext , - } ; - status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag), - atsuTags, atsuSizes, atsuValues ) ; - } - - ATSUTextMeasurement textBefore, textAfter ; - ATSUTextMeasurement ascent, descent ; - - status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, - &textBefore , &textAfter, &ascent , &descent ); - - wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") ); - - Rect rect ; - - if ( m_backgroundMode == wxSOLID ) - { - wxGraphicPath* path = m_graphicContext->CreatePath() ; - path->MoveToPoint( - drawX , - drawY ) ; - path->AddLineToPoint( - (int) (drawX + sin(angle / RAD2DEG) * FixedToInt(ascent + descent)) , - (int) (drawY + cos(angle / RAD2DEG) * FixedToInt(ascent + descent)) ) ; - path->AddLineToPoint( - (int) (drawX + sin(angle / RAD2DEG) * FixedToInt(ascent + descent ) + cos(angle / RAD2DEG) * FixedToInt(textAfter)) , - (int) (drawY + cos(angle / RAD2DEG) * FixedToInt(ascent + descent) - sin(angle / RAD2DEG) * FixedToInt(textAfter)) ) ; - path->AddLineToPoint( - (int) (drawX + cos(angle / RAD2DEG) * FixedToInt(textAfter)) , - (int) (drawY - sin(angle / RAD2DEG) * FixedToInt(textAfter)) ) ; - - m_graphicContext->FillPath( path , m_textBackgroundColour ) ; - delete path ; - } - - drawX += (int)(sin(angle / RAD2DEG) * FixedToInt(ascent)); - drawY += (int)(cos(angle / RAD2DEG) * FixedToInt(ascent)); - - status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, - IntToFixed(drawX) , IntToFixed(drawY) , &rect ); - wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") ); - - CGContextSaveGState(((wxMacCGContext*)(m_graphicContext))->GetNativeContext()); - CGContextTranslateCTM(((wxMacCGContext*)(m_graphicContext))->GetNativeContext(), drawX, drawY); - CGContextScaleCTM(((wxMacCGContext*)(m_graphicContext))->GetNativeContext(), 1, -1); - status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, - IntToFixed(0) , IntToFixed(0) ); - - wxASSERT_MSG( status == noErr , wxT("couldn't draw the rotated text") ); - - CGContextRestoreGState( ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ) ; - - CalcBoundingBox(XDEV2LOG(rect.left), YDEV2LOG(rect.top) ); - CalcBoundingBox(XDEV2LOG(rect.right), YDEV2LOG(rect.bottom) ); - - ::ATSUDisposeTextLayout(atsuLayout); - -#if SIZEOF_WCHAR_T == 4 - free( ubuf ) ; -#endif + m_graphicContext->DrawText( str, drawX ,drawY , angle ) ; } void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) @@ -1873,78 +2129,27 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height { wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoGetTextExtent - invalid DC") ); - wxFont formerFont = m_font ; if ( theFont ) { - // work around the const-ness - *((wxFont*)(&m_font)) = *theFont ; - MacInstallFont() ; + m_graphicContext->SetFont( *theFont ) ; } - if ( str.Length() == 0 ) - return ; - - wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoGetTextExtent - no valid font set") ) ; + wxCoord h , d , e , w ; - OSStatus status = noErr ; - ATSUTextLayout atsuLayout ; - UniCharCount chars = str.Length() ; - UniChar* ubuf = NULL ; - -#if SIZEOF_WCHAR_T == 4 - 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 ) ; -#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 ) ; -#endif - chars = unicharlen / 2 ; -#else -#if wxUSE_UNICODE - ubuf = (UniChar*) str.wc_str() ; -#else - wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; - chars = wxWcslen( wchar.data() ) ; - ubuf = (UniChar*) wchar.data() ; -#endif -#endif + m_graphicContext->GetTextExtent( str, &w, &h, &d, &e ) ; - status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , - &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; - - wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") ); - - ATSUTextMeasurement textBefore, textAfter ; - ATSUTextMeasurement textAscent, textDescent ; - - status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, - &textBefore , &textAfter, &textAscent , &textDescent ); - if ( height ) - *height = YDEV2LOGREL( FixedToInt(textAscent + textDescent) ) ; + *height = YDEV2LOGREL( h ) ; if ( descent ) - *descent =YDEV2LOGREL( FixedToInt(textDescent) ); + *descent =YDEV2LOGREL( d); if ( externalLeading ) - *externalLeading = 0 ; + *externalLeading = YDEV2LOGREL( e); if ( width ) - *width = XDEV2LOGREL( FixedToInt(textAfter - textBefore) ) ; - - ::ATSUDisposeTextLayout(atsuLayout); - -#if SIZEOF_WCHAR_T == 4 - free( ubuf ) ; -#endif + *width = XDEV2LOGREL( w ) ; if ( theFont ) { - // work around the constness - *((wxFont*)(&m_font)) = formerFont ; - MacInstallFont() ; + m_graphicContext->SetFont( m_font ) ; } } @@ -1952,60 +2157,10 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con { wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoGetPartialTextExtents - invalid DC") ); - widths.Empty(); - widths.Add(0, text.Length()); - - if (text.Length() == 0) - return false; - - ATSUTextLayout atsuLayout ; - UniCharCount chars = text.Length() ; - UniChar* ubuf = NULL ; + m_graphicContext->GetPartialTextExtents( text, widths ) ; + for ( size_t i = 0 ; i < widths.GetCount() ; ++i ) + widths[i] = XDEV2LOGREL( widths[i] ); -#if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16 converter ; -#if wxUSE_UNICODE - size_t unicharlen = converter.WC2MB( NULL , text.wc_str() , 0 ) ; - ubuf = (UniChar*) malloc( unicharlen + 2 ) ; - converter.WC2MB( (char*) ubuf , text.wc_str(), unicharlen + 2 ) ; -#else - const wxWCharBuffer wchar = text.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 ) ; -#endif - chars = unicharlen / 2 ; -#else -#if wxUSE_UNICODE - ubuf = (UniChar*) text.wc_str() ; -#else - wxWCharBuffer wchar = text.wc_str( wxConvLocal ) ; - chars = wxWcslen( wchar.data() ) ; - ubuf = (UniChar*) wchar.data() ; -#endif -#endif - - 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]; - } - - ::ATSUDisposeTextLayout(atsuLayout); return true; } @@ -2049,8 +2204,8 @@ void wxDC::Clear(void) { RGBColor color; GetThemeBrushAsColor( m_backgroundBrush.MacGetTheme(), 32, true, &color ); - CGContextSetRGBFillColor( cg, (float) color.red / 65536, - (float) color.green / 65536, (float) color.blue / 65536, 1 ); + CGContextSetRGBFillColor( cg, (CGFloat) color.red / 65536, + (CGFloat) color.green / 65536, (CGFloat) color.blue / 65536, 1 ); CGContextFillRect( cg, rect ); } @@ -2103,95 +2258,98 @@ void wxDC::Clear(void) } } -void wxDC::MacInstallFont() const -{ - wxCHECK_RET( Ok(), wxT("wxDC(cg)::MacInstallFont - invalid DC") ); - - if ( m_macATSUIStyle ) - { - ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle); - m_macATSUIStyle = NULL ; - } - - if ( m_font.Ok() ) - { - OSStatus status ; - - status = ATSUCreateAndCopyStyle( (ATSUStyle) m_font.MacGetATSUStyle() , (ATSUStyle*) &m_macATSUIStyle ) ; - - wxASSERT_MSG( status == noErr, wxT("couldn't create ATSU style") ) ; - - Fixed atsuSize = IntToFixed( int(m_scaleY * m_font.MacGetFontSize()) ) ; - RGBColor atsuColor = MAC_WXCOLORREF( m_textForegroundColour.GetPixel() ) ; - ATSUAttributeTag atsuTags[] = - { - kATSUSizeTag , - kATSUColorTag , - } ; - ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = - { - sizeof( Fixed ) , - sizeof( RGBColor ) , - } ; - ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = - { - &atsuSize , - &atsuColor , - } ; - - status = ::ATSUSetAttributes( - (ATSUStyle)m_macATSUIStyle, sizeof(atsuTags) / sizeof(ATSUAttributeTag) , - atsuTags, atsuSizes, atsuValues); - - wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ) ; - } -} +#endif #pragma mark - // --------------------------------------------------------------------------- // coordinates transformations // --------------------------------------------------------------------------- +/* + wxCoord XLOG2DEVMAC(wxCoord x) const + { + long new_x = x - m_logicalOriginX; + if (new_x > 0) + return (wxCoord)((double)new_x * m_scaleX + 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x; + else + return (wxCoord)((double)new_x * m_scaleX - 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x; + } + wxCoord YLOG2DEVMAC(wxCoord y) const + { + long new_y = y - m_logicalOriginY; + if (new_y > 0) + return (wxCoord)((double)new_y * m_scaleY + 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y; + else + return (wxCoord)((double)new_y * m_scaleY - 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y; + } +*/ // TODO wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const { - return ((wxDC *)this)->XDEV2LOG(x); + long new_x = x - m_deviceOriginX; + if (new_x > 0) + return (wxCoord)((double)new_x / m_scaleX + 0.5) * m_signX + m_logicalOriginX; + else + return (wxCoord)((double)new_x / m_scaleX - 0.5) * m_signX + m_logicalOriginX; } wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const { - return ((wxDC *)this)->YDEV2LOG(y); + long new_y = y - m_deviceOriginY; + if (new_y > 0) + return (wxCoord)((double)new_y / m_scaleY + 0.5) * m_signY + m_logicalOriginY; + else + return (wxCoord)((double)new_y / m_scaleY - 0.5) * m_signY + m_logicalOriginY; } wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const { - return ((wxDC *)this)->XDEV2LOGREL(x); + if (x > 0) + return (wxCoord)((double)x / m_scaleX + 0.5); + else + return (wxCoord)((double)x / m_scaleX - 0.5); } wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const { - return ((wxDC *)this)->YDEV2LOGREL(y); + if (y > 0) + return (wxCoord)((double)y / m_scaleY + 0.5); + else + return (wxCoord)((double)y / m_scaleY - 0.5); } wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const { - return ((wxDC *)this)->XLOG2DEV(x); + long new_x = x - m_logicalOriginX; + if (new_x > 0) + return (wxCoord)((double)new_x * m_scaleX + 0.5) * m_signX + m_deviceOriginX; + else + return (wxCoord)((double)new_x * m_scaleX - 0.5) * m_signX + m_deviceOriginX; } wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const { - return ((wxDC *)this)->YLOG2DEV(y); + long new_y = y - m_logicalOriginY; + if (new_y > 0) + return (wxCoord)((double)new_y * m_scaleY + 0.5) * m_signY + m_deviceOriginY; + else + return (wxCoord)((double)new_y * m_scaleY - 0.5) * m_signY + m_deviceOriginY; } wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const { - return ((wxDC *)this)->XLOG2DEVREL(x); + if (x > 0) + return (wxCoord)((double)x * m_scaleX + 0.5); + else + return (wxCoord)((double)x * m_scaleX - 0.5); } wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const { - return ((wxDC *)this)->YLOG2DEVREL(y); + if (y > 0) + return (wxCoord)((double)y * m_scaleY + 0.5); + else + return (wxCoord)((double)y * m_scaleY - 0.5); } #endif // wxMAC_USE_CORE_GRAPHICS -