X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e469ea37f1edbd6b2b6a0cbc43a3314c337e6f9..236a9de39afa090fdee3cf91cb5364ceca69e3f8:/src/generic/dcpsg.cpp diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index 1f2153f36c..96b05d4f7c 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -1004,11 +1004,11 @@ void wxPostScriptDC::SetFont( const wxFont& font ) 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, "%d scalefont setfont\n", YLOG2DEVREL(m_font.GetPointSize()) ); - #endif + + fprintf( m_pstream, "%f scalefont setfont\n", YLOG2DEVREL(m_font.GetPointSize() * 1000) / 1000.0F); + // this is a hack - we must scale font size (in pts) according to m_scaleY but + // YLOG2DEVREL works with wxCoord type (int or longint). Se we first convert font size + // to 1/1000th of pt and then back. } void wxPostScriptDC::SetPen( const wxPen& pen ) @@ -1143,6 +1143,10 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) { wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); + wxCoord text_w, text_h, text_descent; + + GetTextExtent(text, &text_w, &text_h, &text_descent); + SetFont( m_font ); if (m_textForegroundColour.Ok()) @@ -1183,7 +1187,10 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) int size = m_font.GetPointSize(); - wxCoord by = y + (wxCoord)floor( double(size) * 2.0 / 3.0 ); // approximate baseline +// 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", XLOG2DEV(x), YLOG2DEV(by) ); /* I don't know how to write char to a stream, so I use a mini string */ @@ -1221,8 +1228,6 @@ 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); fprintf( m_pstream, "gsave\n" @@ -1233,13 +1238,124 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) "grestore\n", XLOG2DEV(x), YLOG2DEV(uy), (wxCoord)m_underlineThickness, - XLOG2DEV(x + w), YLOG2DEV(uy) ); + XLOG2DEV(x + text_w), YLOG2DEV(uy) ); } CalcBoundingBox( x, y ); CalcBoundingBox( x + size * text.Length() * 2/3 , y ); } +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; + + fprintf( m_pstream, + "%.8f %.8f %.8f setrgbcolor\n", + redPS, greenPS, bluePS ); + + m_currentRed = red; + m_currentBlue = blue; + m_currentGreen = green; + } + } + + int size = m_font.GetPointSize(); + + long by = y + (long)floor( double(size) * 2.0 / 3.0 ); // approximate baseline + + // FIXME only correct for 90 degrees + fprintf(m_pstream, "%d %d moveto\n", + XLOG2DEV((wxCoord)(x + size)), YLOG2DEV(by) ); + fprintf(m_pstream, "%.8f rotate\n", angle); + + /* 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) textbuf[i]; + if (c == ')' || c == '(' || 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 */ + fprintf(m_pstream, "\\%o", c); + } + else + { + tmpbuf[0] = (char) c; + fprintf( m_pstream, tmpbuf ); + } + } + + fprintf( m_pstream, ") show\n" ); + fprintf( m_pstream, "%.8f rotate\n", -angle ); + + if (m_font.GetUnderlined()) + { + wxCoord uy = (wxCoord)(y + size - m_underlinePosition); + wxCoord w, h; + GetTextExtent(text, &w, &h); + + fprintf( m_pstream, + "gsave\n" + "%d %d moveto\n" + "%ld setlinewidth\n" + "%d %d lineto\n" + "stroke\n" + "grestore\n", + XLOG2DEV(x), YLOG2DEV(uy), + (long)m_underlineThickness, + XLOG2DEV(x + w), YLOG2DEV(uy) ); + } + + CalcBoundingBox( x, y ); + CalcBoundingBox( x + size * text.Length() * 2/3 , y ); +} void wxPostScriptDC::SetBackground (const wxBrush& brush) { @@ -1494,8 +1610,8 @@ void wxPostScriptDC::EndDoc () 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(); @@ -1622,8 +1738,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(); @@ -1786,7 +1902,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, { if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "CourBoO"; else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "CourBo"; - else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "Cour0"; + else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "CourO"; else name = "Cour"; } break; @@ -1802,17 +1918,17 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, { if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "HelvBoO"; else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "HelvBo"; - else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "Helv0"; + else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "HelvO"; else name = "Helv"; } break; } /* get the directory of the AFM files */ - wxString afmName; + wxString afmName = wxEmptyString; if (!m_printData.GetFontMetricPath().IsEmpty()) { - afmName = m_printData.GetFontMetricPath().fn_str(); + afmName = m_printData.GetFontMetricPath(); } /* 2. open and process the file @@ -1831,43 +1947,33 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, /* new elements JC Sun Aug 25 23:21:44 MET DST 1996 */ - afmName << name << ".afm"; - FILE *afmFile = fopen(afmName,"r"); + afmName << name << wxT(".afm"); + FILE *afmFile = wxFopen(afmName,wxT("r")); if (afmFile==NULL) { afmName = wxThePrintSetupData->GetAFMPath(); - afmName << wxFILE_SEP_PATH << name << ".afm"; - afmFile = fopen(afmName,"r"); + afmName << wxFILE_SEP_PATH << name << wxT(".afm"); + afmFile = wxFopen(afmName,wxT("r")); } #ifdef __UNIX__ - else if (afmFile==NULL) +#ifndef __VMS__ + if (afmFile==NULL) + /* please do NOT change the line above to "else if (afmFile==NULL)" - + - afmFile = fopen() may fail and in that case the next if branch + MUST be executed - and it would not if there was "else" */ { 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"); + << wxT("share") << wxFILE_SEP_PATH + << wxT("wx") << wxFILE_SEP_PATH + << wxT("afm") << wxFILE_SEP_PATH + << name << wxT(".afm"); + afmFile = wxFopen(afmName,wxT("r")); } #endif #endif - + if (afmFile==NULL) { wxLogDebug( wxT("GetTextExtent: can't open AFM file '%hs'\n"), afmName.c_str() ); @@ -1989,19 +2095,21 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, 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 */ + widthSum += (lastWidths[' ']/1000.0F * Size); /* assume space */ } else { - widthSum += /*(wxCoord)*/((lastWidths[*p]/1000.0F)*Size); + widthSum += ((lastWidths[*p]/1000.0F)*Size); } } /* 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 ) @@ -2049,10 +2157,8 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, 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