X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a23692f070dc2682defb005bd7287ad18091732a..d223107206e4dfa6768e0bc2455325dd49e4d2bb:/src/os2/fontutil.cpp?ds=sidebyside

diff --git a/src/os2/fontutil.cpp b/src/os2/fontutil.cpp
index 069b7d7f68..a1347e8a8e 100644
--- a/src/os2/fontutil.cpp
+++ b/src/os2/fontutil.cpp
@@ -6,7 +6,7 @@
 // Created:     01.03.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 #define DEBUG_PRINTF(NAME)   { static int raz=0; \
   printf( #NAME " %i\n",raz); fflush(stdout);       \
@@ -39,6 +39,7 @@
 
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"
+#include "wx/encinfo.h"
 
 #include "wx/tokenzr.h"
 
@@ -258,6 +259,44 @@ bool wxTestFontEncoding(
 // wxFont <-> LOGFONT conversion
 // ----------------------------------------------------------------------------
 
+void wxConvertVectorFontSize(
+  FIXED                             fxPointSize
+, PFATTRS                           pFattrs
+)
+{
+    HPS                             hPS;
+    HDC                             hDC;
+    LONG                            lXFontResolution;
+    LONG                            lYFontResolution;
+    SIZEF                           vSizef;
+
+    hPS = WinGetScreenPS(HWND_DESKTOP); // Screen presentation space
+
+    //
+    //   Query device context for the screen and then query
+    //   the resolution of the device for the device context.
+    //
+
+    hDC = GpiQueryDevice(hPS);
+    DevQueryCaps( hDC, CAPS_HORIZONTAL_FONT_RES, (LONG)1, &lXFontResolution);
+    DevQueryCaps( hDC, CAPS_VERTICAL_FONT_RES, (LONG)1, &lYFontResolution);
+
+    //
+    //   Calculate the size of the character box, based on the
+    //   point size selected and the resolution of the device.
+    //   The size parameters are of type FIXED, NOT int.
+    //   NOTE: 1 point == 1/72 of an inch.
+    //
+
+    vSizef.cx = (FIXED)(((fxPointSize) / 72 ) * lXFontResolution );
+    vSizef.cy = (FIXED)(((fxPointSize) / 72 ) * lYFontResolution );
+
+    pFattrs->lMaxBaselineExt = MAKELONG( HIUSHORT( vSizef.cy ), 0 );
+    pFattrs->lAveCharWidth   = MAKELONG( HIUSHORT( vSizef.cx ), 0 );
+    WinReleasePS(hPS);
+
+} // end of wxConvertVectorPointSize
+
 void wxFillLogFont(
   LOGFONT*                          pFattrs  // OS2 GPI FATTRS
 , PFACENAMEDESC                     pFaceName
@@ -327,8 +366,7 @@ void wxFillLogFont(
     // Initialize FATTR and FACENAMEDESC
     //
     pFattrs->usRecordLength = sizeof(FATTRS);
-    pFattrs->fsFontUse = FATTR_FONTUSE_OUTLINE |       // only outline fonts allowed
-                         FATTR_FONTUSE_TRANSFORMABLE;  // may be transformed
+    pFattrs->fsFontUse = FATTR_FONTUSE_OUTLINE;       // only outline fonts allowed
     pFattrs->fsType = 0;
     pFattrs->lMaxBaselineExt = pFattrs->lAveCharWidth = 0;
     pFattrs->idRegistry = 0;
@@ -354,7 +392,6 @@ void wxFillLogFont(
     // font, so now we need to generate an ID
     //
     long                            lNumLids = ::GpiQueryNumberSetIds(*phPS);
-    long                            lGpiError;
 
     if(lNumLids )
     {
@@ -427,17 +464,12 @@ void wxOS2SelectMatchingFontByName(
 )
 {
     int                             i;
-    int                             nDiff0;
     int                             nPointSize;
-    int                             nDiff;
     int                             nIs;
-    int                             nMinDiff;
     int                             nMinDiff0;
-    int                             nApirc;
     int                             anDiff[16];
     int                             anMinDiff[16];
     int                             nIndex = 0;
-    STR8                            zFn;
     char                            zFontFaceName[FACESIZE];
     wxString                        sFaceName;
     USHORT                          usWeightClass;
@@ -450,7 +482,7 @@ void wxOS2SelectMatchingFontByName(
     switch (pFont->GetFamily())
     {
         case wxSCRIPT:
-            sFaceName = wxT("Script");
+            sFaceName = wxT("Tms Rmn");
             break;
 
         case wxDECORATIVE:
@@ -458,15 +490,15 @@ void wxOS2SelectMatchingFontByName(
             break;
 
         case wxROMAN:
-            sFaceName = wxT("Times New Roman");
+            sFaceName = wxT("Tms Rmn");
             break;
 
         case wxTELETYPE:
-            sFaceName = wxT("Courier New") ;
+            sFaceName = wxT("Courier") ;
             break;
 
         case wxMODERN:
-            sFaceName = wxT("Courier New") ;
+            sFaceName = wxT("System VIO") ;
             break;
 
         case wxSWISS:
@@ -602,30 +634,24 @@ void wxOS2SelectMatchingFontByName(
     // Fill in the FATTRS with the best match from FONTMETRICS
     //
     pFattrs->usRecordLength  = sizeof(FATTRS);              // Sets size of structure
-    pFattrs->fsSelection     = pFM[nIndex].fsSelection;     // Uses default selection
     pFattrs->lMatch          = pFM[nIndex].lMatch;          // Force match
-    pFattrs->idRegistry      = pFM[nIndex].idRegistry;      // Uses default registry
-    pFattrs->usCodePage      = pFM[nIndex].usCodePage;      // Code-page
-    pFattrs->fsType          = 0;          // Uses default type
+    pFattrs->idRegistry      = 0;
+    pFattrs->usCodePage      = 0;
+    pFattrs->fsFontUse       = 0;
+    pFattrs->fsType          = 0;
     pFattrs->lMaxBaselineExt = 0;
     pFattrs->lAveCharWidth   = 0;
-    pFattrs->fsFontUse       = FATTR_FONTUSE_OUTLINE |      // only outline fonts allowed
-                               FATTR_FONTUSE_TRANSFORMABLE; // may be transformed
-#if 0
-    pFattrs->lMaxBaselineExt = pFM[nIndex].lMaxBaselineExt;
-    pFattrs->lAveCharWidth   = pFM[nIndex].lAveCharWidth;
-#endif
     wxStrcpy(pFattrs->szFacename, pFM[nIndex].szFacename);
-    // Debug
-    strcpy(zFontFaceName, pFM[nIndex].szFacename);
-    strcpy(zFontFaceName, pFattrs->szFacename);
+    if (pFont->GetWeight() == wxNORMAL)
+        pFattrs->fsSelection = 0;
+    else
+        pFattrs->fsSelection = FATTR_SEL_BOLD;
 
-    if(usWeightClass >= FWEIGHT_BOLD)
-        pFattrs->fsSelection |= FATTR_SEL_BOLD;
-    if(pFont->GetUnderlined())
-        pFattrs->fsSelection |= FATTR_SEL_UNDERSCORE;
-    if(fsSelection & FM_SEL_ITALIC)
+    if (pFont->GetStyle() == wxITALIC || pFont->GetStyle() == wxSLANT)
         pFattrs->fsSelection |= FATTR_SEL_ITALIC;
+
+    if (pFont->GetUnderlined())
+        pFattrs->fsSelection |= FATTR_SEL_UNDERSCORE;
 } // end of wxOS2SelectMatchingFontByName
 
 wxFont wxCreateFontFromLogFont(