X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/613a24f7d270f4dfc2ecac6d009e4114dcb7777f..2cf3a6d7bef6f20bea35062dd3d4dbf0aec9efb5:/src/mac/carbon/dccg.cpp diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp index 2f890c7514..ff20b5cc6b 100755 --- a/src/mac/carbon/dccg.cpp +++ b/src/mac/carbon/dccg.cpp @@ -1,41 +1,47 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "dc.h" -#endif +#include "wx/wxprec.h" #include "wx/dc.h" -#include "wx/app.h" + +#if wxMAC_USE_CORE_GRAPHICS + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" + #include "wx/dcmemory.h" + #include "wx/dcprint.h" + #include "wx/region.h" + #include "wx/image.h" +#endif + #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" - -#if __MSL__ >= 0x6000 -#include "math.h" -using namespace std ; + + +#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 #include "wx/mac/private.h" -#include -#include -#include -#include -#include -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) + +#ifndef wxMAC_USE_CORE_GRAPHICS_BLEND_MODES +#define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 0 #endif //----------------------------------------------------------------------------- @@ -47,81 +53,44 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) const double M_PI = 3.14159265358979 ; #endif #endif -const double RAD2DEG = 180.0 / M_PI; + +const double RAD2DEG = 180.0 / M_PI; const short kEmulatedMode = -1 ; const short kUnsupportedMode = -2 ; extern TECObjectRef s_TECNativeCToUnicode ; -// set to 0 if problems arise -#define wxMAC_EXPERIMENTAL_DC 1 - -wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) : - m_ph( (GrafPtr) dc->m_macPort ) -{ - wxASSERT( dc->Ok() ) ; - m_dc = dc ; - dc->MacSetupPort(&m_ph) ; -} -wxMacPortSetter::~wxMacPortSetter() -{ - m_dc->MacCleanupPort(&m_ph) ; -} - -#if wxMAC_EXPERIMENTAL_DC -class wxMacFastPortSetter -{ -public : - wxMacFastPortSetter( const wxDC *dc ) - { - wxASSERT( dc->Ok() ) ; - GetPort( &m_oldPort ) ; - SetPort( (GrafPtr) dc->m_macPort ) ; - m_clipRgn = NewRgn() ; - GetClip( m_clipRgn ) ; - m_dc = dc ; - dc->MacSetupPort( NULL ) ; - } - ~wxMacFastPortSetter() - { - SetPort( (GrafPtr) m_dc->m_macPort ) ; - SetClip( m_clipRgn ) ; - SetPort( m_oldPort ) ; - m_dc->MacCleanupPort( NULL ) ; - DisposeRgn( m_clipRgn ) ; - } -private : - RgnHandle m_clipRgn ; - GrafPtr m_oldPort ; - const wxDC* m_dc ; -} ; - -#else -typedef wxMacPortSetter wxMacFastPortSetter ; -#endif +// 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 ) ; - + if ( 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 ) ) - OffsetRgn( m_newClip , x , y ) ; + // guard against half constructed objects, this just leads to a empty clip + if ( win->GetPeer() ) + { + 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 ) ) + OffsetRgn( m_newClip , x , y ) ; + } SetClip( m_newClip ) ; } } -wxMacWindowClipper::~wxMacWindowClipper() +wxMacWindowClipper::~wxMacWindowClipper() { SetPort( m_newPort ) ; SetClip( m_formerClip ) ; @@ -133,375 +102,668 @@ 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 ) ; } +// minimal implementation only used for appearance drawing < 10.3 + +wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) : + m_ph( (GrafPtr) dc->m_macPort ) +{ + wxASSERT( dc->Ok() ) ; + m_dc = dc ; + +// dc->MacSetupPort(&m_ph) ; +} + +wxMacPortSetter::~wxMacPortSetter() +{ +// m_dc->MacCleanupPort(&m_ph) ; +} + //----------------------------------------------------------------------------- // 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; } //----------------------------------------------------------------------------- -// wxDC +// device context implementation +// +// more and more of the dc functionality should be implemented by calling +// the appropricate wxMacCGContext, but we will have to do that step by step +// also coordinate conversions should be moved to native matrix ops //----------------------------------------------------------------------------- -// this function emulates all wx colour manipulations, used to verify the implementation -// by setting the mode in the blitting functions to kEmulatedMode -void wxMacCalculateColour( int logical_func , const RGBColor &srcColor , RGBColor &dstColor ) ; -void wxMacCalculateColour( int logical_func , const RGBColor &srcColor , RGBColor &dstColor ) +// we always stock two context states, one at entry, to be able to preserve the +// state we were called with, the other one after changing to HI Graphics orientation +// (this one is used for getting back clippings etc) + +wxMacCGPath::wxMacCGPath() +{ + m_path = CGPathCreateMutable() ; +} + +wxMacCGPath::~wxMacCGPath() +{ + CGPathRelease( m_path ) ; +} + +// opens (starts) a new subpath +void wxMacCGPath::MoveToPoint( wxCoord x1 , wxCoord y1 ) +{ + CGPathMoveToPoint( m_path , NULL , x1 , y1 ) ; +} + +void wxMacCGPath::AddLineToPoint( wxCoord x1 , wxCoord y1 ) +{ + CGPathAddLineToPoint( m_path , NULL , x1 , y1 ) ; +} + +void wxMacCGPath::AddQuadCurveToPoint( wxCoord cx1, wxCoord cy1, wxCoord x1, wxCoord y1 ) +{ + CGPathAddQuadCurveToPoint( m_path , NULL , cx1 , cy1 , x1 , y1 ); +} + +void wxMacCGPath::AddRectangle( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) +{ + CGRect cgRect = { { x , y } , { w , h } } ; + CGPathAddRect( m_path , NULL , cgRect ) ; +} + +void wxMacCGPath::AddCircle( wxCoord x, wxCoord y , wxCoord r ) +{ + CGPathAddArc( m_path , NULL , x , y , r , 0.0 , 2 * M_PI , true ) ; +} + +// closes the current subpath +void wxMacCGPath::CloseSubpath() +{ + CGPathCloseSubpath( m_path ) ; +} + +CGPathRef wxMacCGPath::GetPath() const +{ + return m_path ; +} + +wxMacCGContext::wxMacCGContext( CGrafPtr port ) +{ + m_qdPort = port ; + m_cgContext = NULL ; +} + +wxMacCGContext::wxMacCGContext( CGContextRef cgcontext ) +{ + m_qdPort = NULL ; + m_cgContext = cgcontext ; + CGContextSaveGState( m_cgContext ) ; + CGContextSaveGState( m_cgContext ) ; +} + +wxMacCGContext::wxMacCGContext() +{ + m_qdPort = NULL ; + m_cgContext = NULL ; +} + +wxMacCGContext::~wxMacCGContext() { - switch ( logical_func ) + if ( m_cgContext ) { - case wxAND: // src AND dst - dstColor.red = dstColor.red & srcColor.red ; - dstColor.green = dstColor.green & srcColor.green ; - dstColor.blue = dstColor.blue & srcColor.blue ; - break ; - case wxAND_INVERT: // (NOT src) AND dst - dstColor.red = dstColor.red & ~srcColor.red ; - dstColor.green = dstColor.green & ~srcColor.green ; - dstColor.blue = dstColor.blue & ~srcColor.blue ; - break ; - case wxAND_REVERSE:// src AND (NOT dst) - dstColor.red = ~dstColor.red & srcColor.red ; - dstColor.green = ~dstColor.green & srcColor.green ; - dstColor.blue = ~dstColor.blue & srcColor.blue ; - break ; - case wxCLEAR: // 0 - dstColor.red = 0 ; - dstColor.green = 0 ; - dstColor.blue = 0 ; - break ; - case wxCOPY: // src - dstColor.red = srcColor.red ; - dstColor.green = srcColor.green ; - dstColor.blue = srcColor.blue ; - break ; - case wxEQUIV: // (NOT src) XOR dst - dstColor.red = dstColor.red ^ ~srcColor.red ; - dstColor.green = dstColor.green ^ ~srcColor.green ; - dstColor.blue = dstColor.blue ^ ~srcColor.blue ; - break ; - case wxINVERT: // NOT dst - dstColor.red = ~dstColor.red ; - dstColor.green = ~dstColor.green ; - dstColor.blue = ~dstColor.blue ; - break ; - case wxNAND: // (NOT src) OR (NOT dst) - dstColor.red = ~dstColor.red | ~srcColor.red ; - dstColor.green = ~dstColor.green | ~srcColor.green ; - dstColor.blue = ~dstColor.blue | ~srcColor.blue ; - break ; - case wxNOR: // (NOT src) AND (NOT dst) - dstColor.red = ~dstColor.red & ~srcColor.red ; - dstColor.green = ~dstColor.green & ~srcColor.green ; - dstColor.blue = ~dstColor.blue & ~srcColor.blue ; - break ; - case wxNO_OP: // dst - break ; - case wxOR: // src OR dst - dstColor.red = dstColor.red | srcColor.red ; - dstColor.green = dstColor.green | srcColor.green ; - dstColor.blue = dstColor.blue | srcColor.blue ; - break ; - case wxOR_INVERT: // (NOT src) OR dst - dstColor.red = dstColor.red | ~srcColor.red ; - dstColor.green = dstColor.green | ~srcColor.green ; - dstColor.blue = dstColor.blue | ~srcColor.blue ; - break ; - case wxOR_REVERSE: // src OR (NOT dst) - dstColor.red = ~dstColor.red | srcColor.red ; - dstColor.green = ~dstColor.green | srcColor.green ; - dstColor.blue = ~dstColor.blue | srcColor.blue ; - break ; - case wxSET: // 1 - dstColor.red = 0xFFFF ; - dstColor.green = 0xFFFF ; - dstColor.blue = 0xFFFF ; - break ; - case wxSRC_INVERT: // (NOT src) - dstColor.red = ~srcColor.red ; - dstColor.green = ~srcColor.green ; - dstColor.blue = ~srcColor.blue ; - break ; - case wxXOR: // src XOR dst - dstColor.red = dstColor.red ^ srcColor.red ; - dstColor.green = dstColor.green ^ srcColor.green ; - dstColor.blue = dstColor.blue ^ srcColor.blue ; - break ; + CGContextSynchronize( m_cgContext ) ; + CGContextRestoreGState( m_cgContext ) ; + CGContextRestoreGState( m_cgContext ) ; } + + if ( m_qdPort ) + CGContextRelease( m_cgContext ) ; } -class WXDLLEXPORT wxMacCGPath + +void wxMacCGContext::Clip( const wxRegion ®ion ) { - DECLARE_NO_COPY_CLASS(wxMacCGPath) -public : +// ClipCGContextToRegion ( m_cgContext, &bounds , (RgnHandle) dc->m_macCurrentClipRgn ) ; +} + +void wxMacCGContext::StrokePath( const wxGraphicPath *p ) +{ + const wxMacCGPath* path = dynamic_cast< const wxMacCGPath*>( p ) ; + CGContextAddPath( m_cgContext , path->GetPath() ) ; + CGContextStrokePath( m_cgContext ) ; +} + +void wxMacCGContext::DrawPath( const wxGraphicPath *p , int fillStyle ) +{ + const wxMacCGPath* path = dynamic_cast< const wxMacCGPath*>( p ) ; + CGPathDrawingMode mode = m_mode ; - wxMacCGPath() + if ( fillStyle == wxODDEVEN_RULE ) { - m_path = CGPathCreateMutable() ; + if ( mode == kCGPathFill ) + mode = kCGPathEOFill ; + else if ( mode == kCGPathFillStroke ) + mode = kCGPathEOFillStroke ; } - - ~wxMacCGPath() + + CGContextAddPath( m_cgContext , path->GetPath() ) ; + CGContextDrawPath( m_cgContext , mode ) ; +} + +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() +{ + // make sure that we now have a real cgref, before doing + // anything with paths + CGContextRef cg = GetNativeContext() ; + cg = NULL ; + + return new wxMacCGPath() ; +} + +// in case we only got a QDPort only create a cgref now + +CGContextRef wxMacCGContext::GetNativeContext() +{ + if ( m_cgContext == NULL ) { - CGPathRelease( m_path ) ; + Rect bounds ; + GetPortBounds( (CGrafPtr) m_qdPort , &bounds ) ; + OSStatus status = CreateCGContextForPort((CGrafPtr) m_qdPort , &m_cgContext) ; + 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 ; +} + +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 ; +} + +#pragma mark - +#pragma mark wxMacCGPattern, ImagePattern, HatchPattern classes + +// CGPattern wrapper class: always allocate on heap, never call destructor + +class wxMacCGPattern +{ +public : + wxMacCGPattern() {} + + // is guaranteed to be called only with a non-Null CGContextRef + virtual void Render( CGContextRef ctxRef ) = 0 ; + + operator CGPatternRef() const { return m_patternRef ; } + +protected : + virtual ~wxMacCGPattern() + { + // as this is called only when the m_patternRef is been released; + // don't release it again } - - // Starts a new subpath at - void MoveToPoint( wxCoord x1 , wxCoord y1 ) + + static void _Render( void *info, CGContextRef ctxRef ) { - CGPathMoveToPoint( m_path , NULL , x1 , y1 ) ; + wxMacCGPattern* self = (wxMacCGPattern*) info ; + if ( self && ctxRef ) + self->Render( ctxRef ) ; } - - void AddLineToPoint( wxCoord x1 , wxCoord y1 ) + + static void _Dispose( void *info ) { - CGPathAddLineToPoint( m_path , NULL , x1 , y1 ) ; + wxMacCGPattern* self = (wxMacCGPattern*) info ; + delete self ; } - - void AddRectangle( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) + + CGPatternRef m_patternRef ; + + static const CGPatternCallbacks ms_Callbacks ; +} ; + +const CGPatternCallbacks wxMacCGPattern::ms_Callbacks = { 0, &wxMacCGPattern::_Render, &wxMacCGPattern::_Dispose }; + +class ImagePattern : public wxMacCGPattern +{ +public : + ImagePattern( const wxBitmap* bmp , CGAffineTransform transform ) { - CGRect cgRect = { { x , y } , { w , h } } ; - CGPathAddRect( m_path , NULL , cgRect ) ; + wxASSERT( bmp && bmp->Ok() ) ; + + Init( (CGImageRef) bmp->CGImageCreate() , transform ) ; } - void AddRectangle( CGRect cgRect ) + // ImagePattern takes ownership of CGImageRef passed in + ImagePattern( CGImageRef image , CGAffineTransform transform ) { - CGPathAddRect( m_path , NULL , cgRect ) ; + if ( image ) + CFRetain( image ) ; + + Init( image , transform ) ; } - - void AddCircle( CGPoint center , float r ) + + virtual void Render( CGContextRef ctxRef ) { - CGPathAddArc( m_path , NULL , center.x , center.y , r , 0.0 , 2 * M_PI , true ) ; + if (m_image != NULL) + HIViewDrawCGImage( ctxRef, &m_imageBounds, m_image ); } - - // closes the current subpath - void CloseSubpath() + +protected : + void Init( CGImageRef image, CGAffineTransform transform ) { - CGPathCloseSubpath( m_path ) ; + 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 ) ; + } } - - CGPathRef GetPath() const + + ~ImagePattern() { - return m_path ; + if ( m_image ) + CGImageRelease( m_image ) ; } -private : - CGMutablePathRef m_path ; + + CGImageRef m_image ; + CGRect m_imageBounds ; } ; -class WXDLLEXPORT wxMacCGContext +class HatchPattern : public wxMacCGPattern { - DECLARE_NO_COPY_CLASS(wxMacCGContext) - -public: - wxMacCGContext( const wxDC* dc ) ; - ~wxMacCGContext() ; - - void StrokePath( const wxMacCGPath &path ) +public : + HatchPattern( int hatchstyle, CGAffineTransform transform ) { - - CGContextBeginPath( m_cgContext ) ; - CGContextAddPath( m_cgContext , path.GetPath() ) ; - CGContextClosePath( m_cgContext ) ; - CGContextStrokePath( m_cgContext ) ; + 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 ) ; } - - void DrawPath( const wxMacCGPath &path , int fillStyle = wxWINDING_RULE ) + + void StrokeLineSegments( CGContextRef ctxRef , const CGPoint pts[] , size_t count ) { - CGPathDrawingMode mode = m_mode ; - if ( fillStyle == wxODDEVEN_RULE ) +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 + if ( UMAGetSystemVersion() >= 0x1040 ) + { + CGContextStrokeLineSegments( ctxRef , pts , count ) ; + } + else +#endif { - if ( mode == kCGPathFill ) - mode = kCGPathEOFill ; - else if ( mode == kCGPathFillStroke ) - mode = kCGPathEOFillStroke ; + CGContextBeginPath( ctxRef ); + 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); + } + CGContextStrokePath(ctxRef); } - CGContextBeginPath( m_cgContext ) ; - CGContextAddPath( m_cgContext , path.GetPath() ) ; - CGContextClosePath( m_cgContext ) ; - CGContextDrawPath( m_cgContext , mode ) ; } - - void FillPath( const wxMacCGPath &path , const wxColor &fillColor , int fillStyle = wxWINDING_RULE ) - { - 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 ) ; - if ( m_dc->GetBrush().GetStyle() ) + virtual void Render( CGContextRef ctxRef ) + { + switch ( m_hatch ) { - RGBColor col = MAC_WXCOLORREF( m_dc->GetBrush().GetColour().GetPixel() ) ; - CGContextSetRGBFillColor( m_cgContext , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ; + case wxBDIAGONAL_HATCH : + { + CGPoint pts[] = + { + { 8.0 , 0.0 } , { 0.0 , 8.0 } + }; + StrokeLineSegments( ctxRef , pts , 2 ) ; + } + break ; + + case wxCROSSDIAG_HATCH : + { + 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[] = + { + { 0.0 , 0.0 } , { 8.0 , 8.0 } + }; + StrokeLineSegments( ctxRef , pts , 2 ) ; + } + break ; + + case wxCROSS_HATCH : + { + 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[] = + { + { 0.0 , 4.0 } , { 8.0 , 4.0 } , + }; + StrokeLineSegments( ctxRef , pts , 2 ) ; + } + break ; + + case wxVERTICAL_HATCH : + { + CGPoint pts[] = + { + { 4.0 , 0.0 } , { 4.0 , 8.0 } , + }; + StrokeLineSegments( ctxRef , pts , 2 ) ; + } + break ; + + default: + break; } } - - void SetupPenAndBrush() ; - CGContextRef GetNativeContext() { return m_cgContext ; } -private: - CGContextRef m_cgContext ; - CGPathDrawingMode m_mode ; - const wxDC* m_dc ; -} ; -wxMacCGContext::wxMacCGContext( const wxDC* dc ) -{ - wxASSERT( dc->Ok() ) ; - - Rect bounds ; - GetPortBounds( (CGrafPtr) dc->m_macPort , &bounds ) ; - OSStatus status = QDBeginCGContext( (CGrafPtr) dc->m_macPort , &m_cgContext ) ; - wxASSERT_MSG( status == noErr , wxT("Cannot nest wxDCs on the same window") ) ; - ClipCGContextToRegion ( m_cgContext, &bounds , (RgnHandle) dc->m_macCurrentClipRgn ) ; +protected : + ~HatchPattern() {} - CGContextTranslateCTM( m_cgContext , 0 , bounds.bottom - bounds.top ) ; - CGContextScaleCTM( m_cgContext , 1 , -1 ) ; + CGRect m_imageBounds ; + int m_hatch ; +}; - m_dc = dc ; - SetupPenAndBrush() ; -} +#pragma mark - -void wxMacCGContext::SetupPenAndBrush() +void wxMacCGContext::SetPen( const wxPen &pen ) { - bool fill = m_dc->GetBrush().GetStyle() != wxTRANSPARENT ; - bool stroke = m_dc->GetPen().GetStyle() != wxTRANSPARENT ; - + m_pen = pen ; + if ( m_cgContext == NULL ) + return ; + + bool fill = m_brush.GetStyle() != wxTRANSPARENT ; + bool stroke = pen.GetStyle() != wxTRANSPARENT ; + +#if 0 + // we can benchmark performance; should go into a setting eventually + CGContextSetShouldAntialias( m_cgContext , false ) ; +#endif + if ( fill | stroke ) { - - // setup brushes + // set up brushes m_mode = kCGPathFill ; // just a default - if ( fill ) - { - RGBColor col = MAC_WXCOLORREF( m_dc->GetBrush().GetColour().GetPixel() ) ; - CGContextSetRGBFillColor( m_cgContext , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ; - m_mode = kCGPathFill ; - } if ( stroke ) { - RGBColor col = MAC_WXCOLORREF( m_dc->GetPen().GetColour().GetPixel() ) ; + 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 + float penWidth = pen.GetWidth(); + if (penWidth <= 0.0) + penWidth = 0.1; + CGContextSetLineWidth( m_cgContext , penWidth ) ; + CGLineCap cap ; - switch( m_dc->GetPen().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 ; } - CGContextSetLineCap( m_cgContext , cap ) ; CGLineJoin join ; - switch( m_dc->GetPen().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; + break; } - CGContextSetLineJoin( m_cgContext , join ) ; - - CGContextSetLineWidth( m_cgContext , m_dc->GetPen().GetWidth() == 0 ? 0.1 : m_dc->GetPen().GetWidth() /* TODO * m_dc->m_scaleX */ ) ; m_mode = kCGPathStroke ; int count = 0 ; + const float *lengths = NULL ; float *userLengths = NULL ; - - switch( m_dc->GetPen().GetStyle() ) + + 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 }; + + switch ( pen.GetStyle() ) { case wxSOLID : break ; + case wxDOT : - const float dotted[] = { 3 , 3 }; lengths = dotted ; count = WXSIZEOF(dotted); break ; + case wxLONG_DASH : - const float dashed[] = { 19 , 9 }; lengths = dashed ; count = WXSIZEOF(dashed) ; break ; + case wxSHORT_DASH : - const float short_dashed[] = { 9 , 6 }; lengths = short_dashed ; count = WXSIZEOF(short_dashed) ; break ; + case wxDOT_DASH : - const float dotted_dashed[] = { 9 , 6 , 3 , 3 }; lengths = dotted_dashed ; count = WXSIZEOF(dotted_dashed); break ; + case wxUSER_DASH : wxDash *dashes ; - count = m_dc->GetPen().GetDashes( &dashes ) ; - if ( count >0 ) + count = pen.GetDashes( &dashes ) ; + if ((dashes != NULL) && (count > 0)) { userLengths = new float[count] ; - for( int i = 0 ; i < count ; ++i ) - userLengths[i] = dashes[i] ; + for ( int i = 0 ; i < count ; ++i ) + { + userLengths[i] = dashes[i] * dashUnit ; + + if ( i % 2 == 1 && userLengths[i] < dashUnit + 2.0 ) + userLengths[i] = dashUnit + 2.0 ; + else if ( i % 2 == 0 && userLengths[i] < dashUnit ) + userLengths[i] = dashUnit ; + } } lengths = userLengths ; break ; + + case wxSTIPPLE : + { + float alphaArray[1] = { 1.0 } ; + wxBitmap* bmp = pen.GetStipple() ; + if ( bmp && bmp->Ok() ) + { + wxMacCFRefHolder patternSpace( CGColorSpaceCreatePattern( NULL ) ) ; + CGContextSetStrokeColorSpace( m_cgContext , patternSpace ) ; + wxMacCFRefHolder pattern( *( new ImagePattern( bmp , CGContextGetCTM( m_cgContext ) ) ) ); + CGContextSetStrokePattern( m_cgContext, pattern , alphaArray ) ; + } + } + break ; + default : - break ; + { + 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 } ; + + CGContextSetStrokePattern( m_cgContext, pattern , colorArray ) ; + } + break ; + } + + if ((lengths != NULL) && (count > 0)) + { + CGContextSetLineDash( m_cgContext , 0 , lengths , count ) ; + // force the line cap, otherwise we get artifacts (overlaps) and just solid lines + cap = kCGLineCapButt ; } + else + { + CGContextSetLineDash( m_cgContext , 0 , NULL , 0 ) ; + } + + CGContextSetLineCap( m_cgContext , cap ) ; + CGContextSetLineJoin( m_cgContext , join ) ; - CGContextSetLineDash( m_cgContext , 0 , lengths , count ) ; delete[] userLengths ; - // we need to change the cap, otherwise everything overlaps - // and we get solid lines - if ( count > 0 ) - CGContextSetLineCap( m_cgContext , kCGLineCapButt ) ; } + if ( fill && stroke ) - { m_mode = kCGPathFillStroke ; - } - } } -wxMacCGContext::~wxMacCGContext() +void wxMacCGContext::SetBrush( const wxBrush &brush ) { - QDEndCGContext( (CGrafPtr) m_dc->m_macPort , &m_cgContext ) ; -} + m_brush = brush ; + if ( m_cgContext == NULL ) + return ; + bool fill = brush.GetStyle() != wxTRANSPARENT ; + bool stroke = m_pen.GetStyle() != wxTRANSPARENT ; -#define wxMacGraphicContext wxMacCGContext -#define wxMacGraphicPath wxMacCGPath +#if 0 + // we can benchmark performance, should go into a setting later + CGContextSetShouldAntialias( m_cgContext , false ) ; +#endif + + if ( fill | stroke ) + { + // setup brushes + m_mode = kCGPathFill ; // just a default + + if ( fill ) + { + 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 ) ; + } + else if ( brush.IsHatch() ) + { + wxMacCFRefHolder patternSpace( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) ) ; + 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 } ; + + CGContextSetFillPattern( m_cgContext, pattern , colorArray ) ; + } + else + { + // now brush is a bitmap + float alphaArray[1] = { 1.0 } ; + wxBitmap* bmp = brush.GetStipple() ; + if ( bmp && bmp->Ok() ) + { + wxMacCFRefHolder patternSpace( CGColorSpaceCreatePattern( NULL ) ) ; + CGContextSetFillColorSpace( m_cgContext , patternSpace ) ; + wxMacCFRefHolder pattern( *( new ImagePattern( bmp , CGContextGetCTM( m_cgContext ) ) ) ); + CGContextSetFillPattern( m_cgContext, pattern , alphaArray ) ; + } + } + + m_mode = kCGPathFill ; + } + + if ( fill && stroke ) + m_mode = kCGPathFillStroke ; + else if ( stroke ) + m_mode = kCGPathStroke ; + } +} void AddEllipticArcToPath(CGContextRef c, CGPoint center, float a, float b, float fromDegree , float toDegree ) { @@ -512,39 +774,43 @@ void AddEllipticArcToPath(CGContextRef c, CGPoint center, float a, float b, floa CGContextAddArc(c, 0, 0, 1, DegToRad(fromDegree), DegToRad(toDegree), 0); CGContextClosePath(c); CGContextRestoreGState(c); -} +} void AddRoundedRectToPath(CGContextRef c, CGRect rect, float ovalWidth, float ovalHeight) { float fw, fh; - if (ovalWidth == 0 || ovalHeight == 0) + if (ovalWidth == 0 || ovalHeight == 0) { CGContextAddRect(c, rect); return; } + CGContextSaveGState(c); CGContextTranslateCTM(c, CGRectGetMinX(rect), CGRectGetMinY(rect)); CGContextScaleCTM(c, ovalWidth, ovalHeight); + fw = CGRectGetWidth(rect) / ovalWidth; fh = CGRectGetHeight(rect) / ovalHeight; - 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); + + 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); -} +} + +#pragma mark - 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; - m_internalDeviceOriginX = 0; - m_internalDeviceOriginY = 0; + m_externalDeviceOriginX = 0; m_externalDeviceOriginY = 0; m_logicalScaleX = 1.0; @@ -553,221 +819,121 @@ wxDC::wxDC() m_userScaleY = 1.0; m_scaleX = 1.0; m_scaleY = 1.0; - m_needComputeScaleX = FALSE; - m_needComputeScaleY = FALSE; - m_macPort = NULL ; - m_macMask = NULL ; - m_ok = FALSE ; - m_macFontInstalled = false ; - m_macBrushInstalled = false ; - m_macPenInstalled = false ; - m_macLocalOrigin.x = m_macLocalOrigin.y = 0 ; - m_macBoundaryClipRgn = NewRgn() ; - m_macCurrentClipRgn = NewRgn() ; - SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , -32000 , -32000 , 32000 , 32000 ) ; - SetRectRgn( (RgnHandle) m_macCurrentClipRgn , -32000 , -32000 , 32000 , 32000 ) ; + 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; -#ifdef __WXDEBUG__ - // needed to debug possible errors with two active drawing methods at the same time on - // the same DC - m_macCurrentPortStateHelper = NULL ; -#endif - m_macATSUIStyle = NULL ; - m_macAliasWasEnabled = false; - m_macForegroundPixMap = NULL ; - m_macBackgroundPixMap = NULL ; - m_macGraphicContext = NULL ; -} - -wxDC::~wxDC(void) -{ - DisposeRgn( (RgnHandle) m_macBoundaryClipRgn ) ; - DisposeRgn( (RgnHandle) m_macCurrentClipRgn ) ; - delete m_macGraphicContext ; - -} -void wxDC::MacSetupGraphicContext() -{ - m_macGraphicContext = new wxMacCGContext( this ) ; + m_macATSUIStyle = NULL ; + m_graphicContext = NULL ; } -void wxDC::MacSetupPort(wxMacPortStateHelper* help) const -{ -#ifdef __WXDEBUG__ - wxASSERT( m_macCurrentPortStateHelper == NULL ) ; - m_macCurrentPortStateHelper = help ; -#endif - SetClip( (RgnHandle) m_macCurrentClipRgn); -#if ! wxMAC_EXPERIMENTAL_DC - m_macFontInstalled = false ; - m_macBrushInstalled = false ; - m_macPenInstalled = false ; -#endif -} -void wxDC::MacCleanupPort(wxMacPortStateHelper* help) const +wxDC::~wxDC() { -#ifdef __WXDEBUG__ - wxASSERT( m_macCurrentPortStateHelper == help ) ; - m_macCurrentPortStateHelper = NULL ; -#endif - if( m_macATSUIStyle ) + if ( m_macATSUIStyle ) { ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle); m_macATSUIStyle = NULL ; } - if ( m_macAliasWasEnabled ) - { - SetAntiAliasedTextEnabled(m_macFormerAliasState, m_macFormerAliasSize); - m_macAliasWasEnabled = false ; - } - if ( m_macForegroundPixMap ) - { - Pattern blackColor ; - ::PenPat(GetQDGlobalsBlack(&blackColor)); - DisposePixPat( (PixPatHandle) m_macForegroundPixMap ) ; - m_macForegroundPixMap = NULL ; - } - if ( m_macBackgroundPixMap ) - { - Pattern whiteColor ; - ::BackPat(GetQDGlobalsWhite(&whiteColor)); - DisposePixPat( (PixPatHandle) m_macBackgroundPixMap ) ; - m_macBackgroundPixMap = NULL ; - } + + delete m_graphicContext ; } 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(); - wxCoord h = bmp.GetHeight(); - wxCoord ww = XLOG2DEVREL(w); - wxCoord hh = YLOG2DEVREL(h); - // Set up drawing mode - short mode = (m_logicalFunction == wxCOPY ? srcCopy : - //m_logicalFunction == wxCLEAR ? WHITENESS : - //m_logicalFunction == wxSET ? BLACKNESS : - m_logicalFunction == wxINVERT ? hilite : - //m_logicalFunction == wxAND ? MERGECOPY : - m_logicalFunction == wxOR ? srcOr : - m_logicalFunction == wxSRC_INVERT ? notSrcCopy : - m_logicalFunction == wxXOR ? srcXor : - m_logicalFunction == wxOR_REVERSE ? notSrcOr : - //m_logicalFunction == wxAND_REVERSE ? SRCERASE : - //m_logicalFunction == wxSRC_OR ? srcOr : - //m_logicalFunction == wxSRC_AND ? SRCAND : - srcCopy ); - if ( bmp.GetBitmapType() == kMacBitmapTypePict ) { - Rect bitmaprect = { 0 , 0 , hh, ww }; - ::OffsetRect( &bitmaprect, xx, yy ) ; - ::DrawPicture( (PicHandle) bmp.GetPict(), &bitmaprect ) ; - } - else if ( bmp.GetBitmapType() == kMacBitmapTypeGrafWorld ) - { - GWorldPtr bmapworld = MAC_WXHBITMAP( bmp.GetHBITMAP() ); - PixMapHandle bmappixels ; - // Set foreground and background colours (for bitmaps depth = 1) - if(bmp.GetDepth() == 1) - { - RGBColor fore = MAC_WXCOLORREF(m_textForegroundColour.GetPixel()); - RGBColor back = MAC_WXCOLORREF(m_textBackgroundColour.GetPixel()); - RGBForeColor(&fore); - RGBBackColor(&back); - } - else - { - RGBColor white = { 0xFFFF, 0xFFFF,0xFFFF} ; - RGBColor black = { 0,0,0} ; - RGBForeColor( &black ) ; - RGBBackColor( &white ) ; - } - bmappixels = GetGWorldPixMap( bmapworld ) ; - wxCHECK_RET(LockPixels(bmappixels), - wxT("DoDrawBitmap: Unable to lock pixels")); - Rect source = { 0, 0, h, w }; - Rect dest = { yy, xx, yy + hh, xx + ww }; - if ( useMask && bmp.GetMask() ) - { - if( LockPixels(GetGWorldPixMap(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap())))) - { - CopyDeepMask - ( - GetPortBitMapForCopyBits(bmapworld), - GetPortBitMapForCopyBits(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap())), - GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ), - &source, &source, &dest, mode, NULL - ); - UnlockPixels(GetGWorldPixMap(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap()))); - } - } - else { - CopyBits( GetPortBitMapForCopyBits( bmapworld ), - GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ), - &source, &dest, mode, NULL ) ; - } - UnlockPixels( bmappixels ) ; - } - else if ( bmp.GetBitmapType() == kMacBitmapTypeIcon ) - { - Rect bitmaprect = { 0 , 0 , bmp.GetHeight(), bmp.GetWidth() } ; - OffsetRect( &bitmaprect, xx, yy ) ; - PlotCIconHandle( &bitmaprect , atNone , ttNone , MAC_WXHICON(bmp.GetHICON()) ) ; - } - m_macPenInstalled = false ; - m_macBrushInstalled = false ; - m_macFontInstalled = false ; + 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); + + CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; + CGImageRef image = (CGImageRef)( bmp.CGImageCreate() ) ; + HIRect r = CGRectMake( xx , yy , ww , hh ) ; + HIViewDrawCGImage( cg , &r , image ) ; + CGImageRelease( image ) ; } void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) { - wxCHECK_RET(Ok(), wxT("Invalid dc wxDC::DoDrawIcon")); - wxCHECK_RET(icon.Ok(), wxT("Invalid icon wxDC::DoDrawIcon")); - DoDrawBitmap( icon , x , y , icon.GetMask() != NULL ) ; + 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); + + 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 ) ; } void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { - wxCHECK_RET(Ok(), wxT("wxDC::DoSetClippingRegion Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoSetClippingRegion - invalid DC") ); + wxCoord xx, yy, ww, hh; xx = XLOG2DEVMAC(x); yy = YLOG2DEVMAC(y); ww = XLOG2DEVREL(width); hh = YLOG2DEVREL(height); - SetRectRgn( (RgnHandle) m_macCurrentClipRgn , xx , yy , xx + ww , yy + hh ) ; - SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; - if( m_clipping ) + + CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; + CGRect clipRect = CGRectMake( xx , yy , ww, hh ) ; + CGContextClipToRect( cgContext , clipRect ) ; + +// SetRectRgn( (RgnHandle) m_macCurrentClipRgn , xx , yy , xx + ww , yy + hh ) ; +// SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; + + if ( m_clipping ) { - m_clipX1 = wxMax( m_clipX1 , xx ); - m_clipY1 = wxMax( m_clipY1 , yy ); - m_clipX2 = wxMin( m_clipX2, (xx + ww)); - m_clipY2 = wxMin( m_clipY2, (yy + hh)); + m_clipX1 = wxMax( m_clipX1, xx ); + m_clipY1 = wxMax( m_clipY1, yy ); + m_clipX2 = wxMin( m_clipX2, (xx + ww) ); + m_clipY2 = wxMin( m_clipY2, (yy + hh) ); } else { - m_clipping = TRUE; + m_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 + + // TODO: as soon as we don't reset the context for each operation anymore // we have to update the context as well } -void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) +void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) { - wxCHECK_RET( Ok(), wxT("invalid window dc") ) ; + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoSetClippingRegionAsRegion - invalid DC") ); + if (region.Empty()) { DestroyClippingRegion(); return; } + wxCoord x, y, w, h; region.GetBox( x, y, w, h ); wxCoord xx, yy, ww, hh; @@ -775,6 +941,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 ) @@ -783,22 +950,24 @@ 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 ) + SectRgn( (RgnHandle)m_macCurrentClipRgn , (RgnHandle)m_macBoundaryClipRgn , (RgnHandle)m_macCurrentClipRgn ) ; +#endif + + if ( m_clipping ) { - m_clipX1 = wxMax( m_clipX1 , xx ); - m_clipY1 = wxMax( m_clipY1 , yy ); - m_clipX2 = wxMin( m_clipX2, (xx + ww)); - m_clipY2 = wxMin( m_clipY2, (yy + hh)); + m_clipX1 = wxMax( m_clipX1, xx ); + m_clipY1 = wxMax( m_clipY1, yy ); + m_clipX2 = wxMin( m_clipX2, (xx + ww) ); + m_clipY2 = wxMin( m_clipY2, (yy + hh) ); } else { - m_clipping = TRUE; + m_clipping = true; + m_clipX1 = xx; m_clipY1 = yy; m_clipX2 = xx + ww; @@ -809,31 +978,45 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) void wxDC::DestroyClippingRegion() { - CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; - m_clipping = FALSE; +// CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; + + CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; + CGContextRestoreGState( cgContext ); + CGContextSaveGState( cgContext ); + + m_graphicContext->SetPen( m_pen ) ; + m_graphicContext->SetBrush( m_brush ) ; + + 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")); - m_textForegroundColour = col; - m_macFontInstalled = false ; + wxCHECK_RET( Ok(), wxT("wxDC(cg)::SetTextForeground - invalid DC") ); + + if ( col != m_textForegroundColour ) + { + m_textForegroundColour = col; + MacInstallFont() ; + } } void wxDC::SetTextBackground( const wxColour &col ) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::SetTextBackground - invalid DC") ); + m_textBackgroundColour = col; - m_macFontInstalled = false ; } void wxDC::SetMapMode( int mode ) @@ -841,26 +1024,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; } } @@ -897,7 +1085,7 @@ void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y ) void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) { m_signX = (xLeftRight ? 1 : -1); - m_signY = (yBottomUp ? -1 : 1); + m_signY = (yBottomUp ? -1 : 1); ComputeScaleAndOrigin(); } @@ -908,11 +1096,7 @@ wxSize wxDC::GetPPI() const int wxDC::GetDepth() const { - if ( IsPortColor( (CGrafPtr) m_macPort ) ) - { - return ( (**GetPortPixMap( (CGrafPtr) m_macPort)).pixelSize ) ; - } - return 1 ; + return 32; } void wxDC::ComputeScaleAndOrigin() @@ -922,70 +1106,113 @@ void wxDC::ComputeScaleAndOrigin() double origScaleY = m_scaleY; m_scaleX = m_logicalScaleX * m_userScaleX; m_scaleY = m_logicalScaleY * m_userScaleY; - m_deviceOriginX = m_internalDeviceOriginX + m_externalDeviceOriginX; - m_deviceOriginY = m_internalDeviceOriginY + m_externalDeviceOriginY; + 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); + SetPen( pen ); } } -void wxDC::SetPalette( const wxPalette& palette ) +void wxDC::SetPalette( const wxPalette& palette ) { } -void wxDC::SetBackgroundMode( int mode ) +void wxDC::SetBackgroundMode( int mode ) { m_backgroundMode = mode ; } -void wxDC::SetFont( const wxFont &font ) +void wxDC::SetFont( const wxFont &font ) { m_font = font; - m_macFontInstalled = false ; + MacInstallFont() ; } -void wxDC::SetPen( const wxPen &pen ) +void wxDC::SetPen( const wxPen &pen ) { if ( m_pen == pen ) return ; + m_pen = pen; - m_macPenInstalled = false ; - m_macGraphicContext->SetupPenAndBrush() ; + if ( m_graphicContext ) + { + if ( m_pen.GetStyle() == wxSOLID || m_pen.GetStyle() == wxTRANSPARENT ) + { + m_graphicContext->SetPen( m_pen ) ; + } + else + { + // 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 ); + m_graphicContext->SetPen( m_pen ) ; + CGContextTranslateCTM( cgContext, -origX, -origY ); + } + } } -void wxDC::SetBrush( const wxBrush &brush ) +void wxDC::SetBrush( const wxBrush &brush ) { if (m_brush == brush) return; + m_brush = brush; - m_macBrushInstalled = false ; - m_macGraphicContext->SetupPenAndBrush() ; + if ( m_graphicContext ) + { + if ( brush.GetStyle() == wxSOLID || brush.GetStyle() == wxTRANSPARENT ) + { + m_graphicContext->SetBrush( m_brush ) ; + } + else + { + // 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->SetBrush( m_brush ) ; + CGContextTranslateCTM( cgContext, -origX, -origY ); + } + } } -void wxDC::SetBackground( const wxBrush &brush ) +void wxDC::SetBackground( const wxBrush &brush ) { if (m_backgroundBrush == brush) return; + m_backgroundBrush = brush; if (!m_backgroundBrush.Ok()) return; - m_macBrushInstalled = false ; } -void wxDC::SetLogicalFunction( int function ) +void wxDC::SetLogicalFunction( int function ) { if (m_logicalFunction == function) return; + m_logicalFunction = function ; - m_macFontInstalled = false ; - m_macBrushInstalled = false ; - m_macPenInstalled = false ; +#if wxMAC_USE_CORE_GRAPHICS_BLEND_MODES + CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; + if ( m_logicalFunction == wxCOPY ) + CGContextSetBlendMode( cgContext, kCGBlendModeNormal ) ; + else if ( m_logicalFunction == wxINVERT ) + CGContextSetBlendMode( cgContext, kCGBlendModeExclusion ) ; + else + CGContextSetBlendMode( cgContext, kCGBlendModeNormal ) ; +#endif } extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, @@ -997,225 +1224,317 @@ bool wxDC::DoFloodFill(wxCoord x, wxCoord y, return wxDoFloodFill(this, x, y, col, style); } -bool wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const +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(cg)::DoGetPixel - invalid DC") ); + + wxMacPortSaver helper((CGrafPtr)m_macPort) ; RGBColor colour; - GetCPixel( XLOG2DEVMAC(x), YLOG2DEVMAC(y), &colour ); - // Convert from Mac colour to wx - col->Set( colour.red >> 8, - colour.green >> 8, - colour.blue >> 8); + + // 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 ); + return true ; } -void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) +void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); - + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawLine - invalid DC") ); + +#if !wxMAC_USE_CORE_GRAPHICS_BLEND_MODES + if ( m_logicalFunction != wxCOPY ) + return ; +#endif + wxCoord xx1 = XLOG2DEVMAC(x1) ; wxCoord yy1 = YLOG2DEVMAC(y1) ; wxCoord xx2 = XLOG2DEVMAC(x2) ; wxCoord yy2 = YLOG2DEVMAC(y2) ; - wxMacGraphicPath path ; - path.MoveToPoint( xx1 , yy1 ) ; - path.AddLineToPoint( xx2 , yy2 ) ; - path.CloseSubpath() ; - m_macGraphicContext->StrokePath( path ) ; + wxGraphicPath* path = m_graphicContext->CreatePath() ; + path->MoveToPoint( xx1, yy1 ) ; + path->AddLineToPoint( xx2 , yy2 ) ; + path->CloseSubpath() ; + m_graphicContext->StrokePath( path ) ; + delete path ; CalcBoundingBox(x1, y1); CalcBoundingBox(x2, y2); } -void wxDC::DoCrossHair( wxCoord x, wxCoord y ) +void wxDC::DoCrossHair( wxCoord x, wxCoord y ) { - wxCHECK_RET( Ok(), wxT("wxDC::DoCrossHair Invalid window dc") ); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoCrossHair - invalid DC") ); + + if ( m_logicalFunction != wxCOPY ) + return ; + + int w = 0, h = 0; - - int w = 0; - int h = 0; GetSize( &w, &h ); wxCoord xx = XLOG2DEVMAC(x); wxCoord yy = YLOG2DEVMAC(y); - wxMacGraphicPath path ; - path.MoveToPoint( XLOG2DEVMAC(0), yy ) ; - path.AddLineToPoint( XLOG2DEVMAC(w), yy ) ; - path.CloseSubpath() ; - path.MoveToPoint( xx, YLOG2DEVMAC(0) ) ; - path.AddLineToPoint( xx, YLOG2DEVMAC(h) ) ; - path.CloseSubpath() ; - m_macGraphicContext->StrokePath( path ) ; + wxGraphicPath* path = m_graphicContext->CreatePath() ; + path->MoveToPoint( XLOG2DEVMAC(0), yy ) ; + path->AddLineToPoint( XLOG2DEVMAC(w), yy ) ; + path->CloseSubpath() ; + path->MoveToPoint( xx, YLOG2DEVMAC(0) ) ; + path->AddLineToPoint( xx, YLOG2DEVMAC(h) ) ; + path->CloseSubpath() ; + m_graphicContext->StrokePath( path ) ; + delete path ; CalcBoundingBox(x, y); - CalcBoundingBox(x+w, y+h); + CalcBoundingBox(x + w, y + h); } -/* -* To draw arcs properly the angles need to be converted from the WX style: -* Angles start on the +ve X axis and go anti-clockwise (As you would draw on -* a normal axis on paper). -* TO -* the Mac style: -* Angles start on the +ve y axis and go clockwise. -*/ - -static double wxConvertWXangleToMACangle(double angle) -{ - double newAngle = 90 - angle ; - if ( newAngle < 0 ) - newAngle += 360 ; - return newAngle ; -} - -void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, +void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc ) { - wxCHECK_RET(Ok(), wxT("wxDC::DoDrawArc Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawArc - invalid DC") ); + + if ( m_logicalFunction != wxCOPY ) + return ; + wxCoord xx1 = XLOG2DEVMAC(x1); wxCoord yy1 = YLOG2DEVMAC(y1); wxCoord xx2 = XLOG2DEVMAC(x2); wxCoord yy2 = YLOG2DEVMAC(y2); wxCoord xxc = XLOG2DEVMAC(xc); wxCoord yyc = YLOG2DEVMAC(yc); + double dx = xx1 - xxc; double dy = yy1 - yyc; - double radius = sqrt((double)(dx*dx+dy*dy)); - wxCoord rad = (wxCoord)radius; - double radius1, radius2; + double radius = sqrt((double)(dx * dx + dy * dy)); + wxCoord rad = (wxCoord)radius; + double sa, ea; if (xx1 == xx2 && yy1 == yy2) { - radius1 = 0.0; - radius2 = 360.0; + sa = 0.0; + ea = 360.0; } else if (radius == 0.0) { - radius1 = radius2 = 0.0; + sa = ea = 0.0; } else { - radius1 = (xx1 - xxc == 0) ? + sa = (xx1 - xxc == 0) ? (yy1 - yyc < 0) ? 90.0 : -90.0 : - -atan2(double(yy1-yyc), double(xx1-xxc)) * RAD2DEG; - radius2 = (xx2 - xxc == 0) ? + -atan2(double(yy1 - yyc), double(xx1 - xxc)) * RAD2DEG; + ea = (xx2 - xxc == 0) ? (yy2 - yyc < 0) ? 90.0 : -90.0 : - -atan2(double(yy2-yyc), double(xx2-xxc)) * RAD2DEG; + -atan2(double(yy2 - yyc), double(xx2 - xxc)) * RAD2DEG; } - wxCoord alpha2 = wxCoord(radius2 - radius1); - wxCoord alpha1 = wxCoord(wxConvertWXangleToMACangle(radius1)); - if( (xx1 > xx2) || (yy1 > yy2) ) { - alpha2 *= -1; - } - Rect r = { yyc - rad, xxc - rad, yyc + rad, xxc + rad }; - /* - CGPathDrawingMode mode ; - CGContextRef cgContext = wxBeginCGContext( this , &mode ) ; - - AddEllipticArcToPath( cgContext , CGPointMake( xxc , yyc ) , rad , rad , 0 , 180 ) ; - CGContextDrawPath( cgContext , mode ) ; - - QDEndCGContext( (CGrafPtr) m_macPort , &cgContext ) ; - */ + 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 ) ; + if ( fill ) + CGContextMoveToPoint( ctx , 0 , 0 ) ; + CGContextAddArc( ctx, 0, 0 , rad , DegToRad(sa), DegToRad(ea), 0 ); + if ( fill ) + CGContextAddLineToPoint( ctx , 0 , 0 ) ; + CGContextRestoreGState( ctx ) ; + CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; } -void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, +void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, double sa, double ea ) { - wxCHECK_RET(Ok(), wxT("wxDC::DoDrawEllepticArc Invalid DC")); - Rect r; - double angle = sa - ea; // Order important Mac in opposite direction to wx - // we have to make sure that the filling is always counter-clockwise - if ( angle > 0 ) - angle -= 360 ; + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawEllipticArc - invalid DC") ); + + if ( m_logicalFunction != wxCOPY ) + return ; + wxCoord xx = XLOG2DEVMAC(x); wxCoord yy = YLOG2DEVMAC(y); wxCoord ww = m_signX * XLOG2DEVREL(w); wxCoord hh = m_signY * YLOG2DEVREL(h); + // handle -ve width and/or height - if (ww < 0) { ww = -ww; xx = xx - ww; } - if (hh < 0) { hh = -hh; yy = yy - hh; } - sa = wxConvertWXangleToMACangle(sa); - /* - CGPathDrawingMode mode ; - CGContextRef cgContext = wxBeginCGContext( this , &mode ) ; - - AddEllipticArcToPath( cgContext , CGPointMake( xx + ww / 2 , yy + hh / 2 ) , ww / 2 , hh / 2 , sa , angle) ; + if (ww < 0) + { + ww = -ww; + xx = xx - ww; + } + if (hh < 0) + { + hh = -hh; + yy = yy - hh; + } + + bool fill = m_brush.GetStyle() != wxTRANSPARENT ; - CGContextDrawPath( cgContext , mode ) ; - - QDEndCGContext( (CGrafPtr) m_macPort , &cgContext ) ; - */ + 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 ) ; + if ( fill ) + CGContextMoveToPoint( ctx , 0 , 0 ) ; + CGContextAddArc( ctx, 0, 0, 1, DegToRad( sa ), DegToRad( ea ), 0 ); + if ( fill ) + CGContextAddLineToPoint( ctx , 0 , 0 ) ; + CGContextRestoreGState( ctx ) ; + CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; } -void wxDC::DoDrawPoint( wxCoord x, wxCoord y ) +void wxDC::DoDrawPoint( wxCoord x, wxCoord y ) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawPoint - invalid DC") ); + DoDrawLine( x , y , x + 1 , y + 1 ) ; } -void wxDC::DoDrawLines(int n, wxPoint points[], +void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); - + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawLines - invalid DC") ); + +#if !wxMAC_USE_CORE_GRAPHICS_BLEND_MODES + if ( m_logicalFunction != wxCOPY ) + return ; +#endif + wxCoord x1, x2 , y1 , y2 ; x1 = XLOG2DEVMAC(points[0].x + xoffset); y1 = YLOG2DEVMAC(points[0].y + yoffset); - wxMacGraphicPath path ; - path.MoveToPoint( x1 , y1 ) ; + wxGraphicPath* path = m_graphicContext->CreatePath() ; + path->MoveToPoint( x1 , y1 ) ; for (int i = 1; i < n; i++) { x2 = XLOG2DEVMAC(points[i].x + xoffset); y2 = YLOG2DEVMAC(points[i].y + yoffset); - path.AddLineToPoint( x2 , y2 ) ; + path->AddLineToPoint( x2 , y2 ) ; } - path.CloseSubpath() ; - m_macGraphicContext->StrokePath( path ) ; + + m_graphicContext->StrokePath( path ) ; + delete path ; } -void wxDC::DoDrawPolygon(int n, wxPoint points[], +#if wxUSE_SPLINES +void wxDC::DoDrawSpline(wxList *points) +{ + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawSpline - invalid DC") ); + + 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 ) ) ; + +#if !wxUSE_STL + while ((node = node->GetNext()) != NULL) +#else + while ((node = node->GetNext())) +#endif // !wxUSE_STL + { + p = (wxPoint *)node->GetData(); + x1 = x2; + y1 = y2; + x2 = p->x; + y2 = p->y; + wxCoord cx4 = (x1 + x2) / 2; + wxCoord cy4 = (y1 + y2) / 2; + + path->AddQuadCurveToPoint( + XLOG2DEVMAC( x1 ) , XLOG2DEVMAC( y1 ) , + XLOG2DEVMAC( cx4 ) , XLOG2DEVMAC( cy4 ) ) ; + + cx1 = cx4; + cy1 = cy4; + } + + path->AddLineToPoint( XLOG2DEVMAC( x2 ) , XLOG2DEVMAC( y2 ) ) ; + + m_graphicContext->StrokePath( path ) ; + delete path ; +} +#endif + +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 ) ) + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawPolygon - invalid DC") ); + + 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); - - wxMacGraphicPath path ; - path.MoveToPoint( x1 , y1 ) ; + + wxGraphicPath* path = m_graphicContext->CreatePath() ; + path->MoveToPoint( x1 , y1 ) ; for (int i = 1; i < n; i++) { x2 = XLOG2DEVMAC(points[i].x + xoffset); y2 = YLOG2DEVMAC(points[i].y + yoffset); - path.AddLineToPoint( x2 , y2 ) ; + path->AddLineToPoint( x2 , y2 ) ; } + if ( x1 != x2 || y1 != y2 ) - { - path.AddLineToPoint( x1,y1 ) ; - } - path.CloseSubpath() ; - m_macGraphicContext->DrawPath( path , fillStyle ) ; + path->AddLineToPoint( x1, y1 ) ; + + path->CloseSubpath() ; + m_graphicContext->DrawPath( path , fillStyle ) ; + + delete path ; } void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawRectangle - invalid DC") ); + + if ( m_logicalFunction != wxCOPY ) + return ; + 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) { @@ -1227,26 +1546,33 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) hh = -hh; yy = yy - hh; } - wxMacGraphicPath path ; - path.AddRectangle(xx ,yy , ww , hh ) ; - path.CloseSubpath() ; - m_macGraphicContext->DrawPath( path ) ; + + wxGraphicPath* path = m_graphicContext->CreatePath() ; + path->AddRectangle( xx , yy , ww , hh ) ; + m_graphicContext->DrawPath( path ) ; + delete path ; } -void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, +void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawRoundedRectangle - invalid DC") ); + + 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) { @@ -1258,29 +1584,29 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, hh = -hh; yy = yy - hh; } - Rect rect = { yy , xx , yy + hh , xx + ww } ; - if (m_brush.GetStyle() != wxTRANSPARENT) - { - MacInstallBrush() ; - ::PaintRoundRect( &rect , int(radius * 2) , int(radius * 2) ) ; - } - if (m_pen.GetStyle() != wxTRANSPARENT) - { - MacInstallPen() ; - ::FrameRoundRect( &rect , int(radius * 2) , int(radius * 2) ) ; - } + + wxMacCGContext* mctx = ((wxMacCGContext*) m_graphicContext) ; + CGContextRef ctx = mctx->GetNativeContext() ; + AddRoundedRectToPath( ctx , CGRectMake( xx , yy , ww , hh ) , radius , radius ) ; + CGContextDrawPath( ctx , mctx->GetDrawingMode() ) ; } -void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) +void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawEllipse - invalid DC") ); + + if ( m_logicalFunction != wxCOPY ) + return ; + 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) { @@ -1292,314 +1618,132 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) hh = -hh; yy = yy - hh; } - CGPoint center = CGPointMake( xx + ww / 2 , yy + hh / 2 ) ; - - wxMacGraphicPath path ; - if ( width == height ) - path.AddCircle( center , width / 2.0 ) ; - path.CloseSubpath() ; - m_macGraphicContext->DrawPath( path ) ; - - /* - CGPathDrawingMode mode ; - CGContextRef cgContext = wxBeginCGContext( this , &mode ) ; - - AddEllipticArcToPath( cgContext , CGPointMake( xx + ww / 2 , yy + hh / 2 ) , ww / 2 , hh / 2 , 0 , 360) ; - - CGContextDrawPath( cgContext , mode ) ; - - QDEndCGContext( (CGrafPtr) m_macPort , &cgContext ) ; - */ -} - -bool wxDC::CanDrawBitmap(void) const + + 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() ) ; +} + +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::DoBlit Illegal dc")); - wxCHECK_MSG(source->Ok(), false, wxT("wxDC::DoBlit Illegal source DC")); + wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoBlit - invalid DC") ); + wxCHECK_MSG( source->Ok(), false, wxT("wxDC(cg)::DoBlit - invalid source DC") ); + if ( logical_func == wxNO_OP ) - return TRUE ; + return true ; + if (xsrcMask == -1 && ysrcMask == -1) { - xsrcMask = xsrc; ysrcMask = ysrc; - } - // correct the parameter in case this dc does not have a mask at all - if ( useMask && !source->m_macMask ) - useMask = false ; - Rect srcrect , dstrect ; - srcrect.top = source->YLOG2DEVMAC(ysrc) ; - srcrect.left = source->XLOG2DEVMAC(xsrc) ; - srcrect.right = source->XLOG2DEVMAC(xsrc + width ) ; - srcrect.bottom = source->YLOG2DEVMAC(ysrc + height) ; - dstrect.top = YLOG2DEVMAC(ydest) ; - dstrect.left = XLOG2DEVMAC(xdest) ; - dstrect.bottom = YLOG2DEVMAC(ydest + height ) ; - dstrect.right = XLOG2DEVMAC(xdest + width ) ; - short mode = kUnsupportedMode ; - bool invertDestinationFirst = false ; - switch ( logical_func ) - { - case wxAND: // src AND dst - mode = adMin ; // ok - break ; - case wxAND_INVERT: // (NOT src) AND dst - mode = notSrcOr ; // ok - break ; - case wxAND_REVERSE:// src AND (NOT dst) - invertDestinationFirst = true ; - mode = srcOr ; - break ; - case wxCLEAR: // 0 - mode = kEmulatedMode ; - break ; - case wxCOPY: // src - mode = srcCopy ; // ok - break ; - case wxEQUIV: // (NOT src) XOR dst - mode = srcXor ; // ok - break ; - case wxINVERT: // NOT dst - mode = kEmulatedMode ; //or hilite ; - break ; - case wxNAND: // (NOT src) OR (NOT dst) - invertDestinationFirst = true ; - mode = srcBic ; - break ; - case wxNOR: // (NOT src) AND (NOT dst) - invertDestinationFirst = true ; - mode = notSrcOr ; - break ; - case wxNO_OP: // dst - mode = kEmulatedMode ; // this has already been handled upon entry - break ; - case wxOR: // src OR dst - mode = notSrcBic ; - break ; - case wxOR_INVERT: // (NOT src) OR dst - mode = srcBic ; - break ; - case wxOR_REVERSE: // src OR (NOT dst) - invertDestinationFirst = true ; - mode = notSrcBic ; - break ; - case wxSET: // 1 - mode = kEmulatedMode ; - break ; - case wxSRC_INVERT: // (NOT src) - mode = notSrcCopy ; // ok - break ; - case wxXOR: // src XOR dst - mode = notSrcXor ; // ok - break ; - default : - break ; - } - if ( mode == kUnsupportedMode ) - { - wxFAIL_MSG(wxT("unsupported blitting mode" )); - return FALSE ; + xsrcMask = xsrc; + ysrcMask = ysrc; } - CGrafPtr sourcePort = (CGrafPtr) source->m_macPort ; - PixMapHandle bmappixels = GetGWorldPixMap( sourcePort ) ; - if ( LockPixels(bmappixels) ) + + wxCoord yysrc = source->YLOG2DEVMAC(ysrc) ; + 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 ) { - if ( source->GetDepth() == 1 ) - { - RGBForeColor( &MAC_WXCOLORREF(m_textForegroundColour.GetPixel()) ) ; - RGBBackColor( &MAC_WXCOLORREF(m_textBackgroundColour.GetPixel()) ) ; - } - else - { - // the modes need this, otherwise we'll end up having really nice colors... - RGBColor white = { 0xFFFF, 0xFFFF,0xFFFF} ; - RGBColor black = { 0,0,0} ; - RGBForeColor( &black ) ; - RGBBackColor( &white ) ; - } - if ( useMask && source->m_macMask ) - { - if ( mode == srcCopy ) - { - if ( LockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ) - { - CopyMask( GetPortBitMapForCopyBits( sourcePort ) , - GetPortBitMapForCopyBits( MAC_WXHBITMAP(source->m_macMask) ) , - GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) , - &srcrect, &srcrect , &dstrect ) ; - UnlockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ; - } - } - else - { - RgnHandle clipRgn = NewRgn() ; - LockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ; - BitMapToRegion( clipRgn , (BitMap*) *GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ; - UnlockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ; - OffsetRgn( clipRgn , -srcrect.left + dstrect.left, -srcrect.top + dstrect.top ) ; - if ( mode == kEmulatedMode ) - { - Pattern pat ; - ::PenPat(GetQDGlobalsBlack(&pat)); - if ( logical_func == wxSET ) - { - RGBColor col= { 0xFFFF, 0xFFFF, 0xFFFF } ; - ::RGBForeColor( &col ) ; - ::PaintRgn( clipRgn ) ; - } - else if ( logical_func == wxCLEAR ) - { - RGBColor col= { 0x0000, 0x0000, 0x0000 } ; - ::RGBForeColor( &col ) ; - ::PaintRgn( clipRgn ) ; - } - else if ( logical_func == wxINVERT ) - { - MacInvertRgn( clipRgn ) ; - } - else - { - for ( int y = 0 ; y < srcrect.right - srcrect.left ; ++y ) - { - for ( int x = 0 ; x < srcrect.bottom - srcrect.top ; ++x ) - { - Point dstPoint = { dstrect.top + y , dstrect.left + x } ; - Point srcPoint = { srcrect.top + y , srcrect.left + x } ; - if ( PtInRgn( dstPoint , clipRgn ) ) - { - RGBColor srcColor ; - RGBColor dstColor ; - SetPort( (GrafPtr) sourcePort ) ; - GetCPixel( srcPoint.h , srcPoint.v , &srcColor) ; - SetPort( (GrafPtr) m_macPort ) ; - GetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ; - wxMacCalculateColour( logical_func , srcColor , dstColor ) ; - SetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ; - } - } - } - } - } - else - { - if ( invertDestinationFirst ) - { - MacInvertRgn( clipRgn ) ; - } - CopyBits( GetPortBitMapForCopyBits( sourcePort ) , - GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) , - &srcrect, &dstrect, mode, clipRgn ) ; - } - DisposeRgn( clipRgn ) ; - } - } - else + wxBitmap blit = memdc->GetSelectedObject() ; + + wxASSERT_MSG( blit.Ok() , wxT("Invalid bitmap for blitting") ) ; + + wxCoord bmpwidth = blit.GetWidth(); + wxCoord bmpheight = blit.GetHeight(); + + if ( xxsrc != 0 || yysrc != 0 || bmpwidth != wwsrc || bmpheight != hhsrc ) { - RgnHandle clipRgn = NewRgn() ; - SetRectRgn( clipRgn , dstrect.left , dstrect.top , dstrect.right , dstrect.bottom ) ; - if ( mode == kEmulatedMode ) + wwsrc = wxMin( wwsrc , bmpwidth - xxsrc ) ; + hhsrc = wxMin( hhsrc , bmpheight - yysrc ) ; + if ( wwsrc > 0 && hhsrc > 0 ) { - Pattern pat ; - ::PenPat(GetQDGlobalsBlack(&pat)); - if ( logical_func == wxSET ) - { - RGBColor col= { 0xFFFF, 0xFFFF, 0xFFFF } ; - ::RGBForeColor( &col ) ; - ::PaintRgn( clipRgn ) ; - } - else if ( logical_func == wxCLEAR ) - { - RGBColor col= { 0x0000, 0x0000, 0x0000 } ; - ::RGBForeColor( &col ) ; - ::PaintRgn( clipRgn ) ; - } - else if ( logical_func == wxINVERT ) + if ( xxsrc >= 0 && yysrc >= 0 ) { - MacInvertRgn( clipRgn ) ; + wxRect subrect( xxsrc, yysrc, wwsrc , hhsrc ) ; + blit = blit.GetSubBitmap( subrect ) ; } else { - for ( int y = 0 ; y < srcrect.right - srcrect.left ; ++y ) - { - for ( int x = 0 ; x < srcrect.bottom - srcrect.top ; ++x ) - { - Point dstPoint = { dstrect.top + y , dstrect.left + x } ; - Point srcPoint = { srcrect.top + y , srcrect.left + x } ; - { - RGBColor srcColor ; - RGBColor dstColor ; - SetPort( (GrafPtr) sourcePort ) ; - GetCPixel( srcPoint.h , srcPoint.v , &srcColor) ; - SetPort( (GrafPtr) m_macPort ) ; - GetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ; - wxMacCalculateColour( logical_func , srcColor , dstColor ) ; - SetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ; - } - } - } + // in this case we'd probably have to adjust the different coordinates, but + // we have to find out proper contract first + blit = wxNullBitmap ; } } else { - if ( invertDestinationFirst ) - { - MacInvertRgn( clipRgn ) ; - } - CopyBits( GetPortBitMapForCopyBits( sourcePort ) , - GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) , - &srcrect, &dstrect, mode, NULL ) ; + blit = wxNullBitmap ; } - DisposeRgn( clipRgn ) ; } - UnlockPixels( bmappixels ) ; + + 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_macPenInstalled = false ; - m_macBrushInstalled = false ; - m_macFontInstalled = false ; - return TRUE; -} + else + { +#if 0 + CGContextRef cg = (wxMacCGContext*)(source->GetGraphicContext())->GetNativeContext() ; + void *data = CGBitmapContextGetData( cg ) ; +#endif -#ifndef FixedToInt -// as macro in FixMath.h for 10.3 -inline Fixed IntToFixed( int inInt ) -{ - return (((SInt32) inInt) << 16); -} + return false ; // wxFAIL_MSG( wxT("Blitting is only supported from bitmap contexts") ) ; + } -inline int FixedToInt( Fixed inFixed ) -{ - return (((SInt32) inFixed) >> 16); + return true; } -#endif -void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, +void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, double angle) { - wxCHECK_RET( Ok(), wxT("wxDC::DoDrawRotatedText Invalid window dc") ); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawRotatedText - invalid DC") ); + 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() ; + UniCharCount chars = str.length() ; UniChar* ubuf = NULL ; + #if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16BE 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 @@ -1615,17 +1759,15 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, int drawX = XLOG2DEVMAC(x) ; int drawY = YLOG2DEVMAC(y) ; - MacInstallFont() ; - 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") ); - int iAngle = int( angle ); - - - CGContextSaveGState(m_macGraphicContext->GetNativeContext()); + 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 ) ; @@ -1633,130 +1775,140 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, { kATSULineRotationTag , } ; - ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = { sizeof( Fixed ) , } ; - ATSUAttributeValuePtr atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = { &atsuAngle , } ; - status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags)/sizeof(ATSUAttributeTag), + status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag), atsuTags, atsuSizes, atsuValues ) ; } + { - CGContextRef cgContext = m_macGraphicContext->GetNativeContext() ; + CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; ATSUAttributeTag atsuTags[] = { kATSUCGContextTag , } ; - ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = { sizeof( CGContextRef ) , } ; - ATSUAttributeValuePtr atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = { &cgContext , } ; - status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags)/sizeof(ATSUAttributeTag), + status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag), atsuTags, atsuSizes, atsuValues ) ; } - ATSUTextMeasurement textBefore ; - ATSUTextMeasurement textAfter ; - ATSUTextMeasurement ascent ; - ATSUTextMeasurement descent ; + 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 ) { - wxMacGraphicPath path ; - path.MoveToPoint( - drawX , - drawY ) ; - path.AddLineToPoint( - drawX + sin(angle/RAD2DEG) * FixedToInt(ascent + descent) , - drawY + cos(angle/RAD2DEG) * FixedToInt(ascent + descent) ) ; - path.AddLineToPoint( - drawX + sin(angle/RAD2DEG) * FixedToInt(ascent + descent ) + cos(angle/RAD2DEG) * FixedToInt(textAfter) , - drawY + cos(angle/RAD2DEG) * FixedToInt(ascent + descent) - sin(angle/RAD2DEG) * FixedToInt(textAfter) ) ; - path.AddLineToPoint( - drawX + cos(angle/RAD2DEG) * FixedToInt(textAfter) , - drawY - sin(angle/RAD2DEG) * FixedToInt(textAfter) ) ; - - m_macGraphicContext->FillPath( path , m_textBackgroundColour ) ; + 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)); + 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") ); - CGContextTranslateCTM(m_macGraphicContext->GetNativeContext(), drawX, drawY); - CGContextScaleCTM(m_macGraphicContext->GetNativeContext(), 1, -1); + 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 - CGContextRestoreGState( m_macGraphicContext->GetNativeContext() ) ; } -void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) +void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) { - wxCHECK_RET(Ok(), wxT("wxDC::DoDrawText Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawText - invalid DC") ); + DoDrawRotatedText( strtext , x , y , 0.0 ) ; } -bool wxDC::CanGetTextExtent() const +bool wxDC::CanGetTextExtent() const { - wxCHECK_MSG(Ok(), false, wxT("Invalid DC")); + wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::CanGetTextExtent - invalid DC") ); + return true ; } -void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height, +void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height, wxCoord *descent, wxCoord *externalLeading , wxFont *theFont ) const { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoGetTextExtent - invalid DC") ); + wxFont formerFont = m_font ; if ( theFont ) { - // work around the constness + // work around the const-ness *((wxFont*)(&m_font)) = *theFont ; + MacInstallFont() ; } - - if ( str.Length() == 0 ) + if ( str.empty() ) return ; - + + wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoGetTextExtent - no valid font set") ) ; + OSStatus status = noErr ; ATSUTextLayout atsuLayout ; - UniCharCount chars = str.Length() ; + UniCharCount chars = str.length() ; UniChar* ubuf = NULL ; + #if SIZEOF_WCHAR_T == 4 - wxMBConvUTF16BE 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 @@ -1769,21 +1921,17 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh #endif #endif - MacInstallFont() ; - 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 ; - ATSUTextMeasurement textAfter ; - ATSUTextMeasurement textAscent ; - ATSUTextMeasurement textDescent ; + + ATSUTextMeasurement textBefore, textAfter ; + ATSUTextMeasurement textAscent, textDescent ; status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, &textBefore , &textAfter, &textAscent , &textDescent ); - + if ( height ) *height = YDEV2LOGREL( FixedToInt(textAscent + textDescent) ) ; if ( descent ) @@ -1792,572 +1940,222 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh *externalLeading = 0 ; if ( width ) *width = XDEV2LOGREL( FixedToInt(textAfter - textBefore) ) ; - + ::ATSUDisposeTextLayout(atsuLayout); + #if SIZEOF_WCHAR_T == 4 free( ubuf ) ; #endif + if ( theFont ) { // work around the constness *((wxFont*)(&m_font)) = formerFont ; - m_macFontInstalled = false ; + MacInstallFont() ; } } - bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const { - wxCHECK_MSG(Ok(), false, wxT("Invalid DC")); + wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoGetPartialTextExtents - invalid DC") ); widths.Empty(); - widths.Add(0, text.Length()); + widths.Add(0, text.length()); - if (text.Length() == 0) + if (text.empty()) return false; - - MacInstallFont() ; -#if TARGET_CARBON - bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ; - if ( UMAGetSystemVersion() < 0x1000 || IsKindOf(CLASSINFO( wxPrinterDC ) ) || ((wxFont*)&m_font)->GetNoAntiAliasing() ) - useGetThemeText = false ; - if ( useGetThemeText ) - { - // If anybody knows how to do this more efficiently yet still handle - // the fractional glyph widths that may be present when using AA - // fonts, please change it. Currently it is measuring from the - // begining of the string for each succeding substring, which is much - // slower than this should be. - for (size_t i=0; iGetNativeContext() ; + switch ( m_backgroundBrush.MacGetBrushKind() ) { case kwxMacBrushTheme : { +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 + if ( HIThemeSetFill != 0 ) + { + HIThemeSetFill( m_backgroundBrush.MacGetTheme(), NULL, cg, kHIThemeOrientationNormal ); + CGContextFillRect(cg, rect); + + } + else +#endif + { + 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 ); + } + + // 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 : { - HIThemeBackgroundDrawInfo drawInfo ; - drawInfo.version = 0 ; - drawInfo.state = kThemeStateActive ; - drawInfo.kind = m_backgroundBrush.MacGetThemeBackground(NULL) ; - HIThemeDrawBackground( &rect , &drawInfo, m_macGraphicContext->GetNativeContext() , - kHIThemeOrientationNormal) ; + 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 ) + { + HIThemeBackgroundDrawInfo drawInfo ; + drawInfo.version = 0 ; + drawInfo.state = kThemeStateActive ; + drawInfo.kind = m_backgroundBrush.MacGetThemeBackground( NULL ) ; + if ( drawInfo.kind == kThemeBackgroundMetal ) + { + HIThemeDrawBackground( &rect, &drawInfo, cg, kHIThemeOrientationNormal ) ; + HIThemeApplyBackground( &rect, &drawInfo, cg, kHIThemeOrientationNormal ) ; + } + } +#endif } - break ; + break ; + case kwxMacBrushColour : - { - RGBColor col = MAC_WXCOLORREF( m_backgroundBrush.GetColour().GetPixel()) ; - CGContextSetRGBFillColor( m_macGraphicContext->GetNativeContext() , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ; - CGContextFillRect(m_macGraphicContext->GetNativeContext(), rect); + { + // FIXME: doesn't correctly render stippled brushes !! + // FIXME: should this be replaced by ::SetBrush() ?? - // reset to normal value - col = MAC_WXCOLORREF( GetBrush().GetColour().GetPixel() ) ; - CGContextSetRGBFillColor( m_macGraphicContext->GetNativeContext() , col.red / 65536.0 , col.green / 65536.0 , col.blue / 65536.0 , 1.0 ) ; - } - break ; + 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 ; + + default : + wxFAIL_MSG( wxT("unknown brush kind") ) ; + break ; } } } void wxDC::MacInstallFont() const { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET( Ok(), wxT("wxDC(cg)::MacInstallFont - invalid DC") ); -/* - // if ( m_macFontInstalled ) - // return ; - Pattern blackColor ; - MacSetupBackgroundForCurrentPort(m_backgroundBrush) ; - if ( m_font.Ok() ) - { - ::TextFont( m_font.MacGetFontNum() ) ; - ::TextSize( (short)(m_scaleY * m_font.MacGetFontSize()) ) ; - ::TextFace( m_font.MacGetFontStyle() ) ; - m_macFontInstalled = true ; - m_macBrushInstalled = false ; - m_macPenInstalled = false ; - RGBColor forecolor = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()); - RGBColor backcolor = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()); - ::RGBForeColor( &forecolor ); - ::RGBBackColor( &backcolor ); - } - else - { - FontFamilyID fontId ; - Str255 fontName ; - SInt16 fontSize ; - Style fontStyle ; - GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; - GetFNum( fontName, &fontId ); - ::TextFont( fontId ) ; - ::TextSize( short(m_scaleY * fontSize) ) ; - ::TextFace( fontStyle ) ; - // todo reset after spacing changes - or store the current spacing somewhere - m_macFontInstalled = true ; - m_macBrushInstalled = false ; - m_macPenInstalled = false ; - RGBColor forecolor = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()); - RGBColor backcolor = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()); - ::RGBForeColor( &forecolor ); - ::RGBBackColor( &backcolor ); - } - short mode = patCopy ; - // todo : - switch( m_logicalFunction ) + if ( m_macATSUIStyle ) { - case wxCOPY: // src - mode = patCopy ; - break ; - case wxINVERT: // NOT dst - ::PenPat(GetQDGlobalsBlack(&blackColor)); - mode = patXor ; - break ; - case wxXOR: // src XOR dst - mode = patXor ; - break ; - case wxOR_REVERSE: // src OR (NOT dst) - mode = notPatOr ; - break ; - case wxSRC_INVERT: // (NOT src) - mode = notPatCopy ; - break ; - case wxAND: // src AND dst - mode = adMin ; - break ; - // unsupported TODO - case wxCLEAR: // 0 - case wxAND_REVERSE:// src AND (NOT dst) - case wxAND_INVERT: // (NOT src) AND dst - case wxNO_OP: // dst - case wxNOR: // (NOT src) AND (NOT dst) - case wxEQUIV: // (NOT src) XOR dst - case wxOR_INVERT: // (NOT src) OR dst - case wxNAND: // (NOT src) OR (NOT dst) - case wxOR: // src OR dst - case wxSET: // 1 - // case wxSRC_OR: // source _bitmap_ OR destination - // case wxSRC_AND: // source _bitmap_ AND destination - break ; + ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle); + m_macATSUIStyle = NULL ; } - ::PenMode( mode ) ; -*/ - OSStatus status = noErr ; - Fixed atsuSize = IntToFixed( int(m_scaleY * m_font.MacGetFontSize()) ) ; - Style qdStyle = m_font.MacGetFontStyle() ; - ATSUFontID atsuFont = m_font.MacGetATSUFontID() ; - status = ::ATSUCreateStyle((ATSUStyle *)&m_macATSUIStyle) ; - wxASSERT_MSG( status == noErr , wxT("couldn't create ATSU style") ) ; - ATSUAttributeTag atsuTags[] = - { - kATSUFontTag , - kATSUSizeTag , - kATSUColorTag , - // kATSUBaselineClassTag , - kATSUVerticalCharacterTag, - kATSUQDBoldfaceTag , - kATSUQDItalicTag , - kATSUQDUnderlineTag , - kATSUQDCondensedTag , - kATSUQDExtendedTag , - } ; - ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = - { - sizeof( ATSUFontID ) , - sizeof( Fixed ) , - sizeof( RGBColor ) , - // sizeof( BslnBaselineClass ) , - sizeof( ATSUVerticalCharacterType), - sizeof( Boolean ) , - sizeof( Boolean ) , - sizeof( Boolean ) , - sizeof( Boolean ) , - sizeof( Boolean ) , - } ; - Boolean kTrue = true ; - Boolean kFalse = false ; - //BslnBaselineClass kBaselineDefault = kBSLNHangingBaseline ; - ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal; - ATSUAttributeValuePtr atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = - { - &atsuFont , - &atsuSize , - &MAC_WXCOLORREF( m_textForegroundColour.GetPixel() ) , - // &kBaselineDefault , - &kHorizontal, - (qdStyle & bold) ? &kTrue : &kFalse , - (qdStyle & italic) ? &kTrue : &kFalse , - (qdStyle & underline) ? &kTrue : &kFalse , - (qdStyle & condense) ? &kTrue : &kFalse , - (qdStyle & extend) ? &kTrue : &kFalse , - } ; - status = ::ATSUSetAttributes((ATSUStyle)m_macATSUIStyle, sizeof(atsuTags)/sizeof(ATSUAttributeTag) , - atsuTags, atsuSizes, atsuValues); - wxASSERT_MSG( status == noErr , wxT("couldn't set create ATSU style") ) ; -} - -Pattern gPatterns[] = -{ // hatch patterns - { { 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF } } , - { { 0x01 , 0x02 , 0x04 , 0x08 , 0x10 , 0x20 , 0x40 , 0x80 } } , - { { 0x80 , 0x40 , 0x20 , 0x10 , 0x08 , 0x04 , 0x02 , 0x01 } } , - { { 0x10 , 0x10 , 0x10 , 0xFF , 0x10 , 0x10 , 0x10 , 0x10 } } , - { { 0x00 , 0x00 , 0x00 , 0xFF , 0x00 , 0x00 , 0x00 , 0x00 } } , - { { 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 } } , - { { 0x81 , 0x42 , 0x24 , 0x18 , 0x18 , 0x24 , 0x42 , 0x81 } } , - // dash patterns - { { 0xCC , 0x99 , 0x33 , 0x66 , 0xCC , 0x99 , 0x33 , 0x66 } } , // DOT - { { 0xFE , 0xFD , 0xFB , 0xF7 , 0xEF , 0xDF , 0xBF , 0x7F } } , // LONG_DASH - { { 0xEE , 0xDD , 0xBB , 0x77 , 0xEE , 0xDD , 0xBB , 0x77 } } , // SHORT_DASH - { { 0xDE , 0xBD , 0x7B , 0xF6 , 0xED , 0xDB , 0xB7 , 0x6F } } , // DOT_DASH -} ; -static void wxMacGetPattern(int penStyle, Pattern *pattern) -{ - int index = 0; // solid pattern by default - switch(penStyle) - { - // hatches - case wxBDIAGONAL_HATCH: index = 1; break; - case wxFDIAGONAL_HATCH: index = 2; break; - case wxCROSS_HATCH: index = 3; break; - case wxHORIZONTAL_HATCH: index = 4; break; - case wxVERTICAL_HATCH: index = 5; break; - case wxCROSSDIAG_HATCH: index = 6; break; - // dashes - case wxDOT: index = 7; break; - case wxLONG_DASH: index = 8; break; - case wxSHORT_DASH: index = 9; break; - case wxDOT_DASH: index = 10; break; - } - *pattern = gPatterns[index]; -} - -void wxDC::MacInstallPen() const -{ -/* - wxCHECK_RET(Ok(), wxT("Invalid DC")); - //Pattern blackColor; - // if ( m_macPenInstalled ) - // return ; - RGBColor forecolor = MAC_WXCOLORREF( m_pen.GetColour().GetPixel()); - RGBColor backcolor = MAC_WXCOLORREF( m_backgroundBrush.GetColour().GetPixel()); - ::RGBForeColor( &forecolor ); - ::RGBBackColor( &backcolor ); - ::PenNormal() ; - int penWidth = (int) (m_pen.GetWidth() * m_scaleX) ; ; - // null means only one pixel, at whatever resolution - if ( penWidth == 0 ) - penWidth = 1 ; - ::PenSize(penWidth, penWidth); - - int penStyle = m_pen.GetStyle(); - Pattern pat; - if (penStyle == wxUSER_DASH) - { - // FIXME: there should be exactly 8 items in the dash - wxDash* dash ; - int number = m_pen.GetDashes(&dash) ; - int index = 0; - for ( int i = 0 ; i < 8 ; ++i ) - { - pat.pat[i] = dash[index] ; - if (index < number - 1) - index++; - } - } - else + if ( m_font.Ok() ) { - wxMacGetPattern(penStyle, &pat); - } - ::PenPat(&pat); + OSStatus status ; - short mode = patCopy ; - // todo : - switch( m_logicalFunction ) - { - case wxCOPY: // only foreground color, leave background (thus not patCopy) - mode = patOr ; - break ; - case wxINVERT: // NOT dst - // ::PenPat(GetQDGlobalsBlack(&blackColor)); - mode = patXor ; - break ; - case wxXOR: // src XOR dst - mode = patXor ; - break ; - case wxOR_REVERSE: // src OR (NOT dst) - mode = notPatOr ; - break ; - case wxSRC_INVERT: // (NOT src) - mode = notPatCopy ; - break ; - case wxAND: // src AND dst - mode = adMin ; - break ; - // unsupported TODO - case wxCLEAR: // 0 - case wxAND_REVERSE:// src AND (NOT dst) - case wxAND_INVERT: // (NOT src) AND dst - case wxNO_OP: // dst - case wxNOR: // (NOT src) AND (NOT dst) - case wxEQUIV: // (NOT src) XOR dst - case wxOR_INVERT: // (NOT src) OR dst - case wxNAND: // (NOT src) OR (NOT dst) - case wxOR: // src OR dst - case wxSET: // 1 - // case wxSRC_OR: // source _bitmap_ OR destination - // case wxSRC_AND: // source _bitmap_ AND destination - break ; - } - ::PenMode( mode ) ; - m_macPenInstalled = true ; - m_macBrushInstalled = false ; - m_macFontInstalled = false ; -*/ -} + status = ATSUCreateAndCopyStyle( (ATSUStyle) m_font.MacGetATSUStyle() , (ATSUStyle*) &m_macATSUIStyle ) ; -void wxDC::MacSetupBackgroundForCurrentPort(const wxBrush& background ) -{ - Pattern whiteColor ; - switch( background.MacGetBrushKind() ) - { - case kwxMacBrushTheme : - { - ::SetThemeBackground( background.MacGetTheme() , wxDisplayDepth() , true ) ; - break ; - } - case kwxMacBrushThemeBackground : - { - Rect extent ; - ThemeBackgroundKind bg = background.MacGetThemeBackground( &extent ) ; - ::ApplyThemeBackground( bg , &extent ,kThemeStateActive , wxDisplayDepth() , true ) ; - break ; - } - case kwxMacBrushColour : - { - ::RGBBackColor( &MAC_WXCOLORREF( background.GetColour().GetPixel()) ); - int brushStyle = background.GetStyle(); - if (brushStyle == wxSOLID) - ::BackPat(GetQDGlobalsWhite(&whiteColor)); - else if (IS_HATCH(brushStyle)) - { - Pattern pat ; - wxMacGetPattern(brushStyle, &pat); - ::BackPat(&pat); - } - else - { - ::BackPat(GetQDGlobalsWhite(&whiteColor)); - } - break ; - } - } -} + wxASSERT_MSG( status == noErr, wxT("couldn't create ATSU style") ) ; -void wxDC::MacInstallBrush() const -{ - wxCHECK_RET(Ok(), wxT("Invalid DC")); - Pattern blackColor ; - // if ( m_macBrushInstalled ) - // return ; - // foreground - bool backgroundTransparent = (GetBackgroundMode() == wxTRANSPARENT) ; - ::RGBForeColor( &MAC_WXCOLORREF( m_brush.GetColour().GetPixel()) ); - ::RGBBackColor( &MAC_WXCOLORREF( m_backgroundBrush.GetColour().GetPixel()) ); - int brushStyle = m_brush.GetStyle(); - if (brushStyle == wxSOLID) - { - ::PenPat(GetQDGlobalsBlack(&blackColor)); - } - else if (IS_HATCH(brushStyle)) - { - Pattern pat ; - wxMacGetPattern(brushStyle, &pat); - ::PenPat(&pat); - } - else if ( m_brush.GetStyle() == wxSTIPPLE || m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE ) - { - // we force this in order to be compliant with wxMSW - backgroundTransparent = false ; - // for these the text fore (and back for MASK_OPAQUE) colors are used - wxBitmap* bitmap = m_brush.GetStipple() ; - int width = bitmap->GetWidth() ; - int height = bitmap->GetHeight() ; - GWorldPtr gw = NULL ; - if ( m_brush.GetStyle() == wxSTIPPLE ) - gw = MAC_WXHBITMAP(bitmap->GetHBITMAP()) ; - else - gw = MAC_WXHBITMAP(bitmap->GetMask()->GetMaskBitmap()) ; - PixMapHandle gwpixmaphandle = GetGWorldPixMap( gw ) ; - LockPixels( gwpixmaphandle ) ; - bool isMonochrome = !IsPortColor( gw ) ; - if ( !isMonochrome ) - { - if ( (**gwpixmaphandle).pixelSize == 1 ) - isMonochrome = true ; - } - if ( isMonochrome && width == 8 && height == 8 ) + Fixed atsuSize = IntToFixed( int(m_scaleY * m_font.MacGetFontSize()) ) ; + RGBColor atsuColor = MAC_WXCOLORREF( m_textForegroundColour.GetPixel() ) ; + ATSUAttributeTag atsuTags[] = { - ::RGBForeColor( &MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ); - ::RGBForeColor( &MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()) ); - BitMap* gwbitmap = (BitMap*) *gwpixmaphandle ; // since the color depth is 1 it is a BitMap - UInt8 *gwbits = (UInt8*) gwbitmap->baseAddr ; - int alignment = gwbitmap->rowBytes & 0x7FFF ; - Pattern pat ; - for ( int i = 0 ; i < 8 ; ++i ) - { - pat.pat[i] = gwbits[i*alignment+0] ; - } - UnlockPixels( GetGWorldPixMap( gw ) ) ; - ::PenPat( &pat ) ; - } - else + kATSUSizeTag , + kATSUColorTag , + } ; + ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = { - // this will be the code to handle power of 2 patterns, we will have to arrive at a nice - // caching scheme before putting this into production - Handle image; - long imageSize; - PixPatHandle pixpat = NewPixPat() ; - CopyPixMap(gwpixmaphandle, (**pixpat).patMap); - imageSize = GetPixRowBytes((**pixpat).patMap) * - ((**(**pixpat).patMap).bounds.bottom - - (**(**pixpat).patMap).bounds.top); - PtrToHand( (**gwpixmaphandle).baseAddr, &image, imageSize ); - (**pixpat).patData = image; - if ( isMonochrome ) - { - CTabHandle ctable = ((**((**pixpat).patMap)).pmTable) ; - ColorSpecPtr ctspec = (ColorSpecPtr) &(**ctable).ctTable ; - if ( ctspec[0].rgb.red == 0x0000 ) - { - ctspec[1].rgb = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()) ; - ctspec[0].rgb = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ; - } - else - { - ctspec[0].rgb = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()) ; - ctspec[1].rgb = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ; - } - ::CTabChanged( ctable ) ; - } - ::PenPixPat(pixpat); - m_macForegroundPixMap = pixpat ; - } - UnlockPixels( gwpixmaphandle ) ; - } - else - { - ::PenPat(GetQDGlobalsBlack(&blackColor)); - } - short mode = patCopy ; - switch( m_logicalFunction ) - { - case wxCOPY: // src - if ( backgroundTransparent ) - mode = patOr ; - else - mode = patCopy ; - break ; - case wxINVERT: // NOT dst - if ( !backgroundTransparent ) + sizeof( Fixed ) , + sizeof( RGBColor ) , + } ; + ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = { - ::PenPat(GetQDGlobalsBlack(&blackColor)); - } - mode = patXor ; - break ; - case wxXOR: // src XOR dst - mode = patXor ; - break ; - case wxOR_REVERSE: // src OR (NOT dst) - mode = notPatOr ; - break ; - case wxSRC_INVERT: // (NOT src) - mode = notPatCopy ; - break ; - case wxAND: // src AND dst - mode = adMin ; - break ; - // unsupported TODO - case wxCLEAR: // 0 - case wxAND_REVERSE:// src AND (NOT dst) - case wxAND_INVERT: // (NOT src) AND dst - case wxNO_OP: // dst - case wxNOR: // (NOT src) AND (NOT dst) - case wxEQUIV: // (NOT src) XOR dst - case wxOR_INVERT: // (NOT src) OR dst - case wxNAND: // (NOT src) OR (NOT dst) - case wxOR: // src OR dst - case wxSET: // 1 - // case wxSRC_OR: // source _bitmap_ OR destination - // case wxSRC_AND: // source _bitmap_ AND destination - break ; + &atsuSize , + &atsuColor , + } ; + + status = ::ATSUSetAttributes( + (ATSUStyle)m_macATSUIStyle, sizeof(atsuTags) / sizeof(ATSUAttributeTag) , + atsuTags, atsuSizes, atsuValues); + + wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ) ; } - ::PenMode( mode ) ; - m_macBrushInstalled = true ; - m_macPenInstalled = false ; - m_macFontInstalled = false ; } +#pragma mark - + // --------------------------------------------------------------------------- // coordinates transformations // --------------------------------------------------------------------------- @@ -2401,3 +2199,5 @@ wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const { return ((wxDC *)this)->YLOG2DEVREL(y); } + +#endif // wxMAC_USE_CORE_GRAPHICS