X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afce4c035fffa13edcb0241d84dbae93ae3ee1e3..533c7161fc06f3e78f977a5b0692150213fa2f7e:/src/generic/dcpsg.cpp?ds=sidebyside diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index 883b7665b1..f67a2ec4f8 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -25,8 +25,11 @@ #include "wx/defs.h" #endif // WX_PRECOMP +#if wxUSE_PRINTING_ARCHITECTURE + #if wxUSE_POSTSCRIPT +#include "wx/window.h" #include "wx/dcmemory.h" #include "wx/utils.h" #include "wx/intl.h" @@ -42,6 +45,7 @@ #include "wx/radiobox.h" #include "wx/textctrl.h" #include "wx/prntbase.h" +#include "wx/paper.h" #include @@ -129,34 +133,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\ @@ -175,12 +179,12 @@ 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\ "; static char wxPostScriptHeaderReencodeISO1[] = @@ -230,7 +234,7 @@ static char wxPostScriptHeaderReencodeISO2[] = wxPostScriptDC::wxPostScriptDC () { - m_pstream = (ofstream*) NULL; + m_pstream = (FILE*) NULL; m_currentRed = 0; m_currentGreen = 0; @@ -245,11 +249,17 @@ wxPostScriptDC::wxPostScriptDC () m_signX = 1; // default x-axis left to right m_signY = -1; // default y-axis bottom up -> top down + + // Compatibility only + // HH: Doesn't seem to work for wxMSW... + #ifndef __WXMSW__ + m_printData = * wxThePrintSetupData; + #endif } wxPostScriptDC::wxPostScriptDC (const wxString& file, bool interactive, wxWindow *parent) { - m_pstream = (ofstream*) NULL; + m_pstream = (FILE*) NULL; m_currentRed = 0; m_currentGreen = 0; @@ -273,11 +283,11 @@ bool wxPostScriptDC::Create(const wxString& file, bool interactive, wxWindow *pa m_isInteractive = interactive; m_title = ""; - m_filename = file; + m_printData.SetFilename(file); #ifdef __WXMSW__ // Can only send to file in Windows - wxThePrintSetupData->SetPrinterMode(PS_FILE); + m_printData.SetPrintMode(wxPRINT_MODE_FILE); #endif if (m_isInteractive) @@ -292,9 +302,36 @@ bool wxPostScriptDC::Create(const wxString& file, bool interactive, wxWindow *pa return m_ok; } +wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData) +{ + m_pstream = (FILE*) NULL; + + m_currentRed = 0; + m_currentGreen = 0; + m_currentBlue = 0; + + m_pageNumber = 0; + + 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 () { - if (m_pstream) delete m_pstream; + if (m_pstream) + { + fclose( m_pstream ); + m_pstream = (FILE*) NULL; + } } bool wxPostScriptDC::Ok() const @@ -302,6 +339,7 @@ bool wxPostScriptDC::Ok() const return m_ok; } +// This dialog is deprecated now: use wxGenericPrintDialog or the printing framework bool wxPostScriptDC::PrinterDialog(wxWindow *parent) { wxPostScriptPrintDialog dialog( parent, _("Printer Settings"), wxPoint(150, 150), wxSize(400, 400), @@ -310,41 +348,39 @@ bool wxPostScriptDC::PrinterDialog(wxWindow *parent) if (!m_ok) return FALSE; - if ((m_filename == "") && - (wxThePrintSetupData->GetPrinterMode() == PS_PREVIEW || - wxThePrintSetupData->GetPrinterMode() == PS_PRINTER)) + if ((m_printData.GetFilename() == "") && + (m_printData.GetPrintMode() == wxPRINT_MODE_PREVIEW || + m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER)) { // steve, 05.09.94 #ifdef __VMS__ - wxThePrintSetupData->SetPrinterFile("preview"); + m_printData.SetFilename("preview"); #else // For PS_PRINTER action this depends on a Unix-style print spooler // since the wx_printer_file can be destroyed during a session // @@@ TODO: a Windows-style answer for non-Unix - char userId[256]; + wxChar userId[256]; wxGetUserId (userId, sizeof (userId) / sizeof (char)); - char tmp[256]; - strcpy (tmp, "/tmp/preview_"); - strcat (tmp, userId); - wxThePrintSetupData->SetPrinterFile(tmp); + wxChar tmp[256]; + wxStrcpy (tmp, _T("/tmp/preview_")); + wxStrcat (tmp, userId); + m_printData.SetFilename(tmp); #endif - char tmp2[256]; - strcpy(tmp2, wxThePrintSetupData->GetPrinterFile()); - strcat (tmp2, ".ps"); - wxThePrintSetupData->SetPrinterFile(tmp2); - m_filename = tmp2; + wxChar tmp2[256]; + wxStrcpy(tmp2, m_printData.GetFilename()); + wxStrcat (tmp2, _T(".ps")); + m_printData.SetFilename(tmp2); } - else if ((m_filename == "") && (wxThePrintSetupData->GetPrinterMode() == PS_FILE)) + else if ((m_printData.GetFilename() == _T("")) && (m_printData.GetPrintMode() == wxPRINT_MODE_FILE)) { - wxString file = wxSaveFileSelector (_("PostScript"), "ps"); + wxString file = wxSaveFileSelector (_("PostScript"), _T("ps")); if ( file.IsEmpty() ) { m_ok = FALSE; return FALSE; } - wxThePrintSetupData->SetPrinterFile(file); - m_filename = file; + m_printData.SetFilename(file); m_ok = TRUE; } @@ -353,72 +389,80 @@ bool wxPostScriptDC::PrinterDialog(wxWindow *parent) void wxPostScriptDC::SetClippingRegion (long x, long y, long w, long h) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (m_clipping) return; wxDC::SetClippingRegion( x, y, w, h ); m_clipping = TRUE; - *m_pstream << "gsave\n" - << "newpath\n" - << XLOG2DEV(x) << " " << YLOG2DEV(y) << " moveto\n" - << XLOG2DEV(x+w) << " " << YLOG2DEV(y) << " lineto\n" - << XLOG2DEV(x+w) << " " << YLOG2DEV(y+h) << " lineto\n" - << XLOG2DEV(x) << " " << YLOG2DEV(y+h) << " lineto\n" - << "closepath clip newpath\n"; + fprintf( m_pstream, + "gsave\n newpath\n" + "%ld %ld moveto\n" + "%ld %ld lineto\n" + "%ld %ld lineto\n" + "%ld %ld 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) ); } void wxPostScriptDC::SetClippingRegion( const wxRegion &WXUNUSED(region) ) { + wxFAIL_MSG( _T("wxPostScriptDC::SetClippingRegion not implemented.") ); } void wxPostScriptDC::DestroyClippingRegion() { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); wxDC::DestroyClippingRegion(); if (m_clipping) { m_clipping = FALSE; - *m_pstream << "grestore\n"; + fprintf( m_pstream, "grestore\n" ); } } void wxPostScriptDC::Clear() { - wxFAIL_MSG( "wxPostScriptDC::Clear not implemented." ); + wxFAIL_MSG( _T("wxPostScriptDC::Clear not implemented.") ); } -void wxPostScriptDC::FloodFill (long WXUNUSED(x), long WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style)) +void wxPostScriptDC::DoFloodFill (long WXUNUSED(x), long WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style)) { - wxFAIL_MSG( "wxPostScriptDC::FloodFill not implemented." ); + wxFAIL_MSG( _T("wxPostScriptDC::FloodFill not implemented.") ); } -bool wxPostScriptDC::GetPixel (long WXUNUSED(x), long WXUNUSED(y), wxColour * WXUNUSED(col)) const +bool wxPostScriptDC::DoGetPixel (long WXUNUSED(x), long WXUNUSED(y), wxColour * WXUNUSED(col)) const { - wxFAIL_MSG( "wxPostScriptDC::GetPixel not implemented." ); + wxFAIL_MSG( _T("wxPostScriptDC::GetPixel not implemented.") ); return FALSE; } -void wxPostScriptDC::CrossHair (long WXUNUSED(x), long WXUNUSED(y)) +void wxPostScriptDC::DoCrossHair (long WXUNUSED(x), long WXUNUSED(y)) { - wxFAIL_MSG( "wxPostScriptDC::CrossHair not implemented." ); + wxFAIL_MSG( _T("wxPostScriptDC::CrossHair not implemented.") ); } -void wxPostScriptDC::DrawLine (long x1, long y1, long x2, long y2) +void wxPostScriptDC::DoDrawLine (long x1, long y1, long x2, long y2) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (m_pen.GetStyle() == wxTRANSPARENT) return; SetPen( m_pen ); - *m_pstream << "newpath\n" - << XLOG2DEV(x1) << " " << YLOG2DEV (y1) << " moveto\n" - << XLOG2DEV(x2) << " " << YLOG2DEV (y2) << " lineto\n" - << "stroke\n"; + fprintf( m_pstream, + "newpath\n" + "%ld %ld moveto\n" + "%ld %ld lineto\n" + "stroke\n", + XLOG2DEV(x1), YLOG2DEV(y1), + XLOG2DEV(x2), YLOG2DEV (y2) ); CalcBoundingBox( x1, y1 ); CalcBoundingBox( x2, y2 ); @@ -426,9 +470,9 @@ void wxPostScriptDC::DrawLine (long x1, long y1, long x2, long y2) #define RAD2DEG 57.29577951308 -void wxPostScriptDC::DrawArc (long x1, long y1, long x2, long y2, long xc, long yc) +void wxPostScriptDC::DoDrawArc (long x1, long y1, long x2, long y2, long xc, long yc) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); long dx = x1 - xc; long dy = y1 - yc; @@ -437,19 +481,21 @@ void wxPostScriptDC::DrawArc (long x1, long y1, long x2, long y2, long xc, long if (x1 == x2 && y1 == y2) { - alpha1 = 0.0; - alpha2 = 360.0; - } else if (radius == 0.0) + alpha1 = 0.0; + alpha2 = 360.0; + } + else if (radius == 0.0) { - alpha1 = alpha2 = 0.0; - } else + alpha1 = alpha2 = 0.0; + } + else { - alpha1 = (x1 - xc == 0) ? - (y1 - yc < 0) ? 90.0 : -90.0 : - -atan2(double(y1-yc), double(x1-xc)) * RAD2DEG; - alpha2 = (x2 - xc == 0) ? - (y2 - yc < 0) ? 90.0 : -90.0 : - -atan2(double(y2-yc), double(x2-xc)) * RAD2DEG; + alpha1 = (x1 - xc == 0) ? + (y1 - yc < 0) ? 90.0 : -90.0 : + -atan2(double(y1-yc), double(x1-xc)) * RAD2DEG; + alpha2 = (x2 - xc == 0) ? + (y2 - yc < 0) ? 90.0 : -90.0 : + -atan2(double(y2-yc), double(x2-xc)) * RAD2DEG; } while (alpha1 <= 0) alpha1 += 360; while (alpha2 <= 0) alpha2 += 360; // adjust angles to be between @@ -458,40 +504,42 @@ void wxPostScriptDC::DrawArc (long x1, long y1, long x2, long y2, long xc, long if (m_brush.GetStyle() != wxTRANSPARENT) { - SetBrush( m_brush ); - *m_pstream << "newpath\n" - << XLOG2DEV(xc) << " " - << YLOG2DEV(yc) << " " - << XLOG2DEVREL(radius) << " " - << YLOG2DEVREL(radius) << " " - << alpha1 << " " - << alpha2 << " ellipse\n" - << XLOG2DEV(xc) << " " - << YLOG2DEV(yc) << " lineto\n" - << "closepath\n" - << "fill\n"; + SetBrush( m_brush ); + + fprintf( m_pstream, + "newpath\n" + "%ld %ld %ld %ld %ld %ld ellipse\n" + "%ld %ld lineto\n" + "closepath\n" + "fill\n", + XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL(radius), YLOG2DEVREL(radius), (long)alpha1, (long) alpha2, + XLOG2DEV(xc), YLOG2DEV(yc) ); + + CalcBoundingBox( xc-radius, yc-radius ); + CalcBoundingBox( xc+radius, yc+radius ); } if (m_pen.GetStyle() != wxTRANSPARENT) { - SetPen( m_pen ); - *m_pstream << "newpath\n" - << XLOG2DEV(xc) << " " - << YLOG2DEV(yc) << " " - << XLOG2DEVREL(radius) << " " - << YLOG2DEVREL(radius) << " " - << alpha1 << " " - << alpha2 << " ellipse\n" - << "stroke\n"; - } + SetPen( m_pen ); + + fprintf( m_pstream, + "newpath\n" + "%ld %ld %ld %ld %ld %ld ellipse\n" + "%ld %ld lineto\n" + "stroke\n" + "fill\n", + XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL(radius), YLOG2DEVREL(radius), (long)alpha1, (long) alpha2, + XLOG2DEV(xc), YLOG2DEV(yc) ); - CalcBoundingBox( xc-radius, yc-radius ); - CalcBoundingBox( xc+radius, yc+radius ); + CalcBoundingBox( xc-radius, yc-radius ); + CalcBoundingBox( xc+radius, yc+radius ); + } } -void wxPostScriptDC::DrawEllipticArc(long x,long y,long w,long h,double sa,double ea) +void wxPostScriptDC::DoDrawEllipticArc(long x,long y,long w,long h,double sa,double ea) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("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; @@ -507,104 +555,115 @@ void wxPostScriptDC::DrawEllipticArc(long x,long y,long w,long h,double sa,doubl if (m_brush.GetStyle () != wxTRANSPARENT) { SetBrush( m_brush ); - - *m_pstream << "newpath\n" - << XLOG2DEV(x+w/2) << " " << YLOG2DEV(y+h/2) << " " - << XLOG2DEVREL(w/2) << " " << YLOG2DEVREL(h/2) << " " - << int(sa) <<" "<< int(ea) << " true ellipticarc\n"; - + + fprintf( m_pstream, + "newpath\n" + "%ld %ld %ld %ld %ld %ld true ellipticarc\n", + XLOG2DEV(x+w/2), YLOG2DEV(y+h/2), XLOG2DEVREL(w/2), YLOG2DEVREL(h/2), (long)sa, (long)ea ); + CalcBoundingBox( x ,y ); CalcBoundingBox( x+w, y+h ); - } - + } + if (m_pen.GetStyle () != wxTRANSPARENT) { SetPen( m_pen ); - *m_pstream << "newpath\n" - << XLOG2DEV(x+w/2) << " " << YLOG2DEV(y+h/2) << " " - << XLOG2DEVREL(w/2) << " " << XLOG2DEVREL(h/2) << " " - << int(sa) <<" "<< int(ea) << " false ellipticarc\n"; - - CalcBoundingBox( x, y ); + fprintf( m_pstream, + "newpath\n" + "%ld %ld %ld %ld %ld %ld false ellipticarc\n", + XLOG2DEV(x+w/2), YLOG2DEV(y+h/2), XLOG2DEVREL(w/2), YLOG2DEVREL(h/2), (long)sa, (long)ea ); + + CalcBoundingBox( x ,y ); CalcBoundingBox( x+w, y+h ); } } -void wxPostScriptDC::DrawPoint (long x, long y) +void wxPostScriptDC::DoDrawPoint (long x, long y) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (m_pen.GetStyle() == wxTRANSPARENT) return; SetPen (m_pen); - *m_pstream << "newpath\n" - << XLOG2DEV(x) << " " << YLOG2DEV (y) << " moveto\n" - << XLOG2DEV(x+1) << " " << YLOG2DEV (y) << " lineto\n" - << "stroke\n"; + fprintf( m_pstream, + "newpath\n" + "%ld %ld moveto\n" + "%ld %ld lineto\n" + "stroke\n", + XLOG2DEV(x), YLOG2DEV(y), + XLOG2DEV(x+1), YLOG2DEV(y) ); CalcBoundingBox( x, y ); } -void wxPostScriptDC::DrawPolygon (int n, wxPoint points[], long xoffset, long yoffset, int WXUNUSED(fillStyle)) +void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], long xoffset, long yoffset, int WXUNUSED(fillStyle)) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (n <= 0) return; if (m_brush.GetStyle () != wxTRANSPARENT) { - SetBrush( m_brush ); + SetBrush( m_brush ); - *m_pstream << "newpath\n"; + fprintf( m_pstream, "newpath\n" ); - long xx = XLOG2DEV(points[0].x + xoffset); - long yy = YLOG2DEV(points[0].y + yoffset); - *m_pstream << xx << " " << yy << " moveto\n"; - CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); + long xx = XLOG2DEV(points[0].x + xoffset); + long yy = YLOG2DEV(points[0].y + yoffset); + + fprintf( m_pstream, "%ld %ld moveto\n", xx, yy ); + + CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); - for (int i = 1; i < n; i++) - { - xx = XLOG2DEV(points[i].x + xoffset); - yy = YLOG2DEV(points[i].y + yoffset); - *m_pstream << xx << " " << yy << " lineto\n"; - CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset); - } - *m_pstream << "fill\n"; + for (int i = 1; i < n; i++) + { + xx = XLOG2DEV(points[i].x + xoffset); + yy = YLOG2DEV(points[i].y + yoffset); + + fprintf( m_pstream, "%ld %ld lineto\n", xx, yy ); + + CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset); + } + + fprintf( m_pstream, "fill\n" ); } if (m_pen.GetStyle () != wxTRANSPARENT) { - SetPen( m_pen ); - - *m_pstream << "newpath\n"; + SetPen( m_pen ); + + fprintf( m_pstream, "newpath\n" ); - long xx = XLOG2DEV(points[0].x + xoffset); - long yy = YLOG2DEV(points[0].y + yoffset); - *m_pstream << xx << " " << yy << " moveto\n"; - CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); + long xx = XLOG2DEV(points[0].x + xoffset); + long yy = YLOG2DEV(points[0].y + yoffset); + + fprintf( m_pstream, "%ld %ld moveto\n", xx, yy ); + + CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); - for (int i = 1; i < n; i++) - { - xx = XLOG2DEV(points[i].x + xoffset); - yy = YLOG2DEV(points[i].y + yoffset); - *m_pstream << xx << " " << yy << " lineto\n"; - CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset); - } + for (int i = 1; i < n; i++) + { + xx = XLOG2DEV(points[i].x + xoffset); + yy = YLOG2DEV(points[i].y + yoffset); + + fprintf( m_pstream, "%ld %ld lineto\n", xx, yy ); + + CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset); + } - *m_pstream << "stroke\n"; + fprintf( m_pstream, "fill\n" ); } } -void wxPostScriptDC::DrawLines (int n, wxPoint points[], long xoffset, long yoffset) +void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], long xoffset, long yoffset) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); - if (m_pen.GetStyle() == wxTRANSPARENT) - return; - if (n <= 0) - return; + if (m_pen.GetStyle() == wxTRANSPARENT) return; + + if (n <= 0) return; SetPen (m_pen); @@ -614,34 +673,41 @@ void wxPostScriptDC::DrawLines (int n, wxPoint points[], long xoffset, long yoff CalcBoundingBox( XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset)); } - *m_pstream << "newpath\n" - << XLOG2DEV(points[0].x+xoffset) << " " - << YLOG2DEV(points[0].y+yoffset) << " moveto\n"; + fprintf( m_pstream, + "newpath\n" + "%ld %ld moveto\n", + XLOG2DEV(points[0].x+xoffset), YLOG2DEV(points[0].y+yoffset) ); for (i = 1; i < n; i++) { - *m_pstream << XLOG2DEV(points[i].x+xoffset) << " " - << YLOG2DEV(points[i].y+yoffset) << " lineto\n"; + fprintf( m_pstream, + "%ld %ld lineto\n", + XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) ); } - *m_pstream << "stroke\n"; + fprintf( m_pstream, "stroke\n" ); } -void wxPostScriptDC::DrawRectangle (long x, long y, long width, long height) +void wxPostScriptDC::DoDrawRectangle (long x, long y, long width, long height) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (m_brush.GetStyle () != wxTRANSPARENT) { SetBrush( m_brush ); - - *m_pstream << "newpath\n" - << XLOG2DEV(x) << " " << YLOG2DEV(y) << " moveto\n" - << XLOG2DEV(x + width) << " " << YLOG2DEV(y) << " lineto\n" - << XLOG2DEV(x + width) << " " << YLOG2DEV(y + height) << " lineto\n" - << XLOG2DEV(x) << " " << YLOG2DEV(y + height) << " lineto\n" - << "closepath\n" - << "fill\n"; + + fprintf( m_pstream, + "newpath\n" + "%ld %ld moveto\n" + "%ld %ld lineto\n" + "%ld %ld lineto\n" + "%ld %ld lineto\n" + "closepath\n" + "fill\n", + XLOG2DEV(x), YLOG2DEV(y), + XLOG2DEV(x + width), YLOG2DEV(y), + XLOG2DEV(x + width), YLOG2DEV(y + height), + XLOG2DEV(x), YLOG2DEV(y + height) ); CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); @@ -651,22 +717,27 @@ void wxPostScriptDC::DrawRectangle (long x, long y, long width, long height) { SetPen (m_pen); - *m_pstream << "newpath\n" - << XLOG2DEV(x) << " " << YLOG2DEV(y) << " moveto\n" - << XLOG2DEV(x + width) << " " << YLOG2DEV(y) << " lineto\n" - << XLOG2DEV(x + width) << " " << YLOG2DEV(y + height) << " lineto\n" - << XLOG2DEV(x) << " " << YLOG2DEV(y + height) << " lineto\n" - << "closepath\n" - << "stroke\n"; - + fprintf( m_pstream, + "newpath\n" + "%ld %ld moveto\n" + "%ld %ld lineto\n" + "%ld %ld lineto\n" + "%ld %ld lineto\n" + "closepath\n" + "stroke\n", + XLOG2DEV(x), YLOG2DEV(y), + XLOG2DEV(x + width), YLOG2DEV(y), + XLOG2DEV(x + width), YLOG2DEV(y + height), + XLOG2DEV(x), YLOG2DEV(y + height) ); + CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); } } -void wxPostScriptDC::DrawRoundedRectangle (long x, long y, long width, long height, double radius) +void wxPostScriptDC::DoDrawRoundedRectangle (long x, long y, long width, long height, double radius) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (radius < 0.0) { @@ -686,18 +757,27 @@ void wxPostScriptDC::DrawRoundedRectangle (long x, long y, long width, long heig { SetBrush( m_brush ); - // Draw rectangle anticlockwise - *m_pstream << "newpath\n" - << XLOG2DEV(x + rad) << " " << YLOG2DEV(y + rad) << " " << XLOG2DEVREL(rad) << " 90 180 arc\n" - << XLOG2DEV(x) << " " << YLOG2DEV(y + rad) << " moveto\n" - << XLOG2DEV(x + rad) << " " << YLOG2DEV(y + height - rad) << " " << XLOG2DEVREL(rad) << " 180 270 arc\n" - << XLOG2DEV(x + width - rad) << " " << YLOG2DEV(y + height) << " lineto\n" - << XLOG2DEV(x + width - rad) << " " << YLOG2DEV(y + height - rad) << " " << XLOG2DEVREL(rad) << " 270 0 arc\n" - << XLOG2DEV(x + width) << " " << YLOG2DEV(y + rad) << " lineto\n" - << XLOG2DEV(x + width - rad) << " " << YLOG2DEV(y + rad) << " " << XLOG2DEVREL(rad) << " 0 90 arc\n" - << XLOG2DEV(x + rad) << " " << YLOG2DEV(y) << " lineto\n" - << "closepath\n" - << "fill\n"; + /* Draw rectangle anticlockwise */ + fprintf( m_pstream, + "newpath\n" + "%ld %ld %ld 90 180 arc\n" + "%ld %ld moveto\n" + "%ld %ld %ld 180 270 arc\n" + "%ld %ld lineto\n" + "%ld %ld %ld 270 0 arc\n" + "%ld %ld lineto\n" + "%ld %ld %ld 0 90 arc\n" + "%ld %ld lineto\n" + "closepath\n" + "fill\n", + XLOG2DEV(x + rad), YLOG2DEV(y + rad), XLOG2DEVREL(rad), + XLOG2DEV(x), YLOG2DEV(y + rad), + XLOG2DEV(x + rad), YLOG2DEV(y + height - rad), XLOG2DEVREL(rad), + XLOG2DEV(x + width - rad), YLOG2DEV(y + height), + XLOG2DEV(x + width - rad), YLOG2DEV(y + height - rad), XLOG2DEVREL(rad), + XLOG2DEV(x + width), YLOG2DEV(y + rad), + XLOG2DEV(x + width - rad), YLOG2DEV(y + rad), XLOG2DEVREL(rad), + XLOG2DEV(x + rad), YLOG2DEV(y) ); CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); @@ -707,63 +787,87 @@ void wxPostScriptDC::DrawRoundedRectangle (long x, long y, long width, long heig { SetPen (m_pen); - // Draw rectangle anticlockwise - *m_pstream << "newpath\n" - << XLOG2DEV(x + rad) << " " << YLOG2DEV(y + rad) << " " << XLOG2DEVREL(rad) << " 90 180 arc\n" - << XLOG2DEV(x) << " " << YLOG2DEV(y + rad) << " moveto\n" - << XLOG2DEV(x + rad) << " " << YLOG2DEV(y + height - rad) << " " << XLOG2DEVREL(rad) << " 180 270 arc\n" - << XLOG2DEV(x + width - rad) << " " << YLOG2DEV(y + height) << " lineto\n" - << XLOG2DEV(x + width - rad) << " " << YLOG2DEV(y + height - rad) << " " << XLOG2DEVREL(rad) << " 270 0 arc\n" - << XLOG2DEV(x + width) << " " << YLOG2DEV(y + rad) << " lineto\n" - << XLOG2DEV(x + width - rad) << " " << YLOG2DEV(y + rad) << " " << XLOG2DEVREL(rad) << " 0 90 arc\n" - << XLOG2DEV(x + rad) << " " << YLOG2DEV(y) << " lineto\n" - << "closepath\n" - << "stroke\n"; + /* Draw rectangle anticlockwise */ + fprintf( m_pstream, + "newpath\n" + "%ld %ld %ld 90 180 arc\n" + "%ld %ld moveto\n" + "%ld %ld %ld 180 270 arc\n" + "%ld %ld lineto\n" + "%ld %ld %ld 270 0 arc\n" + "%ld %ld lineto\n" + "%ld %ld %ld 0 90 arc\n" + "%ld %ld lineto\n" + "closepath\n" + "stroke\n", + XLOG2DEV(x + rad), YLOG2DEV(y + rad), XLOG2DEVREL(rad), + XLOG2DEV(x), YLOG2DEV(y + rad), + XLOG2DEV(x + rad), YLOG2DEV(y + height - rad), XLOG2DEVREL(rad), + XLOG2DEV(x + width - rad), YLOG2DEV(y + height), + XLOG2DEV(x + width - rad), YLOG2DEV(y + height - rad), XLOG2DEVREL(rad), + XLOG2DEV(x + width), YLOG2DEV(y + rad), + XLOG2DEV(x + width - rad), YLOG2DEV(y + rad), XLOG2DEVREL(rad), + XLOG2DEV(x + rad), YLOG2DEV(y) ); CalcBoundingBox( x, y ); CalcBoundingBox( x + width, y + height ); } } -void wxPostScriptDC::DrawEllipse (long x, long y, long width, long height) +void wxPostScriptDC::DoDrawEllipse (long x, long y, long width, long height) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (m_brush.GetStyle () != wxTRANSPARENT) { SetBrush (m_brush); - *m_pstream << "newpath\n" - << XLOG2DEV(x + width / 2) << " " << YLOG2DEV(y + height / 2) << " " - << XLOG2DEV(width / 2) << " " << YLOG2DEVREL(height / 2) << " 0 360 ellipse\n" - << "fill\n"; + fprintf( m_pstream, + "newpath\n" + "%ld %ld %ld %ld 0 360 ellipse\n" + "fill\n", + XLOG2DEV(x + width / 2), YLOG2DEV(y + height / 2), + XLOG2DEV(width / 2), YLOG2DEVREL(height / 2) ); CalcBoundingBox( x - width, y - height ); CalcBoundingBox( x + width, y + height ); } - if (m_pen.Ok() && m_pen.GetStyle () != wxTRANSPARENT) + if (m_pen.GetStyle () != wxTRANSPARENT) { SetPen (m_pen); - *m_pstream << "newpath\n" - << XLOG2DEV(x + width / 2) << " " << YLOG2DEV(y + height / 2) << " " - << XLOG2DEV(width / 2) << " " << YLOG2DEVREL(height / 2) << " 0 360 ellipse\n" - << "stroke\n"; + fprintf( m_pstream, + "newpath\n" + "%ld %ld %ld %ld 0 360 ellipse\n" + "stroke\n", + XLOG2DEV(x + width / 2), YLOG2DEV(y + height / 2), + XLOG2DEV(width / 2), YLOG2DEVREL(height / 2) ); CalcBoundingBox( x - width, y - height ); CalcBoundingBox( x + width, y + height ); } } -void wxPostScriptDC::DrawIcon( const wxIcon& icon, long x, long y ) +void wxPostScriptDC::DoDrawIcon( const wxIcon& icon, long x, long y ) { DrawBitmap( icon, x, y, TRUE ); } -void wxPostScriptDC::DrawBitmap( const wxBitmap& bitmap, long x, long y, bool WXUNUSED(useMask) ) +/* this has to be char, not wxChar */ +static char hexArray[] = "0123456789ABCDEF"; +static void LocalDecToHex( int dec, char *buf ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + int firstDigit = (int)(dec/16.0); + int secondDigit = (int)(dec - (firstDigit*16.0)); + buf[0] = hexArray[firstDigit]; + buf[1] = hexArray[secondDigit]; + buf[2] = 0; +} + +void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, long x, long y, bool WXUNUSED(useMask) ) +{ + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (!bitmap.Ok()) return; @@ -771,53 +875,53 @@ void wxPostScriptDC::DrawBitmap( const wxBitmap& bitmap, long x, long y, bool WX if (!image.Ok()) return; - int ww = XLOG2DEVREL(image.GetWidth()); - int hh = YLOG2DEVREL(image.GetHeight()); + long ww = XLOG2DEVREL(image.GetWidth()); + long hh = YLOG2DEVREL(image.GetHeight()); image = image.Scale( ww, hh ); if (!image.Ok()) return; - int xx = XLOG2DEV(x); - int yy = YLOG2DEV(y + bitmap.GetHeight()); - - *m_pstream << "/origstate save def\n" - << "20 dict begin\n" - << "/pix " << ww << " string def\n" - << "/grays " << ww << " string def\n" - << "/npixels 0 def\n" - << "/rgbindx 0 def\n" - << xx << " " << yy << " translate\n" - << ww << " " << hh << " scale\n" - << ww << " " << hh << " 8\n" - << "[" << ww << " 0 0 " << (-hh) << " 0 " << hh << "]\n" - << "{currentfile pix readhexstring pop}\n" - << "false 3 colorimage\n"; + long xx = XLOG2DEV(x); + long yy = YLOG2DEV(y + bitmap.GetHeight()); + + fprintf( m_pstream, + "/origstate save def\n" + "20 dict begin\n" + "/pix %ld string def\n" + "/grays %ld string def\n" + "/npixels 0 def\n" + "/rgbindx 0 def\n" + "%ld %ld translate\n" + "%ld %ld scale\n" + "%ld %ld 8\n" + "[%ld 0 0 %ld 0 %ld]\n" + "{currentfile pix readhexstring pop}\n" + "false 3 colorimage\n", + ww, ww, xx, yy, ww, hh, ww, hh, ww, -hh, hh ); for (int j = 0; j < hh; j++) { for (int i = 0; i < ww; i++) { - char buffer[5]; - buffer[2] = 0; - wxDecToHex( image.GetRed(i,j), buffer ); - *m_pstream << buffer; - wxDecToHex( image.GetGreen(i,j), buffer ); - *m_pstream << buffer; - wxDecToHex( image.GetBlue(i,j), buffer ); - *m_pstream << buffer; - } - *m_pstream << "\n"; + char buffer[5]; + LocalDecToHex( image.GetRed(i,j), buffer ); + fprintf( m_pstream, buffer ); + LocalDecToHex( image.GetGreen(i,j), buffer ); + fprintf( m_pstream, buffer ); + LocalDecToHex( image.GetBlue(i,j), buffer ); + fprintf( m_pstream, buffer ); + } + fprintf( m_pstream, "\n" ); } - *m_pstream << "end\n"; - *m_pstream << "origstate restore\n"; - + fprintf( m_pstream, "end\n" ); + fprintf( m_pstream, "origstate restore\n" ); } void wxPostScriptDC::SetFont( const wxFont& font ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (!font.Ok()) return; @@ -828,7 +932,7 @@ void wxPostScriptDC::SetFont( const wxFont& font ) int Style = m_font.GetStyle(); int Weight = m_font.GetWeight(); - switch (m_font.GetFamily ()) + switch (m_font.GetFamily()) { case wxTELETYPE: case wxMODERN: @@ -853,60 +957,66 @@ void wxPostScriptDC::SetFont( const wxFont& font ) if (Style == wxNORMAL && (Weight == wxNORMAL || Weight == wxLIGHT)) { - if (m_font.GetFamily () == wxROMAN) - style = "-Roman"; - else - style = ""; + if (m_font.GetFamily () == wxROMAN) + style = "-Roman"; + else + style = ""; } else if (Style == wxNORMAL && Weight == wxBOLD) { - style = "-Bold"; + style = "-Bold"; } else if (Style == wxITALIC && (Weight == wxNORMAL || Weight == wxLIGHT)) { - if (m_font.GetFamily () == wxROMAN) - style = "-Italic"; - else - style = "-Oblique"; + if (m_font.GetFamily () == wxROMAN) + style = "-Italic"; + else + style = "-Oblique"; } else if (Style == wxITALIC && Weight == wxBOLD) { - if (m_font.GetFamily () == wxROMAN) - style = "-BoldItalic"; - else - style = "-BoldOblique"; + if (m_font.GetFamily () == wxROMAN) + style = "-BoldItalic"; + else + style = "-BoldOblique"; } else if (Style == wxSLANT && (Weight == wxNORMAL || Weight == wxLIGHT)) { - if (m_font.GetFamily () == wxROMAN) - style = "-Italic"; - else - style = "-Oblique"; + if (m_font.GetFamily () == wxROMAN) + style = "-Italic"; + else + style = "-Oblique"; } else if (Style == wxSLANT && Weight == wxBOLD) { - if (m_font.GetFamily () == wxROMAN) - style = "-BoldItalic"; - else - style = "-BoldOblique"; + if (m_font.GetFamily () == wxROMAN) + style = "-BoldItalic"; + else + style = "-BoldOblique"; } else { - style = ""; + style = ""; } - char buf[100]; - strcpy (buf, name); - strcat (buf, style); + char buffer[100]; + strcpy( buffer, name ); + strcat( buffer, style ); - *m_pstream << buf << " reencodeISO def\n"; - *m_pstream << buf << " findfont\n"; - *m_pstream << YLOG2DEVREL(m_font.GetPointSize()) << " scalefont setfont\n"; + fprintf( m_pstream, buffer ); + fprintf( m_pstream, " reencodeISO def\n" ); + fprintf( m_pstream, buffer ); + fprintf( m_pstream, " findfont\n" ); + #ifdef __WXMSW__ + fprintf( m_pstream, "%d scalefont setfont\n", YLOG2DEVREL(m_font.GetPointSize()) ); + #else + fprintf( m_pstream, "%ld scalefont setfont\n", YLOG2DEVREL(m_font.GetPointSize()) ); + #endif } void wxPostScriptDC::SetPen( const wxPen& pen ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (!pen.Ok()) return; @@ -914,8 +1024,11 @@ void wxPostScriptDC::SetPen( const wxPen& pen ) m_pen = pen; - *m_pstream << XLOG2DEVREL(m_pen.GetWidth()) << " setlinewidth\n"; - + #ifdef __WXMSW__ + fprintf( m_pstream, "%d setlinewidth\n", XLOG2DEVREL(m_pen.GetWidth()) ); + #else + fprintf( m_pstream, "%ld setlinewidth\n", XLOG2DEVREL(m_pen.GetWidth()) ); + #endif /* Line style - WRONG: 2nd arg is OFFSET @@ -934,7 +1047,7 @@ void wxPostScriptDC::SetPen( const wxPen& pen ) static const char *dotted_dashed = "[6 6 2 6] 4"; const char *psdash = (char *) NULL; - switch (m_pen.GetStyle ()) + switch (m_pen.GetStyle()) { case wxDOT: psdash = dotted; break; case wxSHORT_DASH: psdash = short_dashed; break; @@ -947,7 +1060,8 @@ void wxPostScriptDC::SetPen( const wxPen& pen ) if (oldStyle != m_pen.GetStyle()) { - *m_pstream << psdash << " setdash\n"; + fprintf( m_pstream, psdash ); + fprintf( m_pstream," setdash\n" ); } // Line colour @@ -958,103 +1072,112 @@ void wxPostScriptDC::SetPen( const wxPen& pen ) if (!m_colour) { // Anything not white is black - if (!(red == (unsigned char) 255 && blue == (unsigned char) 255 - && green == (unsigned char) 255)) - { - red = (unsigned char) 0; - green = (unsigned char) 0; - blue = (unsigned char) 0; - } - - // setgray here ? + if (! (red == (unsigned char) 255 && + blue == (unsigned char) 255 && + green == (unsigned char) 255) ) + { + red = (unsigned char) 0; + green = (unsigned char) 0; + blue = (unsigned char) 0; + } + // setgray here ? } if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue)) { - long redPS = (long) (((int) red) / 255.0); - long bluePS = (long) (((int) blue) / 255.0); - long greenPS = (long) (((int) green) / 255.0); - - *m_pstream << redPS << " " << greenPS << " " << bluePS << " setrgbcolor\n"; - - m_currentRed = red; - m_currentBlue = blue; - m_currentGreen = green; + double redPS = (double)(red) / 255.0; + double bluePS = (double)(blue) / 255.0; + double greenPS = (double)(green) / 255.0; + + fprintf( m_pstream, + "%.8f %.8f %.8f setrgbcolor\n", + redPS, greenPS, bluePS ); + + m_currentRed = red; + m_currentBlue = blue; + m_currentGreen = green; } } void wxPostScriptDC::SetBrush( const wxBrush& brush ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (!brush.Ok()) return; m_brush = brush; // Brush colour - unsigned char red = m_brush.GetColour ().Red (); - unsigned char blue = m_brush.GetColour ().Blue (); - unsigned char green = m_brush.GetColour ().Green (); + unsigned char red = m_brush.GetColour().Red(); + unsigned char blue = m_brush.GetColour().Blue(); + unsigned char green = m_brush.GetColour().Green(); if (!m_colour) { - // Anything not black is white - if (!(red == (unsigned char) 0 && blue == (unsigned char) 0 - && green == (unsigned char) 0)) - { - red = (unsigned char) 255; - green = (unsigned char) 255; - blue = (unsigned char) 255; - } - - // setgray here ? + // Anything not white is black + if (! (red == (unsigned char) 255 && + blue == (unsigned char) 255 && + green == (unsigned char) 255) ) + { + red = (unsigned char) 0; + green = (unsigned char) 0; + blue = (unsigned char) 0; + } + // setgray here ? } - + if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue)) { - long redPS = (long) (((int) red) / 255.0); - long bluePS = (long) (((int) blue) / 255.0); - long greenPS = (long) (((int) green) / 255.0); - *m_pstream << redPS << " " << greenPS << " " << bluePS << " setrgbcolor\n"; - m_currentRed = red; - m_currentBlue = blue; - m_currentGreen = green; + double redPS = (double)(red) / 255.0; + double bluePS = (double)(blue) / 255.0; + double greenPS = (double)(green) / 255.0; + + fprintf( m_pstream, + "%.8f %.8f %.8f setrgbcolor\n", + redPS, greenPS, bluePS ); + + m_currentRed = red; + m_currentBlue = blue; + m_currentGreen = green; } } -void wxPostScriptDC::DrawText( const wxString& text, long x, long y, bool WXUNUSED(use16bit) ) +void wxPostScriptDC::DoDrawText( const wxString& text, long x, long y ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); SetFont( m_font ); - if (m_textForegroundColour.Ok ()) + if (m_textForegroundColour.Ok()) { - unsigned char red = m_textForegroundColour.Red (); - unsigned char blue = m_textForegroundColour.Blue (); - unsigned char green = m_textForegroundColour.Green (); + unsigned char red = m_textForegroundColour.Red(); + unsigned char blue = m_textForegroundColour.Blue(); + unsigned char green = m_textForegroundColour.Green(); if (!m_colour) - { - // Anything not white is black - if (!(red == (unsigned char) 255 && blue == (unsigned char) 255 - && green == (unsigned char) 255)) { - red = (unsigned char) 0; - green = (unsigned char) 0; - blue = (unsigned char) 0; + // Anything not white is black + if (! (red == (unsigned char) 255 && + blue == (unsigned char) 255 && + green == (unsigned char) 255)) + { + red = (unsigned char) 0; + green = (unsigned char) 0; + blue = (unsigned char) 0; + } } - } - - // maybe setgray here ? + // maybe setgray here ? if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue)) { - long redPS = (long) (((int) red) / 255.0); - long bluePS = (long) (((int) blue) / 255.0); - long greenPS = (long) (((int) green) / 255.0); - *m_pstream << redPS << " " << greenPS << " " << bluePS << " setrgbcolor\n"; - + double redPS = (double)(red) / 255.0; + double bluePS = (double)(blue) / 255.0; + double greenPS = (double)(green) / 255.0; + + fprintf( m_pstream, + "%.8f %.8f %.8f setrgbcolor\n", + redPS, greenPS, bluePS ); + m_currentRed = red; m_currentBlue = blue; m_currentGreen = green; @@ -1063,31 +1186,40 @@ void wxPostScriptDC::DrawText( const wxString& text, long x, long y, bool WXUNUS int size = m_font.GetPointSize(); - long by = y + (long)floor( float(size) * 2.0 / 3.0 ); // approximate baseline - *m_pstream << XLOG2DEV(x) << " " << YLOG2DEV(by) << " moveto\n"; + long by = y + (long)floor( double(size) * 2.0 / 3.0 ); // approximate baseline + fprintf( m_pstream, "%ld %ld moveto\n", XLOG2DEV(x), YLOG2DEV(by) ); - *m_pstream << "("; - int len = strlen ((char *)(const char *)text); + /* I don't know how to write char to a stream, so I use a mini string */ + char tmpbuf[2]; + tmpbuf[1] = 0; + + fprintf( m_pstream, "(" ); + const wxWX2MBbuf textbuf = text.mb_str(); + int len = strlen(textbuf); int i; for (i = 0; i < len; i++) { - int c = (unsigned char) text[i]; - if ( c == ')' || c == '(' || c == '\\') + int c = (unsigned char) textbuf[i]; + if (c == ')' || c == '(' || c == '\\') { - *m_pstream << "\\" << (char) c; + /* Cope with special characters */ + fprintf( m_pstream, "\\" ); + tmpbuf[0] = (char) c; + fprintf( m_pstream, tmpbuf ); } else if ( c >= 128 ) { - // Cope with character codes > 127 - char tmp[5]; - sprintf(tmp, "\\%o", c); - *m_pstream << tmp; + /* Cope with character codes > 127 */ + fprintf(m_pstream, "\\%o", c); } else - *m_pstream << (char) c; + { + tmpbuf[0] = (char) c; + fprintf( m_pstream, tmpbuf ); + } } - - *m_pstream << ")" << " show\n"; + + fprintf( m_pstream, ") show\n" ); if (m_font.GetUnderlined()) { @@ -1095,11 +1227,16 @@ void wxPostScriptDC::DrawText( const wxString& text, long x, long y, bool WXUNUS long w, h; GetTextExtent(text, &w, &h); - *m_pstream << "gsave " << XLOG2DEV(x) << " " << YLOG2DEV(uy) - << " moveto\n" - << (long)m_underlineThickness << " setlinewidth " - << XLOG2DEV(x + w) << " " << YLOG2DEV(uy) - << " lineto stroke grestore\n"; + fprintf( m_pstream, + "gsave\n" + "%ld %ld moveto\n" + "%ld setlinewidth\n" + "%ld %ld lineto\n" + "stroke\n" + "grestore\n", + XLOG2DEV(x), YLOG2DEV(uy), + (long)m_underlineThickness, + XLOG2DEV(x + w), YLOG2DEV(uy) ); } CalcBoundingBox( x, y ); @@ -1114,12 +1251,12 @@ void wxPostScriptDC::SetBackground (const wxBrush& brush) void wxPostScriptDC::SetLogicalFunction (int WXUNUSED(function)) { - wxFAIL_MSG( "wxPostScriptDC::SetLogicalFunction not implemented." ); + wxFAIL_MSG( _T("wxPostScriptDC::SetLogicalFunction not implemented.") ); } -void wxPostScriptDC::DrawSpline( wxList *points ) +void wxPostScriptDC::DoDrawSpline( wxList *points ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); SetPen( m_pen ); @@ -1138,9 +1275,12 @@ void wxPostScriptDC::DrawSpline( wxList *points ) x3 = a = (double)(x1 + c) / 2; y3 = b = (double)(y1 + d) / 2; - *m_pstream << "newpath " - << XLOG2DEV((long)x1) << " " << YLOG2DEV((long)y1) << " moveto " - << XLOG2DEV((long)x3) << " " << YLOG2DEV((long)y3) << " lineto\n"; + fprintf( m_pstream, + "newpath\n" + "%ld %ld moveto\n" + "%ld %ld lineto\n", + XLOG2DEV((long)x1), YLOG2DEV((long)y1), + XLOG2DEV((long)x3), YLOG2DEV((long)y3) ); CalcBoundingBox( (long)x1, (long)y1 ); CalcBoundingBox( (long)x3, (long)y3 ); @@ -1149,17 +1289,20 @@ void wxPostScriptDC::DrawSpline( wxList *points ) { q = (wxPoint *)node->Data(); - x1 = x3; - y1 = y3; - x2 = c; - y2 = d; - c = q->x; - d = q->y; + x1 = x3; + y1 = y3; + x2 = c; + y2 = d; + c = q->x; + d = q->y; x3 = (double)(x2 + c) / 2; y3 = (double)(y2 + d) / 2; - *m_pstream << XLOG2DEV((long)x1) << " " << YLOG2DEV((long)y1) << " " - << XLOG2DEV((long)x2) << " " << YLOG2DEV((long)y2) << " " - << XLOG2DEV((long)x3) << " " << YLOG2DEV((long)y3) << " DrawSplineSection\n"; + + fprintf( m_pstream, + "%ld %ld %ld %ld %ld %ld DrawSplineSection\n", + XLOG2DEV((long)x1), YLOG2DEV((long)y1), + XLOG2DEV((long)x2), YLOG2DEV((long)y2), + XLOG2DEV((long)x3), YLOG2DEV((long)y3) ); CalcBoundingBox( (long)x1, (long)y1 ); CalcBoundingBox( (long)x3, (long)y3 ); @@ -1170,10 +1313,13 @@ void wxPostScriptDC::DrawSpline( wxList *points ) next-to-last and last point respectively, in the point list */ - *m_pstream << XLOG2DEV((long)c) << " " << YLOG2DEV((long)d) << " lineto stroke\n"; + fprintf( m_pstream, + "%ld %ld lineto\n" + "stroke\n", + XLOG2DEV((long)c), YLOG2DEV((long)d) ); } -long wxPostScriptDC::GetCharWidth () +long wxPostScriptDC::GetCharWidth() const { // Chris Breeze: reasonable approximation using wxMODERN/Courier return (long) (GetCharHeight() * 72.0 / 120.0); @@ -1182,7 +1328,7 @@ long wxPostScriptDC::GetCharWidth () void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); m_signX = (xLeftRight ? 1 : -1); m_signY = (yBottomUp ? 1 : -1); @@ -1195,7 +1341,7 @@ void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) void wxPostScriptDC::SetDeviceOrigin( long x, long y ) { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); int h = 0; int w = 0; @@ -1204,54 +1350,98 @@ void wxPostScriptDC::SetDeviceOrigin( long x, long y ) wxDC::SetDeviceOrigin( x, h-y ); } -void wxPostScriptDC::GetSize(int* width, int* height) const +void wxPostScriptDC::DoGetSize(int* width, int* height) const { - const char *paperType = wxThePrintSetupData->GetPaperName(); + wxPaperSize id = m_printData.GetPaperId(); - if (!paperType) paperType = _("A4 210 x 297 mm"); + wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(id); - wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(paperType); - - if (!paper) paper = wxThePrintPaperDatabase->FindPaperType(_("A4 210 x 297 mm")); + if (!paper) paper = wxThePrintPaperDatabase->FindPaperType(wxPAPER_A4); + int w = 595; + int h = 842; if (paper) { - if (width) *width = paper->widthPixels; - if (height) *height = paper->heightPixels; + w = paper->GetSizeDeviceUnits().x; + h = paper->GetSizeDeviceUnits().y; } - else + + if (m_printData.GetOrientation() == wxLANDSCAPE) { - if (width) *width = 595; - if (height) *height = 842; + int tmp = w; + w = h; + h = tmp; } + + if (width) *width = w; + if (height) *height = h; } -bool wxPostScriptDC::StartDoc (const wxString& message) +void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const { - wxCHECK_MSG( m_ok, FALSE, "invalid postscript dc" ); + wxPaperSize id = m_printData.GetPaperId(); + + wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(id); + + if (!paper) paper = wxThePrintPaperDatabase->FindPaperType(wxPAPER_A4); - if (m_filename == "") + int w = 210; + int h = 297; + if (paper) { - m_filename = wxGetTempFileName("ps"); - wxThePrintSetupData->SetPrinterFile((char *)(const char *)m_filename); - m_ok = TRUE; + w = paper->GetWidth() / 10; + h = paper->GetHeight() / 10; } - else + + if (m_printData.GetOrientation() == wxLANDSCAPE) { - wxThePrintSetupData->SetPrinterFile((char *)(const char *)m_filename); + int tmp = w; + w = h; + h = tmp; } + + if (width) *width = w; + if (height) *height = h; +} - m_pstream = new ofstream (wxThePrintSetupData->GetPrinterFile()); +// Resolution in pixels per logical inch +wxSize wxPostScriptDC::GetPPI(void) const +{ + return wxSize(72, 72); +} - if (!m_pstream || !m_pstream->good()) + +bool wxPostScriptDC::StartDoc( const wxString& message ) +{ + wxCHECK_MSG( m_ok, FALSE, _T("invalid postscript dc") ); + + if (m_printData.GetFilename() == "") { - wxMessageBox (_("Cannot open file!"), _("Error"), wxOK); - m_ok = FALSE; - return FALSE; + wxString filename = wxGetTempFileName("ps"); + m_printData.SetFilename(filename); + } + + m_pstream = fopen( m_printData.GetFilename().fn_str(), "w+" ); + + if (!m_pstream) + { + wxMessageBox( _("Cannot open file for PostScript printing!"), _("Error"), wxOK ); + m_ok = FALSE; + return FALSE; } m_ok = TRUE; + fprintf( m_pstream, "%%%%BeginProlog\n" ); + fprintf( m_pstream, wxPostScriptHeaderEllipse ); + fprintf( m_pstream, wxPostScriptHeaderEllipticArc ); + fprintf( m_pstream, wxPostScriptHeaderColourImage ); + fprintf( m_pstream, wxPostScriptHeaderReencodeISO1 ); + fprintf( m_pstream, wxPostScriptHeaderReencodeISO2 ); + if (wxPostScriptHeaderSpline) + fprintf( m_pstream, wxPostScriptHeaderSpline ); + fprintf( m_pstream, "%%%%EndProlog\n" ); + SetBrush( *wxBLACK_BRUSH ); SetPen( *wxBLACK_PEN ); SetBackground( *wxWHITE_BRUSH ); @@ -1268,58 +1458,55 @@ bool wxPostScriptDC::StartDoc (const wxString& message) void wxPostScriptDC::EndDoc () { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); if (m_clipping) { m_clipping = FALSE; - *m_pstream << "grestore\n"; + fprintf( m_pstream, "grestore\n" ); } - if (m_pstream) - { - delete m_pstream; - m_pstream = (ofstream *) NULL; - } + fclose( m_pstream ); + m_pstream = (FILE *) NULL; - char *header_file = wxGetTempFileName("ps"); + wxChar *header_file = wxGetTempFileName("ps"); - m_pstream = new ofstream( header_file ); + m_pstream = fopen( wxConvFile.cWX2MB(header_file) , "w+" ); - *m_pstream << "%!PS-Adobe-2.0\n"; /* PostScript magic strings */ - *m_pstream << "%%Title: " << (const char *) m_title << "\n"; - *m_pstream << "%%Creator: " << wxTheApp->argv[0] << "\n"; - *m_pstream << "%%CreationDate: " << wxNow() << "\n"; + fprintf( m_pstream, "%%!PS-Adobe-2.0\n" ); // PostScript magic strings + fprintf( m_pstream, "%%%%Title: %s\n", (const char *)m_title.mb_str() ); + fprintf( m_pstream, "%%%%Creator: %s\n", (const char*)wxConvCurrent->cWX2MB(wxTheApp->argv[0]) ); + fprintf( m_pstream, "%%%%CreationDate: %s\n", (const char *)wxNow().mb_str() ); - char userID[256]; + wxChar userID[256]; if ( wxGetEmailAddress(userID, sizeof(userID)) ) { - *m_pstream << "%%For: " << (char *)userID; - char userName[245]; + fprintf( m_pstream, "%%%%For: %s ", MBSTRINGCAST wxConvCurrent->cWX2MB(userID) ); + wxChar userName[245]; if (wxGetUserName(userName, sizeof(userName))) - *m_pstream << " (" << (char *)userName << ")"; - *m_pstream << "\n"; + fprintf( m_pstream, " (%s)", MBSTRINGCAST wxConvCurrent->cWX2MB(userName) ); + fprintf( m_pstream, "\n" ); } else if ( wxGetUserName(userID, sizeof(userID)) ) { - *m_pstream << "%%For: " << (char *)userID << "\n"; + fprintf( m_pstream, "%%%%For: %s\n", MBSTRINGCAST wxConvCurrent->cWX2MB(userID) );; } // THE FOLLOWING HAS BEEN CONTRIBUTED BY Andy Fyfe long wx_printer_translate_x, wx_printer_translate_y; double wx_printer_scale_x, wx_printer_scale_y; - wxThePrintSetupData->GetPrinterTranslation(&wx_printer_translate_x, &wx_printer_translate_y); - wxThePrintSetupData->GetPrinterScaling(&wx_printer_scale_x, &wx_printer_scale_y); - if (wxThePrintSetupData->GetPrinterOrientation() == PS_LANDSCAPE) - { - *m_pstream << "%%Orientation: Landscape\n"; - } + wx_printer_translate_x = m_printData.GetPrinterTranslateX(); + wx_printer_translate_y = m_printData.GetPrinterTranslateY(); + + wx_printer_scale_x = m_printData.GetPrinterScaleX(); + wx_printer_scale_y = m_printData.GetPrinterScaleY(); + + if (m_printData.GetOrientation() == wxLANDSCAPE) + fprintf( m_pstream, "%%%%Orientation: Landscape\n" ); else - { - *m_pstream << "%%Orientation: Portrait\n"; - } + fprintf( m_pstream, "%%%%Orientation: Portrait\n" ); // Compute the bounding box. Note that it is in the default user // coordinate system, thus we have to convert the values. @@ -1329,7 +1516,7 @@ void wxPostScriptDC::EndDoc () long ury = (long) ((YLOG2DEV(m_maxY)+wx_printer_translate_y)*wx_printer_scale_y); // If we're landscape, our sense of "x" and "y" is reversed. - if (wxThePrintSetupData->GetPrinterOrientation() == PS_LANDSCAPE) + if (m_printData.GetOrientation() == wxLANDSCAPE) { long tmp; tmp = llx; llx = lly; lly = tmp; @@ -1343,11 +1530,12 @@ void wxPostScriptDC::EndDoc () // The Adobe specifications call for integers; we round as to make // the bounding larger. - *m_pstream << "%%BoundingBox: " - << floor((double)llx) << " " << floor((double)lly) << " " - << ceil((double)urx) << " " << ceil((double)ury) << "\n"; - *m_pstream << "%%Pages: " << (wxPageNumber - 1) << "\n"; - *m_pstream << "%%EndComments\n\n"; + fprintf( m_pstream, + "%%%%BoundingBox: %ld %ld %ld %ld\n", + (long)floor((double)llx), (long)floor((double)lly), + (long)ceil((double)urx), (long)ceil((double)ury) ); + fprintf( m_pstream, "%%%%Pages: %d\n", (wxPageNumber - 1) ); + fprintf( m_pstream, "%%%%EndComments\n\n" ); // To check the correctness of the bounding box, postscript commands // to draw a box corresponding to the bounding box are generated below. @@ -1355,81 +1543,76 @@ 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. - *m_pstream << "% newpath\n"; - *m_pstream << "% " << llx << " " << lly << " moveto\n"; - *m_pstream << "% " << urx << " " << lly << " lineto\n"; - *m_pstream << "% " << urx << " " << ury << " lineto\n"; - *m_pstream << "% " << llx << " " << ury << " lineto closepath stroke\n"; - - *m_pstream << "%%BeginProlog\n"; - *m_pstream << wxPostScriptHeaderEllipse; - *m_pstream << wxPostScriptHeaderEllipticArc; - *m_pstream << wxPostScriptHeaderColourImage; - *m_pstream << wxPostScriptHeaderReencodeISO1; - *m_pstream << wxPostScriptHeaderReencodeISO2; - - if (wxPostScriptHeaderSpline) - *m_pstream << wxPostScriptHeaderSpline; - *m_pstream << "%%EndProlog\n"; + fprintf( m_pstream, "%% newpath\n" ); + fprintf( m_pstream, "%% %ld %ld moveto\n", llx, lly ); + fprintf( m_pstream, "%% %ld %ld lineto\n", urx, lly ); + fprintf( m_pstream, "%% %ld %ld lineto\n", urx, ury ); + fprintf( m_pstream, "%% %ld %ld lineto closepath stroke\n", llx, ury ); - delete m_pstream; - m_pstream = (ofstream *) NULL; + fclose( m_pstream ); + m_pstream = (FILE*) NULL; - char *tmp_file = wxGetTempFileName("ps"); + wxChar *tmp_file = wxGetTempFileName("ps"); // Paste header Before wx_printer_file - wxConcatFiles (header_file, wxThePrintSetupData->GetPrinterFile(), tmp_file); - wxRemoveFile (header_file); - wxRemoveFile (wxThePrintSetupData->GetPrinterFile()); - wxRenameFile(tmp_file, wxThePrintSetupData->GetPrinterFile()); + wxConcatFiles (header_file, m_printData.GetFilename(), tmp_file ); + wxRemoveFile( header_file ); + wxRemoveFile( m_printData.GetFilename() ); + wxRenameFile( tmp_file, m_printData.GetFilename() ); #if defined(__X__) || defined(__WXGTK__) - if (m_ok) - { - switch (wxThePrintSetupData->GetPrinterMode()) { - case PS_PREVIEW: + if (m_ok) { - char *argv[3]; - argv[0] = wxThePrintSetupData->GetPrintPreviewCommand(); - argv[1] = wxThePrintSetupData->GetPrinterFile(); - argv[2] = (char *) NULL; - wxExecute (argv, TRUE); - wxRemoveFile(wxThePrintSetupData->GetPrinterFile()); - } - break; - - case PS_PRINTER: - { - char *argv[4]; - int argc = 0; - argv[argc++] = wxThePrintSetupData->GetPrinterCommand(); - - // !SM! If we simply assign to argv[1] here, if printer options - // are blank, we get an annoying and confusing message from lpr. - char * opts = wxThePrintSetupData->GetPrinterOptions(); - if (opts && *opts) - argv[argc++] = opts; - - argv[argc++] = wxThePrintSetupData->GetPrinterFile(); - argv[argc++] = (char *) NULL; - wxExecute (argv, TRUE); - wxRemoveFile(wxThePrintSetupData->GetPrinterFile()); - } - break; + wxString previewCommand(m_printData.GetPreviewCommand()); + wxString printerCommand(m_printData.GetPrinterCommand()); + wxString printerOptions(m_printData.GetPrinterOptions()); + wxString filename(m_printData.GetFilename()); - case PS_FILE: - break; - } + switch (m_printData.GetPrintMode()) + { + case wxPRINT_MODE_PREVIEW: + { + wxChar *argv[3]; + argv[0] = WXSTRINGCAST previewCommand; + argv[1] = WXSTRINGCAST filename; + argv[2] = (wxChar*) NULL; + wxExecute( argv, TRUE ); + wxRemoveFile( m_printData.GetFilename() ); + } + break; + case wxPRINT_MODE_PRINTER: + { + wxChar *argv[4]; + int argc = 0; + argv[argc++] = WXSTRINGCAST printerCommand; + + // !SM! If we simply assign to argv[1] here, if printer options + // are blank, we get an annoying and confusing message from lpr. + wxChar *opts = WXSTRINGCAST printerOptions; + if (opts && *opts) + argv[argc++] = opts; + + argv[argc++] = WXSTRINGCAST filename; + argv[argc++] = (wxChar *) NULL; + wxExecute( argv, TRUE ); + wxRemoveFile( filename ); + } + break; + case wxPRINT_MODE_FILE: + case wxPRINT_MODE_NONE: + break; + } } #endif } -void wxPostScriptDC::StartPage () +void wxPostScriptDC::StartPage() { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); - *m_pstream << "%%Page: " << (wxPageNumber++) << "\n"; + fprintf( m_pstream, "%%%%Page: %d\n", wxPageNumber++ ); + // What is this one supposed to do? RR. // *m_pstream << "matrix currentmatrix\n"; // Added by Chris Breeze @@ -1438,46 +1621,49 @@ void wxPostScriptDC::StartPage () // transformation and so we need to reset the origin // (and rotate the page for landscape printing) -/* - m_scaleFactor = 1.0; - m_logicalOriginX = 0; - m_logicalOriginY = 0; -*/ // Output scaling long translate_x, translate_y; double scale_x, scale_y; - wxThePrintSetupData->GetPrinterTranslation(&translate_x, &translate_y); - wxThePrintSetupData->GetPrinterScaling(&scale_x, &scale_y); - if (wxThePrintSetupData->GetPrinterOrientation() == PS_LANDSCAPE) + translate_x = m_printData.GetPrinterTranslateX(); + translate_y = m_printData.GetPrinterTranslateY(); + + scale_x = m_printData.GetPrinterScaleX(); + scale_y = m_printData.GetPrinterScaleY(); + + if (m_printData.GetOrientation() == wxLANDSCAPE) { - translate_y -= m_maxY; - *m_pstream << "90 rotate\n"; + int h; + GetSize( (int*) NULL, &h ); + translate_y -= h; + fprintf( m_pstream, "90 rotate\n" ); + + // I copied this one from a PostScript tutorial, but to no avail. RR. +// fprintf( m_pstream, "90 rotate llx neg ury nef translate\n" ); } - *m_pstream << scale_x << " " << scale_y << " scale\n"; - *m_pstream << translate_x << " " << translate_y << " translate\n"; + fprintf( m_pstream, "%.8f %.8f scale\n", scale_x, scale_y ); + fprintf( m_pstream, "%ld %ld translate\n", translate_x, translate_y ); } void wxPostScriptDC::EndPage () { - wxCHECK_RET( m_ok && m_pstream, "invalid postscript dc" ); + wxCHECK_RET( m_ok && m_pstream, _T("invalid postscript dc") ); - *m_pstream << "showpage\n"; + fprintf( m_pstream, "showpage\n" ); } -bool wxPostScriptDC::Blit( long xdest, long ydest, +bool wxPostScriptDC::DoBlit( long xdest, long ydest, long fwidth, long fheight, wxDC *source, long xsrc, long ysrc, int rop, bool WXUNUSED(useMask) ) { - wxCHECK_MSG( m_ok && m_pstream, FALSE, "invalid postscript dc" ); + wxCHECK_MSG( m_ok && m_pstream, FALSE, _T("invalid postscript dc") ); - wxCHECK_MSG( source, FALSE, "invalid source dc" ); + wxCHECK_MSG( source, FALSE, _T("invalid source dc") ); /* blit into a bitmap */ - wxBitmap bitmap( (int)fwidth, (int)fheight ); wxMemoryDC memDC; memDC.SelectObject(bitmap); @@ -1485,13 +1671,12 @@ bool wxPostScriptDC::Blit( long xdest, long ydest, memDC.SelectObject(wxNullBitmap); /* draw bitmap. scaling and positioning is done there */ - DrawBitmap( bitmap, xdest, ydest ); return TRUE; } -long wxPostScriptDC::GetCharHeight() +long wxPostScriptDC::GetCharHeight() const { if (m_font.Ok()) return m_font.GetPointSize(); @@ -1500,16 +1685,17 @@ long wxPostScriptDC::GetCharHeight() } void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, - long *descent, long *externalLeading, wxFont *theFont, - bool WXUNUSED(use16) ) + long *descent, long *externalLeading, wxFont *theFont ) const { wxFont *fontToUse = theFont; if (!fontToUse) fontToUse = (wxFont*) &m_font; - wxCHECK_RET( fontToUse, "GetTextExtent: no font defined" ); - wxCHECK_RET( x, "GetTextExtent: x == NULL" ); - wxCHECK_RET( y, "GetTextExtent: y == NULL" ); + wxCHECK_RET( fontToUse, _T("GetTextExtent: no font defined") ); + wxCHECK_RET( x, _T("GetTextExtent: x == NULL") ); + wxCHECK_RET( y, _T("GetTextExtent: y == NULL") ); + + const wxWX2MBbuf strbuf = string.mb_str(); #if !USE_AFM_FOR_POSTSCRIPT /* Provide a VERY rough estimate (avoid using it). @@ -1521,7 +1707,7 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, { height = fontToUse->GetPointSize(); } - *x = strlen (string) * height * 72 / 120; + *x = strlen (strbuf) * height * 72 / 120; *y = (long) (height * 1.32); /* allow for descender */ if (descent) *descent = 0; if (externalLeading) *externalLeading = 0; @@ -1621,7 +1807,11 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, /* get the directory of the AFM files */ char afmName[256]; afmName[0] = 0; - if (wxGetAFMPath()) strcpy( afmName, wxGetAFMPath() ); + + if (!m_printData.GetFontMetricPath().IsEmpty()) + { + strcpy( afmName, m_printData.GetFontMetricPath().fn_str() ) + } /* 2. open and process the file / a short explanation of the AFM format: @@ -1642,7 +1832,26 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, strcat(afmName,name); strcat(afmName,".afm"); FILE *afmFile = fopen(afmName,"r"); - if ( afmFile==NULL ) + +#ifdef __UNIX__ + if (afmFile==NULL) + { + strcpy( afmName, "/usr/local/share/wx/gs_afm/" ); + strcat(afmName,name); + strcat(afmName,".afm"); + FILE *afmFile = fopen(afmName,"r"); + } + + if (afmFile==NULL) + { + strcpy( afmName, "/usr/share/wx/gs_afm/" ); + strcat(afmName,name); + strcat(afmName,".afm"); + FILE *afmFile = fopen(afmName,"r"); + } +#endif + + if (afmFile==NULL) { wxLogDebug( "GetTextExtent: can't open AFM file '%s'\n", afmName ); wxLogDebug( " using approximate values\n"); @@ -1752,7 +1961,7 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, long widthSum=0; long height=Size; /* by default */ unsigned char *p; - for(p=(unsigned char *)(const char *)string; *p; p++) + for(p=(unsigned char *)strbuf; *p; p++) { if(lastWidths[*p]== INT_MIN) { @@ -1794,28 +2003,6 @@ void wxPostScriptDC::GetTextExtent( const wxString& string, long *x, long *y, #endif } -void wxPostScriptDC::GetSizeMM(long *width, long *height) const -{ - const char *paperType = wxThePrintSetupData->GetPaperName(); - - if (!paperType) paperType = _("A4 210 x 297 mm"); - - wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(paperType); - - if (!paper) paper = wxThePrintPaperDatabase->FindPaperType(_("A4 210 x 297 mm")); - - if (paper) - { - if (width) *width = paper->widthMM; - if (height) *height = paper->heightMM; - } - else - { - if (width) *width = 210; - if (height) *height = 297; - } -} - // Determine the Default Postscript Previewer // available on the platform #if defined(__SUN__) && defined(__XVIEW__) @@ -1832,7 +2019,7 @@ void wxPostScriptDC::GetSizeMM(long *width, long *height) const # define PS_VIEWER_PROG "ghostview" #else // Windows ghostscript/ghostview -# define PS_VIEWER_PROG NULL +# define PS_VIEWER_PROG "gsview" #endif wxPrintSetupData *wxThePrintSetupData = (wxPrintSetupData *) NULL; @@ -1895,10 +2082,10 @@ wxPostScriptPrintDialog::wxPostScriptPrintDialog (wxWindow *parent, const wxStri radio0->SetSelection((int)wxThePrintSetupData->GetPrinterOrientation() - 1); // @@@ Configuration hook - if (wxThePrintSetupData->GetPrintPreviewCommand() == NULL) + if ( !wxThePrintSetupData->GetPrintPreviewCommand() ) wxThePrintSetupData->SetPrintPreviewCommand(PS_VIEWER_PROG); - wxGetResource ("wxWindows", "PSView", &wxThePrintSetupData->previewCommand); + // wxGetResource ("wxWindows", "PSView", &wxThePrintSetupData->m_previewCommand); features = (wxThePrintSetupData->GetPrintPreviewCommand() && *wxThePrintSetupData->GetPrintPreviewCommand()) ? 3 : 2; @@ -1959,17 +2146,17 @@ int wxPostScriptPrintDialog::ShowModal () wxRadioBox *radio0 = (wxRadioBox *)FindWindow(wxID_PRINTER_ORIENTATION); wxRadioBox *radio1 = (wxRadioBox *)FindWindow(wxID_PRINTER_MODES); - StringToDouble (WXSTRINGCAST text1->GetValue (), &wxThePrintSetupData->printerScaleX); - StringToDouble (WXSTRINGCAST text2->GetValue (), &wxThePrintSetupData->printerScaleY); - StringToLong (WXSTRINGCAST text3->GetValue (), &wxThePrintSetupData->printerTranslateX); - StringToLong (WXSTRINGCAST text4->GetValue (), &wxThePrintSetupData->printerTranslateY); + StringToDouble (WXSTRINGCAST text1->GetValue (), &wxThePrintSetupData->m_printerScaleX); + StringToDouble (WXSTRINGCAST text2->GetValue (), &wxThePrintSetupData->m_printerScaleY); + StringToLong (WXSTRINGCAST text3->GetValue (), &wxThePrintSetupData->m_printerTranslateX); + StringToLong (WXSTRINGCAST text4->GetValue (), &wxThePrintSetupData->m_printerTranslateY); #ifdef __X__ // wxThePrintSetupData->SetPrinterOptions(WXSTRINGCAST text0->GetValue ()); // wxThePrintSetupData->SetPrinterCommand(WXSTRINGCAST text_prt->GetValue ()); #endif - wxThePrintSetupData->SetPrinterOrientation((radio0->GetSelection() == 1 ? PS_LANDSCAPE : PS_PORTRAIT)); + wxThePrintSetupData->SetPrinterOrientation((radio0->GetSelection() == 1 ? wxLANDSCAPE : wxPORTRAIT)); // C++ wants this switch ( radio1->GetSelection() ) { @@ -1986,22 +2173,22 @@ int wxPostScriptPrintDialog::ShowModal () // PostScript printer settings // RETAINED FOR BACKWARD COMPATIBILITY -void wxSetPrinterCommand(const char *cmd) +void wxSetPrinterCommand(const wxString& cmd) { wxThePrintSetupData->SetPrinterCommand(cmd); } -void wxSetPrintPreviewCommand(const char *cmd) +void wxSetPrintPreviewCommand(const wxString& cmd) { wxThePrintSetupData->SetPrintPreviewCommand(cmd); } -void wxSetPrinterOptions(const char *flags) +void wxSetPrinterOptions(const wxString& flags) { wxThePrintSetupData->SetPrinterOptions(flags); } -void wxSetPrinterFile(const char *f) +void wxSetPrinterFile(const wxString& f) { wxThePrintSetupData->SetPrinterFile(f); } @@ -2027,28 +2214,28 @@ void wxSetPrinterMode(int mode) wxThePrintSetupData->SetPrinterMode(mode); } -void wxSetAFMPath(const char *f) +void wxSetAFMPath(const wxString& f) { wxThePrintSetupData->SetAFMPath(f); } // Get current values -char *wxGetPrinterCommand() +wxString wxGetPrinterCommand() { return wxThePrintSetupData->GetPrinterCommand(); } -char *wxGetPrintPreviewCommand() +wxString wxGetPrintPreviewCommand() { return wxThePrintSetupData->GetPrintPreviewCommand(); } -char *wxGetPrinterOptions() +wxString wxGetPrinterOptions() { return wxThePrintSetupData->GetPrinterOptions(); } -char *wxGetPrinterFile() +wxString wxGetPrinterFile() { return wxThePrintSetupData->GetPrinterFile(); } @@ -2073,7 +2260,7 @@ int wxGetPrinterMode() return wxThePrintSetupData->GetPrinterMode(); } -char *wxGetAFMPath() +wxString wxGetAFMPath() { return wxThePrintSetupData->GetAFMPath(); } @@ -2084,200 +2271,17 @@ char *wxGetAFMPath() wxPrintSetupData::wxPrintSetupData() { - printerCommand = (char *) NULL; - previewCommand = (char *) NULL; - printerFlags = (char *) NULL; - printerOrient = PS_PORTRAIT; - printerScaleX = (double)1.0; - printerScaleY = (double)1.0; - printerTranslateX = 0; - printerTranslateY = 0; - // 1 = Preview, 2 = print to file, 3 = send to printer - printerMode = 3; - afmPath = (char *) NULL; - paperName = (char *) NULL; - printColour = TRUE; - printerFile = (char *) NULL; + m_printerOrient = wxPORTRAIT; + m_printerScaleX = (double)1.0; + m_printerScaleY = (double)1.0; + m_printerTranslateX = 0; + m_printerTranslateY = 0; + m_printerMode = wxPRINT_MODE_FILE; + m_printColour = TRUE; } wxPrintSetupData::~wxPrintSetupData() { - if (printerCommand) - delete[] printerCommand; - if (previewCommand) - delete[] previewCommand; - if (printerFlags) - delete[] printerFlags; - if (afmPath) - delete[] afmPath; - if (paperName) - delete[] paperName; - if (printerFile) - delete[] printerFile; -} - -void wxPrintSetupData::SetPrinterCommand(const char *cmd) -{ - if (cmd == printerCommand) - return; - - if (printerCommand) - delete[] printerCommand; - if (cmd) - printerCommand = copystring(cmd); - else - printerCommand = (char *) NULL; -} - -void wxPrintSetupData::SetPrintPreviewCommand(const char *cmd) -{ - if (cmd == previewCommand) - return; - - if (previewCommand) - delete[] previewCommand; - if (cmd) - previewCommand = copystring(cmd); - else - previewCommand = (char *) NULL; -} - -void wxPrintSetupData::SetPaperName(const char *name) -{ - if (name == paperName) - return; - - if (paperName) - delete[] paperName; - if (name) - paperName = copystring(name); - else - paperName = (char *) NULL; -} - -void wxPrintSetupData::SetPrinterOptions(const char *flags) -{ - if (printerFlags == flags) - return; - - if (printerFlags) - delete[] printerFlags; - if (flags) - printerFlags = copystring(flags); - else - printerFlags = (char *) NULL; -} - -void wxPrintSetupData::SetPrinterFile(const char *f) -{ - if (f == printerFile) - return; - - if (printerFile) - delete[] printerFile; - if (f) - printerFile = copystring(f); - else - printerFile = (char *) NULL; -} - -void wxPrintSetupData::SetPrinterOrientation(int orient) -{ - printerOrient = orient; -} - -void wxPrintSetupData::SetPrinterScaling(double x, double y) -{ - printerScaleX = x; - printerScaleY = y; -} - -void wxPrintSetupData::SetPrinterTranslation(long x, long y) -{ - printerTranslateX = x; - printerTranslateY = y; -} - -// 1 = Preview, 2 = print to file, 3 = send to printer -void wxPrintSetupData::SetPrinterMode(int mode) -{ - printerMode = mode; -} - -void wxPrintSetupData::SetAFMPath(const char *f) -{ - if (f == afmPath) - return; - - if (afmPath) - delete[] afmPath; - if (f) - afmPath = copystring(f); - else - afmPath = (char *) NULL; -} - -void wxPrintSetupData::SetColour(bool col) -{ - printColour = col; -} - -// Get current values -char *wxPrintSetupData::GetPrinterCommand() -{ - return printerCommand; -} - -char *wxPrintSetupData::GetPrintPreviewCommand() -{ - return previewCommand; -} - -char *wxPrintSetupData::GetPrinterOptions() -{ - return printerFlags; -} - -char *wxPrintSetupData::GetPrinterFile() -{ - return printerFile; -} - -char *wxPrintSetupData::GetPaperName() -{ - return paperName; -} - -int wxPrintSetupData::GetPrinterOrientation() -{ - return printerOrient; -} - -void wxPrintSetupData::GetPrinterScaling(double *x, double *y) -{ - *x = printerScaleX; - *y = printerScaleY; -} - -void wxPrintSetupData::GetPrinterTranslation(long *x, long *y) -{ - *x = printerTranslateX; - *y = printerTranslateY; -} - -int wxPrintSetupData::GetPrinterMode() -{ - return printerMode; -} - -char *wxPrintSetupData::GetAFMPath() -{ - return afmPath; -} - -bool wxPrintSetupData::GetColour() -{ - return printColour; } void wxPrintSetupData::operator=(wxPrintSetupData& data) @@ -2300,6 +2304,22 @@ void wxPrintSetupData::operator=(wxPrintSetupData& data) SetColour(data.GetColour()); } +// Initialize from a wxPrintData object (wxPrintData should now be used instead of wxPrintSetupData). +void wxPrintSetupData::operator=(const wxPrintData& data) +{ + SetPrinterCommand(data.GetPrinterCommand()); + SetPrintPreviewCommand(data.GetPreviewCommand()); + SetPrinterOptions(data.GetPrinterOptions()); + SetPrinterTranslation(data.GetPrinterTranslateX(), data.GetPrinterTranslateY()); + SetPrinterScaling(data.GetPrinterScaleX(), data.GetPrinterScaleY()); + SetPrinterOrientation(data.GetOrientation()); + SetPrinterMode((int) data.GetPrintMode()); + SetAFMPath(data.GetFontMetricPath()); + SetPaperName(wxThePrintPaperDatabase->ConvertIdToName(data.GetPaperId())); + SetColour(data.GetColour()); + SetPrinterFile(data.GetFilename()); +} + void wxInitializePrintSetupData(bool init) { if (init) @@ -2307,9 +2327,9 @@ void wxInitializePrintSetupData(bool init) wxThePrintSetupData = new wxPrintSetupData; wxThePrintSetupData->SetPrintPreviewCommand(PS_VIEWER_PROG); - wxThePrintSetupData->SetPrinterOrientation(PS_PORTRAIT); - wxThePrintSetupData->SetPrinterMode(PS_PREVIEW); - wxThePrintSetupData->SetPaperName(_("A4 210 x 297 mm")); + wxThePrintSetupData->SetPrinterOrientation(wxPORTRAIT); + wxThePrintSetupData->SetPrinterMode(wxPRINT_MODE_PREVIEW); + wxThePrintSetupData->SetPaperName(_("A4 sheet, 210 x 297 mm")); // Could have a .ini file to read in some defaults // - and/or use environment variables, e.g. WXWIN @@ -2321,12 +2341,12 @@ void wxInitializePrintSetupData(bool init) #ifdef __WXMSW__ wxThePrintSetupData->SetPrinterCommand("print"); wxThePrintSetupData->SetAFMPath("c:\\windows\\system\\"); - wxThePrintSetupData->SetPrinterOptions(NULL); + wxThePrintSetupData->SetPrinterOptions(""); #endif #if !defined(__VMS__) && !defined(__WXMSW__) wxThePrintSetupData->SetPrinterCommand("lpr"); - wxThePrintSetupData->SetPrinterOptions((char *) NULL); - wxThePrintSetupData->SetAFMPath((char *) NULL); + wxThePrintSetupData->SetPrinterOptions(""); + wxThePrintSetupData->SetAFMPath(""); #endif } else @@ -2369,3 +2389,6 @@ void wxPostScriptModule::OnExit() #endif // wxUSE_POSTSCRIPT + +#endif + // wxUSE_PRINTING_ARCHITECTURE