X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83576e682dd00c5ff68c3daafbdee54ce881cc83..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/msw/graphics.cpp diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp index acbbcd7593..0bc8226142 100644 --- a/src/msw/graphics.cpp +++ b/src/msw/graphics.cpp @@ -11,35 +11,50 @@ #include "wx/wxprec.h" -#include "wx/dc.h" - #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#ifndef WX_PRECOMP -#include "wx/msw/wrapcdlg.h" -#include "wx/image.h" -#include "wx/window.h" #include "wx/dc.h" -#include "wx/utils.h" -#include "wx/dialog.h" -#include "wx/app.h" -#include "wx/bitmap.h" -#include "wx/dcmemory.h" -#include "wx/log.h" -#include "wx/icon.h" -#include "wx/dcprint.h" -#include "wx/module.h" + +#if wxUSE_GRAPHICS_CONTEXT + +#ifndef WX_PRECOMP + #include "wx/msw/wrapcdlg.h" + #include "wx/image.h" + #include "wx/window.h" + #include "wx/utils.h" + #include "wx/dialog.h" + #include "wx/app.h" + #include "wx/bitmap.h" + #include "wx/log.h" + #include "wx/icon.h" + #include "wx/module.h" + // include all dc types that are used as a param + #include "wx/dc.h" + #include "wx/dcclient.h" + #include "wx/dcmemory.h" + #include "wx/dcprint.h" #endif -#include "wx/graphics.h" +#include "wx/stack.h" -#if wxUSE_GRAPHICS_CONTEXT +#include "wx/private/graphics.h" +#include "wx/msw/wrapgdip.h" +#include "wx/msw/dc.h" +#if wxUSE_ENH_METAFILE + #include "wx/msw/enhmeta.h" +#endif +#include "wx/dcgraph.h" + +#include "wx/msw/private.h" // needs to be before #include -#include +#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__) +#include +#endif -using namespace std; +namespace +{ //----------------------------------------------------------------------------- // constants @@ -51,11 +66,19 @@ const double RAD2DEG = 180.0 / M_PI; // 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; } +inline double dmin(double a, double b) { return a < b ? a : b; } +inline double dmax(double a, double b) { return a > b ? a : b; } + +inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } +inline double RadToDeg(double deg) { return (deg * 180.0) / M_PI; } -static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } -static inline double RadToDeg(double deg) { return (deg * 180.0) / M_PI; } +// translate a wxColour to a Color +inline Color wxColourToColor(const wxColour& col) +{ + return Color(col.Alpha(), col.Red(), col.Green(), col.Blue()); +} + +} // anonymous namespace //----------------------------------------------------------------------------- // device context implementation @@ -73,33 +96,15 @@ static inline double RadToDeg(double deg) { return (deg * 180.0) / M_PI; } // wxGraphicsPath implementation //----------------------------------------------------------------------------- -#include "wx/msw/private.h" // needs to be before #include - -#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__) -#include -#endif - -// TODO remove this dependency (gdiplus needs the macros) - -#ifndef max -#define max(a,b) (((a) > (b)) ? (a) : (b)) -#endif - -#ifndef min -#define min(a,b) (((a) < (b)) ? (a) : (b)) -#endif - -#include "gdiplus.h" -using namespace Gdiplus; +class wxGDIPlusContext; -class WXDLLIMPEXP_CORE wxGDIPlusPath : public wxGraphicsPath +class wxGDIPlusPathData : public wxGraphicsPathData { public : - wxGDIPlusPath(); - wxGDIPlusPath(wxGraphicsRenderer* renderer, GraphicsPath* path = NULL); - ~wxGDIPlusPath(); + wxGDIPlusPathData(wxGraphicsRenderer* renderer, GraphicsPath* path = NULL); + ~wxGDIPlusPathData(); - virtual wxGraphicsPath *Clone() const; + virtual wxGraphicsObjectRefData *Clone() const; // // These are the path primitives from which everything else can be constructed @@ -108,31 +113,31 @@ public : // begins a new subpath at (x,y) virtual void MoveToPoint( wxDouble x, wxDouble y ); - // adds a straight line from the current point to (x,y) + // adds a straight line from the current point to (x,y) virtual void AddLineToPoint( wxDouble x, wxDouble y ); // adds a cubic Bezier curve from the current point, using two control points and an end point virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ); - // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle + // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) ; // gets the last point of the current path, (0,0) if not yet set - virtual void GetCurrentPoint( wxDouble& x, wxDouble&y) ; + virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const; // adds another path - virtual void AddPath( const wxGraphicsPath* path ); + virtual void AddPath( const wxGraphicsPathData* path ); // closes the current sub-path virtual void CloseSubpath(); // - // These are convenience functions which - if not available natively will be assembled + // These are convenience functions which - if not available natively will be assembled // using the primitives from above // - // appends a rectangle as a new closed subpath + // appends a rectangle as a new closed subpath virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) ; /* @@ -143,53 +148,51 @@ public : virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) ; */ - // returns the native path - virtual void * GetNativePath() const { return m_path; } - - // give the native path returned by GetNativePath() back (there might be some deallocations necessary) - virtual void UnGetNativePath(void * WXUNUSED(path)) {} + // returns the native path + virtual void * GetNativePath() const { return m_path; } + + // give the native path returned by GetNativePath() back (there might be some deallocations necessary) + virtual void UnGetNativePath(void * WXUNUSED(path)) const {} // transforms each point of this path by the matrix - virtual void Transform( wxGraphicsMatrix* matrix ) ; + virtual void Transform( const wxGraphicsMatrixData* matrix ) ; // gets the bounding box enclosing all points (possibly including control points) - virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) ; + virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const; - virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxWINDING_RULE) ; + virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const; private : GraphicsPath* m_path; - DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusPath) }; -class WXDLLIMPEXP_CORE wxGDIPlusMatrix : public wxGraphicsMatrix +class wxGDIPlusMatrixData : public wxGraphicsMatrixData { public : - wxGDIPlusMatrix() ; - - wxGDIPlusMatrix(wxGraphicsRenderer* renderer, Matrix* matrix = NULL ) ; - virtual ~wxGDIPlusMatrix() ; + wxGDIPlusMatrixData(wxGraphicsRenderer* renderer, Matrix* matrix = NULL) ; + virtual ~wxGDIPlusMatrixData() ; - virtual wxGraphicsMatrix *Clone() const ; + virtual wxGraphicsObjectRefData* Clone() const ; // concatenates the matrix - virtual void Concat( const wxGraphicsMatrix *t ); - - // copies the passed in matrix - virtual void Copy( const wxGraphicsMatrix *t ); + virtual void Concat( const wxGraphicsMatrixData *t ); // sets the matrix to the respective values - virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, + virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, wxDouble tx=0.0, wxDouble ty=0.0); + // gets the component valuess of the matrix + virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL, + wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const; + // makes this the inverse matrix virtual void Invert(); // returns true if the elements of the transformation matrix are equal ? - virtual bool IsEqual( const wxGraphicsMatrix* t) const ; + virtual bool IsEqual( const wxGraphicsMatrixData* t) const ; // return true if this is the identity matrix - virtual bool IsIdentity(); + virtual bool IsIdentity() const; // // transformation @@ -202,36 +205,32 @@ public : virtual void Scale( wxDouble xScale , wxDouble yScale ); // add the rotation to this matrix (radians) - virtual void Rotate( wxDouble angle ); + virtual void Rotate( wxDouble angle ); // // apply the transforms // // applies that matrix to the point - virtual void TransformPoint( wxDouble *x, wxDouble *y ); + virtual void TransformPoint( wxDouble *x, wxDouble *y ) const; // applies the matrix except for translations - virtual void TransformDistance( wxDouble *dx, wxDouble *dy ); + virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const; // returns the native representation virtual void * GetNativeMatrix() const; private: Matrix* m_matrix ; - - DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusMatrix) } ; -class WXDLLIMPEXP_CORE wxGDIPlusPen : public wxGraphicsPen +class wxGDIPlusPenData : public wxGraphicsObjectRefData { public: - wxGDIPlusPen(); - wxGDIPlusPen( wxGraphicsRenderer* renderer, const wxPen &pen ); - ~wxGDIPlusPen(); + wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &pen ); + ~wxGDIPlusPenData(); void Init(); - virtual void Apply( wxGraphicsContext* context ); virtual wxDouble GetWidth() { return m_width; } virtual Pen* GetGDIPlusPen() { return m_pen; } @@ -241,57 +240,73 @@ protected : Brush* m_penBrush; wxDouble m_width; -private : - DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusPen) }; -class WXDLLIMPEXP_CORE wxGDIPlusBrush : public wxGraphicsBrush +class wxGDIPlusBrushData : public wxGraphicsObjectRefData { public: - wxGDIPlusBrush(); - wxGDIPlusBrush( wxGraphicsRenderer* renderer ); - wxGDIPlusBrush( wxGraphicsRenderer* renderer, const wxBrush &brush ); - ~wxGDIPlusBrush (); - - virtual void Apply( wxGraphicsContext* context ); - void CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, - const wxColour&c1, const wxColour&c2 ); - void CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius, - const wxColour &oColor, const wxColour &cColor ); + wxGDIPlusBrushData( wxGraphicsRenderer* renderer ); + wxGDIPlusBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush ); + ~wxGDIPlusBrushData (); + + void CreateLinearGradientBrush(wxDouble x1, wxDouble y1, + wxDouble x2, wxDouble y2, + const wxGraphicsGradientStops& stops); + void CreateRadialGradientBrush(wxDouble xo, wxDouble yo, + wxDouble xc, wxDouble yc, + wxDouble radius, + const wxGraphicsGradientStops& stops); + virtual Brush* GetGDIPlusBrush() { return m_brush; } protected: virtual void Init(); -private : +private: + // common part of Create{Linear,Radial}GradientBrush() + template + void SetGradientStops(T *brush, const wxGraphicsGradientStops& stops); + Brush* m_brush; Image* m_brushImage; GraphicsPath* m_brushPath; +}; + +class WXDLLIMPEXP_CORE wxGDIPlusBitmapData : public wxGraphicsObjectRefData +{ +public: + wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, Bitmap* bitmap ); + wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, const wxBitmap &bmp ); + ~wxGDIPlusBitmapData (); - DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusBrush) + virtual Bitmap* GetGDIPlusBitmap() { return m_bitmap; } + +private : + Bitmap* m_bitmap; + Bitmap* m_helper; }; -class wxGDIPlusFont : public wxGraphicsFont +class wxGDIPlusFontData : public wxGraphicsObjectRefData { public: - wxGDIPlusFont(); - wxGDIPlusFont( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col ); - ~wxGDIPlusFont(); + wxGDIPlusFontData( wxGraphicsRenderer* renderer, + const wxGDIPlusContext* gc, + const wxFont &font, + const wxColour& col ); + ~wxGDIPlusFontData(); - virtual void Apply( wxGraphicsContext* context ); virtual Brush* GetGDIPlusBrush() { return m_textBrush; } virtual Font* GetGDIPlusFont() { return m_font; } private : Brush* m_textBrush; Font* m_font; - - DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusFont) }; -class WXDLLIMPEXP_CORE wxGDIPlusContext : public wxGraphicsContext +class wxGDIPlusContext : public wxGraphicsContext { public: - wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc ); + wxGDIPlusContext( wxGraphicsRenderer* renderer, const wxDC& dc ); + wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc, wxDouble width, wxDouble height ); wxGDIPlusContext( wxGraphicsRenderer* renderer, HWND hwnd ); wxGDIPlusContext( wxGraphicsRenderer* renderer, Graphics* gr); wxGDIPlusContext(); @@ -301,85 +316,239 @@ public: virtual void Clip( const wxRegion ®ion ); // clips drawings to the rect virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ); - - // resets the clipping to original extent - virtual void ResetClip(); - virtual void * GetNativeContext(); - - virtual void StrokePath( const wxGraphicsPath *p ); - virtual void FillPath( const wxGraphicsPath *p , int fillStyle = wxWINDING_RULE ); + // resets the clipping to original extent + virtual void ResetClip(); + + virtual void * GetNativeContext(); - virtual void Translate( wxDouble dx , wxDouble dy ); - virtual void Scale( wxDouble xScale , wxDouble yScale ); - virtual void Rotate( wxDouble angle ); + virtual void StrokePath( const wxGraphicsPath& p ); + virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); + + virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ); + + // stroke lines connecting each of the points + virtual void StrokeLines( size_t n, const wxPoint2DDouble *points); + + // draws a polygon + virtual void DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); + + virtual bool SetAntialiasMode(wxAntialiasMode antialias); + + virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation); + + virtual bool SetCompositionMode(wxCompositionMode op); + + virtual void BeginLayer(wxDouble opacity); + + virtual void EndLayer(); + + virtual void Translate( wxDouble dx , wxDouble dy ); + virtual void Scale( wxDouble xScale , wxDouble yScale ); + virtual void Rotate( wxDouble angle ); // concatenates this transform with the current transform of this context - virtual void ConcatTransform( const wxGraphicsMatrix* matrix ); + virtual void ConcatTransform( const wxGraphicsMatrix& matrix ); // sets the transform of this context - virtual void SetTransform( const wxGraphicsMatrix* matrix ); + virtual void SetTransform( const wxGraphicsMatrix& matrix ); // gets the matrix of this context - virtual void GetTransform( wxGraphicsMatrix* matrix ); + virtual wxGraphicsMatrix GetTransform() const; + virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ); virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ); virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ); - virtual void PushState(); + virtual void PushState(); virtual void PopState(); - virtual void DrawText( const wxString &str, wxDouble x, wxDouble y); + // sets the font of this context + virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) const; + virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height, wxDouble *descent, wxDouble *externalLeading ) const; virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const; + virtual bool ShouldOffset() const; + virtual void GetSize( wxDouble* width, wxDouble *height ); + + Graphics* GetGraphics() const { return m_context; } + +protected: + + wxDouble m_fontScaleRatio; private: void Init(); void SetDefaults(); + virtual void DoDrawText(const wxString& str, wxDouble x, wxDouble y) + { DoDrawFilledText(str, x, y, wxNullGraphicsBrush); } + virtual void DoDrawFilledText(const wxString& str, wxDouble x, wxDouble y, + const wxGraphicsBrush& backgroundBrush); + Graphics* m_context; - vector m_stateStack; + wxStack m_stateStack; GraphicsState m_state1; GraphicsState m_state2; DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusContext) }; +class wxGDIPlusMeasuringContext : public wxGDIPlusContext +{ +public: + wxGDIPlusMeasuringContext( wxGraphicsRenderer* renderer ) : wxGDIPlusContext( renderer , m_hdc = GetDC(NULL), 1000, 1000 ) + { + } + wxGDIPlusMeasuringContext() + { + } + + virtual ~wxGDIPlusMeasuringContext() + { + ReleaseDC( NULL, m_hdc ); + } + +private: + HDC m_hdc ; + DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusMeasuringContext) +} ; + +class wxGDIPlusPrintingContext : public wxGDIPlusContext +{ +public: + wxGDIPlusPrintingContext( wxGraphicsRenderer* renderer, const wxDC& dc ); + virtual ~wxGDIPlusPrintingContext() { } +protected: +}; + //----------------------------------------------------------------------------- -// wxGDIPlusPen implementation +// wxGDIPlusRenderer declaration //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusPen,wxGraphicsPen) - -wxGDIPlusPen::wxGDIPlusPen() : wxGraphicsPen(NULL) +class wxGDIPlusRenderer : public wxGraphicsRenderer { - wxLogDebug(wxT("Illegal Constructor called")); -} +public : + wxGDIPlusRenderer() + { + m_loaded = -1; + m_gditoken = 0; + } + + virtual ~wxGDIPlusRenderer() + { + if ( m_loaded == 1 ) + { + Unload(); + } + } + + // Context + + virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc); + + virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc); + +#if wxUSE_PRINTING_ARCHITECTURE + virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc); +#endif + +#if wxUSE_ENH_METAFILE + virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc); +#endif + + virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ); + + virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ); + + virtual wxGraphicsContext * CreateContext( wxWindow* window ); + + virtual wxGraphicsContext * CreateMeasuringContext(); + + // Path + + virtual wxGraphicsPath CreatePath(); + + // Matrix + + virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, + wxDouble tx=0.0, wxDouble ty=0.0); + + + virtual wxGraphicsPen CreatePen(const wxPen& pen) ; + + virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) ; + + virtual wxGraphicsBrush + CreateLinearGradientBrush(wxDouble x1, wxDouble y1, + wxDouble x2, wxDouble y2, + const wxGraphicsGradientStops& stops); + + virtual wxGraphicsBrush + CreateRadialGradientBrush(wxDouble xo, wxDouble yo, + wxDouble xc, wxDouble yc, + wxDouble radius, + const wxGraphicsGradientStops& stops); + + // create a native bitmap representation + virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ); + + // stub: should not be called directly + virtual wxGraphicsFont CreateFont( const wxFont& WXUNUSED(font), + const wxColour& WXUNUSED(col) ) + { wxFAIL; return wxNullGraphicsFont; } + + // this is used to really create the font + wxGraphicsFont CreateGDIPlusFont( const wxGDIPlusContext* gc, + const wxFont &font, + const wxColour &col ); + + // create a graphics bitmap from a native bitmap + virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap ); -wxGDIPlusPen::~wxGDIPlusPen() + // create a subimage from a native image representation + virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ); + +protected : + bool EnsureIsLoaded(); + void Load(); + void Unload(); + friend class wxGDIPlusRendererModule; + +private : + int m_loaded; + ULONG_PTR m_gditoken; + + DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusRenderer) +} ; + +//----------------------------------------------------------------------------- +// wxGDIPlusPen implementation +//----------------------------------------------------------------------------- + +wxGDIPlusPenData::~wxGDIPlusPenData() { delete m_pen; delete m_penImage; delete m_penBrush; } -void wxGDIPlusPen::Init() +void wxGDIPlusPenData::Init() { m_pen = NULL ; m_penImage = NULL; m_penBrush = NULL; } -wxGDIPlusPen::wxGDIPlusPen( wxGraphicsRenderer* renderer, const wxPen &pen ) -: wxGraphicsPen(renderer) -{ +wxGDIPlusPenData::wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &pen ) +: wxGraphicsObjectRefData(renderer) +{ Init(); m_width = pen.GetWidth(); if (m_width <= 0.0) m_width = 0.1; - m_pen = new Pen(Color( pen.GetColour().Alpha() , pen.GetColour().Red() , - pen.GetColour().Green() , pen.GetColour().Blue() ), m_width ); + m_pen = new Pen(wxColourToColor(pen.GetColour()), m_width ); LineCap cap; switch ( pen.GetCap() ) @@ -429,25 +598,25 @@ wxGDIPlusPen::wxGDIPlusPen( wxGraphicsRenderer* renderer, const wxPen &pen ) DashStyle dashStyle = DashStyleSolid; switch ( pen.GetStyle() ) { - case wxSOLID : + case wxPENSTYLE_SOLID : break; - case wxDOT : + case wxPENSTYLE_DOT : dashStyle = DashStyleDot; break; - case wxLONG_DASH : + case wxPENSTYLE_LONG_DASH : dashStyle = DashStyleDash; // TODO verify break; - case wxSHORT_DASH : + case wxPENSTYLE_SHORT_DASH : dashStyle = DashStyleDash; break; - case wxDOT_DASH : + case wxPENSTYLE_DOT_DASH : dashStyle = DashStyleDashDot; break; - case wxUSER_DASH : + case wxPENSTYLE_USER_DASH : { dashStyle = DashStyleCustom; wxDash *dashes; @@ -464,12 +633,18 @@ wxGDIPlusPen::wxGDIPlusPen( wxGraphicsRenderer* renderer, const wxPen &pen ) } } break; - case wxSTIPPLE : + case wxPENSTYLE_STIPPLE : { wxBitmap* bmp = pen.GetStipple(); - if ( bmp && bmp->Ok() ) + if ( bmp && bmp->IsOk() ) { - m_penImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),(HPALETTE)bmp->GetPalette()->GetHPALETTE()); + m_penImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(), +#if wxUSE_PALETTE + (HPALETTE)bmp->GetPalette()->GetHPALETTE() +#else + NULL +#endif + ); m_penBrush = new TextureBrush(m_penImage); m_pen->SetBrush( m_penBrush ); } @@ -477,177 +652,204 @@ wxGDIPlusPen::wxGDIPlusPen( wxGraphicsRenderer* renderer, const wxPen &pen ) } break; default : - if ( pen.GetStyle() >= wxFIRST_HATCH && pen.GetStyle() <= wxLAST_HATCH ) + if ( pen.GetStyle() >= wxPENSTYLE_FIRST_HATCH && + pen.GetStyle() <= wxPENSTYLE_LAST_HATCH ) { - HatchStyle style = HatchStyleHorizontal; + HatchStyle style; switch( pen.GetStyle() ) { - case wxBDIAGONAL_HATCH : + case wxPENSTYLE_BDIAGONAL_HATCH : style = HatchStyleBackwardDiagonal; break ; - case wxCROSSDIAG_HATCH : + case wxPENSTYLE_CROSSDIAG_HATCH : style = HatchStyleDiagonalCross; break ; - case wxFDIAGONAL_HATCH : + case wxPENSTYLE_FDIAGONAL_HATCH : style = HatchStyleForwardDiagonal; break ; - case wxCROSS_HATCH : + case wxPENSTYLE_CROSS_HATCH : style = HatchStyleCross; break ; - case wxHORIZONTAL_HATCH : + case wxPENSTYLE_HORIZONTAL_HATCH : style = HatchStyleHorizontal; break ; - case wxVERTICAL_HATCH : + case wxPENSTYLE_VERTICAL_HATCH : style = HatchStyleVertical; break ; - + default: + style = HatchStyleHorizontal; } - m_penBrush = new HatchBrush(style,Color( pen.GetColour().Alpha() , pen.GetColour().Red() , - pen.GetColour().Green() , pen.GetColour().Blue() ), Color::Transparent ); + m_penBrush = new HatchBrush + ( + style, + wxColourToColor(pen.GetColour()), + Color::Transparent + ); m_pen->SetBrush( m_penBrush ); } break; - } + } if ( dashStyle != DashStyleSolid ) m_pen->SetDashStyle(dashStyle); } -void wxGDIPlusPen::Apply( wxGraphicsContext* WXUNUSED(context) ) -{ - // nothing to do here -} - - //----------------------------------------------------------------------------- // wxGDIPlusBrush implementation //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusBrush,wxGraphicsBrush) - -wxGDIPlusBrush::wxGDIPlusBrush( wxGraphicsRenderer* renderer ) -: wxGraphicsBrush(renderer) +wxGDIPlusBrushData::wxGDIPlusBrushData( wxGraphicsRenderer* renderer ) +: wxGraphicsObjectRefData(renderer) { Init(); } -wxGDIPlusBrush::wxGDIPlusBrush( ) -: wxGraphicsBrush(NULL) -{ - wxLogDebug(wxT("Illegal Constructor called")); -} - - -wxGDIPlusBrush::wxGDIPlusBrush( wxGraphicsRenderer* renderer , const wxBrush &brush ) -: wxGraphicsBrush(renderer) +wxGDIPlusBrushData::wxGDIPlusBrushData( wxGraphicsRenderer* renderer , const wxBrush &brush ) +: wxGraphicsObjectRefData(renderer) { Init(); if ( brush.GetStyle() == wxSOLID) { - m_brush = new SolidBrush( Color( brush.GetColour().Alpha() , brush.GetColour().Red() , - brush.GetColour().Green() , brush.GetColour().Blue() ) ); + m_brush = new SolidBrush(wxColourToColor( brush.GetColour())); } else if ( brush.IsHatch() ) { - HatchStyle style = HatchStyleHorizontal; + HatchStyle style; switch( brush.GetStyle() ) { - case wxBDIAGONAL_HATCH : + case wxBRUSHSTYLE_BDIAGONAL_HATCH : style = HatchStyleBackwardDiagonal; break ; - case wxCROSSDIAG_HATCH : + case wxBRUSHSTYLE_CROSSDIAG_HATCH : style = HatchStyleDiagonalCross; break ; - case wxFDIAGONAL_HATCH : + case wxBRUSHSTYLE_FDIAGONAL_HATCH : style = HatchStyleForwardDiagonal; break ; - case wxCROSS_HATCH : + case wxBRUSHSTYLE_CROSS_HATCH : style = HatchStyleCross; break ; - case wxHORIZONTAL_HATCH : + case wxBRUSHSTYLE_HORIZONTAL_HATCH : style = HatchStyleHorizontal; break ; - case wxVERTICAL_HATCH : + case wxBRUSHSTYLE_VERTICAL_HATCH : style = HatchStyleVertical; break ; - + default: + style = HatchStyleHorizontal; } - m_brush = new HatchBrush(style,Color( brush.GetColour().Alpha() , brush.GetColour().Red() , - brush.GetColour().Green() , brush.GetColour().Blue() ), Color::Transparent ); + m_brush = new HatchBrush + ( + style, + wxColourToColor(brush.GetColour()), + Color::Transparent + ); } - else + else { wxBitmap* bmp = brush.GetStipple(); - if ( bmp && bmp->Ok() ) + if ( bmp && bmp->IsOk() ) { wxDELETE( m_brushImage ); - m_brushImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),(HPALETTE)bmp->GetPalette()->GetHPALETTE()); + m_brushImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(), +#if wxUSE_PALETTE + (HPALETTE)bmp->GetPalette()->GetHPALETTE() +#else + NULL +#endif + ); m_brush = new TextureBrush(m_brushImage); } } } -wxGDIPlusBrush::~wxGDIPlusBrush() +wxGDIPlusBrushData::~wxGDIPlusBrushData() { delete m_brush; delete m_brushImage; delete m_brushPath; }; -void wxGDIPlusBrush::Init() +void wxGDIPlusBrushData::Init() { m_brush = NULL; m_brushImage= NULL; m_brushPath= NULL; } -void wxGDIPlusBrush::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, const wxColour&c1, const wxColour&c2) +template +void +wxGDIPlusBrushData::SetGradientStops(T *brush, + const wxGraphicsGradientStops& stops) { - m_brush = new LinearGradientBrush( PointF( x1,y1) , PointF( x2,y2), - Color( c1.Alpha(), c1.Red(),c1.Green() , c1.Blue() ), - Color( c2.Alpha(), c2.Red(),c2.Green() , c2.Blue() )); + const unsigned numStops = stops.GetCount(); + if ( numStops <= 2 ) + { + // initial and final colours are set during the brush creation, nothing + // more to do + return; + } + + wxVector colors(numStops); + wxVector positions(numStops); + + for ( unsigned i = 0; i < numStops; i++ ) + { + wxGraphicsGradientStop stop = stops.Item(i); + + colors[i] = wxColourToColor(stop.GetColour()); + positions[i] = stop.GetPosition(); + } + + brush->SetInterpolationColors(&colors[0], &positions[0], numStops); +} + +void +wxGDIPlusBrushData::CreateLinearGradientBrush(wxDouble x1, wxDouble y1, + wxDouble x2, wxDouble y2, + const wxGraphicsGradientStops& stops) +{ + LinearGradientBrush * const + brush = new LinearGradientBrush(PointF(x1, y1) , PointF(x2, y2), + wxColourToColor(stops.GetStartColour()), + wxColourToColor(stops.GetEndColour())); + m_brush = brush; + + SetGradientStops(brush, stops); } -void wxGDIPlusBrush::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius, - const wxColour &oColor, const wxColour &cColor) +void +wxGDIPlusBrushData::CreateRadialGradientBrush(wxDouble xo, wxDouble yo, + wxDouble xc, wxDouble yc, + wxDouble radius, + const wxGraphicsGradientStops& stops) { - // Create a path that consists of a single circle. m_brushPath = new GraphicsPath(); - m_brushPath->AddEllipse( (REAL)(xc-radius), (REAL)(yc-radius), (REAL)(2*radius), (REAL)(2*radius)); + m_brushPath->AddEllipse( (REAL)(xc-radius), (REAL)(yc-radius), + (REAL)(2*radius), (REAL)(2*radius)); - PathGradientBrush *b = new PathGradientBrush(m_brushPath); - m_brush = b; - b->SetCenterPoint( PointF(xo,yo)); - b->SetCenterColor(Color( oColor.Alpha(), oColor.Red(),oColor.Green() , oColor.Blue() )); + PathGradientBrush * const brush = new PathGradientBrush(m_brushPath); + m_brush = brush; + brush->SetCenterPoint(PointF(xo, yo)); + brush->SetCenterColor(wxColourToColor(stops.GetStartColour())); - Color colors[] = {Color( cColor.Alpha(), cColor.Red(),cColor.Green() , cColor.Blue() )}; + const Color col(wxColourToColor(stops.GetEndColour())); int count = 1; - b->SetSurroundColors(colors, &count); -} + brush->SetSurroundColors(&col, &count); -void wxGDIPlusBrush::Apply( wxGraphicsContext* WXUNUSED(context) ) -{ - // nothing to do here + SetGradientStops(brush, stops); } //----------------------------------------------------------------------------- // wxGDIPlusFont implementation //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusFont,wxGraphicsFont) - -wxGDIPlusFont::wxGDIPlusFont() : wxGraphicsFont( NULL ) +wxGDIPlusFontData::wxGDIPlusFontData( wxGraphicsRenderer* renderer, + const wxGDIPlusContext* gc, + const wxFont &font, + const wxColour& col ) + : wxGraphicsObjectRefData( renderer ) { - wxLogDebug(wxT("Illegal Constructor called")); -} - -wxGDIPlusFont::wxGDIPlusFont( wxGraphicsRenderer* renderer, const wxFont &font, - const wxColour& col ) : wxGraphicsFont( renderer ) -{ - m_textBrush = NULL; - m_font = NULL; - wxWCharBuffer s = font.GetFaceName().wc_str( *wxConvUI ); - int size = font.GetPointSize(); int style = FontStyleRegular; if ( font.GetStyle() == wxFONTSTYLE_ITALIC ) style |= FontStyleItalic; @@ -655,105 +857,228 @@ wxGDIPlusFont::wxGDIPlusFont( wxGraphicsRenderer* renderer, const wxFont &font, style |= FontStyleUnderline; if ( font.GetWeight() == wxFONTWEIGHT_BOLD ) style |= FontStyleBold; - m_font = new Font( s , size , style ); - m_textBrush = new SolidBrush( Color( col.Alpha() , col.Red() , - col.Green() , col.Blue() )); -} -wxGDIPlusFont::~wxGDIPlusFont() -{ - delete m_textBrush; - delete m_font; -} + Graphics* context = gc->GetGraphics(); -void wxGDIPlusFont::Apply( wxGraphicsContext* WXUNUSED(context) ) -{ - // nothing to do here -} + Unit fontUnit = context->GetPageUnit(); + // if fontUnit is UnitDisplay, then specify UnitPixel, otherwise + // you'll get a "InvalidParameter" from GDI+ + if ( fontUnit == UnitDisplay ) + fontUnit = UnitPixel; -//----------------------------------------------------------------------------- -// wxGDIPlusPath implementation -//----------------------------------------------------------------------------- + REAL points = font.GetPointSize(); -IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusPath,wxGraphicsPath) + // This scaling is needed when we use unit other than the + // default UnitPoint. It works for both display and printing. + REAL size = points * (100.0 / 72.0); -wxGDIPlusPath::wxGDIPlusPath(wxGraphicsRenderer* renderer, GraphicsPath* path ) : wxGraphicsPath(renderer) -{ - if ( path ) - m_path = path; - else - m_path = new GraphicsPath(); + // NB: font unit should match context's unit. We can use UnitPixel, + // as that is what the print context should use. + m_font = new Font( s, size, style, fontUnit ); + + m_textBrush = new SolidBrush(wxColourToColor(col)); } -wxGDIPlusPath::wxGDIPlusPath() : wxGraphicsPath(NULL) +wxGDIPlusFontData::~wxGDIPlusFontData() { - wxLogDebug(wxT("Illegal Constructor called")); + delete m_textBrush; + delete m_font; } +// the built-in conversions functions create non-premultiplied bitmaps, while GDIPlus needs them in the +// premultiplied format, therefore in the failing cases we create a new bitmap using the non-premultiplied +// bytes as parameter, since there is no real copying of the data going in, only references are stored +// m_helper has to be kept alive as well + +//----------------------------------------------------------------------------- +// wxGDIPlusBitmapData implementation +//----------------------------------------------------------------------------- -wxGDIPlusPath::~wxGDIPlusPath() +wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, Bitmap* bitmap ) : + wxGraphicsObjectRefData( renderer ), m_bitmap( bitmap ) { - delete m_path; + m_helper = NULL; } -wxGraphicsPath* wxGDIPlusPath::Clone() const +wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, + const wxBitmap &bmp) : wxGraphicsObjectRefData( renderer ) { - return new wxGDIPlusPath( GetRenderer() , m_path->Clone()); -} + m_bitmap = NULL; + m_helper = NULL; + Bitmap* image = NULL; + if ( bmp.GetMask() ) + { + Bitmap interim((HBITMAP)bmp.GetHBITMAP(), +#if wxUSE_PALETTE + (HPALETTE)bmp.GetPalette()->GetHPALETTE() +#else + NULL +#endif + ); + size_t width = interim.GetWidth(); + size_t height = interim.GetHeight(); + Rect bounds(0,0,width,height); -// -// The Primitives -// + image = new Bitmap(width,height,PixelFormat32bppPARGB) ; -void wxGDIPlusPath::MoveToPoint( wxDouble x , wxDouble y ) -{ - m_path->StartFigure(); - m_path->AddLine((REAL) x,(REAL) y,(REAL) x,(REAL) y); -} + Bitmap interimMask((HBITMAP)bmp.GetMask()->GetMaskBitmap(),NULL); + wxASSERT(interimMask.GetPixelFormat() == PixelFormat1bppIndexed); -void wxGDIPlusPath::AddLineToPoint( wxDouble x , wxDouble y ) -{ - m_path->AddLine((REAL) x,(REAL) y,(REAL) x,(REAL) y); -} + BitmapData dataMask ; + interimMask.LockBits(&bounds,ImageLockModeRead, + interimMask.GetPixelFormat(),&dataMask); -void wxGDIPlusPath::CloseSubpath() -{ - m_path->CloseFigure(); -} -void wxGDIPlusPath::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) -{ - PointF c1(cx1,cy1); - PointF c2(cx2,cy2); - PointF end(x,y); - PointF start; - m_path->GetLastPoint(&start); - m_path->AddBezier(start,c1,c2,end); -} + BitmapData imageData ; + image->LockBits(&bounds,ImageLockModeWrite, PixelFormat32bppPARGB, &imageData); -// gets the last point of the current path, (0,0) if not yet set -void wxGDIPlusPath::GetCurrentPoint( wxDouble& x, wxDouble&y) -{ - PointF start; - m_path->GetLastPoint(&start); - x = start.X ; - y = start.Y ; -} + BYTE maskPattern = 0 ; + BYTE maskByte = 0; + size_t maskIndex ; -void wxGDIPlusPath::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAngle, double endAngle, bool clockwise ) -{ - double sweepAngle = endAngle - startAngle ; - if( abs(sweepAngle) >= 2*M_PI) - { - sweepAngle = 2 * M_PI; - } - else - { - if ( clockwise ) + for ( size_t y = 0 ; y < height ; ++y) { - if( sweepAngle < 0 ) + maskIndex = 0 ; + for( size_t x = 0 ; x < width; ++x) + { + if ( x % 8 == 0) + { + maskPattern = 0x80; + maskByte = *((BYTE*)dataMask.Scan0 + dataMask.Stride*y + maskIndex); + maskIndex++; + } + else + maskPattern = maskPattern >> 1; + + ARGB *dest = (ARGB*)((BYTE*)imageData.Scan0 + imageData.Stride*y + x*4); + if ( (maskByte & maskPattern) == 0 ) + *dest = 0x00000000; + else + { + Color c ; + interim.GetPixel(x,y,&c) ; + *dest = (c.GetValue() | Color::AlphaMask); + } + } + } + + image->UnlockBits(&imageData); + + interimMask.UnlockBits(&dataMask); + interim.UnlockBits(&dataMask); + } + else + { + image = Bitmap::FromHBITMAP((HBITMAP)bmp.GetHBITMAP(), +#if wxUSE_PALETTE + (HPALETTE)bmp.GetPalette()->GetHPALETTE() +#else + NULL +#endif + ); + if ( bmp.HasAlpha() && GetPixelFormatSize(image->GetPixelFormat()) == 32 ) + { + size_t width = image->GetWidth(); + size_t height = image->GetHeight(); + Rect bounds(0,0,width,height); + static BitmapData data ; + + m_helper = image ; + image = NULL ; + m_helper->LockBits(&bounds, ImageLockModeRead, + m_helper->GetPixelFormat(),&data); + + image = new Bitmap(data.Width, data.Height, data.Stride, + PixelFormat32bppPARGB , (BYTE*) data.Scan0); + + m_helper->UnlockBits(&data); + } + } + if ( image ) + m_bitmap = image; +} + +wxGDIPlusBitmapData::~wxGDIPlusBitmapData() +{ + delete m_bitmap; + delete m_helper; +} + +//----------------------------------------------------------------------------- +// wxGDIPlusPath implementation +//----------------------------------------------------------------------------- + +wxGDIPlusPathData::wxGDIPlusPathData(wxGraphicsRenderer* renderer, GraphicsPath* path ) : wxGraphicsPathData(renderer) +{ + if ( path ) + m_path = path; + else + m_path = new GraphicsPath(); +} + +wxGDIPlusPathData::~wxGDIPlusPathData() +{ + delete m_path; +} + +wxGraphicsObjectRefData* wxGDIPlusPathData::Clone() const +{ + return new wxGDIPlusPathData( GetRenderer() , m_path->Clone()); +} + +// +// The Primitives +// + +void wxGDIPlusPathData::MoveToPoint( wxDouble x , wxDouble y ) +{ + m_path->StartFigure(); + m_path->AddLine((REAL) x,(REAL) y,(REAL) x,(REAL) y); +} + +void wxGDIPlusPathData::AddLineToPoint( wxDouble x , wxDouble y ) +{ + m_path->AddLine((REAL) x,(REAL) y,(REAL) x,(REAL) y); +} + +void wxGDIPlusPathData::CloseSubpath() +{ + m_path->CloseFigure(); +} + +void wxGDIPlusPathData::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) +{ + PointF c1(cx1,cy1); + PointF c2(cx2,cy2); + PointF end(x,y); + PointF start; + m_path->GetLastPoint(&start); + m_path->AddBezier(start,c1,c2,end); +} + +// gets the last point of the current path, (0,0) if not yet set +void wxGDIPlusPathData::GetCurrentPoint( wxDouble* x, wxDouble* y) const +{ + PointF start; + m_path->GetLastPoint(&start); + *x = start.X ; + *y = start.Y ; +} + +void wxGDIPlusPathData::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAngle, double endAngle, bool clockwise ) +{ + double sweepAngle = endAngle - startAngle ; + if( fabs(sweepAngle) >= 2*M_PI) + { + sweepAngle = 2 * M_PI; + } + else + { + if ( clockwise ) + { + if( sweepAngle < 0 ) sweepAngle += 2 * M_PI; } else @@ -763,28 +1088,28 @@ void wxGDIPlusPath::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAngl } } - m_path->AddArc((REAL) (x-r),(REAL) (y-r),(REAL) (2*r),(REAL) (2*r),RadToDeg(startAngle),RadToDeg(sweepAngle)); + m_path->AddArc((REAL) (x-r),(REAL) (y-r),(REAL) (2*r),(REAL) (2*r),RadToDeg(startAngle),RadToDeg(sweepAngle)); } -void wxGDIPlusPath::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +void wxGDIPlusPathData::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) { m_path->AddRectangle(RectF(x,y,w,h)); } -void wxGDIPlusPath::AddPath( const wxGraphicsPath* path ) +void wxGDIPlusPathData::AddPath( const wxGraphicsPathData* path ) { m_path->AddPath( (GraphicsPath*) path->GetNativePath(), FALSE); } // transforms each point of this path by the matrix -void wxGDIPlusPath::Transform( wxGraphicsMatrix* matrix ) +void wxGDIPlusPathData::Transform( const wxGraphicsMatrixData* matrix ) { m_path->Transform( (Matrix*) matrix->GetNativeMatrix() ); } // gets the bounding box enclosing all points (possibly including control points) -void wxGDIPlusPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) +void wxGDIPlusPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const { RectF bounds; m_path->GetBounds( &bounds, NULL, NULL) ; @@ -794,25 +1119,18 @@ void wxGDIPlusPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) *h = bounds.Height; } -bool wxGDIPlusPath::Contains( wxDouble x, wxDouble y, int fillStyle ) +bool wxGDIPlusPathData::Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle ) const { m_path->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding); return m_path->IsVisible( (FLOAT) x,(FLOAT) y) == TRUE ; } //----------------------------------------------------------------------------- -// wxGDIPlusMatrix implementation +// wxGDIPlusMatrixData implementation //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusMatrix,wxGraphicsMatrix) - -wxGDIPlusMatrix::wxGDIPlusMatrix() : wxGraphicsMatrix(NULL) -{ - wxLogDebug(wxT("Illegal Constructor called")); -} - -wxGDIPlusMatrix::wxGDIPlusMatrix(wxGraphicsRenderer* renderer, Matrix* matrix ) - : wxGraphicsMatrix(renderer) +wxGDIPlusMatrixData::wxGDIPlusMatrixData(wxGraphicsRenderer* renderer, Matrix* matrix ) + : wxGraphicsMatrixData(renderer) { if ( matrix ) m_matrix = matrix ; @@ -820,50 +1138,57 @@ wxGDIPlusMatrix::wxGDIPlusMatrix(wxGraphicsRenderer* renderer, Matrix* matrix ) m_matrix = new Matrix(); } -wxGDIPlusMatrix::~wxGDIPlusMatrix() +wxGDIPlusMatrixData::~wxGDIPlusMatrixData() { delete m_matrix; } -wxGraphicsMatrix *wxGDIPlusMatrix::Clone() const +wxGraphicsObjectRefData *wxGDIPlusMatrixData::Clone() const { - return new wxGDIPlusMatrix( GetRenderer(), m_matrix->Clone()); + return new wxGDIPlusMatrixData( GetRenderer(), m_matrix->Clone()); } // concatenates the matrix -void wxGDIPlusMatrix::Concat( const wxGraphicsMatrix *t ) +void wxGDIPlusMatrixData::Concat( const wxGraphicsMatrixData *t ) { m_matrix->Multiply( (Matrix*) t->GetNativeMatrix()); } -// copies the passed in matrix -void wxGDIPlusMatrix::Copy( const wxGraphicsMatrix *t ) -{ - delete m_matrix; - m_matrix = ((Matrix*) t->GetNativeMatrix())->Clone(); -} - // sets the matrix to the respective values -void wxGDIPlusMatrix::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d, +void wxGDIPlusMatrixData::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d, wxDouble tx, wxDouble ty) { m_matrix->SetElements(a,b,c,d,tx,ty); } +// gets the component valuess of the matrix +void wxGDIPlusMatrixData::Get(wxDouble* a, wxDouble* b, wxDouble* c, + wxDouble* d, wxDouble* tx, wxDouble* ty) const +{ + REAL elements[6]; + m_matrix->GetElements(elements); + if (a) *a = elements[0]; + if (b) *b = elements[1]; + if (c) *c = elements[2]; + if (d) *d = elements[3]; + if (tx) *tx= elements[4]; + if (ty) *ty= elements[5]; +} + // makes this the inverse matrix -void wxGDIPlusMatrix::Invert() +void wxGDIPlusMatrixData::Invert() { m_matrix->Invert(); } // returns true if the elements of the transformation matrix are equal ? -bool wxGDIPlusMatrix::IsEqual( const wxGraphicsMatrix* t) const +bool wxGDIPlusMatrixData::IsEqual( const wxGraphicsMatrixData* t) const { return m_matrix->Equals((Matrix*) t->GetNativeMatrix())== TRUE ; } // return true if this is the identity matrix -bool wxGDIPlusMatrix::IsIdentity() +bool wxGDIPlusMatrixData::IsIdentity() const { return m_matrix->IsIdentity() == TRUE ; } @@ -873,21 +1198,21 @@ bool wxGDIPlusMatrix::IsIdentity() // // add the translation to this matrix -void wxGDIPlusMatrix::Translate( wxDouble dx , wxDouble dy ) +void wxGDIPlusMatrixData::Translate( wxDouble dx , wxDouble dy ) { m_matrix->Translate(dx,dy); } // add the scale to this matrix -void wxGDIPlusMatrix::Scale( wxDouble xScale , wxDouble yScale ) +void wxGDIPlusMatrixData::Scale( wxDouble xScale , wxDouble yScale ) { m_matrix->Scale(xScale,yScale); } // add the rotation to this matrix (radians) -void wxGDIPlusMatrix::Rotate( wxDouble angle ) +void wxGDIPlusMatrixData::Rotate( wxDouble angle ) { - m_matrix->Rotate( angle ); + m_matrix->Rotate( RadToDeg(angle) ); } // @@ -895,7 +1220,7 @@ void wxGDIPlusMatrix::Rotate( wxDouble angle ) // // applies that matrix to the point -void wxGDIPlusMatrix::TransformPoint( wxDouble *x, wxDouble *y ) +void wxGDIPlusMatrixData::TransformPoint( wxDouble *x, wxDouble *y ) const { PointF pt(*x,*y); m_matrix->TransformPoints(&pt); @@ -904,7 +1229,7 @@ void wxGDIPlusMatrix::TransformPoint( wxDouble *x, wxDouble *y ) } // applies the matrix except for translations -void wxGDIPlusMatrix::TransformDistance( wxDouble *dx, wxDouble *dy ) +void wxGDIPlusMatrixData::TransformDistance( wxDouble *dx, wxDouble *dy ) const { PointF pt(*dx,*dy); m_matrix->TransformVectors(&pt); @@ -913,7 +1238,7 @@ void wxGDIPlusMatrix::TransformDistance( wxDouble *dx, wxDouble *dy ) } // returns the native representation -void * wxGDIPlusMatrix::GetNativeMatrix() const +void * wxGDIPlusMatrixData::GetNativeMatrix() const { return m_matrix; } @@ -923,12 +1248,51 @@ void * wxGDIPlusMatrix::GetNativeMatrix() const //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusContext,wxGraphicsContext) +IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusMeasuringContext,wxGDIPlusContext) -wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc ) +class wxGDIPlusOffsetHelper +{ +public : + wxGDIPlusOffsetHelper( Graphics* gr , bool offset ) + { + m_gr = gr; + m_offset = offset; + if ( m_offset ) + m_gr->TranslateTransform( 0.5, 0.5 ); + } + ~wxGDIPlusOffsetHelper( ) + { + if ( m_offset ) + m_gr->TranslateTransform( -0.5, -0.5 ); + } +public : + Graphics* m_gr; + bool m_offset; +} ; + +wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc, wxDouble width, wxDouble height ) : wxGraphicsContext(renderer) { Init(); m_context = new Graphics( hdc); + m_width = width; + m_height = height; + SetDefaults(); +} + +wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, const wxDC& dc ) + : wxGraphicsContext(renderer) +{ + Init(); + + wxMSWDCImpl *msw = wxDynamicCast( dc.GetImpl() , wxMSWDCImpl ); + HDC hdc = (HDC) msw->GetHDC(); + + m_context = new Graphics(hdc); + wxSize sz = dc.GetSize(); + m_width = sz.x; + m_height = sz.y; + SetDefaults(); } @@ -936,7 +1300,11 @@ wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, HWND hwnd ) : wxGraphicsContext(renderer) { Init(); + m_enableOffset = true; m_context = new Graphics( hwnd); + RECT rect = wxGetWindowRect(hwnd); + m_width = rect.right - rect.left; + m_height = rect.bottom - rect.top; SetDefaults(); } @@ -958,10 +1326,15 @@ void wxGDIPlusContext::Init() m_context = NULL; m_state1 = 0; m_state2= 0; + m_height = 0; + m_width = 0; + m_fontScaleRatio = 1.0; } void wxGDIPlusContext::SetDefaults() { + m_context->SetTextRenderingHint(TextRenderingHintSystemDefault); + m_context->SetPixelOffsetMode(PixelOffsetModeHalf); m_context->SetSmoothingMode(SmoothingModeHighQuality); m_state1 = m_context->Save(); m_state2 = m_context->Save(); @@ -969,10 +1342,6 @@ void wxGDIPlusContext::SetDefaults() wxGDIPlusContext::~wxGDIPlusContext() { - SetBrush(NULL); - SetFont(NULL); - SetPen(NULL); - if ( m_context ) { m_context->Restore( m_state2 ); @@ -984,170 +1353,252 @@ wxGDIPlusContext::~wxGDIPlusContext() void wxGDIPlusContext::Clip( const wxRegion ®ion ) { - m_context->SetClip((HRGN)region.GetHRGN(),CombineModeIntersect); + Region rgn((HRGN)region.GetHRGN()); + m_context->SetClip(&rgn,CombineModeIntersect); } void wxGDIPlusContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) { m_context->SetClip(RectF(x,y,w,h),CombineModeIntersect); } - + void wxGDIPlusContext::ResetClip() { m_context->ResetClip(); } -void wxGDIPlusContext::StrokePath( const wxGraphicsPath *path ) +void wxGDIPlusContext::DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) { - if ( m_pen ) + if (m_composition == wxCOMPOSITION_DEST) + return; + + wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() ); + Brush *brush = m_brush.IsNull() ? NULL : ((wxGDIPlusBrushData*)m_brush.GetRefData())->GetGDIPlusBrush(); + Pen *pen = m_pen.IsNull() ? NULL : ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen(); + + if ( brush ) { - m_context->DrawPath( ((wxGDIPlusPen*)m_pen)->GetGDIPlusPen() , (GraphicsPath*) path->GetNativePath() ); + // the offset is used to fill only the inside of the rectangle and not paint underneath + // its border which may influence a transparent Pen + REAL offset = 0; + if ( pen ) + offset = pen->GetWidth(); + m_context->FillRectangle( brush, (REAL)x + offset/2, (REAL)y + offset/2, (REAL)w - offset, (REAL)h - offset); } -} -void wxGDIPlusContext::FillPath( const wxGraphicsPath *path , int fillStyle ) -{ - if ( m_brush ) + if ( pen ) { - ((GraphicsPath*) path->GetNativePath())->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding); - m_context->FillPath( ((wxGDIPlusBrush*)m_brush)->GetGDIPlusBrush() , - (GraphicsPath*) path->GetNativePath()); + m_context->DrawRectangle( pen, (REAL)x, (REAL)y, (REAL)w, (REAL)h ); } } -void wxGDIPlusContext::Rotate( wxDouble angle ) +void wxGDIPlusContext::StrokeLines( size_t n, const wxPoint2DDouble *points) { - m_context->RotateTransform( RadToDeg(angle) ); + if (m_composition == wxCOMPOSITION_DEST) + return; + + if ( !m_pen.IsNull() ) + { + wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() ); + Point *cpoints = new Point[n]; + for (size_t i = 0; i < n; i++) + { + cpoints[i].X = (int)(points[i].m_x ); + cpoints[i].Y = (int)(points[i].m_y ); + + } // for (size_t i = 0; i < n; i++) + m_context->DrawLines( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , cpoints , n ) ; + delete[] cpoints; + } } -void wxGDIPlusContext::Translate( wxDouble dx , wxDouble dy ) +void wxGDIPlusContext::DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode WXUNUSED(fillStyle) ) { - m_context->TranslateTransform( dx , dy ); + if (m_composition == wxCOMPOSITION_DEST) + return; + + wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() ); + Point *cpoints = new Point[n]; + for (size_t i = 0; i < n; i++) + { + cpoints[i].X = (int)(points[i].m_x ); + cpoints[i].Y = (int)(points[i].m_y ); + + } // for (int i = 0; i < n; i++) + if ( !m_brush.IsNull() ) + m_context->FillPolygon( ((wxGDIPlusBrushData*)m_brush.GetRefData())->GetGDIPlusBrush() , cpoints , n ) ; + if ( !m_pen.IsNull() ) + m_context->DrawLines( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , cpoints , n ) ; + delete[] cpoints; } -void wxGDIPlusContext::Scale( wxDouble xScale , wxDouble yScale ) +void wxGDIPlusContext::StrokePath( const wxGraphicsPath& path ) { - m_context->ScaleTransform(xScale,yScale); + if (m_composition == wxCOMPOSITION_DEST) + return; + + if ( !m_pen.IsNull() ) + { + wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() ); + m_context->DrawPath( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , (GraphicsPath*) path.GetNativePath() ); + } } -void wxGDIPlusContext::PushState() +void wxGDIPlusContext::FillPath( const wxGraphicsPath& path , wxPolygonFillMode fillStyle ) { - GraphicsState state = m_context->Save(); - m_stateStack.push_back(state); + if (m_composition == wxCOMPOSITION_DEST) + return; + + if ( !m_brush.IsNull() ) + { + wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() ); + ((GraphicsPath*) path.GetNativePath())->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding); + m_context->FillPath( ((wxGDIPlusBrushData*)m_brush.GetRefData())->GetGDIPlusBrush() , + (GraphicsPath*) path.GetNativePath()); + } } -void wxGDIPlusContext::PopState() +bool wxGDIPlusContext::SetAntialiasMode(wxAntialiasMode antialias) { - GraphicsState state = m_stateStack.back(); - m_stateStack.pop_back(); - m_context->Restore(state); + if (m_antialias == antialias) + return true; + + m_antialias = antialias; + + SmoothingMode antialiasMode; + switch (antialias) + { + case wxANTIALIAS_DEFAULT: + antialiasMode = SmoothingModeHighQuality; + break; + case wxANTIALIAS_NONE: + antialiasMode = SmoothingModeNone; + break; + default: + return false; + } + m_context->SetSmoothingMode(antialiasMode); + return true; } -// the built-in conversions functions create non-premultiplied bitmaps, while GDIPlus needs them in the -// premultiplied format, therefore in the failing cases we create a new bitmap using the non-premultiplied -// bytes as parameter +bool wxGDIPlusContext::SetInterpolationQuality(wxInterpolationQuality WXUNUSED(interpolation)) +{ + // placeholder + return false; +} -void wxGDIPlusContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +bool wxGDIPlusContext::SetCompositionMode(wxCompositionMode op) { - Bitmap* image = NULL; - Bitmap* helper = NULL; - if ( bmp.GetMask() ) - { - Bitmap interim((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE()) ; + if ( m_composition == op ) + return true; - size_t width = interim.GetWidth(); - size_t height = interim.GetHeight(); - Rect bounds(0,0,width,height); + m_composition = op; - image = new Bitmap(width,height,PixelFormat32bppPARGB) ; + if (m_composition == wxCOMPOSITION_DEST) + return true; - Bitmap interimMask((HBITMAP)bmp.GetMask()->GetMaskBitmap(),NULL); - wxASSERT(interimMask.GetPixelFormat() == PixelFormat1bppIndexed); + CompositingMode cop; + switch (op) + { + case wxCOMPOSITION_SOURCE: + cop = CompositingModeSourceCopy; + break; + case wxCOMPOSITION_OVER: + cop = CompositingModeSourceOver; + break; + default: + return false; + } - BitmapData dataMask ; - interimMask.LockBits(&bounds,ImageLockModeRead, - interimMask.GetPixelFormat(),&dataMask); + m_context->SetCompositingMode(cop); + return true; +} +void wxGDIPlusContext::BeginLayer(wxDouble /* opacity */) +{ + // TODO +} - BitmapData imageData ; - image->LockBits(&bounds,ImageLockModeWrite, PixelFormat32bppPARGB, &imageData); +void wxGDIPlusContext::EndLayer() +{ + // TODO +} - BYTE maskPattern = 0 ; - BYTE maskByte = 0; - size_t maskIndex ; +void wxGDIPlusContext::Rotate( wxDouble angle ) +{ + m_context->RotateTransform( RadToDeg(angle) ); +} - for ( size_t y = 0 ; y < height ; ++y) - { - maskIndex = 0 ; - for( size_t x = 0 ; x < width; ++x) - { - if ( x % 8 == 0) - { - maskPattern = 0x80; - maskByte = *((BYTE*)dataMask.Scan0 + dataMask.Stride*y + maskIndex); - maskIndex++; - } - else - maskPattern = maskPattern >> 1; +void wxGDIPlusContext::Translate( wxDouble dx , wxDouble dy ) +{ + m_context->TranslateTransform( dx , dy ); +} - ARGB *dest = (ARGB*)((BYTE*)imageData.Scan0 + imageData.Stride*y + x*4); - if ( (maskByte & maskPattern) == 0 ) - *dest = 0x00000000; - else - { - Color c ; - interim.GetPixel(x,y,&c) ; - *dest = (c.GetValue() | Color::AlphaMask); - } - } - } +void wxGDIPlusContext::Scale( wxDouble xScale , wxDouble yScale ) +{ + m_context->ScaleTransform(xScale,yScale); +} - image->UnlockBits(&imageData); +void wxGDIPlusContext::PushState() +{ + GraphicsState state = m_context->Save(); + m_stateStack.push(state); +} - interimMask.UnlockBits(&dataMask); - interim.UnlockBits(&dataMask); - } - else - { - image = Bitmap::FromHBITMAP((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE()); - if ( GetPixelFormatSize(image->GetPixelFormat()) == 32 ) - { - size_t width = image->GetWidth(); - size_t height = image->GetHeight(); - Rect bounds(0,0,width,height); - BitmapData data ; +void wxGDIPlusContext::PopState() +{ + wxCHECK_RET( !m_stateStack.empty(), wxT("No state to pop") ); - helper = image ; - image = NULL ; - helper->LockBits(&bounds, ImageLockModeRead, - helper->GetPixelFormat(),&data); + GraphicsState state = m_stateStack.top(); + m_stateStack.pop(); + m_context->Restore(state); +} - image = new Bitmap(data.Width, data.Height, data.Stride, - PixelFormat32bppARGB , (BYTE*) data.Scan0); +void wxGDIPlusContext::DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +{ + if (m_composition == wxCOMPOSITION_DEST) + return; - helper->UnlockBits(&data); + Bitmap* image = static_cast(bmp.GetRefData())->GetGDIPlusBitmap(); + if ( image ) + { + if( image->GetWidth() != (UINT) w || image->GetHeight() != (UINT) h ) + { + Rect drawRect((REAL) x, (REAL)y, (REAL)w, (REAL)h); + m_context->SetPixelOffsetMode( PixelOffsetModeNone ); + m_context->DrawImage(image, drawRect, 0 , 0 , image->GetWidth(), image->GetHeight(), UnitPixel ) ; + m_context->SetPixelOffsetMode( PixelOffsetModeHalf ); } + else + m_context->DrawImage(image,(REAL) x,(REAL) y,(REAL) w,(REAL) h) ; } - if ( image ) - m_context->DrawImage(image,(REAL) x,(REAL) y,(REAL) w,(REAL) h) ; - delete image ; - delete helper ; } -void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +void wxGDIPlusContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) +{ + wxGraphicsBitmap bitmap = GetRenderer()->CreateBitmap(bmp); + DrawBitmap(bitmap, x, y, w, h); +} + +void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) { + if (m_composition == wxCOMPOSITION_DEST) + return; + + // the built-in conversion fails when there is alpha in the HICON (eg XP style icons), we can only + // find out by looking at the bitmap data whether there really was alpha in it HICON hIcon = (HICON)icon.GetHICON(); ICONINFO iconInfo ; // IconInfo creates the bitmaps for color and mask, we must dispose of them after use if (!GetIconInfo(hIcon,&iconInfo)) return; - BITMAP iconBmpData ; - GetObject(iconInfo.hbmColor,sizeof(BITMAP),&iconBmpData); Bitmap interim(iconInfo.hbmColor,NULL); Bitmap* image = NULL ; + // if it's not 32 bit, it doesn't have an alpha channel, note that since the conversion doesn't + // work correctly, asking IsAlphaPixelFormat at this point fails as well if( GetPixelFormatSize(interim.GetPixelFormat())!= 32 ) { image = Bitmap::FromHICON(hIcon); @@ -1161,8 +1612,28 @@ void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxD interim.LockBits(&bounds, ImageLockModeRead, interim.GetPixelFormat(),&data); - image = new Bitmap(data.Width, data.Height, data.Stride, + + bool hasAlpha = false; + for ( size_t y = 0 ; y < height && !hasAlpha ; ++y) + { + for( size_t x = 0 ; x < width && !hasAlpha; ++x) + { + ARGB *dest = (ARGB*)((BYTE*)data.Scan0 + data.Stride*y + x*4); + if ( ( *dest & Color::AlphaMask ) != 0 ) + hasAlpha = true; + } + } + + if ( hasAlpha ) + { + image = new Bitmap(data.Width, data.Height, data.Stride, PixelFormat32bppARGB , (BYTE*) data.Scan0); + } + else + { + image = Bitmap::FromHICON(hIcon); + } + interim.UnlockBits(&data); } @@ -1173,28 +1644,56 @@ void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxD DeleteObject(iconInfo.hbmMask); } +wxGraphicsFont wxGDIPlusContext::CreateFont( const wxFont &font, + const wxColour &col ) const +{ + wxGDIPlusRenderer* renderer = + static_cast(GetRenderer()); + return renderer->CreateGDIPlusFont(this, font, col); +} -void wxGDIPlusContext::DrawText( const wxString &str, wxDouble x, wxDouble y ) +void wxGDIPlusContext::DoDrawFilledText(const wxString& str, + wxDouble x, wxDouble y, + const wxGraphicsBrush& brush) { + if (m_composition == wxCOMPOSITION_DEST) + return; + + wxCHECK_RET( !m_font.IsNull(), + wxT("wxGDIPlusContext::DrawText - no valid font set") ); + if ( str.IsEmpty()) return ; - wxWCharBuffer s = str.wc_str( *wxConvUI ); - m_context->DrawString( s , -1 , ((wxGDIPlusFont*)m_font)->GetGDIPlusFont() , - PointF( x , y ) , ((wxGDIPlusFont*)m_font)->GetGDIPlusBrush() ); - // TODO m_backgroundMode == wxSOLID + wxGDIPlusFontData * const + fontData = (wxGDIPlusFontData *)m_font.GetRefData(); + wxGDIPlusBrushData * const + brushData = (wxGDIPlusBrushData *)brush.GetRefData(); + + m_context->DrawString + ( + str.wc_str(*wxConvUI), // string to draw, always Unicode + -1, // length: string is NUL-terminated + fontData->GetGDIPlusFont(), + PointF(x, y), + StringFormat::GenericTypographic(), + brushData ? brushData->GetGDIPlusBrush() + : fontData->GetGDIPlusBrush() + ); } void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height, wxDouble *descent, wxDouble *externalLeading ) const { + wxCHECK_RET( !m_font.IsNull(), wxT("wxGDIPlusContext::GetTextExtent - no valid font set") ); + wxWCharBuffer s = str.wc_str( *wxConvUI ); FontFamily ffamily ; - Font* f = ((wxGDIPlusFont*)m_font)->GetGDIPlusFont(); - + Font* f = ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusFont(); + f->GetFamily(&ffamily) ; - REAL factorY = m_context->GetDpiY() / 72.0 ; + REAL factorY = m_fontScaleRatio; REAL rDescent = ffamily.GetCellDescent(FontStyleRegular) * f->GetSize() / ffamily.GetEmHeight(FontStyleRegular); @@ -1204,157 +1703,154 @@ void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDo f->GetSize() / ffamily.GetEmHeight(FontStyleRegular); if ( height ) - *height = rHeight * factorY + 0.5 ; + *height = rHeight * factorY; if ( descent ) - *descent = rDescent * factorY + 0.5 ; + *descent = rDescent * factorY; if ( externalLeading ) - *externalLeading = (rHeight - rAscent - rDescent) * factorY + 0.5 ; + *externalLeading = (rHeight - rAscent - rDescent) * factorY; // measuring empty strings is not guaranteed, so do it by hand - if ( str.IsEmpty()) + if ( str.IsEmpty()) { if ( width ) *width = 0 ; } else { - // MeasureString does return a rectangle that is way too large, so it is - // not usable here RectF layoutRect(0,0, 100000.0f, 100000.0f); - StringFormat strFormat; - CharacterRange strRange(0,wcslen(s)); - strFormat.SetMeasurableCharacterRanges(1,&strRange); - Region region ; - m_context->MeasureCharacterRanges(s, -1 , f,layoutRect, &strFormat,1,®ion) ; - RectF bbox ; - region.GetBounds(&bbox,m_context); + StringFormat strFormat( StringFormat::GenericTypographic() ); + strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() ); + + RectF bounds ; + m_context->MeasureString((const wchar_t *) s , wcslen(s) , f, layoutRect, &strFormat, &bounds ) ; if ( width ) - *width = bbox.GetRight()-bbox.GetLeft()+0.5; + *width = bounds.Width; + if ( height ) + *height = bounds.Height; } } -void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const +void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const { widths.Empty(); widths.Add(0, text.length()); + wxCHECK_RET( !m_font.IsNull(), wxT("wxGDIPlusContext::GetPartialTextExtents - no valid font set") ); + if (text.empty()) return; - Font* f = ((wxGDIPlusFont*)m_font)->GetGDIPlusFont(); + Font* f = ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusFont(); wxWCharBuffer ws = text.wc_str( *wxConvUI ); size_t len = wcslen( ws ) ; wxASSERT_MSG(text.length() == len , wxT("GetPartialTextExtents not yet implemented for multichar situations")); RectF layoutRect(0,0, 100000.0f, 100000.0f); - StringFormat strFormat; + StringFormat strFormat( StringFormat::GenericTypographic() ); - CharacterRange* ranges = new CharacterRange[len] ; - Region* regions = new Region[len]; - for( size_t i = 0 ; i < len ; ++i) + size_t startPosition = 0; + size_t remainder = len; + const size_t maxSpan = 32; + CharacterRange* ranges = new CharacterRange[maxSpan] ; + Region* regions = new Region[maxSpan]; + + while( remainder > 0 ) { - ranges[i].First = i ; - ranges[i].Length = 1 ; + size_t span = wxMin( maxSpan, remainder ); + + for( size_t i = 0 ; i < span ; ++i) + { + ranges[i].First = 0 ; + ranges[i].Length = startPosition+i+1 ; + } + strFormat.SetMeasurableCharacterRanges(span,ranges); + strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() ); + m_context->MeasureCharacterRanges(ws, -1 , f,layoutRect, &strFormat,span,regions) ; + + RectF bbox ; + for ( size_t i = 0 ; i < span ; ++i) + { + regions[i].GetBounds(&bbox,m_context); + widths[startPosition+i] = bbox.Width; + } + remainder -= span; + startPosition += span; } - strFormat.SetMeasurableCharacterRanges(len,ranges); - m_context->MeasureCharacterRanges(ws, -1 , f,layoutRect, &strFormat,1,regions) ; - RectF bbox ; - for ( size_t i = 0 ; i < len ; ++i) + delete[] ranges; + delete[] regions; +} + +bool wxGDIPlusContext::ShouldOffset() const +{ + if ( !m_enableOffset ) + return false; + + int penwidth = 0 ; + if ( !m_pen.IsNull() ) { - regions[i].GetBounds(&bbox,m_context); - widths[i] = bbox.GetRight()-bbox.GetLeft(); + penwidth = (int)((wxGDIPlusPenData*)m_pen.GetRefData())->GetWidth(); + if ( penwidth == 0 ) + penwidth = 1; } + return ( penwidth % 2 ) == 1; } -void* wxGDIPlusContext::GetNativeContext() +void* wxGDIPlusContext::GetNativeContext() { - return m_context; + return m_context; } // concatenates this transform with the current transform of this context -void wxGDIPlusContext::ConcatTransform( const wxGraphicsMatrix* matrix ) +void wxGDIPlusContext::ConcatTransform( const wxGraphicsMatrix& matrix ) { - m_context->MultiplyTransform((Matrix*) matrix->GetNativeMatrix()); + m_context->MultiplyTransform((Matrix*) matrix.GetNativeMatrix()); } // sets the transform of this context -void wxGDIPlusContext::SetTransform( const wxGraphicsMatrix* matrix ) +void wxGDIPlusContext::SetTransform( const wxGraphicsMatrix& matrix ) { - m_context->SetTransform((Matrix*) matrix->GetNativeMatrix()); + m_context->SetTransform((Matrix*) matrix.GetNativeMatrix()); } // gets the matrix of this context -void wxGDIPlusContext::GetTransform( wxGraphicsMatrix* matrix ) +wxGraphicsMatrix wxGDIPlusContext::GetTransform() const { - m_context->GetTransform((Matrix*) matrix->GetNativeMatrix()); + wxGraphicsMatrix matrix = CreateMatrix(); + m_context->GetTransform((Matrix*) matrix.GetNativeMatrix()); + return matrix; } -//----------------------------------------------------------------------------- -// wxGDIPlusRenderer declaration -//----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxGDIPlusRenderer : public wxGraphicsRenderer +void wxGDIPlusContext::GetSize( wxDouble* width, wxDouble *height ) { -public : - wxGDIPlusRenderer() - { - m_loaded = false; - m_gditoken = NULL; - } - - virtual ~wxGDIPlusRenderer() - { - if (m_loaded) - { - Unload(); - } - } - - // Context - - virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc); - - virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ); - - virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ); - - virtual wxGraphicsContext * CreateContext( wxWindow* window ); - - // Path - - virtual wxGraphicsPath * CreatePath(); - - // Matrix - - virtual wxGraphicsMatrix * CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, - wxDouble tx=0.0, wxDouble ty=0.0); - - - virtual wxGraphicsPen* CreatePen(const wxPen& pen) ; - - virtual wxGraphicsBrush* CreateBrush(const wxBrush& brush ) ; + *width = m_width; + *height = m_height; +} - // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2 - virtual wxGraphicsBrush* CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, - const wxColour&c1, const wxColour&c2) ; +//----------------------------------------------------------------------------- +// wxGDIPlusPrintingContext implementation +//----------------------------------------------------------------------------- - // sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc) - // with radius r and color cColor - virtual wxGraphicsBrush* CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius, - const wxColour &oColor, const wxColour &cColor) ; +wxGDIPlusPrintingContext::wxGDIPlusPrintingContext( wxGraphicsRenderer* renderer, + const wxDC& dc ) + : wxGDIPlusContext(renderer, dc) +{ + Graphics* context = GetGraphics(); - // sets the font - virtual wxGraphicsFont* CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ; -protected : - void EnsureIsLoaded(); - void Load(); - void Unload(); + //m_context->SetPageUnit(UnitDocument); -private : - bool m_loaded; - DWORD m_gditoken; + // Setup page scale, based on DPI ratio. + // Antecedent should be 100dpi when the default page unit + // (UnitDisplay) is used. Page unit UnitDocument would require 300dpi + // instead. Note that calling SetPageScale() does not have effect on + // non-printing DCs (that is, any other than wxPrinterDC or + // wxEnhMetaFileDC). + REAL dpiRatio = 100.0 / context->GetDpiY(); + context->SetPageScale(dpiRatio); - DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusRenderer) -} ; + // We use this modifier when measuring fonts. It is needed because the + // page scale is modified above. + m_fontScaleRatio = context->GetDpiY() / 72.0; +} //----------------------------------------------------------------------------- // wxGDIPlusRenderer implementation @@ -1369,121 +1865,284 @@ wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer() return &gs_GDIPlusRenderer; } -void wxGDIPlusRenderer::EnsureIsLoaded() +bool wxGDIPlusRenderer::EnsureIsLoaded() { - if (!m_loaded) + // load gdiplus.dll if not yet loaded, but don't bother doing it again + // if we already tried and failed (we don't want to spend lot of time + // returning NULL from wxGraphicsContext::Create(), which may be called + // relatively frequently): + if ( m_loaded == -1 ) { Load(); } + + return m_loaded == 1; } +// call EnsureIsLoaded() and return returnOnFail value if it fails +#define ENSURE_LOADED_OR_RETURN(returnOnFail) \ + if ( !EnsureIsLoaded() ) \ + return (returnOnFail) + + void wxGDIPlusRenderer::Load() { GdiplusStartupInput input; GdiplusStartupOutput output; - GdiplusStartup(&m_gditoken,&input,&output); - m_loaded = true; + if ( GdiplusStartup(&m_gditoken,&input,&output) == Gdiplus::Ok ) + { + wxLogTrace("gdiplus", "successfully initialized GDI+"); + m_loaded = 1; + } + else + { + wxLogTrace("gdiplus", "failed to initialize GDI+, missing gdiplus.dll?"); + m_loaded = 0; + } } void wxGDIPlusRenderer::Unload() { if ( m_gditoken ) + { GdiplusShutdown(m_gditoken); + m_gditoken = 0; + } + m_loaded = -1; // next Load() will try again } wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxWindowDC& dc) { - EnsureIsLoaded(); - return new wxGDIPlusContext(this,(HDC) dc.GetHDC()); + ENSURE_LOADED_OR_RETURN(NULL); + wxGDIPlusContext* context = new wxGDIPlusContext(this, dc); + context->EnableOffset(true); + return context; +} + +#if wxUSE_PRINTING_ARCHITECTURE +wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxPrinterDC& dc) +{ + ENSURE_LOADED_OR_RETURN(NULL); + wxGDIPlusContext* context = new wxGDIPlusPrintingContext(this, dc); + return context; +} +#endif + +#if wxUSE_ENH_METAFILE +wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxEnhMetaFileDC& dc) +{ + ENSURE_LOADED_OR_RETURN(NULL); + wxGDIPlusContext* context = new wxGDIPlusPrintingContext(this, dc); + return context; +} +#endif + +wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxMemoryDC& dc) +{ + ENSURE_LOADED_OR_RETURN(NULL); + wxGDIPlusContext* context = new wxGDIPlusContext(this, dc); + context->EnableOffset(true); + return context; +} + +wxGraphicsContext * wxGDIPlusRenderer::CreateMeasuringContext() +{ + ENSURE_LOADED_OR_RETURN(NULL); + return new wxGDIPlusMeasuringContext(this); } wxGraphicsContext * wxGDIPlusRenderer::CreateContextFromNativeContext( void * context ) { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(NULL); return new wxGDIPlusContext(this,(Graphics*) context); } wxGraphicsContext * wxGDIPlusRenderer::CreateContextFromNativeWindow( void * window ) { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(NULL); return new wxGDIPlusContext(this,(HWND) window); } wxGraphicsContext * wxGDIPlusRenderer::CreateContext( wxWindow* window ) { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(NULL); return new wxGDIPlusContext(this, (HWND) window->GetHWND() ); } // Path -wxGraphicsPath * wxGDIPlusRenderer::CreatePath() +wxGraphicsPath wxGDIPlusRenderer::CreatePath() { - EnsureIsLoaded(); - return new wxGDIPlusPath( this ); + ENSURE_LOADED_OR_RETURN(wxNullGraphicsPath); + wxGraphicsPath m; + m.SetRefData( new wxGDIPlusPathData(this)); + return m; } // Matrix -wxGraphicsMatrix * wxGDIPlusRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d, +wxGraphicsMatrix wxGDIPlusRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d, wxDouble tx, wxDouble ty) { - EnsureIsLoaded(); - wxGDIPlusMatrix* m = new wxGDIPlusMatrix( this ); - m->Set( a,b,c,d,tx,ty ) ; + ENSURE_LOADED_OR_RETURN(wxNullGraphicsMatrix); + wxGraphicsMatrix m; + wxGDIPlusMatrixData* data = new wxGDIPlusMatrixData( this ); + data->Set( a,b,c,d,tx,ty ) ; + m.SetRefData(data); return m; } -wxGraphicsPen* wxGDIPlusRenderer::CreatePen(const wxPen& pen) +wxGraphicsPen wxGDIPlusRenderer::CreatePen(const wxPen& pen) { - EnsureIsLoaded(); - if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT ) - return NULL; + ENSURE_LOADED_OR_RETURN(wxNullGraphicsPen); + if ( !pen.IsOk() || pen.GetStyle() == wxTRANSPARENT ) + return wxNullGraphicsPen; else - return new wxGDIPlusPen( this, pen ); + { + wxGraphicsPen p; + p.SetRefData(new wxGDIPlusPenData( this, pen )); + return p; + } } -wxGraphicsBrush* wxGDIPlusRenderer::CreateBrush(const wxBrush& brush ) +wxGraphicsBrush wxGDIPlusRenderer::CreateBrush(const wxBrush& brush ) { - EnsureIsLoaded(); - if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT ) - return NULL; + ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush); + if ( !brush.IsOk() || brush.GetStyle() == wxTRANSPARENT ) + return wxNullGraphicsBrush; + else + { + wxGraphicsBrush p; + p.SetRefData(new wxGDIPlusBrushData( this, brush )); + return p; + } +} + +wxGraphicsBrush +wxGDIPlusRenderer::CreateLinearGradientBrush(wxDouble x1, wxDouble y1, + wxDouble x2, wxDouble y2, + const wxGraphicsGradientStops& stops) +{ + ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush); + wxGraphicsBrush p; + wxGDIPlusBrushData* d = new wxGDIPlusBrushData( this ); + d->CreateLinearGradientBrush(x1, y1, x2, y2, stops); + p.SetRefData(d); + return p; + } + +wxGraphicsBrush +wxGDIPlusRenderer::CreateRadialGradientBrush(wxDouble xo, wxDouble yo, + wxDouble xc, wxDouble yc, + wxDouble radius, + const wxGraphicsGradientStops& stops) +{ + ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush); + wxGraphicsBrush p; + wxGDIPlusBrushData* d = new wxGDIPlusBrushData( this ); + d->CreateRadialGradientBrush(xo,yo,xc,yc,radius,stops); + p.SetRefData(d); + return p; +} + +wxGraphicsFont +wxGDIPlusRenderer::CreateGDIPlusFont( const wxGDIPlusContext* gc, + const wxFont &font, + const wxColour &col ) +{ + ENSURE_LOADED_OR_RETURN(wxNullGraphicsFont); + if ( font.IsOk() ) + { + wxGraphicsFont p; + p.SetRefData(new wxGDIPlusFontData( this, gc, font, col )); + return p; + } else - return new wxGDIPlusBrush( this, brush ); + return wxNullGraphicsFont; } -// sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2 -wxGraphicsBrush* wxGDIPlusRenderer::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, - const wxColour&c1, const wxColour&c2) +wxGraphicsBitmap wxGDIPlusRenderer::CreateBitmap( const wxBitmap &bitmap ) { - EnsureIsLoaded(); - wxGDIPlusBrush* brush = new wxGDIPlusBrush(this); - brush->CreateLinearGradientBrush(x1, y1, x2, y2, c1, c2); - return brush; + ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap); + if ( bitmap.IsOk() ) + { + wxGraphicsBitmap p; + p.SetRefData(new wxGDIPlusBitmapData( this , bitmap )); + return p; + } + else + return wxNullGraphicsBitmap; } -// sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc) -// with radius r and color cColor -wxGraphicsBrush* wxGDIPlusRenderer::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius, - const wxColour &oColor, const wxColour &cColor) +wxGraphicsBitmap wxGDIPlusRenderer::CreateBitmapFromNativeBitmap( void *bitmap ) { - EnsureIsLoaded(); - wxGDIPlusBrush* brush = new wxGDIPlusBrush(this); - brush->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor); - return brush; + ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap); + if ( bitmap != NULL ) + { + wxGraphicsBitmap p; + p.SetRefData(new wxGDIPlusBitmapData( this , (Bitmap*) bitmap )); + return p; + } + else + return wxNullGraphicsBitmap; } -// sets the font -wxGraphicsFont* wxGDIPlusRenderer::CreateFont( const wxFont &font , const wxColour &col ) +wxGraphicsBitmap wxGDIPlusRenderer::CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) { - EnsureIsLoaded(); - if ( font.Ok() ) - return new wxGDIPlusFont( this , font, col ); + ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap); + Bitmap* image = static_cast(bitmap.GetRefData())->GetGDIPlusBitmap(); + if ( image ) + { + wxGraphicsBitmap p; + p.SetRefData(new wxGDIPlusBitmapData( this , image->Clone( (REAL) x , (REAL) y , (REAL) w , (REAL) h , PixelFormat32bppPARGB) )); + return p; + } else + return wxNullGraphicsBitmap; +} + +// Shutdown GDI+ at app exit, before possible dll unload +class wxGDIPlusRendererModule : public wxModule +{ +public: + virtual bool OnInit() { return true; } + virtual void OnExit() { gs_GDIPlusRenderer.Unload(); } + +private: + DECLARE_DYNAMIC_CLASS(wxGDIPlusRendererModule) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusRendererModule, wxModule) + +// ---------------------------------------------------------------------------- +// wxMSW-specific parts of wxGCDC +// ---------------------------------------------------------------------------- + +WXHDC wxGCDC::AcquireHDC() +{ + wxGraphicsContext * const gc = GetGraphicsContext(); + if ( !gc ) return NULL; + + Graphics * const g = static_cast(gc->GetNativeContext()); + return g ? g->GetHDC() : NULL; +} + +void wxGCDC::ReleaseHDC(WXHDC hdc) +{ + if ( !hdc ) + return; + + wxGraphicsContext * const gc = GetGraphicsContext(); + wxCHECK_RET( gc, "can't release HDC because there is no wxGraphicsContext" ); + + Graphics * const g = static_cast(gc->GetNativeContext()); + wxCHECK_RET( g, "can't release HDC because there is no Graphics" ); + + g->ReleaseHDC((HDC)hdc); } #endif // wxUSE_GRAPHICS_CONTEXT