X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6aa89a22b8e47000c98bff05c6f545f331f1c353..82bf63a08ca2c5e2d500557550449cad219991c9:/src/generic/dcpsg.cpp?ds=sidebyside diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index f53091ad05..d35e0ab584 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcpsg.cpp +// Name: src/generic/dcpsg.cpp // Purpose: Generic wxPostScriptDC implementation // Author: Julian Smart, Robert Roebling, Markus Holzhem // Modified by: @@ -9,41 +9,31 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "dcpsg.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif -#ifndef WX_PRECOMP -#endif // WX_PRECOMP - -#if wxUSE_PRINTING_ARCHITECTURE +#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT -#if wxUSE_POSTSCRIPT +#include "wx/generic/dcpsg.h" -#include "wx/setup.h" +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/dcmemory.h" + #include "wx/math.h" + #include "wx/image.h" + #include "wx/icon.h" +#endif // WX_PRECOMP -#include "wx/dcmemory.h" -#include "wx/utils.h" -#include "wx/intl.h" -#include "wx/app.h" -#include "wx/image.h" -#include "wx/log.h" -#include "wx/generic/dcpsg.h" #include "wx/prntbase.h" +#include "wx/generic/prntdlgg.h" #include "wx/paper.h" #include "wx/filefn.h" -#if WXWIN_COMPATIBILITY_2_2 - #include "wx/window.h" - #include "wx/printdlg.h" -#endif - -#include +#include "wx/stdpaths.h" #ifdef __WXMSW__ @@ -85,7 +75,7 @@ static const char *wxPostScriptHeaderConicTo = "\ p1_x p1_y p2_x p2_y to_x to_y curveto\n\ } bind def\n\ "; - + static const char *wxPostScriptHeaderEllipse = "\ /ellipsedict 8 dict def\n\ ellipsedict /mtrx matrix put\n\ @@ -146,34 +136,34 @@ static const char *wxPostScriptHeaderSpline = "\ "; static const char *wxPostScriptHeaderColourImage = "\ -%% define 'colorimage' if it isn't defined\n\ -%% ('colortogray' and 'mergeprocs' come from xwd2ps\n\ -%% via xgrab)\n\ -/colorimage where %% do we know about 'colorimage'?\n\ - { pop } %% yes: pop off the 'dict' returned\n\ - { %% no: define one\n\ - /colortogray { %% define an RGB->I function\n\ - /rgbdata exch store %% call input 'rgbdata'\n\ +% define 'colorimage' if it isn't defined\n\ +% ('colortogray' and 'mergeprocs' come from xwd2ps\n\ +% via xgrab)\n\ +/colorimage where % do we know about 'colorimage'?\n\ + { pop } % yes: pop off the 'dict' returned\n\ + { % no: define one\n\ + /colortogray { % define an RGB->I function\n\ + /rgbdata exch store % call input 'rgbdata'\n\ rgbdata length 3 idiv\n\ /npixls exch store\n\ /rgbindx 0 store\n\ 0 1 npixls 1 sub {\n\ grays exch\n\ - rgbdata rgbindx get 20 mul %% Red\n\ - rgbdata rgbindx 1 add get 32 mul %% Green\n\ - rgbdata rgbindx 2 add get 12 mul %% Blue\n\ - add add 64 idiv %% I = .5G + .31R + .18B\n\ + rgbdata rgbindx get 20 mul % Red\n\ + rgbdata rgbindx 1 add get 32 mul % Green\n\ + rgbdata rgbindx 2 add get 12 mul % Blue\n\ + add add 64 idiv % I = .5G + .31R + .18B\n\ put\n\ /rgbindx rgbindx 3 add store\n\ } for\n\ grays 0 npixls getinterval\n\ } bind def\n\ \n\ - %% Utility procedure for colorimage operator.\n\ - %% This procedure takes two procedures off the\n\ - %% stack and merges them into a single procedure.\n\ + % Utility procedure for colorimage operator.\n\ + % This procedure takes two procedures off the\n\ + % stack and merges them into a single procedure.\n\ \n\ - /mergeprocs { %% def\n\ + /mergeprocs { % def\n\ dup length\n\ 3 -1 roll\n\ dup\n\ @@ -192,16 +182,14 @@ static const char *wxPostScriptHeaderColourImage = "\ putinterval\n\ } bind def\n\ \n\ - /colorimage { %% def\n\ - pop pop %% remove 'false 3' operands\n\ + /colorimage { % def\n\ + pop pop % remove 'false 3' operands\n\ {colortogray} mergeprocs\n\ image\n\ } bind def\n\ - } ifelse %% end of 'false' case\n\ + } ifelse % end of 'false' case\n\ "; -#if wxUSE_PANGO -#else static char wxPostScriptHeaderReencodeISO1[] = "\n/reencodeISO {\n" "dup dup findfont dup length dict begin\n" @@ -242,48 +230,88 @@ static char wxPostScriptHeaderReencodeISO2[] = "/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis\n" "/yacute/thorn/ydieresis\n" "] def\n\n"; -#endif //------------------------------------------------------------------------------- // wxPostScriptDC //------------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC) -float wxPostScriptDC::ms_PSScaleFactor = 1.0; +IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC) -void wxPostScriptDC::SetResolution(int ppi) +wxPostScriptDC::wxPostScriptDC() + : wxDC(new wxPostScriptDCImpl(this)) { - ms_PSScaleFactor = (float)ppi / 72.0; } -int wxPostScriptDC::GetResolution() +wxPostScriptDC::wxPostScriptDC(const wxPrintData& printData) + : wxDC(new wxPostScriptDCImpl(this, printData)) { - return (int)(ms_PSScaleFactor * 72.0); } +// conversion +static const double RAD2DEG = 180.0 / M_PI; + +// we don't want to use only 72 dpi from PS print +static const int DPI = 600; +static const double PS2DEV = 600.0 / 72.0; +static const double DEV2PS = 72.0 / 600.0; + +#define XLOG2DEV(x) ((double)(LogicalToDeviceX(x)) * DEV2PS) +#define XLOG2DEVREL(x) ((double)(LogicalToDeviceXRel(x)) * DEV2PS) +#define YLOG2DEV(x) ((m_pageHeight - (double)LogicalToDeviceY(x)) * DEV2PS) +#define YLOG2DEVREL(x) ((double)(LogicalToDeviceYRel(x)) * DEV2PS) + + +IMPLEMENT_ABSTRACT_CLASS(wxPostScriptDCImpl, wxDCImpl) + //------------------------------------------------------------------------------- -wxPostScriptDC::wxPostScriptDC () +wxPostScriptDCImpl::wxPostScriptDCImpl( wxPostScriptDC *owner ) : + wxDCImpl( owner ) { - m_pstream = (FILE*) NULL; + Init(); - m_currentRed = 0; - m_currentGreen = 0; - m_currentBlue = 0; + m_pageHeight = 842 * PS2DEV; - m_pageNumber = 0; + m_ok = true; +} - m_clipping = FALSE; +wxPostScriptDCImpl::wxPostScriptDCImpl( wxPostScriptDC *owner, const wxPrintData& data ) : + wxDCImpl( owner ) +{ + Init(); - m_underlinePosition = 0.0; - m_underlineThickness = 0.0; + // this calculates m_pageHeight required for + // taking the inverted Y axis into account + SetPrintData( data ); + + m_ok = true; +} + + +wxPostScriptDCImpl::wxPostScriptDCImpl( wxPrinterDC *owner ) : + wxDCImpl( owner ) +{ + Init(); + + m_pageHeight = 842 * PS2DEV; + + m_ok = true; +} - m_signX = 1; // default x-axis left to right - m_signY = -1; // default y-axis bottom up -> top down +wxPostScriptDCImpl::wxPostScriptDCImpl( wxPrinterDC *owner, const wxPrintData& data ) : + wxDCImpl( owner ) +{ + Init(); + + // this calculates m_pageHeight required for + // taking the inverted Y axis into account + SetPrintData( data ); + + m_ok = true; } -wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData) +void wxPostScriptDCImpl::Init() { m_pstream = (FILE*) NULL; @@ -293,20 +321,14 @@ wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData) m_pageNumber = 0; - m_clipping = FALSE; + m_clipping = false; m_underlinePosition = 0.0; m_underlineThickness = 0.0; - m_signX = 1; // default x-axis left to right - m_signY = -1; // default y-axis bottom up -> top down - - m_printData = printData; - - m_ok = TRUE; } -wxPostScriptDC::~wxPostScriptDC () +wxPostScriptDCImpl::~wxPostScriptDCImpl () { if (m_pstream) { @@ -315,123 +337,121 @@ wxPostScriptDC::~wxPostScriptDC () } } -#if WXWIN_COMPATIBILITY_2_2 -bool wxPostScriptDC::Create( const wxString &output, bool interactive, wxWindow *parent ) +bool wxPostScriptDCImpl::IsOk() const { - wxPrintData data; - data.SetFilename( output ); - data.SetPrintMode( wxPRINT_MODE_FILE ); - - if (interactive) - { - wxPrintDialogData ddata( data ); - wxPrintDialog dialog( parent, &data ); - dialog.GetPrintDialogData().SetSetupDialog(TRUE); - if (dialog.ShowModal() != wxID_OK) - { - m_ok = FALSE; - return FALSE; - } - data = dialog.GetPrintDialogData().GetPrintData(); - } - - return TRUE; + return m_ok; } -#endif +wxRect wxPostScriptDCImpl::GetPaperRect() +{ + int w = 0; + int h = 0; + DoGetSize( &w, &h ); + return wxRect(0,0,w,h); +} -bool wxPostScriptDC::Ok() const +int wxPostScriptDCImpl::GetResolution() { - return m_ok; + return DPI; } -void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h) +void wxPostScriptDCImpl::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h) { - wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); - - if (m_clipping) DestroyClippingRegion(); - - wxDC::DoSetClippingRegion(x, y, w, h); - - m_clipping = TRUE; - fprintf( m_pstream, - "gsave\n newpath\n" - "%d %d moveto\n" - "%d %d lineto\n" - "%d %d lineto\n" - "%d %d lineto\n" - "closepath clip newpath\n", - LogicalToDeviceX(x), LogicalToDeviceY(y), - LogicalToDeviceX(x+w), LogicalToDeviceY(y), - LogicalToDeviceX(x+w), LogicalToDeviceY(y+h), - LogicalToDeviceX(x), LogicalToDeviceY(y+h) ); + wxCHECK_RET( m_ok , wxT("invalid postscript dc") ); + + if (m_clipping) + DestroyClippingRegion(); + + m_clipX1 = x; + m_clipY1 = y; + m_clipX2 = x + w; + m_clipY2 = y + h; + + m_clipping = true; + + wxString buffer; + buffer.Printf( "gsave\n" + "newpath\n" + "%f %f moveto\n" + "%f %f lineto\n" + "%f %f lineto\n" + "%f %f lineto\n" + "closepath clip newpath\n", + XLOG2DEV(x), YLOG2DEV(y), + XLOG2DEV(x+w), YLOG2DEV(y), + XLOG2DEV(x+w), YLOG2DEV(y+h), + XLOG2DEV(x), YLOG2DEV(y+h) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); } -void wxPostScriptDC::DestroyClippingRegion() +void wxPostScriptDCImpl::DestroyClippingRegion() { - wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + wxCHECK_RET( m_ok , wxT("invalid postscript dc") ); if (m_clipping) { - m_clipping = FALSE; - fprintf( m_pstream, "grestore\n" ); + m_clipping = false; + PsPrint( "grestore\n" ); } - wxDC::DestroyClippingRegion(); + wxDCImpl::DestroyClippingRegion(); } -void wxPostScriptDC::Clear() +void wxPostScriptDCImpl::Clear() { - wxFAIL_MSG( wxT("wxPostScriptDC::Clear not implemented.") ); + // This should fail silently to avoid unnecessary + // asserts + // wxFAIL_MSG( wxT("wxPostScriptDCImpl::Clear not implemented.") ); } -bool wxPostScriptDC::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style)) +bool wxPostScriptDCImpl::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style)) { - wxFAIL_MSG( wxT("wxPostScriptDC::FloodFill not implemented.") ); - return FALSE; + wxFAIL_MSG( wxT("wxPostScriptDCImpl::FloodFill not implemented.") ); + return false; } -bool wxPostScriptDC::DoGetPixel (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour * WXUNUSED(col)) const +bool wxPostScriptDCImpl::DoGetPixel (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour * WXUNUSED(col)) const { - wxFAIL_MSG( wxT("wxPostScriptDC::GetPixel not implemented.") ); - return FALSE; + wxFAIL_MSG( wxT("wxPostScriptDCImpl::GetPixel not implemented.") ); + return false; } -void wxPostScriptDC::DoCrossHair (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) +void wxPostScriptDCImpl::DoCrossHair (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) { - wxFAIL_MSG( wxT("wxPostScriptDC::CrossHair not implemented.") ); + wxFAIL_MSG( wxT("wxPostScriptDCImpl::CrossHair not implemented.") ); } -void wxPostScriptDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) +void wxPostScriptDCImpl::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { - wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (m_pen.GetStyle() == wxTRANSPARENT) return; + if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return; SetPen( m_pen ); - fprintf( m_pstream, - "newpath\n" - "%d %d moveto\n" - "%d %d lineto\n" - "stroke\n", - LogicalToDeviceX(x1), LogicalToDeviceY(y1), - LogicalToDeviceX(x2), LogicalToDeviceY (y2) ); + wxString buffer; + buffer.Printf( "newpath\n" + "%f %f moveto\n" + "%f %f lineto\n" + "stroke\n", + XLOG2DEV(x1), YLOG2DEV(y1), + XLOG2DEV(x2), YLOG2DEV(y2) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( x1, y1 ); CalcBoundingBox( x2, y2 ); } -#define RAD2DEG 57.29577951308 - -void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) +void wxPostScriptDCImpl::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) { - wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); wxCoord dx = x1 - xc; wxCoord dy = y1 - yc; - wxCoord radius = (wxCoord) sqrt( (double)(dx*dx+dy*dy) ); + double radius = sqrt( (double)(dx*dx+dy*dy) ); double alpha1, alpha2; if (x1 == x2 && y1 == y2) @@ -439,9 +459,10 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, alpha1 = 0.0; alpha2 = 360.0; } - else if (radius == 0.0) + else if ( wxIsNullDouble(radius) ) { - alpha1 = alpha2 = 0.0; + alpha1 = + alpha2 = 0.0; } else { @@ -457,167 +478,277 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, while (alpha1 > 360) alpha1 -= 360; // 0 and 360 degree while (alpha2 > 360) alpha2 -= 360; - if (m_brush.GetStyle() != wxTRANSPARENT) + int i_radius = wxRound( radius ); + + if (m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT) { SetBrush( m_brush ); - fprintf( m_pstream, - "newpath\n" - "%d %d %d %d %d %d ellipse\n" - "%d %d lineto\n" - "closepath\n" - "fill\n", - LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2, - LogicalToDeviceX(xc), LogicalToDeviceY(yc) ); - - CalcBoundingBox( xc-radius, yc-radius ); - CalcBoundingBox( xc+radius, yc+radius ); + wxString buffer; + buffer.Printf( "newpath\n" + "%f %f %f %f %f %f ellipse\n" + "%f %f lineto\n" + "closepath\n" + "fill\n", + XLOG2DEV(xc), YLOG2DEV(yc), + XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius), + alpha1, alpha2, + XLOG2DEV(xc), YLOG2DEV(yc) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); + + CalcBoundingBox( xc-i_radius, yc-i_radius ); + CalcBoundingBox( xc+i_radius, yc+i_radius ); } - if (m_pen.GetStyle() != wxTRANSPARENT) + if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT) { SetPen( m_pen ); - fprintf( m_pstream, - "newpath\n" - "%d %d %d %d %d %d ellipse\n" - "%d %d lineto\n" - "stroke\n" - "fill\n", - LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2, - LogicalToDeviceX(xc), LogicalToDeviceY(yc) ); - - CalcBoundingBox( xc-radius, yc-radius ); - CalcBoundingBox( xc+radius, yc+radius ); + wxString buffer; + buffer.Printf( "newpath\n" + "%f %f %f %f %f %f ellipse\n" + "%f %f lineto\n" + "closepath\n" + "stroke\n", + XLOG2DEV(xc), YLOG2DEV(yc), + XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius), + alpha1, alpha2, + XLOG2DEV(xc), YLOG2DEV(yc) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); + + CalcBoundingBox( xc-i_radius, yc-i_radius ); + CalcBoundingBox( xc+i_radius, yc+i_radius ); } } -void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) +void wxPostScriptDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) { - wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); - - if (sa>=360 || sa<=-360) sa=sa-int(sa/360)*360; - if (ea>=360 || ea<=-360) ea=ea-int(ea/360)*360; - if (sa<0) sa+=360; - if (ea<0) ea+=360; - - if (sa==ea) + wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); + + if ( sa >= 360 || sa <= -360 ) + sa -= int(sa/360)*360; + if ( ea >= 360 || ea <=- 360 ) + ea -= int(ea/360)*360; + if ( sa < 0 ) + sa += 360; + if ( ea < 0 ) + ea += 360; + + if ( wxIsSameDouble(sa, ea) ) { - DrawEllipse(x,y,w,h); + DoDrawEllipse(x,y,w,h); return; } - if (m_brush.GetStyle () != wxTRANSPARENT) + if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT) { SetBrush( m_brush ); - fprintf( m_pstream, - "newpath\n" - "%d %d %d %d %d %d true ellipticarc\n", - LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2), LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2), (wxCoord)sa, (wxCoord)ea ); + wxString buffer; + buffer.Printf( "newpath\n" + "%f %f %f %f %f %f true ellipticarc\n", + XLOG2DEV(x+w/2), YLOG2DEV(y+h/2), + XLOG2DEVREL(w/2), YLOG2DEVREL(h/2), + sa, ea ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( x ,y ); CalcBoundingBox( x+w, y+h ); } - if (m_pen.GetStyle () != wxTRANSPARENT) + if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT) { SetPen( m_pen ); - fprintf(m_pstream, - "newpath\n" - "%d %d %d %d %d %d false ellipticarc\n", - LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2), LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2), (wxCoord)sa, (wxCoord)ea ); + wxString buffer; + buffer.Printf( "newpath\n" + "%f %f %f %f %f %f false ellipticarc\n", + XLOG2DEV(x+w/2), YLOG2DEV(y+h/2), + XLOG2DEVREL(w/2), YLOG2DEVREL(h/2), + sa, ea ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( x ,y ); CalcBoundingBox( x+w, y+h ); } } -void wxPostScriptDC::DoDrawPoint (wxCoord x, wxCoord y) +void wxPostScriptDCImpl::DoDrawPoint (wxCoord x, wxCoord y) { - wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (m_pen.GetStyle() == wxTRANSPARENT) return; + if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return; SetPen (m_pen); - fprintf( m_pstream, - "newpath\n" - "%d %d moveto\n" - "%d %d lineto\n" - "stroke\n", - LogicalToDeviceX(x), LogicalToDeviceY(y), - LogicalToDeviceX(x+1), LogicalToDeviceY(y) ); + wxString buffer; + buffer.Printf( "newpath\n" + "%f %f moveto\n" + "%f %f lineto\n" + "stroke\n", + XLOG2DEV(x), YLOG2DEV(y), + XLOG2DEV(x+1), YLOG2DEV(y) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( x, y ); } -void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int WXUNUSED(fillStyle)) +void wxPostScriptDCImpl::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle) { - wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); if (n <= 0) return; - if (m_brush.GetStyle () != wxTRANSPARENT) + if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT) { SetBrush( m_brush ); - fprintf( m_pstream, "newpath\n" ); + PsPrint( "newpath\n" ); - wxCoord xx = LogicalToDeviceX(points[0].x + xoffset); - wxCoord yy = LogicalToDeviceY(points[0].y + yoffset); + double xx = XLOG2DEV(points[0].x + xoffset); + double yy = YLOG2DEV(points[0].y + yoffset); - fprintf( m_pstream, "%d %d moveto\n", xx, yy ); + wxString buffer; + buffer.Printf( "%f %f moveto\n", xx, yy ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); for (int i = 1; i < n; i++) { - xx = LogicalToDeviceX(points[i].x + xoffset); - yy = LogicalToDeviceY(points[i].y + yoffset); + xx = XLOG2DEV(points[i].x + xoffset); + yy = YLOG2DEV(points[i].y + yoffset); - fprintf( m_pstream, "%d %d lineto\n", xx, yy ); + buffer.Printf( "%f %f lineto\n", xx, yy ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset); } - fprintf( m_pstream, "fill\n" ); + PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") ); } - if (m_pen.GetStyle () != wxTRANSPARENT) + if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT) { SetPen( m_pen ); - fprintf( m_pstream, "newpath\n" ); + PsPrint( "newpath\n" ); - wxCoord xx = LogicalToDeviceX(points[0].x + xoffset); - wxCoord yy = LogicalToDeviceY(points[0].y + yoffset); + double xx = XLOG2DEV(points[0].x + xoffset); + double yy = YLOG2DEV(points[0].y + yoffset); - fprintf( m_pstream, "%d %d moveto\n", xx, yy ); + wxString buffer; + buffer.Printf( "%f %f moveto\n", xx, yy ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); for (int i = 1; i < n; i++) { - xx = LogicalToDeviceX(points[i].x + xoffset); - yy = LogicalToDeviceY(points[i].y + yoffset); + xx = XLOG2DEV(points[i].x + xoffset); + yy = YLOG2DEV(points[i].y + yoffset); - fprintf( m_pstream, "%d %d lineto\n", xx, yy ); + buffer.Printf( "%f %f lineto\n", xx, yy ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset); } - fprintf( m_pstream, "closepath\n" ); - fprintf( m_pstream, "stroke\n" ); + PsPrint( "closepath\n" ); + PsPrint( "stroke\n" ); + } +} + +void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle) +{ + wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); + + if (n <= 0) return; + + if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT) + { + SetBrush( m_brush ); + + PsPrint( "newpath\n" ); + + int ofs = 0; + for (int i = 0; i < n; ofs += count[i++]) + { + double xx = XLOG2DEV(points[ofs].x + xoffset); + double yy = YLOG2DEV(points[ofs].y + yoffset); + + wxString buffer; + buffer.Printf( "%f %f moveto\n", xx, yy ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); + + CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset ); + + for (int j = 1; j < count[i]; j++) + { + xx = XLOG2DEV(points[ofs+j].x + xoffset); + yy = YLOG2DEV(points[ofs+j].y + yoffset); + + buffer.Printf( "%f %f lineto\n", xx, yy ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); + + CalcBoundingBox( points[ofs+j].x + xoffset, points[ofs+j].y + yoffset); + } + } + PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") ); + } + + if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT) + { + SetPen( m_pen ); + + PsPrint( "newpath\n" ); + + int ofs = 0; + for (int i = 0; i < n; ofs += count[i++]) + { + double xx = XLOG2DEV(points[ofs].x + xoffset); + double yy = YLOG2DEV(points[ofs].y + yoffset); + + wxString buffer; + buffer.Printf( "%f %f moveto\n", xx, yy ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); + + CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset ); + + for (int j = 1; j < count[i]; j++) + { + xx = XLOG2DEV(points[ofs+j].x + xoffset); + yy = YLOG2DEV(points[ofs+j].y + yoffset); + + buffer.Printf( "%f %f lineto\n", xx, yy ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); + + CalcBoundingBox( points[ofs+j].x + xoffset, points[ofs+j].y + yoffset); + } + } + PsPrint( "closepath\n" ); + PsPrint( "stroke\n" ); } } -void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) +void wxPostScriptDCImpl::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) { - wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (m_pen.GetStyle() == wxTRANSPARENT) return; + if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return; if (n <= 0) return; @@ -625,205 +756,217 @@ void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCo int i; for ( i =0; i -#include - -#ifndef FT_Outline_Decompose - FT_EXPORT( FT_Error ) FT_Outline_Decompose( - FT_Outline* outline, - const FT_Outline_Funcs* interface, - void* user ); -#endif - -typedef struct _OutlineInfo OutlineInfo; -struct _OutlineInfo { - FILE *file; -}; - -static int paps_move_to( FT_Vector* to, - void *user_data) -{ - OutlineInfo *outline_info = (OutlineInfo*)user_data; - fprintf(outline_info->file, "%d %d moveto\n", - (int)to->x , - (int)to->y ); - return 0; -} - -static int paps_line_to( FT_Vector* to, - void *user_data) -{ - OutlineInfo *outline_info = (OutlineInfo*)user_data; - fprintf(outline_info->file, "%d %d lineto\n", - (int)to->x , - (int)to->y ); - return 0; -} - -static int paps_conic_to( FT_Vector* control, - FT_Vector* to, - void *user_data) +void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) { - OutlineInfo *outline_info = (OutlineInfo*)user_data; - fprintf(outline_info->file, "%d %d %d %d conicto\n", - (int)control->x , - (int)control->y , - (int)to->x , - (int)to->y ); - return 0; -} + wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); -static int paps_cubic_to( FT_Vector* control1, - FT_Vector* control2, - FT_Vector* to, - void *user_data) -{ - OutlineInfo *outline_info = (OutlineInfo*)user_data; - fprintf(outline_info->file, - "%d %d %d %d %d %d curveto\n", - (int)control1->x , - (int)control1->y , - (int)control2->x , - (int)control2->y , - (int)to->x , - (int)to->y ); - return 0; -} - -void draw_bezier_outline(FILE *file, - FT_Face face, - FT_UInt glyph_index, - int pos_x, - int pos_y, - double scale_x, - double scale_y ) -{ - FT_Int load_flags = FT_LOAD_NO_BITMAP; - FT_Glyph glyph; - - FT_Outline_Funcs outlinefunc = - { - paps_move_to, - paps_line_to, - paps_conic_to, - paps_cubic_to - }; - - OutlineInfo outline_info; - outline_info.file = file; - - fprintf(file, "gsave\n"); - fprintf(file, "%d %d translate\n", pos_x, pos_y ); - - // We have to replace the "," from the German - // locale with the Englich "." for PostScript - char buf[100]; - sprintf(buf, "%.8f %.8f scale\n", scale_x, scale_y ); - for (size_t i = 0; i < strlen(buf); i++) - if (buf[i] == ',') buf[i] = '.'; - fprintf(file, buf); - - FT_Load_Glyph(face, glyph_index, load_flags); - FT_Get_Glyph (face->glyph, &glyph); - FT_Outline_Decompose (&(((FT_OutlineGlyph)glyph)->outline), - &outlinefunc, &outline_info); - fprintf(file, "closepath fill grestore\n"); - - FT_Done_Glyph (glyph); -} - -#endif - -void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) -{ - wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + const wxWX2MBbuf textbuf = text.mb_str(); + if ( !textbuf ) + return; if (m_textForegroundColour.Ok()) { @@ -1267,104 +1314,20 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) double bluePS = (double)(blue) / 255.0; double greenPS = (double)(green) / 255.0; - char buffer[100]; - sprintf( buffer, - "%.8f %.8f %.8f setrgbcolor\n", - redPS, greenPS, bluePS ); - for (size_t i = 0; i < strlen(buffer); i++) - if (buffer[i] == ',') buffer[i] = '.'; - fprintf( m_pstream, buffer ); + wxString buffer; + buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); m_currentRed = red; m_currentBlue = blue; m_currentGreen = green; } } - -#if wxUSE_PANGO - int ps_dpi = 72; - int pango_dpi = 600; - PangoContext *context = pango_ft2_get_context ( pango_dpi, pango_dpi ); - - double scale = (double)pango_dpi / (double)ps_dpi; - scale /= m_userScaleY; - - pango_context_set_language (context, pango_language_from_string ("en_US")); - pango_context_set_base_dir (context, PANGO_DIRECTION_LTR ); - - pango_context_set_font_description (context, m_font.GetNativeFontInfo()->description ); - - PangoLayout *layout = pango_layout_new (context); -#if wxUSE_UNICODE - wxCharBuffer buffer = wxConvUTF8.cWC2MB( text ); -#else - wxCharBuffer buffer = wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ); -#endif - pango_layout_set_text( layout, (const char*) buffer, strlen(buffer) ); - - fprintf( m_pstream, "%%%% %s\n", (const char*)buffer ); - - PangoRectangle rect; - pango_layout_get_extents(layout, NULL, &rect); - - int xx = LogicalToDeviceX( x ); - int yy = LogicalToDeviceY( y ); - - int xxx = xx * PANGO_SCALE; - int yyy = yy * PANGO_SCALE - (int)(rect.height * 0.66 / scale); // Move down by estimated baseline. HACK. - -#define ps_kludge_factor 2.8 - - // Loop over lines in layout - int num_lines = pango_layout_get_line_count( layout ); - for (int i = 0; i < num_lines; i++) - { - PangoLayoutLine *line = pango_layout_get_line( layout, i ); - - // width of glyphs already printed - int all_width = 0; - - // Loop over runs in line - GSList *runs_list = line->runs; - while (runs_list) - { - PangoLayoutRun *run = (PangoLayoutRun*) runs_list->data; - PangoItem *item = run->item; - PangoGlyphString *glyphs = run->glyphs; - PangoAnalysis *analysis = &item->analysis; - PangoFont *font = analysis->font; - FT_Face ft_face = pango_ft2_font_get_face(font); - - int num_glyphs = glyphs->num_glyphs; - for (int glyph_idx = 0; glyph_idx < num_glyphs; glyph_idx++) - { - PangoGlyphGeometry geometry = glyphs->glyphs[glyph_idx].geometry; - int pos_x = xxx + (int)((double)(all_width+geometry.x_offset) / scale); - int pos_y = yyy + (int)((double)geometry.y_offset / scale ); - all_width += geometry.width; - - draw_bezier_outline( m_pstream, ft_face, - (FT_UInt)(glyphs->glyphs[glyph_idx].glyph), - pos_x / PANGO_SCALE, - pos_y / PANGO_SCALE, - 1.0/(ps_kludge_factor * scale * 26.6), - 1.0/(ps_kludge_factor * scale * 26.6) ); - } - runs_list = runs_list->next; - } - } - g_object_unref( G_OBJECT( layout ) ); - g_object_unref( G_OBJECT( context ) ); -#else wxCoord text_w, text_h, text_descent; - GetTextExtent(text, &text_w, &text_h, &text_descent); - - // VZ: this seems to be unnecessary, so taking it out for now, if it - // doesn't create any problems, remove this comment entirely - //SetFont( m_font ); - + GetOwner()->GetTextExtent(text, &text_w, &text_h, &text_descent); int size = m_font.GetPointSize(); @@ -1372,68 +1335,66 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) // commented by V. Slavik and replaced by accurate version // - note that there is still rounding error in text_descent! wxCoord by = y + size - text_descent; // baseline - fprintf( m_pstream, "%d %d moveto\n", LogicalToDeviceX(x), LogicalToDeviceY(by) ); - fprintf( m_pstream, "(" ); - const wxWX2MBbuf textbuf = text.mb_str(); - size_t len = strlen(textbuf); - size_t i; - for (i = 0; i < len; i++) + wxString buffer; + buffer.Printf( "%f %f moveto\n", XLOG2DEV(x), YLOG2DEV(by) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); + PsPrint( "(" ); + + for ( const char *p = textbuf; *p != '\0'; p++ ) { - int c = (unsigned char) textbuf[i]; + int c = (unsigned char)*p; if (c == ')' || c == '(' || c == '\\') { /* Cope with special characters */ - fprintf( m_pstream, "\\" ); - fputc(c, m_pstream); + PsPrint( "\\" ); + PsPrint( (char) c ); } else if ( c >= 128 ) { /* Cope with character codes > 127 */ - fprintf(m_pstream, "\\%o", c); + buffer.Printf( "\\%o", c ); + PsPrint( buffer ); } else { - fputc(c, m_pstream); + PsPrint( (char) c ); } } - fprintf( m_pstream, ") show\n" ); + PsPrint( ") show\n" ); if (m_font.GetUnderlined()) { wxCoord uy = (wxCoord)(y + size - m_underlinePosition); - char buffer[100]; - sprintf( buffer, - "gsave\n" - "%d %d moveto\n" - "%f setlinewidth\n" - "%d %d lineto\n" - "stroke\n" - "grestore\n", - LogicalToDeviceX(x), LogicalToDeviceY(uy), + buffer.Printf( "gsave\n" + "%f %f moveto\n" + "%f setlinewidth\n" + "%f %f lineto\n" + "stroke\n" + "grestore\n", + XLOG2DEV(x), YLOG2DEV(uy), m_underlineThickness, - LogicalToDeviceX(x + text_w), LogicalToDeviceY(uy) ); - for (i = 0; i < 100; i++) - if (buffer[i] == ',') buffer[i] = '.'; - fprintf( m_pstream, buffer ); + XLOG2DEV(x + text_w), YLOG2DEV(uy) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); } CalcBoundingBox( x, y ); - CalcBoundingBox( x + size * text.Length() * 2/3 , y ); -#endif + CalcBoundingBox( x + size * text.length() * 2/3 , y ); } -void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle ) +void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle ) { - if (angle == 0.0) + if ( wxIsNullDouble(angle) ) { DoDrawText(text, x, y); return; } - wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); SetFont( m_font ); @@ -1463,13 +1424,10 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord double bluePS = (double)(blue) / 255.0; double greenPS = (double)(green) / 255.0; - char buffer[100]; - sprintf( buffer, - "%.8f %.8f %.8f setrgbcolor\n", - redPS, greenPS, bluePS ); - for (int i = 0; i < 100; i++) - if (buffer[i] == ',') buffer[i] = '.'; - fprintf( m_pstream, buffer ); + wxString buffer; + buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); m_currentRed = red; m_currentBlue = blue; @@ -1479,116 +1437,129 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord int size = m_font.GetPointSize(); - fprintf(m_pstream, "%d %d moveto\n", - LogicalToDeviceX(x), LogicalToDeviceY(y)); + wxString buffer; + buffer.Printf( "%f %f moveto\n", XLOG2DEV(x), YLOG2DEV(y)); + buffer.Replace( ",", "." ); + PsPrint( buffer ); - char buffer[100]; - sprintf(buffer, "%.8f rotate\n", angle); - size_t i; - for (i = 0; i < 100; i++) - if (buffer[i] == ',') buffer[i] = '.'; - fprintf(m_pstream, buffer); + buffer.Printf( "%f rotate\n", angle ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); - fprintf( m_pstream, "(" ); + PsPrint( "(" ); const wxWX2MBbuf textbuf = text.mb_str(); - size_t len = strlen(textbuf); - for (i = 0; i < len; i++) + if ( textbuf ) { - int c = (unsigned char) textbuf[i]; - if (c == ')' || c == '(' || c == '\\') - { - /* Cope with special characters */ - fprintf( m_pstream, "\\" ); - fputc(c, m_pstream); - } - else if ( c >= 128 ) - { - /* Cope with character codes > 127 */ - fprintf(m_pstream, "\\%o", c); - } - else + for ( const char *p = textbuf; *p != '\0'; p++ ) { - fputc(c, m_pstream); + int c = (unsigned char)*p; + if (c == ')' || c == '(' || c == '\\') + { + /* Cope with special characters */ + PsPrint( "\\" ); + PsPrint( (char) c ); + } + else if ( c >= 128 ) + { + /* Cope with character codes > 127 */ + buffer.Printf( "\\%o", c); + PsPrint( buffer ); + } + else + { + PsPrint( (char) c ); + } } } - fprintf( m_pstream, ") show\n" ); + PsPrint( ") show\n" ); - sprintf( buffer, "%.8f rotate\n", -angle ); - for (i = 0; i < 100; i++) - if (buffer[i] == ',') buffer[i] = '.'; - fprintf( m_pstream, buffer ); + buffer.Printf( "%f rotate\n", -angle ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); if (m_font.GetUnderlined()) { wxCoord uy = (wxCoord)(y + size - m_underlinePosition); wxCoord w, h; - char buffer[100]; - GetTextExtent(text, &w, &h); - - sprintf( buffer, - "gsave\n" - "%d %d moveto\n" - "%f setlinewidth\n" - "%d %d lineto\n" - "stroke\n" - "grestore\n", - LogicalToDeviceX(x), LogicalToDeviceY(uy), - m_underlineThickness, - LogicalToDeviceX(x + w), LogicalToDeviceY(uy) ); - for (i = 0; i < 100; i++) - if (buffer[i] == ',') buffer[i] = '.'; - fprintf( m_pstream, buffer ); + GetOwner()->GetTextExtent(text, &w, &h); + + buffer.Printf( + "gsave\n" + "%f %f moveto\n" + "%f setlinewidth\n" + "%f %f lineto\n" + "stroke\n" + "grestore\n", + XLOG2DEV(x), YLOG2DEV(uy), + m_underlineThickness, + XLOG2DEV(x + w), YLOG2DEV(uy) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); } CalcBoundingBox( x, y ); - CalcBoundingBox( x + size * text.Length() * 2/3 , y ); + CalcBoundingBox( x + size * text.length() * 2/3 , y ); } -void wxPostScriptDC::SetBackground (const wxBrush& brush) +void wxPostScriptDCImpl::SetBackground (const wxBrush& brush) { m_backgroundBrush = brush; } -void wxPostScriptDC::SetLogicalFunction (int WXUNUSED(function)) +void wxPostScriptDCImpl::SetLogicalFunction (int WXUNUSED(function)) { - wxFAIL_MSG( wxT("wxPostScriptDC::SetLogicalFunction not implemented.") ); + wxFAIL_MSG( wxT("wxPostScriptDCImpl::SetLogicalFunction not implemented.") ); } -void wxPostScriptDC::DoDrawSpline( wxList *points ) +#if wxUSE_SPLINES +void wxPostScriptDCImpl::DoDrawSpline( const wxPointList *points ) { - wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); SetPen( m_pen ); - double a, b, c, d, x1, y1, x2, y2, x3, y3; + // a and b are not used + //double a, b; + double c, d, x1, y1, x2, y2, x3, y3; wxPoint *p, *q; - wxNode *node = points->GetFirst(); - p = (wxPoint *)node->GetData(); + wxPointList::compatibility_iterator node = points->GetFirst(); + p = node->GetData(); x1 = p->x; y1 = p->y; node = node->GetNext(); - p = (wxPoint *)node->GetData(); + p = node->GetData(); c = p->x; d = p->y; - x3 = a = (double)(x1 + c) / 2; - y3 = b = (double)(y1 + d) / 2; - - fprintf( m_pstream, - "newpath\n" - "%d %d moveto\n" - "%d %d lineto\n", - LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1), - LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) ); + x3 = + #if 0 + a = + #endif + (double)(x1 + c) / 2; + y3 = + #if 0 + b = + #endif + (double)(y1 + d) / 2; + + wxString buffer; + buffer.Printf( "newpath\n" + "%f %f moveto\n" + "%f %f lineto\n", + XLOG2DEV(wxRound(x1)), YLOG2DEV(wxRound(y1)), + XLOG2DEV(wxRound(x3)), YLOG2DEV(wxRound(y3)) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 ); CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 ); - while ((node = node->GetNext()) != NULL) + node = node->GetNext(); + while (node) { - q = (wxPoint *)node->GetData(); + q = node->GetData(); x1 = x3; y1 = y3; @@ -1599,14 +1570,17 @@ void wxPostScriptDC::DoDrawSpline( wxList *points ) x3 = (double)(x2 + c) / 2; y3 = (double)(y2 + d) / 2; - fprintf( m_pstream, - "%d %d %d %d %d %d DrawSplineSection\n", - LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1), - LogicalToDeviceX((wxCoord)x2), LogicalToDeviceY((wxCoord)y2), - LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) ); + buffer.Printf( "%f %f %f %f %f %f DrawSplineSection\n", + XLOG2DEV(wxRound(x1)), YLOG2DEV(wxRound(y1)), + XLOG2DEV(wxRound(x2)), YLOG2DEV(wxRound(y2)), + XLOG2DEV(wxRound(x3)), YLOG2DEV(wxRound(y3)) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 ); CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 ); + + node = node->GetNext(); } /* @@ -1614,44 +1588,55 @@ void wxPostScriptDC::DoDrawSpline( wxList *points ) next-to-last and last point respectively, in the point list */ - fprintf( m_pstream, - "%d %d lineto\n" - "stroke\n", - LogicalToDeviceX((wxCoord)c), LogicalToDeviceY((wxCoord)d) ); + buffer.Printf( "%f %f lineto\nstroke\n", XLOG2DEV(wxRound(c)), YLOG2DEV(wxRound(d)) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); } +#endif // wxUSE_SPLINES -wxCoord wxPostScriptDC::GetCharWidth() const +wxCoord wxPostScriptDCImpl::GetCharWidth() const { // Chris Breeze: reasonable approximation using wxMODERN/Courier return (wxCoord) (GetCharHeight() * 72.0 / 120.0); } - -void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) +void wxPostScriptDCImpl::SetPrintData(const wxPrintData& data) { - wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + m_printData = data; - m_signX = (xLeftRight ? 1 : -1); - m_signY = (yBottomUp ? 1 : -1); + wxPaperSize id = m_printData.GetPaperId(); + wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(id); + if (!paper) paper = wxThePrintPaperDatabase->FindPaperType(wxPAPER_A4); + int w = 595; + int h = 842; + if (paper) + { + w = paper->GetSizeDeviceUnits().x; + h = paper->GetSizeDeviceUnits().y; + } - // FIXME there is no such function in MSW nor in OS2/PM -#if !defined(__WXMSW__) && !defined(__WXPM__) - ComputeScaleAndOrigin(); -#endif + if (m_printData.GetOrientation() == wxLANDSCAPE) + m_pageHeight = w * PS2DEV; + else + m_pageHeight = h * PS2DEV; } -void wxPostScriptDC::SetDeviceOrigin( wxCoord x, wxCoord y ) +void wxPostScriptDCImpl::ComputeScaleAndOrigin() { - wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + const wxRealPoint origScale(m_scaleX, m_scaleY); - int h = 0; - int w = 0; - GetSize( &w, &h ); + wxDCImpl::ComputeScaleAndOrigin(); - wxDC::SetDeviceOrigin( x, h-y ); + // If scale has changed call SetPen to recalulate the line width + // and SetFont to recalculate font size + if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.IsOk() ) + { + SetPen( m_pen ); + SetFont( m_font ); + } } -void wxPostScriptDC::DoGetSize(int* width, int* height) const +void wxPostScriptDCImpl::DoGetSize(int* width, int* height) const { wxPaperSize id = m_printData.GetPaperId(); @@ -1674,11 +1659,14 @@ void wxPostScriptDC::DoGetSize(int* width, int* height) const h = tmp; } - if (width) *width = (int)(w * ms_PSScaleFactor); - if (height) *height = (int)(h * ms_PSScaleFactor); + if (width) + *width = wxRound( w * PS2DEV ); + + if (height) + *height = wxRound( h * PS2DEV ); } -void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const +void wxPostScriptDCImpl::DoGetSizeMM(int *width, int *height) const { wxPaperSize id = m_printData.GetPaperId(); @@ -1706,80 +1694,88 @@ void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const } // Resolution in pixels per logical inch -wxSize wxPostScriptDC::GetPPI(void) const +wxSize wxPostScriptDCImpl::GetPPI(void) const { - return wxSize((int)(72 * ms_PSScaleFactor), - (int)(72 * ms_PSScaleFactor)); + return wxSize( DPI, DPI ); } -bool wxPostScriptDC::StartDoc( const wxString& message ) +bool wxPostScriptDCImpl::StartDoc( const wxString& message ) { - wxCHECK_MSG( m_ok, FALSE, wxT("invalid postscript dc") ); + wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") ); - if (m_printData.GetFilename() == wxT("")) + if (m_printData.GetPrintMode() != wxPRINT_MODE_STREAM ) { - wxString filename = wxGetTempFileName( wxT("ps") ); - m_printData.SetFilename(filename); - } + if (m_printData.GetFilename() == wxEmptyString) + { + wxString filename = wxGetTempFileName( wxT("ps") ); + m_printData.SetFilename(filename); + } - m_pstream = wxFopen( m_printData.GetFilename().c_str(), wxT("w+") ); // FIXME: use fn_str() here under Unicode? + m_pstream = wxFopen( m_printData.GetFilename(), wxT("w+") ); - if (!m_pstream) - { - wxLogError( _("Cannot open file for PostScript printing!")); - m_ok = FALSE; - return FALSE; + if (!m_pstream) + { + wxLogError( _("Cannot open file for PostScript printing!")); + m_ok = false; + return false; + } } - m_ok = TRUE; + m_ok = true; + m_title = message; + + wxString buffer; + + PsPrint( "%!PS-Adobe-2.0\n" ); + + buffer.Printf( "%%%%Title: %s\n", m_title ); + PsPrint( buffer ); + PsPrint( "%%Creator: wxWidgets PostScript renderer\n" ); + + buffer.Printf( "%%%%CreationDate: %s\n", wxNow() ); + PsPrint( buffer ); - fprintf( m_pstream, "%%!PS-Adobe-2.0\n" ); - fprintf( m_pstream, "%%%%Title: %s\n", (const char *) m_title.ToAscii() ); - fprintf( m_pstream, "%%%%Creator: wxWindows PostScript renderer\n" ); - fprintf( m_pstream, "%%%%CreationDate: %s\n", (const char *) wxNow().ToAscii() ); if (m_printData.GetOrientation() == wxLANDSCAPE) - fprintf( m_pstream, "%%%%Orientation: Landscape\n" ); + PsPrint( "%%Orientation: Landscape\n" ); else - fprintf( m_pstream, "%%%%Orientation: Portrait\n" ); - - // fprintf( m_pstream, "%%%%Pages: %d\n", (wxPageNumber - 1) ); - - char *paper = "A4"; + PsPrint( "%%Orientation: Portrait\n" ); + + const wxChar *paper; switch (m_printData.GetPaperId()) { - case wxPAPER_LETTER: paper = "Letter"; break; // Letter: paper ""; 8 1/2 by 11 inches - case wxPAPER_LEGAL: paper = "Legal"; break; // Legal, 8 1/2 by 14 inches - case wxPAPER_A4: paper = "A4"; break; // A4 Sheet, 210 by 297 millimeters - case wxPAPER_TABLOID: paper = "Tabloid"; break; // Tabloid, 11 by 17 inches - case wxPAPER_LEDGER: paper = "Ledger"; break; // Ledger, 17 by 11 inches - case wxPAPER_STATEMENT: paper = "Statement"; break; // Statement, 5 1/2 by 8 1/2 inches - case wxPAPER_EXECUTIVE: paper = "Executive"; break; // Executive, 7 1/4 by 10 1/2 inches - case wxPAPER_A3: paper = "A3"; break; // A3 sheet, 297 by 420 millimeters - case wxPAPER_A5: paper = "A5"; break; // A5 sheet, 148 by 210 millimeters - case wxPAPER_B4: paper = "B4"; break; // B4 sheet, 250 by 354 millimeters - case wxPAPER_B5: paper = "B5"; break; // B5 sheet, 182-by-257-millimeter paper - case wxPAPER_FOLIO: paper = "Folio"; break; // Folio, 8-1/2-by-13-inch paper - case wxPAPER_QUARTO: paper = "Quaro"; break; // Quarto, 215-by-275-millimeter paper - case wxPAPER_10X14: paper = "10x14"; break; // 10-by-14-inch sheet - default: paper = "A4"; + case wxPAPER_LETTER: paper = wxT("Letter"); break; // Letter: paper ""; 8 1/2 by 11 inches + case wxPAPER_LEGAL: paper = wxT("Legal"); break; // Legal, 8 1/2 by 14 inches + case wxPAPER_A4: paper = wxT("A4"); break; // A4 Sheet, 210 by 297 millimeters + case wxPAPER_TABLOID: paper = wxT("Tabloid"); break; // Tabloid, 11 by 17 inches + case wxPAPER_LEDGER: paper = wxT("Ledger"); break; // Ledger, 17 by 11 inches + case wxPAPER_STATEMENT: paper = wxT("Statement"); break; // Statement, 5 1/2 by 8 1/2 inches + case wxPAPER_EXECUTIVE: paper = wxT("Executive"); break; // Executive, 7 1/4 by 10 1/2 inches + case wxPAPER_A3: paper = wxT("A3"); break; // A3 sheet, 297 by 420 millimeters + case wxPAPER_A5: paper = wxT("A5"); break; // A5 sheet, 148 by 210 millimeters + case wxPAPER_B4: paper = wxT("B4"); break; // B4 sheet, 250 by 354 millimeters + case wxPAPER_B5: paper = wxT("B5"); break; // B5 sheet, 182-by-257-millimeter paper + case wxPAPER_FOLIO: paper = wxT("Folio"); break; // Folio, 8-1/2-by-13-inch paper + case wxPAPER_QUARTO: paper = wxT("Quaro"); break; // Quarto, 215-by-275-millimeter paper + case wxPAPER_10X14: paper = wxT("10x14"); break; // 10-by-14-inch sheet + default: paper = wxT("A4"); } - fprintf( m_pstream, "%%%%DocumentPaperSizes: %s\n", paper ); - fprintf( m_pstream, "%%%%EndComments\n\n" ); - - fprintf( m_pstream, "%%%%BeginProlog\n" ); - fprintf( m_pstream, wxPostScriptHeaderConicTo ); - fprintf( m_pstream, wxPostScriptHeaderEllipse ); - fprintf( m_pstream, wxPostScriptHeaderEllipticArc ); - fprintf( m_pstream, wxPostScriptHeaderColourImage ); -#if wxUSE_PANGO -#else - fprintf( m_pstream, wxPostScriptHeaderReencodeISO1 ); - fprintf( m_pstream, wxPostScriptHeaderReencodeISO2 ); -#endif + + buffer.Printf( "%%%%DocumentPaperSizes: %s\n", paper ); + PsPrint( buffer ); + + PsPrint( "%%EndComments\n\n" ); + + PsPrint( "%%BeginProlog\n" ); + PsPrint( wxPostScriptHeaderConicTo ); + PsPrint( wxPostScriptHeaderEllipse ); + PsPrint( wxPostScriptHeaderEllipticArc ); + PsPrint( wxPostScriptHeaderColourImage ); + PsPrint( wxPostScriptHeaderReencodeISO1 ); + PsPrint( wxPostScriptHeaderReencodeISO2 ); if (wxPostScriptHeaderSpline) - fprintf( m_pstream, wxPostScriptHeaderSpline ); - fprintf( m_pstream, "%%%%EndProlog\n" ); + PsPrint( wxPostScriptHeaderSpline ); + PsPrint( "%%EndProlog\n" ); SetBrush( *wxBLACK_BRUSH ); SetPen( *wxBLACK_PEN ); @@ -1789,26 +1785,26 @@ bool wxPostScriptDC::StartDoc( const wxString& message ) // set origin according to paper size SetDeviceOrigin( 0,0 ); - wxPageNumber = 1; m_pageNumber = 1; - m_title = message; - return TRUE; + return true; } -void wxPostScriptDC::EndDoc () +void wxPostScriptDCImpl::EndDoc () { - wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); if (m_clipping) { - m_clipping = FALSE; - fprintf( m_pstream, "grestore\n" ); + m_clipping = false; + PsPrint( "grestore\n" ); } - fclose( m_pstream ); - m_pstream = (FILE *) NULL; + if ( m_pstream ) { + fclose( m_pstream ); + m_pstream = (FILE *) NULL; + } -#if 0 +#if 0 // THE FOLLOWING HAS BEEN CONTRIBUTED BY Andy Fyfe wxCoord wx_printer_translate_x, wx_printer_translate_y; double wx_printer_scale_x, wx_printer_scale_y; @@ -1821,10 +1817,10 @@ void wxPostScriptDC::EndDoc () // Compute the bounding box. Note that it is in the default user // coordinate system, thus we have to convert the values. - wxCoord minX = (wxCoord) LogicalToDeviceX(m_minX); - wxCoord minY = (wxCoord) LogicalToDeviceY(m_minY); - wxCoord maxX = (wxCoord) LogicalToDeviceX(m_maxX); - wxCoord maxY = (wxCoord) LogicalToDeviceY(m_maxY); + wxCoord minX = (wxCoord) XLOG2DEV(m_minX); + wxCoord minY = (wxCoord) YLOG2DEV(m_minY); + wxCoord maxX = (wxCoord) XLOG2DEV(m_maxX); + wxCoord maxY = (wxCoord) YLOG2DEV(m_maxY); // LOG2DEV may have changed the minimum to maximum vice versa if ( minX > maxX ) { wxCoord tmp = minX; minX = maxX; maxX = tmp; } @@ -1857,8 +1853,7 @@ void wxPostScriptDC::EndDoc () // The Adobe specifications call for integers; we round as to make // the bounding larger. - fprintf( m_pstream, - "%%%%BoundingBox: %d %d %d %d\n", + PsPrintf( wxT("%%%%BoundingBox: %d %d %d %d\n"), (wxCoord)floor((double)llx), (wxCoord)floor((double)lly), (wxCoord)ceil((double)urx), (wxCoord)ceil((double)ury) ); @@ -1868,104 +1863,101 @@ void wxPostScriptDC::EndDoc () // commands are generated within comments. These lines appear before any // adjustment of scale, rotation, or translation, and hence are in the // default user coordinates. - fprintf( m_pstream, "%% newpath\n" ); - fprintf( m_pstream, "%% %d %d moveto\n", llx, lly ); - fprintf( m_pstream, "%% %d %d lineto\n", urx, lly ); - fprintf( m_pstream, "%% %d %d lineto\n", urx, ury ); - fprintf( m_pstream, "%% %d %d lineto closepath stroke\n", llx, ury ); + PsPrint( "% newpath\n" ); + PsPrintf( wxT("%% %d %d moveto\n"), llx, lly ); + PsPrintf( wxT("%% %d %d lineto\n"), urx, lly ); + PsPrintf( wxT("%% %d %d lineto\n"), urx, ury ); + PsPrintf( wxT("%% %d %d lineto closepath stroke\n"), llx, ury ); #endif -#if defined(__X__) || defined(__WXGTK__) - if (m_ok && (m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER)) +#ifndef __WXMSW__ + wxPostScriptPrintNativeData *data = + (wxPostScriptPrintNativeData *) m_printData.GetNativeData(); + + if (m_ok && (m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER)) { wxString command; - command += m_printData.GetPrinterCommand(); + command += data->GetPrinterCommand(); + command += wxT(" "); + command += data->GetPrinterOptions(); command += wxT(" "); command += m_printData.GetFilename(); - wxExecute( command, TRUE ); + wxExecute( command, true ); wxRemoveFile( m_printData.GetFilename() ); } #endif } -void wxPostScriptDC::StartPage() +void wxPostScriptDCImpl::StartPage() { - wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - fprintf( m_pstream, "%%%%Page: %d\n", wxPageNumber++ ); + wxString buffer; + buffer.Printf( wxT("%%%%Page: %d\n"), m_pageNumber++ ); + PsPrint( buffer ); - // What is this one supposed to do? RR. -// *m_pstream << "matrix currentmatrix\n"; +#if 0 + wxPostScriptPrintNativeData *data = + (wxPostScriptPrintNativeData *) m_printData.GetNativeData(); - // Added by Chris Breeze + wxCoord translate_x = (wxCoord)data->GetPrinterTranslateX(); + wxCoord translate_y = (wxCoord)data->GetPrinterTranslateY(); - // Each page starts with an "initgraphics" which resets the - // transformation and so we need to reset the origin - // (and rotate the page for landscape printing) + buffer.Printf( "%d %d translate\n", translate_x, translate_y ); + PsPrint( buffer ); - // Output scaling - wxCoord translate_x, translate_y; - double scale_x, scale_y; + double scale_x = data->GetPrinterScaleX(); + double scale_y = data->GetPrinterScaleY(); - translate_x = (wxCoord)m_printData.GetPrinterTranslateX(); - translate_y = (wxCoord)m_printData.GetPrinterTranslateY(); + buffer.Printf( "%f %f scale\n", scale_x, scale_y ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); - scale_x = m_printData.GetPrinterScaleX(); - scale_y = m_printData.GetPrinterScaleY(); - - if (m_printData.GetOrientation() == wxLANDSCAPE) - { - int h; - GetSize( (int*) NULL, &h ); - translate_y -= h; - fprintf( m_pstream, "90 rotate\n" ); +#endif - // I copied this one from a PostScript tutorial, but to no avail. RR. - // fprintf( m_pstream, "90 rotate llx neg ury nef translate\n" ); - } + // Each page starts with an "initgraphics" which resets the + // transformation and so we need to rotate the page for + // landscape printing) - char buffer[100]; - sprintf( buffer, "%.8f %.8f scale\n", scale_x / ms_PSScaleFactor, - scale_y / ms_PSScaleFactor); - for (int i = 0; i < 100; i++) - if (buffer[i] == ',') buffer[i] = '.'; - fprintf( m_pstream, buffer ); + // I copied this one from a PostScript tutorial, but to no avail. RR. + // PsPrint( "90 rotate llx neg ury nef translate\n" ); - fprintf( m_pstream, "%d %d translate\n", translate_x, translate_y ); + if (m_printData.GetOrientation() == wxLANDSCAPE) + PsPrint( "90 rotate\n" ); } -void wxPostScriptDC::EndPage () +void wxPostScriptDCImpl::EndPage () { - wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + wxCHECK_RET( m_ok , wxT("invalid postscript dc") ); - fprintf( m_pstream, "showpage\n" ); + PsPrint( "showpage\n" ); } -bool wxPostScriptDC::DoBlit( wxCoord xdest, wxCoord ydest, +bool wxPostScriptDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord fwidth, wxCoord fheight, wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) ) { - wxCHECK_MSG( m_ok && m_pstream, FALSE, wxT("invalid postscript dc") ); + wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") ); - wxCHECK_MSG( source, FALSE, wxT("invalid source dc") ); + wxCHECK_MSG( source, false, wxT("invalid source dc") ); - /* blit into a bitmap */ + // blit into a bitmap wxBitmap bitmap( (int)fwidth, (int)fheight ); wxMemoryDC memDC; memDC.SelectObject(bitmap); memDC.Blit(0, 0, fwidth, fheight, source, xsrc, ysrc, rop); /* TODO: Blit transparently? */ memDC.SelectObject(wxNullBitmap); - /* draw bitmap. scaling and positioning is done there */ - DrawBitmap( bitmap, xdest, ydest ); + //draw bitmap. scaling and positioning is done there + GetOwner()->DrawBitmap( bitmap, xdest, ydest ); - return TRUE; + return true; } -wxCoord wxPostScriptDC::GetCharHeight() const +wxCoord wxPostScriptDCImpl::GetCharHeight() const { if (m_font.Ok()) return m_font.GetPointSize(); @@ -1973,66 +1965,61 @@ wxCoord wxPostScriptDC::GetCharHeight() const return 12; } -void wxPostScriptDC::DoGetTextExtent(const wxString& string, +void wxPostScriptDCImpl::PsPrint( const wxString& str ) +{ + const wxCharBuffer psdata(str.utf8_str()); + + wxPostScriptPrintNativeData *data = + (wxPostScriptPrintNativeData *) m_printData.GetNativeData(); + + switch (m_printData.GetPrintMode()) + { +#if wxUSE_STREAMS + // append to output stream + case wxPRINT_MODE_STREAM: + { + wxOutputStream* outputstream = data->GetOutputStream(); + wxCHECK_RET( outputstream, wxT("invalid outputstream") ); + outputstream->Write( psdata, strlen( psdata ) ); + } + break; +#endif // wxUSE_STREAMS + + // save data into file + default: + wxCHECK_RET( m_pstream, wxT("invalid postscript dc") ); + fwrite( psdata, 1, strlen( psdata ), m_pstream ); + } +} + +void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent, wxCoord *externalLeading, - wxFont *theFont ) const + const wxFont *theFont ) const { - wxFont *fontToUse = theFont; + const wxFont *fontToUse = theFont; - if (!fontToUse) fontToUse = (wxFont*) &m_font; + if (!fontToUse) fontToUse = &m_font; wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") ); - if (string.IsEmpty()) + if (string.empty()) { if (x) (*x) = 0; if (y) (*y) = 0; + if (descent) (*descent) = 0; + if (externalLeading) (*externalLeading) = 0; return; } - -#if wxUSE_PANGO - int wx_dpi = GetResolution(); - int pango_dpi = 600; - PangoContext *context = pango_ft2_get_context ( pango_dpi, pango_dpi ); - - double scale = pango_dpi / wx_dpi; - scale /= m_userScaleY; - - pango_context_set_language (context, pango_language_from_string ("en_US")); - pango_context_set_base_dir (context, PANGO_DIRECTION_LTR ); - - PangoLayout *layout = pango_layout_new (context); - - PangoFontDescription *desc = fontToUse->GetNativeFontInfo()->description; - pango_layout_set_font_description(layout, desc); -#if wxUSE_UNICODE - const wxCharBuffer data = wxConvUTF8.cWC2MB( string ); -#else - const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string ); - const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata ); -#endif - pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); - PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data; - - PangoRectangle rect; - pango_layout_line_get_extents(line, NULL, &rect); - - if (x) (*x) = (wxCoord) ( rect.width / PANGO_SCALE / scale ); - if (y) (*y) = (wxCoord) ( rect.height / PANGO_SCALE / scale ); - if (descent) - { - // Do something about metrics here - (*descent) = 0; - } - if (externalLeading) (*externalLeading) = 0; // ?? - - g_object_unref( G_OBJECT( layout ) ); -#else + // GTK 2.0 const wxWX2MBbuf strbuf = string.mb_str(); + // conversion failed (non e.g. ISO characters) + if ( !strbuf ) + return; + #if !wxUSE_AFM_FOR_POSTSCRIPT /* Provide a VERY rough estimate (avoid using it). * Produces accurate results for mono-spaced font @@ -2068,12 +2055,12 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, / in 'points' (1/72 of an inch). this should later on be / changed to depend on the mapping mode. / CAVE: the path to the AFM files must be set before calling this - / function. this is usually done by a call like the following: + / fun3B3Bction. this is usually done by a call like the following: / wxSetAFMPath("d:\\wxw161\\afm\\"); / / example: / - / wxPostScriptDC dc(NULL, TRUE); + / wxPostScriptDC dc(NULL, true); / if (dc.Ok()){ / wxSetAFMPath("d:\\wxw161\\afm\\"); / dc.StartDoc("Test"); @@ -2115,7 +2102,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, lastStyle = Style; lastWeight = Weight; - const wxChar *name = NULL; + const wxChar *name; switch (Family) { @@ -2139,8 +2126,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, case wxSCRIPT: { name = wxT("Zapf.afm"); - Style = wxNORMAL; - Weight = wxNORMAL; + break; } case wxSWISS: default: @@ -2154,20 +2140,36 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, } FILE *afmFile = NULL; - + // Get the directory of the AFM files wxString afmName; - if (!m_printData.GetFontMetricPath().IsEmpty()) + + // VZ: I don't know if the cast always works under Unix but it clearly + // never does under Windows where the pointer is + // wxWindowsPrintNativeData and so calling GetFontMetricPath() on + // it just crashes +#ifndef __WIN32__ + wxPostScriptPrintNativeData *data = + wxDynamicCast(m_printData.GetNativeData(), wxPostScriptPrintNativeData); + + if (data && !data->GetFontMetricPath().empty()) { - afmName = m_printData.GetFontMetricPath(); + afmName = data->GetFontMetricPath(); afmName << wxFILE_SEP_PATH << name; - afmFile = wxFopen(afmName,wxT("r")); } +#endif // __WIN32__ -#if defined(__UNIX__) && !defined(__VMS__) - if (afmFile==NULL) + if ( !afmName.empty() ) + afmFile = wxFopen(afmName, wxT("r")); + + if ( !afmFile ) { +#if defined(__UNIX__) && !defined(__VMS__) afmName = wxGetDataDir(); +#else // !__UNIX__ + afmName = wxStandardPaths::Get().GetDataDir(); +#endif // __UNIX__/!__UNIX__ + afmName << wxFILE_SEP_PATH #if defined(__LINUX__) || defined(__FREEBSD__) << wxT("gs_afm") << wxFILE_SEP_PATH @@ -2177,7 +2179,6 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, << name; afmFile = wxFopen(afmName,wxT("r")); } -#endif /* 2. open and process the file / a short explanation of the AFM format: @@ -2204,8 +2205,10 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, /* init the widths array */ for(int i=0; i<256; i++) lastWidths[i] = INT_MIN; /* some variables for holding parts of a line */ - char cString[10],semiString[10],WXString[10],descString[20]; - char upString[30], utString[30], encString[50]; + char cString[10], semiString[10], WXString[10]; + char descString[20]; + char upString[30], utString[30]; + char encString[50]; char line[256]; int ascii,cWidth; /* read in the file and parse it */ @@ -2282,22 +2285,24 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, / the correct way would be to map the character names / like 'adieresis' to corresp. positions of ISOEnc and read / these values from AFM files, too. Maybe later ... */ - lastWidths[196] = lastWidths['A']; // Ä - lastWidths[228] = lastWidths['a']; // ä - lastWidths[214] = lastWidths['O']; // Ö - lastWidths[246] = lastWidths['o']; // ö - lastWidths[220] = lastWidths['U']; // Ü - lastWidths[252] = lastWidths['u']; // ü - lastWidths[223] = lastWidths[251]; // ß + + // NB: casts to int are needed to suppress gcc 3.3 warnings + lastWidths[196] = lastWidths[(int)'A']; // U+00C4 A Umlaute + lastWidths[228] = lastWidths[(int)'a']; // U+00E4 a Umlaute + lastWidths[214] = lastWidths[(int)'O']; // U+00D6 O Umlaute + lastWidths[246] = lastWidths[(int)'o']; // U+00F6 o Umlaute + lastWidths[220] = lastWidths[(int)'U']; // U+00DC U Umlaute + lastWidths[252] = lastWidths[(int)'u']; // U+00FC u Umlaute + lastWidths[223] = lastWidths[(int)251]; // U+00DF eszett (scharfes s) /* JC: calculate UnderlineThickness/UnderlinePosition */ // VS: dirty, but is there any better solution? double *pt; pt = (double*) &m_underlinePosition; - *pt = LogicalToDeviceYRel((wxCoord)(UnderlinePosition * fontToUse->GetPointSize())) / 1000.0f; + *pt = YLOG2DEVREL((wxCoord)(UnderlinePosition * fontToUse->GetPointSize())) / 1000.0f; pt = (double*) &m_underlineThickness; - *pt = LogicalToDeviceYRel((wxCoord)(UnderlineThickness * fontToUse->GetPointSize())) / 1000.0f; + *pt = YLOG2DEVREL((wxCoord)(UnderlineThickness * fontToUse->GetPointSize())) / 1000.0f; } @@ -2314,7 +2319,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, if(lastWidths[*p]== INT_MIN) { wxLogDebug(wxT("GetTextExtent: undefined width for character '%c' (%d)"), *p,*p); - sum += lastWidths[' ']; /* assume space */ + sum += lastWidths[(unsigned char)' ']; /* assume space */ } else { @@ -2357,62 +2362,9 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, if (externalLeading) *externalLeading = 0; #endif // Use AFM - -#endif - // GTK 2.0 -} - -#if WXWIN_COMPATIBILITY_2_2 -WXDLLEXPORT wxPrintSetupData *wxThePrintSetupData = 0; - -void wxInitializePrintSetupData(bool init) -{ - if (init) - { - // gets initialized in the constructor - wxThePrintSetupData = new wxPrintSetupData; - } - else - { - delete wxThePrintSetupData; - - wxThePrintSetupData = (wxPrintSetupData *) NULL; - } } -// A module to allow initialization/cleanup of PostScript-related -// things without calling these functions from app.cpp. - -class WXDLLEXPORT wxPostScriptModule: public wxModule -{ -DECLARE_DYNAMIC_CLASS(wxPostScriptModule) -public: - wxPostScriptModule() {} - bool OnInit(); - void OnExit(); -}; - -IMPLEMENT_DYNAMIC_CLASS(wxPostScriptModule, wxModule) - -bool wxPostScriptModule::OnInit() -{ - wxInitializePrintSetupData(); - - return TRUE; -} - -void wxPostScriptModule::OnExit() -{ - wxInitializePrintSetupData(FALSE); -} -#endif - // WXWIN_COMPATIBILITY_2_2 - -#endif - // wxUSE_POSTSCRIPT - -#endif - // wxUSE_PRINTING_ARCHITECTURE +#endif // wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT // vi:sts=4:sw=4:et