X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e469ea37f1edbd6b2b6a0cbc43a3314c337e6f9..5175dbbd9f20e7fd39e0820ea510c1c6ea349584:/src/generic/dcpsg.cpp diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index 1f2153f36c..f53091ad05 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -5,13 +5,12 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation -#pragma interface +#pragma implementation "dcpsg.h" #endif #include "wx/wxprec.h" @@ -21,32 +20,28 @@ #endif #ifndef WX_PRECOMP - #include "wx/setup.h" - #include "wx/defs.h" #endif // WX_PRECOMP #if wxUSE_PRINTING_ARCHITECTURE #if wxUSE_POSTSCRIPT -#include "wx/window.h" +#include "wx/setup.h" + #include "wx/dcmemory.h" #include "wx/utils.h" #include "wx/intl.h" -#include "wx/filedlg.h" #include "wx/app.h" -#include "wx/msgdlg.h" #include "wx/image.h" #include "wx/log.h" #include "wx/generic/dcpsg.h" -#include "wx/generic/prntdlgg.h" -#include "wx/button.h" -#include "wx/stattext.h" -#include "wx/radiobox.h" -#include "wx/textctrl.h" #include "wx/prntbase.h" #include "wx/paper.h" #include "wx/filefn.h" +#if WXWIN_COMPATIBILITY_2_2 + #include "wx/window.h" + #include "wx/printdlg.h" +#endif #include @@ -74,6 +69,23 @@ // start and end of document/page //----------------------------------------------------------------------------- +static const char *wxPostScriptHeaderConicTo = "\ +/conicto {\n\ + /to_y exch def\n\ + /to_x exch def\n\ + /conic_cntrl_y exch def\n\ + /conic_cntrl_x exch def\n\ + currentpoint\n\ + /p0_y exch def\n\ + /p0_x exch def\n\ + /p1_x p0_x conic_cntrl_x p0_x sub 2 3 div mul add def\n\ + /p1_y p0_y conic_cntrl_y p0_y sub 2 3 div mul add def\n\ + /p2_x p1_x to_x p0_x sub 1 3 div mul add def\n\ + /p2_y p1_y to_y p0_y sub 1 3 div mul add def\n\ + 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\ @@ -188,6 +200,8 @@ static const char *wxPostScriptHeaderColourImage = "\ } ifelse %% end of 'false' case\n\ "; +#if wxUSE_PANGO +#else static char wxPostScriptHeaderReencodeISO1[] = "\n/reencodeISO {\n" "dup dup findfont dup length dict begin\n" @@ -228,37 +242,29 @@ static char wxPostScriptHeaderReencodeISO2[] = "/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis\n" "/yacute/thorn/ydieresis\n" "] def\n\n"; +#endif //------------------------------------------------------------------------------- // wxPostScriptDC //------------------------------------------------------------------------------- -wxPostScriptDC::wxPostScriptDC () -{ - m_pstream = (FILE*) NULL; - - m_currentRed = 0; - m_currentGreen = 0; - m_currentBlue = 0; - - m_pageNumber = 0; - - m_clipping = FALSE; +IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC) - m_underlinePosition = 0.0; - m_underlineThickness = 0.0; +float wxPostScriptDC::ms_PSScaleFactor = 1.0; - m_signX = 1; // default x-axis left to right - m_signY = -1; // default y-axis bottom up -> top down +void wxPostScriptDC::SetResolution(int ppi) +{ + ms_PSScaleFactor = (float)ppi / 72.0; +} - // Compatibility only - // HH: Doesn't seem to work for wxMSW... - #ifndef __WXMSW__ - m_printData = * wxThePrintSetupData; - #endif +int wxPostScriptDC::GetResolution() +{ + return (int)(ms_PSScaleFactor * 72.0); } -wxPostScriptDC::wxPostScriptDC (const wxString& file, bool interactive, wxWindow *parent) +//------------------------------------------------------------------------------- + +wxPostScriptDC::wxPostScriptDC () { m_pstream = (FILE*) NULL; @@ -275,32 +281,6 @@ wxPostScriptDC::wxPostScriptDC (const wxString& file, bool interactive, wxWindow m_signX = 1; // default x-axis left to right m_signY = -1; // default y-axis bottom up -> top down - - Create(file, interactive, parent); -} - -bool wxPostScriptDC::Create(const wxString& file, bool interactive, wxWindow *parent) -{ - m_isInteractive = interactive; - - m_title = ""; - m_printData.SetFilename(file); - -#ifdef __WXMSW__ - // Can only send to file in Windows - m_printData.SetPrintMode(wxPRINT_MODE_FILE); -#endif - - if (m_isInteractive) - { - if ((m_ok = PrinterDialog (parent) ) == FALSE) return FALSE; - } - else - { - m_ok = TRUE; - } - - return m_ok; } wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData) @@ -335,57 +315,34 @@ wxPostScriptDC::~wxPostScriptDC () } } -bool wxPostScriptDC::Ok() const -{ - return m_ok; -} - -// This dialog is deprecated now: use wxGenericPrintDialog or the printing framework -bool wxPostScriptDC::PrinterDialog(wxWindow *parent) +#if WXWIN_COMPATIBILITY_2_2 +bool wxPostScriptDC::Create( const wxString &output, bool interactive, wxWindow *parent ) { - wxPostScriptPrintDialog dialog( parent, _("Printer Settings"), wxPoint(150, 150), wxSize(400, 400), - wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL ); - m_ok = (dialog.ShowModal () == wxID_OK); - - if (!m_ok) return FALSE; - - if ((m_printData.GetFilename() == "") && - (m_printData.GetPrintMode() == wxPRINT_MODE_PREVIEW || - m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER)) + wxPrintData data; + data.SetFilename( output ); + data.SetPrintMode( wxPRINT_MODE_FILE ); + + if (interactive) { -// steve, 05.09.94 -#ifdef __VMS__ - 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 - wxChar userId[256]; - wxGetUserId (userId, sizeof (userId) / sizeof (char)); - wxChar tmp[256]; - wxStrcpy (tmp, wxT("/tmp/preview_")); - wxStrcat (tmp, userId); - m_printData.SetFilename(tmp); -#endif - wxChar tmp2[256]; - wxStrcpy(tmp2, m_printData.GetFilename()); - wxStrcat (tmp2, wxT(".ps")); - m_printData.SetFilename(tmp2); + 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(); } - else if ((m_printData.GetFilename() == wxT("")) && (m_printData.GetPrintMode() == wxPRINT_MODE_FILE)) - { - wxString file = wxSaveFileSelector (_("PostScript"), wxT("ps")); - if ( file.IsEmpty() ) - { - m_ok = FALSE; - return FALSE; - } + + return TRUE; +} +#endif - m_printData.SetFilename(file); - m_ok = TRUE; - } - return m_ok; +bool wxPostScriptDC::Ok() const +{ + return m_ok; } void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h) @@ -404,10 +361,10 @@ void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoo "%d %d lineto\n" "%d %d 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) ); + LogicalToDeviceX(x), LogicalToDeviceY(y), + LogicalToDeviceX(x+w), LogicalToDeviceY(y), + LogicalToDeviceX(x+w), LogicalToDeviceY(y+h), + LogicalToDeviceX(x), LogicalToDeviceY(y+h) ); } @@ -429,9 +386,10 @@ void wxPostScriptDC::Clear() wxFAIL_MSG( wxT("wxPostScriptDC::Clear not implemented.") ); } -void wxPostScriptDC::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style)) +bool wxPostScriptDC::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style)) { wxFAIL_MSG( wxT("wxPostScriptDC::FloodFill not implemented.") ); + return FALSE; } bool wxPostScriptDC::DoGetPixel (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour * WXUNUSED(col)) const @@ -458,8 +416,8 @@ void wxPostScriptDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) "%d %d moveto\n" "%d %d lineto\n" "stroke\n", - XLOG2DEV(x1), YLOG2DEV(y1), - XLOG2DEV(x2), YLOG2DEV (y2) ); + LogicalToDeviceX(x1), LogicalToDeviceY(y1), + LogicalToDeviceX(x2), LogicalToDeviceY (y2) ); CalcBoundingBox( x1, y1 ); CalcBoundingBox( x2, y2 ); @@ -509,8 +467,8 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, "%d %d lineto\n" "closepath\n" "fill\n", - XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL(radius), YLOG2DEVREL(radius), (wxCoord)alpha1, (wxCoord) alpha2, - XLOG2DEV(xc), YLOG2DEV(yc) ); + 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 ); @@ -526,8 +484,8 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, "%d %d lineto\n" "stroke\n" "fill\n", - XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL(radius), YLOG2DEVREL(radius), (wxCoord)alpha1, (wxCoord) alpha2, - XLOG2DEV(xc), YLOG2DEV(yc) ); + 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 ); @@ -556,7 +514,7 @@ void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d fprintf( m_pstream, "newpath\n" "%d %d %d %d %d %d true ellipticarc\n", - XLOG2DEV(x+w/2), YLOG2DEV(y+h/2), XLOG2DEVREL(w/2), YLOG2DEVREL(h/2), (wxCoord)sa, (wxCoord)ea ); + LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2), LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2), (wxCoord)sa, (wxCoord)ea ); CalcBoundingBox( x ,y ); CalcBoundingBox( x+w, y+h ); @@ -569,7 +527,7 @@ void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d fprintf(m_pstream, "newpath\n" "%d %d %d %d %d %d false ellipticarc\n", - XLOG2DEV(x+w/2), YLOG2DEV(y+h/2), XLOG2DEVREL(w/2), YLOG2DEVREL(h/2), (wxCoord)sa, (wxCoord)ea ); + LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2), LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2), (wxCoord)sa, (wxCoord)ea ); CalcBoundingBox( x ,y ); CalcBoundingBox( x+w, y+h ); @@ -589,8 +547,8 @@ void wxPostScriptDC::DoDrawPoint (wxCoord x, wxCoord y) "%d %d moveto\n" "%d %d lineto\n" "stroke\n", - XLOG2DEV(x), YLOG2DEV(y), - XLOG2DEV(x+1), YLOG2DEV(y) ); + LogicalToDeviceX(x), LogicalToDeviceY(y), + LogicalToDeviceX(x+1), LogicalToDeviceY(y) ); CalcBoundingBox( x, y ); } @@ -607,8 +565,8 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx fprintf( m_pstream, "newpath\n" ); - wxCoord xx = XLOG2DEV(points[0].x + xoffset); - wxCoord yy = YLOG2DEV(points[0].y + yoffset); + wxCoord xx = LogicalToDeviceX(points[0].x + xoffset); + wxCoord yy = LogicalToDeviceY(points[0].y + yoffset); fprintf( m_pstream, "%d %d moveto\n", xx, yy ); @@ -616,8 +574,8 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx for (int i = 1; i < n; i++) { - xx = XLOG2DEV(points[i].x + xoffset); - yy = YLOG2DEV(points[i].y + yoffset); + xx = LogicalToDeviceX(points[i].x + xoffset); + yy = LogicalToDeviceY(points[i].y + yoffset); fprintf( m_pstream, "%d %d lineto\n", xx, yy ); @@ -633,8 +591,8 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx fprintf( m_pstream, "newpath\n" ); - wxCoord xx = XLOG2DEV(points[0].x + xoffset); - wxCoord yy = YLOG2DEV(points[0].y + yoffset); + wxCoord xx = LogicalToDeviceX(points[0].x + xoffset); + wxCoord yy = LogicalToDeviceY(points[0].y + yoffset); fprintf( m_pstream, "%d %d moveto\n", xx, yy ); @@ -642,15 +600,16 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx for (int i = 1; i < n; i++) { - xx = XLOG2DEV(points[i].x + xoffset); - yy = YLOG2DEV(points[i].y + yoffset); + xx = LogicalToDeviceX(points[i].x + xoffset); + yy = LogicalToDeviceY(points[i].y + yoffset); fprintf( m_pstream, "%d %d lineto\n", xx, yy ); CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset); } - fprintf( m_pstream, "fill\n" ); + fprintf( m_pstream, "closepath\n" ); + fprintf( m_pstream, "stroke\n" ); } } @@ -667,19 +626,19 @@ 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) +{ + 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; +} + +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") ); - SetFont( m_font ); - if (m_textForegroundColour.Ok()) { unsigned char red = m_textForegroundColour.Red(); @@ -1171,29 +1267,117 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) double bluePS = (double)(blue) / 255.0; double greenPS = (double)(green) / 255.0; - fprintf( m_pstream, - "%.8f %.8f %.8f setrgbcolor\n", - redPS, greenPS, bluePS ); + 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 ); 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; + } + } - int size = m_font.GetPointSize(); + 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); - wxCoord by = y + (wxCoord)floor( double(size) * 2.0 / 3.0 ); // approximate baseline - fprintf( m_pstream, "%d %d moveto\n", XLOG2DEV(x), YLOG2DEV(by) ); + // 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 ); - /* I don't know how to write char to a stream, so I use a mini string */ - char tmpbuf[2]; - tmpbuf[1] = 0; + + int size = m_font.GetPointSize(); + +// wxCoord by = y + (wxCoord)floor( double(size) * 2.0 / 3.0 ); // approximate baseline +// 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(); - int len = strlen(textbuf); - int i; + size_t len = strlen(textbuf); + size_t i; for (i = 0; i < len; i++) { int c = (unsigned char) textbuf[i]; @@ -1201,8 +1385,7 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) { /* Cope with special characters */ fprintf( m_pstream, "\\" ); - tmpbuf[0] = (char) c; - fprintf( m_pstream, tmpbuf ); + fputc(c, m_pstream); } else if ( c >= 128 ) { @@ -1211,8 +1394,7 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) } else { - tmpbuf[0] = (char) c; - fprintf( m_pstream, tmpbuf ); + fputc(c, m_pstream); } } @@ -1221,25 +1403,147 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) if (m_font.GetUnderlined()) { wxCoord uy = (wxCoord)(y + size - m_underlinePosition); - wxCoord w, h; - GetTextExtent(text, &w, &h); + char buffer[100]; - fprintf( m_pstream, + sprintf( buffer, "gsave\n" "%d %d moveto\n" - "%d setlinewidth\n" + "%f setlinewidth\n" "%d %d lineto\n" "stroke\n" "grestore\n", - XLOG2DEV(x), YLOG2DEV(uy), - (wxCoord)m_underlineThickness, - XLOG2DEV(x + w), YLOG2DEV(uy) ); + LogicalToDeviceX(x), LogicalToDeviceY(uy), + m_underlineThickness, + LogicalToDeviceX(x + text_w), LogicalToDeviceY(uy) ); + for (i = 0; i < 100; i++) + if (buffer[i] == ',') buffer[i] = '.'; + fprintf( m_pstream, buffer ); } CalcBoundingBox( x, y ); CalcBoundingBox( x + size * text.Length() * 2/3 , y ); +#endif } +void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle ) +{ + if (angle == 0.0) + { + DoDrawText(text, x, y); + return; + } + + wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + + SetFont( m_font ); + + if (m_textForegroundColour.Ok()) + { + 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; + } + } + + // maybe setgray here ? + if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue)) + { + double redPS = (double)(red) / 255.0; + 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 ); + + m_currentRed = red; + m_currentBlue = blue; + m_currentGreen = green; + } + } + + int size = m_font.GetPointSize(); + + fprintf(m_pstream, "%d %d moveto\n", + LogicalToDeviceX(x), LogicalToDeviceY(y)); + + 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); + + fprintf( m_pstream, "(" ); + const wxWX2MBbuf textbuf = text.mb_str(); + size_t len = strlen(textbuf); + for (i = 0; i < len; i++) + { + 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 + { + fputc(c, m_pstream); + } + } + + fprintf( m_pstream, ") show\n" ); + + sprintf( buffer, "%.8f rotate\n", -angle ); + for (i = 0; i < 100; i++) + if (buffer[i] == ',') buffer[i] = '.'; + fprintf( m_pstream, 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 ); + } + + CalcBoundingBox( x, y ); + CalcBoundingBox( x + size * text.Length() * 2/3 , y ); +} void wxPostScriptDC::SetBackground (const wxBrush& brush) { @@ -1260,13 +1564,13 @@ void wxPostScriptDC::DoDrawSpline( wxList *points ) double a, b, c, d, x1, y1, x2, y2, x3, y3; wxPoint *p, *q; - wxNode *node = points->First(); - p = (wxPoint *)node->Data(); + wxNode *node = points->GetFirst(); + p = (wxPoint *)node->GetData(); x1 = p->x; y1 = p->y; - node = node->Next(); - p = (wxPoint *)node->Data(); + node = node->GetNext(); + p = (wxPoint *)node->GetData(); c = p->x; d = p->y; x3 = a = (double)(x1 + c) / 2; @@ -1276,15 +1580,15 @@ void wxPostScriptDC::DoDrawSpline( wxList *points ) "newpath\n" "%d %d moveto\n" "%d %d lineto\n", - XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1), - XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) ); + LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1), + LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) ); CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 ); CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 ); - while ((node = node->Next()) != NULL) + while ((node = node->GetNext()) != NULL) { - q = (wxPoint *)node->Data(); + q = (wxPoint *)node->GetData(); x1 = x3; y1 = y3; @@ -1297,9 +1601,9 @@ void wxPostScriptDC::DoDrawSpline( wxList *points ) fprintf( m_pstream, "%d %d %d %d %d %d DrawSplineSection\n", - XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1), - XLOG2DEV((wxCoord)x2), YLOG2DEV((wxCoord)y2), - XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) ); + LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1), + LogicalToDeviceX((wxCoord)x2), LogicalToDeviceY((wxCoord)y2), + LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) ); CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 ); CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 ); @@ -1313,7 +1617,7 @@ void wxPostScriptDC::DoDrawSpline( wxList *points ) fprintf( m_pstream, "%d %d lineto\n" "stroke\n", - XLOG2DEV((wxCoord)c), YLOG2DEV((wxCoord)d) ); + LogicalToDeviceX((wxCoord)c), LogicalToDeviceY((wxCoord)d) ); } wxCoord wxPostScriptDC::GetCharWidth() const @@ -1370,8 +1674,8 @@ void wxPostScriptDC::DoGetSize(int* width, int* height) const h = tmp; } - if (width) *width = w; - if (height) *height = h; + if (width) *width = (int)(w * ms_PSScaleFactor); + if (height) *height = (int)(h * ms_PSScaleFactor); } void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const @@ -1404,7 +1708,8 @@ void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const // Resolution in pixels per logical inch wxSize wxPostScriptDC::GetPPI(void) const { - return wxSize(72, 72); + return wxSize((int)(72 * ms_PSScaleFactor), + (int)(72 * ms_PSScaleFactor)); } @@ -1412,29 +1717,66 @@ bool wxPostScriptDC::StartDoc( const wxString& message ) { wxCHECK_MSG( m_ok, FALSE, wxT("invalid postscript dc") ); - if (m_printData.GetFilename() == "") + if (m_printData.GetFilename() == wxT("")) { - wxString filename = wxGetTempFileName("ps"); + wxString filename = wxGetTempFileName( wxT("ps") ); m_printData.SetFilename(filename); } - m_pstream = fopen( m_printData.GetFilename().fn_str(), "w+" ); + m_pstream = wxFopen( m_printData.GetFilename().c_str(), wxT("w+") ); // FIXME: use fn_str() here under Unicode? if (!m_pstream) { - wxMessageBox( _("Cannot open file for PostScript printing!"), _("Error"), wxOK ); + wxLogError( _("Cannot open file for PostScript printing!")); m_ok = FALSE; return FALSE; } m_ok = TRUE; + 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" ); + else + fprintf( m_pstream, "%%%%Orientation: Portrait\n" ); + + // fprintf( m_pstream, "%%%%Pages: %d\n", (wxPageNumber - 1) ); + + char *paper = "A4"; + 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"; + } + 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 if (wxPostScriptHeaderSpline) fprintf( m_pstream, wxPostScriptHeaderSpline ); fprintf( m_pstream, "%%%%EndProlog\n" ); @@ -1466,51 +1808,39 @@ void wxPostScriptDC::EndDoc () fclose( m_pstream ); m_pstream = (FILE *) NULL; - wxChar *header_file = wxGetTempFileName("ps"); - - m_pstream = fopen( wxConvFile.cWX2MB(header_file) , "w+" ); - - 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() ); - - wxChar userID[256]; - if ( wxGetEmailAddress(userID, sizeof(userID)) ) - { - fprintf( m_pstream, "%%%%For: %s ", wxMBSTRINGCAST wxConvCurrent->cWX2MB(userID) ); - wxChar userName[245]; - if (wxGetUserName(userName, sizeof(userName))) - fprintf( m_pstream, " (%s)", wxMBSTRINGCAST wxConvCurrent->cWX2MB(userName) ); - fprintf( m_pstream, "\n" ); - } - else if ( wxGetUserName(userID, sizeof(userID)) ) - { - fprintf( m_pstream, "%%%%For: %s\n", wxMBSTRINGCAST wxConvCurrent->cWX2MB(userID) );; - } - +#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; - wx_printer_translate_x = m_printData.GetPrinterTranslateX(); - wx_printer_translate_y = m_printData.GetPrinterTranslateY(); + wx_printer_translate_x = (wxCoord)m_printData.GetPrinterTranslateX(); + wx_printer_translate_y = (wxCoord)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 - 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. - wxCoord llx = (wxCoord) ((XLOG2DEV(m_minX)+wx_printer_translate_x)*wx_printer_scale_x); - wxCoord lly = (wxCoord) ((YLOG2DEV(m_minY)+wx_printer_translate_y)*wx_printer_scale_y); - wxCoord urx = (wxCoord) ((XLOG2DEV(m_maxX)+wx_printer_translate_x)*wx_printer_scale_x); - wxCoord ury = (wxCoord) ((YLOG2DEV(m_maxY)+wx_printer_translate_y)*wx_printer_scale_y); + wxCoord minX = (wxCoord) LogicalToDeviceX(m_minX); + wxCoord minY = (wxCoord) LogicalToDeviceY(m_minY); + wxCoord maxX = (wxCoord) LogicalToDeviceX(m_maxX); + wxCoord maxY = (wxCoord) LogicalToDeviceY(m_maxY); + + // LOG2DEV may have changed the minimum to maximum vice versa + if ( minX > maxX ) { wxCoord tmp = minX; minX = maxX; maxX = tmp; } + if ( minY > maxY ) { wxCoord tmp = minY; minY = maxY; maxY = tmp; } + + // account for used scaling (boundingbox is before scaling in ps-file) + double scale_x = m_printData.GetPrinterScaleX() / ms_PSScaleFactor; + double scale_y = m_printData.GetPrinterScaleY() / ms_PSScaleFactor; + + wxCoord llx, lly, urx, ury; + llx = (wxCoord) ((minX+wx_printer_translate_x)*scale_x); + lly = (wxCoord) ((minY+wx_printer_translate_y)*scale_y); + urx = (wxCoord) ((maxX+wx_printer_translate_x)*scale_x); + ury = (wxCoord) ((maxY+wx_printer_translate_y)*scale_y); + // (end of bounding box computation) + // If we're landscape, our sense of "x" and "y" is reversed. if (m_printData.GetOrientation() == wxLANDSCAPE) @@ -1531,8 +1861,6 @@ void wxPostScriptDC::EndDoc () "%%%%BoundingBox: %d %d %d %d\n", (wxCoord)floor((double)llx), (wxCoord)floor((double)lly), (wxCoord)ceil((double)urx), (wxCoord)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. @@ -1545,60 +1873,18 @@ void wxPostScriptDC::EndDoc () 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 ); - - fclose( m_pstream ); - m_pstream = (FILE*) NULL; - - wxChar *tmp_file = wxGetTempFileName("ps"); - - // Paste header Before wx_printer_file - wxConcatFiles (header_file, m_printData.GetFilename(), tmp_file ); - wxRemoveFile( header_file ); - wxRemoveFile( m_printData.GetFilename() ); - wxRenameFile( tmp_file, m_printData.GetFilename() ); +#endif #if defined(__X__) || defined(__WXGTK__) - if (m_ok) + if (m_ok && (m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER)) { - wxString previewCommand(m_printData.GetPreviewCommand()); - wxString printerCommand(m_printData.GetPrinterCommand()); - wxString printerOptions(m_printData.GetPrinterOptions()); - wxString filename(m_printData.GetFilename()); + wxString command; + command += m_printData.GetPrinterCommand(); + command += wxT(" "); + command += m_printData.GetFilename(); - 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; - } + wxExecute( command, TRUE ); + wxRemoveFile( m_printData.GetFilename() ); } #endif } @@ -1622,8 +1908,8 @@ void wxPostScriptDC::StartPage() wxCoord translate_x, translate_y; double scale_x, scale_y; - translate_x = m_printData.GetPrinterTranslateX(); - translate_y = m_printData.GetPrinterTranslateY(); + translate_x = (wxCoord)m_printData.GetPrinterTranslateX(); + translate_y = (wxCoord)m_printData.GetPrinterTranslateY(); scale_x = m_printData.GetPrinterScaleX(); scale_y = m_printData.GetPrinterScaleY(); @@ -1639,7 +1925,13 @@ void wxPostScriptDC::StartPage() // fprintf( m_pstream, "90 rotate llx neg ury nef translate\n" ); } - fprintf( m_pstream, "%.8f %.8f scale\n", scale_x, scale_y ); + 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 ); + fprintf( m_pstream, "%d %d translate\n", translate_x, translate_y ); } @@ -1654,7 +1946,7 @@ bool wxPostScriptDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord fwidth, wxCoord fheight, wxDC *source, wxCoord xsrc, wxCoord ysrc, - int rop, bool WXUNUSED(useMask) ) + int rop, bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) ) { wxCHECK_MSG( m_ok && m_pstream, FALSE, wxT("invalid postscript dc") ); @@ -1676,7 +1968,7 @@ bool wxPostScriptDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord wxPostScriptDC::GetCharHeight() const { if (m_font.Ok()) - return m_font.GetPointSize(); + return m_font.GetPointSize(); else return 12; } @@ -1691,8 +1983,53 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, if (!fontToUse) fontToUse = (wxFont*) &m_font; wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") ); - wxCHECK_RET( x, wxT("GetTextExtent: x == NULL") ); - wxCHECK_RET( y, wxT("GetTextExtent: y == NULL") ); + + if (string.IsEmpty()) + { + if (x) (*x) = 0; + if (y) (*y) = 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(); @@ -1763,58 +2100,85 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, double UnderlinePosition = 0.0; double UnderlineThickness = 0.0; - /* get actual parameters */ - const int Family = fontToUse->GetFamily(); - const int Size = fontToUse->GetPointSize(); - const int Style = fontToUse->GetStyle(); - const int Weight = fontToUse->GetWeight(); + // Get actual parameters + int Family = fontToUse->GetFamily(); + int Size = fontToUse->GetPointSize(); + int Style = fontToUse->GetStyle(); + int Weight = fontToUse->GetWeight(); - /* if we have another font, read the font-metrics */ + // If we have another font, read the font-metrics if (Family!=lastFamily || Size!=lastSize || Style!=lastStyle || Weight!=lastWeight) { - /* store actual values */ + // Store actual values lastFamily = Family; lastSize = Size; lastStyle = Style; lastWeight = Weight; - char *name = (char*) NULL; + const wxChar *name = NULL; switch (Family) { case wxMODERN: - { - if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "CourBoO"; - else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "CourBo"; - else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "Cour0"; - else name = "Cour"; - } + case wxTELETYPE: + { + if ((Style == wxITALIC) && (Weight == wxBOLD)) name = wxT("CourBoO.afm"); + else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = wxT("CourBo.afm"); + else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = wxT("CourO.afm"); + else name = wxT("Cour.afm"); break; + } case wxROMAN: - { - if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "TimesBoO"; - else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "TimesBo"; - else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "TimesO"; - else name = "TimesRo"; - } + { + if ((Style == wxITALIC) && (Weight == wxBOLD)) name = wxT("TimesBoO.afm"); + else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = wxT("TimesBo.afm"); + else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = wxT("TimesO.afm"); + else name = wxT("TimesRo.afm"); break; + } + case wxSCRIPT: + { + name = wxT("Zapf.afm"); + Style = wxNORMAL; + Weight = wxNORMAL; + } + case wxSWISS: default: - { - if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "HelvBoO"; - else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "HelvBo"; - else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "Helv0"; - else name = "Helv"; - } + { + if ((Style == wxITALIC) && (Weight == wxBOLD)) name = wxT("HelvBoO.afm"); + else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = wxT("HelvBo.afm"); + else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = wxT("HelvO.afm"); + else name = wxT("Helv.afm"); break; + } } - /* get the directory of the AFM files */ + FILE *afmFile = NULL; + + // Get the directory of the AFM files wxString afmName; if (!m_printData.GetFontMetricPath().IsEmpty()) { - afmName = m_printData.GetFontMetricPath().fn_str(); + afmName = m_printData.GetFontMetricPath(); + afmName << wxFILE_SEP_PATH << name; + afmFile = wxFopen(afmName,wxT("r")); } +#if defined(__UNIX__) && !defined(__VMS__) + if (afmFile==NULL) + { + afmName = wxGetDataDir(); + afmName << wxFILE_SEP_PATH +#if defined(__LINUX__) || defined(__FREEBSD__) + << wxT("gs_afm") << wxFILE_SEP_PATH +#else + << wxT("afm") << wxFILE_SEP_PATH +#endif + << name; + afmFile = wxFopen(afmName,wxT("r")); + } +#endif + /* 2. open and process the file / a short explanation of the AFM format: / we have for each character a line, which gives its size @@ -1828,50 +2192,10 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, / / when the font has changed, we read in the right AFM file and store the / character widths in an array, which is processed below (see point 3.). */ - - /* new elements JC Sun Aug 25 23:21:44 MET DST 1996 */ - - afmName << name << ".afm"; - FILE *afmFile = fopen(afmName,"r"); if (afmFile==NULL) { - afmName = wxThePrintSetupData->GetAFMPath(); - afmName << wxFILE_SEP_PATH << name << ".afm"; - afmFile = fopen(afmName,"r"); - } - -#ifdef __UNIX__ - else if (afmFile==NULL) - { - afmName = wxINSTALL_PREFIX; - afmName << wxFILE_SEP_PATH - << "afm" << wxFILE_SEP_PATH - << name << ".afm"; - afmFile = fopen(afmName,"r"); - } - -#if 0 - else if (afmFile==NULL) - { - strcpy( afmName, "/usr/local/share/wx/afm/" ); - strcat(afmName,name); - strcat(afmName,".afm"); - afmFile = fopen(afmName,"r"); - } - else if (afmFile==NULL) - { - strcpy( afmName, "/usr/share/wx/afm/" ); - strcat(afmName,name); - strcat(afmName,".afm"); - afmFile = fopen(afmName,"r"); - } -#endif -#endif - - if (afmFile==NULL) - { - wxLogDebug( wxT("GetTextExtent: can't open AFM file '%hs'\n"), afmName.c_str() ); - wxLogDebug( wxT(" using approximate values\n")); + wxLogDebug( wxT("GetTextExtent: can't open AFM file '%s'"), afmName.c_str() ); + wxLogDebug( wxT(" using approximate values")); for (int i=0; i<256; i++) lastWidths[i] = 500; /* an approximate value */ lastDescender = -150; /* dito. */ } @@ -1893,7 +2217,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, if ((sscanf(line,"%s%d",descString,&lastDescender)!=2) || (strcmp(descString,"Descender")!=0)) { - wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad descender)\n"), afmName.c_str(),line ); + wxLogDebug( wxT("AFM-file '%s': line '%s' has error (bad descender)"), afmName.c_str(),line ); } } /* JC 1.) check for UnderlinePosition */ @@ -1902,7 +2226,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, if ((sscanf(line,"%s%lf",upString,&UnderlinePosition)!=2) || (strcmp(upString,"UnderlinePosition")!=0)) { - wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad UnderlinePosition)\n"), afmName.c_str(), line ); + wxLogDebug( wxT("AFM-file '%s': line '%s' has error (bad UnderlinePosition)"), afmName.c_str(), line ); } } /* JC 2.) check for UnderlineThickness */ @@ -1911,7 +2235,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, if ((sscanf(line,"%s%lf",utString,&UnderlineThickness)!=2) || (strcmp(utString,"UnderlineThickness")!=0)) { - wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad UnderlineThickness)\n"), afmName.c_str(), line ); + wxLogDebug( wxT("AFM-file '%s': line '%s' has error (bad UnderlineThickness)"), afmName.c_str(), line ); } } /* JC 3.) check for EncodingScheme */ @@ -1920,11 +2244,11 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, if ((sscanf(line,"%s%s",utString,encString)!=2) || (strcmp(utString,"EncodingScheme")!=0)) { - wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad EncodingScheme)\n"), afmName.c_str(), line ); + wxLogDebug( wxT("AFM-file '%s': line '%s' has error (bad EncodingScheme)"), afmName.c_str(), line ); } else if (strncmp(encString, "AdobeStandardEncoding", 21)) { - wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (unsupported EncodingScheme %hs)\n"), + wxLogDebug( wxT("AFM-file '%s': line '%s' has error (unsupported EncodingScheme %s)"), afmName.c_str(),line, encString); } } @@ -1933,11 +2257,11 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, { if (sscanf(line,"%s%d%s%s%d",cString,&ascii,semiString,WXString,&cWidth)!=5) { - wxLogDebug(wxT("AFM-file '%hs': line '%hs' has an error (bad character width)\n"),afmName.c_str(),line); + wxLogDebug(wxT("AFM-file '%s': line '%s' has an error (bad character width)"),afmName.c_str(),line); } if(strcmp(cString,"C")!=0 || strcmp(semiString,";")!=0 || strcmp(WXString,"WX")!=0) { - wxLogDebug(wxT("AFM-file '%hs': line '%hs' has a format error\n"),afmName.c_str(),line); + wxLogDebug(wxT("AFM-file '%s': line '%s' has a format error"),afmName.c_str(),line); } /* printf(" char '%c'=%d has width '%d'\n",ascii,ascii,cWidth); */ if (ascii>=0 && ascii<256) @@ -1947,7 +2271,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, else { /* MATTHEW: this happens a lot; don't print an error */ - /* wxLogDebug("AFM-file '%s': ASCII value %d out of range\n",afmName.c_str(),ascii); */ + /* wxLogDebug("AFM-file '%s': ASCII value %d out of range",afmName.c_str(),ascii); */ } } /* C.) ignore other entries. */ @@ -1965,43 +2289,50 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, lastWidths[220] = lastWidths['U']; // Ü lastWidths[252] = lastWidths['u']; // ü lastWidths[223] = lastWidths[251]; // ß - } - /* JC: calculate UnderlineThickness/UnderlinePosition */ - { + /* JC: calculate UnderlineThickness/UnderlinePosition */ + // VS: dirty, but is there any better solution? double *pt; pt = (double*) &m_underlinePosition; - *pt = UnderlinePosition * fontToUse->GetPointSize() / 1000.0f; + *pt = LogicalToDeviceYRel((wxCoord)(UnderlinePosition * fontToUse->GetPointSize())) / 1000.0f; pt = (double*) &m_underlineThickness; - *pt = UnderlineThickness * fontToUse->GetPointSize() / 1000.0f * m_scaleFactor; + *pt = LogicalToDeviceYRel((wxCoord)(UnderlineThickness * fontToUse->GetPointSize())) / 1000.0f; + } + /* 3. now the font metrics are read in, calc size this / is done by adding the widths of the characters in the / string. they are given in 1/1000 of the size! */ - double widthSum=0; + long sum=0; wxCoord height=Size; /* by default */ unsigned char *p; for(p=(unsigned char *)wxMBSTRINGCAST strbuf; *p; p++) { if(lastWidths[*p]== INT_MIN) { - wxLogDebug(wxT("GetTextExtent: undefined width for character '%hc' (%d)\n"), *p,*p); - widthSum += /*(wxCoord)*/(lastWidths[' ']/1000.0F * Size); /* assume space */ + wxLogDebug(wxT("GetTextExtent: undefined width for character '%c' (%d)"), *p,*p); + sum += lastWidths[' ']; /* assume space */ } else { - widthSum += /*(wxCoord)*/((lastWidths[*p]/1000.0F)*Size); + sum += lastWidths[*p]; } } + double widthSum = sum; + widthSum *= Size; + widthSum /= 1000.0F; + /* add descender to height (it is usually a negative value) */ - if (lastDescender != INT_MIN) - { - height += (wxCoord)(((-lastDescender)/1000.0F) * Size); /* MATTHEW: forgot scale */ - } + //if (lastDescender != INT_MIN) + //{ + // height += (wxCoord)(((-lastDescender)/1000.0F) * Size); /* MATTHEW: forgot scale */ + //} + // - commented by V. Slavik - height already contains descender in it + // (judging from few experiments) /* return size values */ if ( x ) @@ -2024,366 +2355,29 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, /* currently no idea how to calculate this! */ if (externalLeading) *externalLeading = 0; - -#endif -} - -// Determine the Default Postscript Previewer -// available on the platform -#if defined(__SUN__) && defined(__XVIEW__) -// OpenWindow/NeWS's Postscript Previewer -# define PS_VIEWER_PROG "pageview" -#elif defined(__VMS__) -#define PS_VIEWER_PROG "view/format=ps/select=x_display" -#elif defined(__SGI__) -// SGI's Display Postscript Previewer -//# define PS_VIEWER_PROG "dps" -# define PS_VIEWER_PROG "xpsview" -#elif defined(__X__) || defined(__WXGTK__) -// Front-end to ghostscript -# define PS_VIEWER_PROG "ghostview" -#else -// Windows ghostscript/ghostview -# define PS_VIEWER_PROG "gsview" #endif + // Use AFM -wxPrintSetupData *wxThePrintSetupData = (wxPrintSetupData *) NULL; - -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC) -IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject) -#endif - -// Redundant now I think -#if 1 -IMPLEMENT_CLASS(wxPostScriptPrintDialog, wxDialog) - -wxPostScriptPrintDialog::wxPostScriptPrintDialog (wxWindow *parent, const wxString& title, - const wxPoint& pos, const wxSize& size, wxCoord style): - wxDialog(parent, -1, title, pos, size, style) -{ - wxBeginBusyCursor(); - - char buf[100]; - int yPos = 40; - wxString - *orientation = new wxString[2], - *print_modes = new wxString[3]; - int features; - wxCoord wx_printer_translate_x, wx_printer_translate_y; - double wx_printer_scale_x, wx_printer_scale_y; - - orientation[0] = _("Portrait"); - orientation[1] = _("Landscape"); - - print_modes[0] = _("Send to Printer"); - print_modes[1] = _("Print to File"); - print_modes[2] = _("Preview Only"); - - - - wxButton *okBut = new wxButton (this, wxID_OK, _("OK"), wxPoint(5, 5)); - (void) new wxButton (this, wxID_CANCEL, _("Cancel"), wxPoint(40, 5)); - okBut->SetDefault(); - - -#if defined(__WXGTK__) || defined (__WXMOTIF__) - (void) new wxStaticText( this, -1, _("Printer Command: "), - wxPoint(5, yPos) ); - (void) new wxTextCtrl( this, wxID_PRINTER_COMMAND, wxThePrintSetupData->GetPrinterCommand(), - wxPoint(100, yPos), wxSize(100, -1) ); - - (void) new wxStaticText( this, -1, _("Printer Options: "), - wxPoint(210, yPos) ); - (void) new wxTextCtrl( this, wxID_PRINTER_OPTIONS, wxThePrintSetupData->GetPrinterOptions(), - wxPoint(305, yPos), wxSize(150, -1) ); - - yPos += 40; #endif - - - wxRadioBox *radio0 = new wxRadioBox(this, wxID_PRINTER_ORIENTATION, "Orientation: ", wxPoint(5, yPos), wxSize(-1,-1), - 2,orientation,2,wxRA_SPECIFY_ROWS); - radio0->SetSelection((int)wxThePrintSetupData->GetPrinterOrientation() - 1); - - // @@@ Configuration hook - if ( !wxThePrintSetupData->GetPrintPreviewCommand() ) - wxThePrintSetupData->SetPrintPreviewCommand(PS_VIEWER_PROG); - - // wxGetResource ("wxWindows", "PSView", &wxThePrintSetupData->m_previewCommand); - - features = (wxThePrintSetupData->GetPrintPreviewCommand() && - *wxThePrintSetupData->GetPrintPreviewCommand()) ? 3 : 2; - - wxRadioBox *radio1 = new wxRadioBox(this, wxID_PRINTER_MODES, _("PostScript:"), - wxPoint(150, yPos), - wxSize(-1,-1), features, - print_modes, features, wxRA_SPECIFY_ROWS); - -#ifdef __WXMSW__ - radio1->Enable(0, FALSE); - if (wxThePrintSetupData->GetPrintPreviewCommand() && *wxThePrintSetupData->GetPrintPreviewCommand()) - radio1->Enable(2, FALSE); -#endif - - radio1->SetSelection((int)wxThePrintSetupData->GetPrinterMode()); - wxThePrintSetupData->GetPrinterTranslation(&wx_printer_translate_x, &wx_printer_translate_y); - wxThePrintSetupData->GetPrinterScaling(&wx_printer_scale_x, &wx_printer_scale_y); - - sprintf (buf, "%.2f", wx_printer_scale_x); - - yPos += 90; - (void) new wxStaticText(this, -1, _("X Scaling"), wxPoint(5, yPos)); - /* wxTextCtrl *text1 = */ (void) new wxTextCtrl(this, wxID_PRINTER_X_SCALE, buf, wxPoint(100, yPos), wxSize(100, -1)); - - sprintf (buf, "%.2f", wx_printer_scale_y); - (void) new wxStaticText(this, -1, _("Y Scaling"), wxPoint(220, yPos)); - /* wxTextCtrl *text2 = */ (void) new wxTextCtrl(this, wxID_PRINTER_Y_SCALE, buf, wxPoint(320, yPos), wxSize(100, -1)); - - yPos += 25; - - (void) new wxStaticText(this, -1, _("X Translation"), wxPoint(5, yPos)); - sprintf (buf, "%.2d", wx_printer_translate_x); - /* wxTextCtrl *text3 = */ (void) new wxTextCtrl(this, wxID_PRINTER_X_TRANS, buf, wxPoint(100, yPos), wxSize(100, -1)); - - (void) new wxStaticText(this, -1, _("Y Translation"), wxPoint(220, yPos)); - sprintf (buf, "%.2d", wx_printer_translate_y); - /* wxTextCtrl *text4 = */ (void) new wxTextCtrl(this, wxID_PRINTER_Y_TRANS, buf, wxPoint(320, yPos), wxSize(100, -1)); - - Fit (); - - delete[] orientation; - delete[] print_modes; - - wxEndBusyCursor(); -} - -int wxPostScriptPrintDialog::ShowModal () -{ - if ( wxDialog::ShowModal() == wxID_OK ) - { -// wxTextCtrl *text0 = (wxTextCtrl *)FindWindow(wxID_PRINTER_OPTIONS); - wxTextCtrl *text1 = (wxTextCtrl *)FindWindow(wxID_PRINTER_X_SCALE); - wxTextCtrl *text2 = (wxTextCtrl *)FindWindow(wxID_PRINTER_Y_SCALE); - wxTextCtrl *text3 = (wxTextCtrl *)FindWindow(wxID_PRINTER_X_TRANS); - wxTextCtrl *text4 = (wxTextCtrl *)FindWindow(wxID_PRINTER_Y_TRANS); -// wxTextCtrl *text_prt = (wxTextCtrl *)FindWindow(wxID_PRINTER_COMMAND); - wxRadioBox *radio0 = (wxRadioBox *)FindWindow(wxID_PRINTER_ORIENTATION); - wxRadioBox *radio1 = (wxRadioBox *)FindWindow(wxID_PRINTER_MODES); - - StringToDouble (WXSTRINGCAST text1->GetValue (), &wxThePrintSetupData->m_printerScaleX); - StringToDouble (WXSTRINGCAST text2->GetValue (), &wxThePrintSetupData->m_printerScaleY); - - long dummy; - StringToLong (WXSTRINGCAST text3->GetValue (), &dummy); - wxThePrintSetupData->m_printerTranslateX = (wxCoord)dummy; - StringToLong (WXSTRINGCAST text4->GetValue (), &dummy); - wxThePrintSetupData->m_printerTranslateY = (wxCoord)dummy; - -#ifdef __X__ - // wxThePrintSetupData->SetPrinterOptions(WXSTRINGCAST text0->GetValue ()); - // wxThePrintSetupData->SetPrinterCommand(WXSTRINGCAST text_prt->GetValue ()); -#endif - - wxThePrintSetupData->SetPrinterOrientation((radio0->GetSelection() == 1 ? wxLANDSCAPE : wxPORTRAIT)); - - // C++ wants this - switch ( radio1->GetSelection() ) { - case 0: wxThePrintSetupData->SetPrinterMode(PS_PRINTER); break; - case 1: wxThePrintSetupData->SetPrinterMode(PS_FILE); break; - case 2: wxThePrintSetupData->SetPrinterMode(PS_PREVIEW); break; - } - return wxID_OK; - } - return wxID_CANCEL; -} -#endif - // 0 (redundant) - -// PostScript printer settings -// RETAINED FOR BACKWARD COMPATIBILITY -void wxSetPrinterCommand(const wxString& cmd) -{ - wxThePrintSetupData->SetPrinterCommand(cmd); -} - -void wxSetPrintPreviewCommand(const wxString& cmd) -{ - wxThePrintSetupData->SetPrintPreviewCommand(cmd); -} - -void wxSetPrinterOptions(const wxString& flags) -{ - wxThePrintSetupData->SetPrinterOptions(flags); -} - -void wxSetPrinterFile(const wxString& f) -{ - wxThePrintSetupData->SetPrinterFile(f); -} - -void wxSetPrinterOrientation(int orient) -{ - wxThePrintSetupData->SetPrinterOrientation(orient); -} - -void wxSetPrinterScaling(double x, double y) -{ - wxThePrintSetupData->SetPrinterScaling(x, y); -} - -void wxSetPrinterTranslation(wxCoord x, wxCoord y) -{ - wxThePrintSetupData->SetPrinterTranslation(x, y); + // GTK 2.0 } -// 1 = Preview, 2 = print to file, 3 = send to printer -void wxSetPrinterMode(int mode) -{ - wxThePrintSetupData->SetPrinterMode(mode); -} - -void wxSetAFMPath(const wxString& f) -{ - wxThePrintSetupData->SetAFMPath(f); -} - -// Get current values -wxString wxGetPrinterCommand() -{ - return wxThePrintSetupData->GetPrinterCommand(); -} - -wxString wxGetPrintPreviewCommand() -{ - return wxThePrintSetupData->GetPrintPreviewCommand(); -} - -wxString wxGetPrinterOptions() -{ - return wxThePrintSetupData->GetPrinterOptions(); -} - -wxString wxGetPrinterFile() -{ - return wxThePrintSetupData->GetPrinterFile(); -} - -int wxGetPrinterOrientation() -{ - return wxThePrintSetupData->GetPrinterOrientation(); -} - -void wxGetPrinterScaling(double* x, double* y) -{ - wxThePrintSetupData->GetPrinterScaling(x, y); -} - -void wxGetPrinterTranslation(wxCoord *x, wxCoord *y) -{ - wxThePrintSetupData->GetPrinterTranslation(x, y); -} - -int wxGetPrinterMode() -{ - return wxThePrintSetupData->GetPrinterMode(); -} - -wxString wxGetAFMPath() -{ - return wxThePrintSetupData->GetAFMPath(); -} - -/* - * Print setup data - */ - -wxPrintSetupData::wxPrintSetupData() -{ - 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() -{ -} - -void wxPrintSetupData::operator=(wxPrintSetupData& data) -{ - SetPrinterCommand(data.GetPrinterCommand()); - SetPrintPreviewCommand(data.GetPrintPreviewCommand()); - SetPrinterOptions(data.GetPrinterOptions()); - wxCoord x, y; - data.GetPrinterTranslation(&x, &y); - SetPrinterTranslation(x, y); - - double x1, y1; - data.GetPrinterScaling(&x1, &y1); - SetPrinterScaling(x1, y1); - - SetPrinterOrientation(data.GetPrinterOrientation()); - SetPrinterMode(data.GetPrinterMode()); - SetAFMPath(data.GetAFMPath()); - SetPaperName(data.GetPaperName()); - 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()); -} +#if WXWIN_COMPATIBILITY_2_2 +WXDLLEXPORT wxPrintSetupData *wxThePrintSetupData = 0; void wxInitializePrintSetupData(bool init) { - if (init) - { - wxThePrintSetupData = new wxPrintSetupData; - - wxThePrintSetupData->SetPrintPreviewCommand(PS_VIEWER_PROG); - 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 -#ifdef __VMS__ - wxThePrintSetupData->SetPrinterCommand("print"); - wxThePrintSetupData->SetPrinterOptions("/nonotify/queue=psqueue"); - wxThePrintSetupData->SetAFMPath("sys$ps_font_metrics:"); -#endif -#ifdef __WXMSW__ - wxThePrintSetupData->SetPrinterCommand("print"); - wxThePrintSetupData->SetAFMPath("c:\\windows\\system\\"); - wxThePrintSetupData->SetPrinterOptions(""); -#endif -#if !defined(__VMS__) && !defined(__WXMSW__) - wxThePrintSetupData->SetPrinterCommand("lpr"); - wxThePrintSetupData->SetPrinterOptions(""); - wxThePrintSetupData->SetAFMPath(""); -#endif - } - else - { - if (wxThePrintSetupData) - delete wxThePrintSetupData; - wxThePrintSetupData = (wxPrintSetupData *) NULL; - } + 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 @@ -2400,10 +2394,6 @@ public: IMPLEMENT_DYNAMIC_CLASS(wxPostScriptModule, wxModule) -/* - * Initialization/cleanup module - */ - bool wxPostScriptModule::OnInit() { wxInitializePrintSetupData(); @@ -2415,9 +2405,14 @@ void wxPostScriptModule::OnExit() { wxInitializePrintSetupData(FALSE); } +#endif + // WXWIN_COMPATIBILITY_2_2 #endif // wxUSE_POSTSCRIPT #endif // wxUSE_PRINTING_ARCHITECTURE + + +// vi:sts=4:sw=4:et