added wxGet/Set/UnsetEnv() for Unix

[wxWidgets.git] / src / generic / dcpsg.cpp

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index fc57d30483353bd28a37b73321ee64310c736ecb..0db195a9343453efffcd1df8b1d70e08166fdc54 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -664,7 +664,8 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx
             CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset);
         }
 
             CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset);
         }
 

-        fprintf( m_pstream, "fill\n" );
+        fprintf( m_pstream, "closepath\n" );
+        fprintf( m_pstream, "stroke\n" );

     }
 }
 
     }
 }
 


@@ -838,7 +839,7 @@ void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord
                 "%d %d %d %d 0 360 ellipse\n"
                 "fill\n",
                 XLOG2DEV(x + width / 2), YLOG2DEV(y + height / 2),
                 "%d %d %d %d 0 360 ellipse\n"
                 "fill\n",
                 XLOG2DEV(x + width / 2), YLOG2DEV(y + height / 2),

-                XLOG2DEV(width / 2), YLOG2DEVREL(height / 2) );
+                XLOG2DEVREL(width / 2), YLOG2DEVREL(height / 2) );

 
         CalcBoundingBox( x - width, y - height );
         CalcBoundingBox( x + width, y + height );
 
         CalcBoundingBox( x - width, y - height );
         CalcBoundingBox( x + width, y + height );


@@ -853,7 +854,7 @@ void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord
                 "%d %d %d %d 0 360 ellipse\n"
                 "stroke\n",
                 XLOG2DEV(x + width / 2), YLOG2DEV(y + height / 2),
                 "%d %d %d %d 0 360 ellipse\n"
                 "stroke\n",
                 XLOG2DEV(x + width / 2), YLOG2DEV(y + height / 2),

-                XLOG2DEV(width / 2), YLOG2DEVREL(height / 2) );
+                XLOG2DEVREL(width / 2), YLOG2DEVREL(height / 2) );

 
         CalcBoundingBox( x - width, y - height );
         CalcBoundingBox( x + width, y + height );
 
         CalcBoundingBox( x - width, y - height );
         CalcBoundingBox( x + width, y + height );


@@ -938,87 +939,83 @@ void wxPostScriptDC::SetFont( const wxFont& font )
 
     m_font = font;
 
 
     m_font = font;
 

-    const char *name;
-    const char *style = "";

     int Style = m_font.GetStyle();
     int Weight = m_font.GetWeight();
 
     int Style = m_font.GetStyle();
     int Weight = m_font.GetWeight();
 

+    const char *name;

     switch (m_font.GetFamily())
     {
         case wxTELETYPE:
         case wxMODERN:
     switch (m_font.GetFamily())
     {
         case wxTELETYPE:
         case wxMODERN:

-            name = "/Courier";
-            break;
-        case wxSWISS:
-            name = "/Helvetica";
+        {
+            if (Style == wxITALIC)
+            {
+                if (Weight == wxBOLD)
+                    name = "/Courier-BoldOblique";
+                else
+                    name = "/Courier-Oblique";
+            }
+            else
+            {
+                if (Weight == wxBOLD)
+                    name = "/Courier-Bold";
+                else
+                    name = "/Courier";
+            }

             break;
             break;

+        }

         case wxROMAN:
         case wxROMAN:

-//          name = "/Times-Roman";
-            name = "/Times"; // Altered by EDZ
+        {
+            if (Style == wxITALIC)
+            {
+                if (Weight == wxBOLD)
+                    name = "/Times-BoldItalic";
+                else
+                    name = "/Times-Italic";
+            }
+            else
+            {
+                if (Weight == wxBOLD)
+                    name = "/Times-Bold";
+                else
+                    name = "/Times-Roman";
+            }

             break;
             break;

+        }

         case wxSCRIPT:
         case wxSCRIPT:

-            name = "/Zapf-Chancery-MediumItalic";
+        {
+            name = "/ZapfChancery-MediumItalic";

             Style  = wxNORMAL;
             Weight = wxNORMAL;
             break;
             Style  = wxNORMAL;
             Weight = wxNORMAL;
             break;

+        }
+        case wxSWISS:

         default:
         default:

-        case wxDEFAULT: // Sans Serif Font
-            name = "/LucidaSans";
-    }
-
-    if (Style == wxNORMAL && (Weight == wxNORMAL || Weight == wxLIGHT))
-    {
-        if (m_font.GetFamily () == wxROMAN)
-            style = "-Roman";
-        else
-            style = "";
-    }
-    else if (Style == wxNORMAL && Weight == wxBOLD)
-    {
-        style = "-Bold";
-    }
-    else if (Style == wxITALIC && (Weight == wxNORMAL || Weight == wxLIGHT))
-    {
-        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";
-    }
-    else if (Style == wxSLANT && (Weight == wxNORMAL || Weight == wxLIGHT))
-    {
-        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";
-    }
-    else
-    {
-        style = "";
+        {
+            if (Style == wxITALIC)
+            {
+                if (Weight == wxBOLD)
+                    name = "/Helvetica-BoldOblique";
+                else
+                    name = "/Helvetica-Oblique";
+            }
+            else
+            {
+                if (Weight == wxBOLD)
+                    name = "/Helvetica-Bold";
+                else
+                    name = "/Helvetica";
+            }
+            break;
+        }

     }
 
     }
 

-    char buffer[100];
-    strcpy( buffer, name );
-    strcat( buffer, style );
-
-    fprintf( m_pstream, buffer );
+    fprintf( m_pstream, name );

     fprintf( m_pstream, " reencodeISO def\n" );
     fprintf( m_pstream, " reencodeISO def\n" );

-    fprintf( m_pstream, buffer );
+    fprintf( m_pstream, name );

     fprintf( m_pstream, " findfont\n" );
 
     fprintf( m_pstream, " findfont\n" );
 

+    char buffer[100];

     sprintf( buffer, "%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
     sprintf( buffer, "%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


@@ -1871,8 +1868,6 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
     if (!fontToUse) fontToUse = (wxFont*) &m_font;
 
     wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") );
     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") );

 
     const wxWX2MBbuf strbuf = string.mb_str();
 
 
     const wxWX2MBbuf strbuf = string.mb_str();
 


@@ -1944,10 +1939,10 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
     double UnderlineThickness = 0.0;
 
     /* get actual parameters */
     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();
+    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 (Family!=lastFamily || Size!=lastSize || Style!=lastStyle || Weight!=lastWeight)
 
     /* if we have another font, read the font-metrics */
     if (Family!=lastFamily || Size!=lastSize || Style!=lastStyle || Weight!=lastWeight)


@@ -1963,29 +1958,37 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
         switch (Family)
         {
             case wxMODERN:
         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 = "CourO";
-                    else name = "Cour";
-                }
+            case wxTELETYPE:
+            {
+                if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "CourBoO.afm";
+                else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "CourBo.afm";
+                else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "CourO.afm";
+                else name = "Cour.afm";

                 break;
                 break;

+            }

             case wxROMAN:
             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 = "TimesBoO.afm";
+                else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "TimesBo.afm";
+                else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "TimesO.afm";
+                else name = "TimesRo.afm";

                 break;
                 break;

+            }
+            case wxSCRIPT:
+            {
+                name = "Zapf.afm";
+                Style = wxNORMAL;
+                Weight = wxNORMAL;
+            }
+            case wxSWISS:

             default:
             default:

-                {
-                    if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "HelvBoO";
-                    else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "HelvBo";
-                    else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "HelvO";
-                    else name = "Helv";
-                }
+            {
+                if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "HelvBoO.afm";
+                else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "HelvBo.afm";
+                else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "HelvO.afm";
+                else name = "Helv.afm";

                 break;
                 break;

+            }

         }
 
         /* get the directory of the AFM files */
         }
 
         /* get the directory of the AFM files */


@@ -2011,17 +2014,17 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
 
         /* new elements JC Sun Aug 25 23:21:44 MET DST 1996 */
 
 
         /* new elements JC Sun Aug 25 23:21:44 MET DST 1996 */
 

-        afmName << name << wxT(".afm");
+        afmName << name;

         FILE *afmFile = wxFopen(afmName,wxT("r"));
         FILE *afmFile = wxFopen(afmName,wxT("r"));

+        

         if (afmFile==NULL)
         {
            afmName = wxThePrintSetupData->GetAFMPath();
         if (afmFile==NULL)
         {
            afmName = wxThePrintSetupData->GetAFMPath();

-           afmName << wxFILE_SEP_PATH << name << wxT(".afm");
+           afmName << wxFILE_SEP_PATH << name;

            afmFile = wxFopen(afmName,wxT("r"));
         }
 
            afmFile = wxFopen(afmName,wxT("r"));
         }
 

-#ifdef __UNIX__
-#ifndef __VMS__
+#if defined(__UNIX__) && !defined(__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
        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


@@ -2031,11 +2034,14 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
            afmName <<  wxFILE_SEP_PATH
                    << wxT("share") << wxFILE_SEP_PATH
                    << wxT("wx") << wxFILE_SEP_PATH
            afmName <<  wxFILE_SEP_PATH
                    << wxT("share") << wxFILE_SEP_PATH
                    << wxT("wx") << wxFILE_SEP_PATH

+#if defined(__LINUX__) || defined(__FREEBSD__)
+                   << wxT("gs_afm") << wxFILE_SEP_PATH
+#else

                    << wxT("afm") << wxFILE_SEP_PATH
                    << wxT("afm") << wxFILE_SEP_PATH

-                   << name << wxT(".afm");
+#endif
+                   << name;

            afmFile = wxFopen(afmName,wxT("r"));
         }
            afmFile = wxFopen(afmName,wxT("r"));
         }

-#endif

 #endif
 
         if (afmFile==NULL)
 #endif
 
         if (afmFile==NULL)


@@ -2152,7 +2158,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
        /  is done by adding the widths of the characters in the
        /  string. they are given in 1/1000 of the size! */
 
        /  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++)
     wxCoord height=Size; /* by default */
     unsigned char *p;
     for(p=(unsigned char *)wxMBSTRINGCAST strbuf; *p; p++)


@@ -2160,14 +2166,18 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
         if(lastWidths[*p]== INT_MIN)
         {
             wxLogDebug(wxT("GetTextExtent: undefined width for character '%hc' (%d)\n"), *p,*p);
         if(lastWidths[*p]== INT_MIN)
         {
             wxLogDebug(wxT("GetTextExtent: undefined width for character '%hc' (%d)\n"), *p,*p);

-            widthSum += (lastWidths[' ']/1000.0F * Size); /* assume space */
+            sum += lastWidths[' ']; /* assume space */

         }
         else
         {
         }
         else
         {

-            widthSum += ((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)
     //{
     /* add descender to height (it is usually a negative value) */
     //if (lastDescender != INT_MIN)
     //{