X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e528b997e87057723d1b823dd86e3f69ebb672b..c13cace12594b37706e9520a6fbd602c949f8127:/src/msw/fontutil.cpp

diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp
index 87acd82949..a5b4de99d7 100644
--- a/src/msw/fontutil.cpp
+++ b/src/msw/fontutil.cpp
@@ -41,6 +41,12 @@
 
 #include "wx/tokenzr.h"
 
+// If 1, use the screen resolution to calculate font sizes.
+// This is OK for screen fonts but might have implications when the
+// same font is used for printing.
+// If 0, assume 96 DPI.
+#define wxUSE_SCREEN_DPI 1
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -50,12 +56,18 @@
 // ----------------------------------------------------------------------------
 
 // convert to/from the string representation: format is
-//      facename[;charset]
+//      encodingid;facename[;charset]
 
 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {
     wxStringTokenizer tokenizer(s, _T(";"));
 
+    wxString encid = tokenizer.GetNextToken();
+    long enc;
+    if ( !encid.ToLong(&enc) )
+        return FALSE;
+    encoding = (wxFontEncoding)enc;
+
     facename = tokenizer.GetNextToken();
     if ( !facename )
         return FALSE;
@@ -81,10 +93,12 @@ bool wxNativeEncodingInfo::FromString(const wxString& s)
 
 wxString wxNativeEncodingInfo::ToString() const
 {
-    wxString s(facename);
+    wxString s;
+
+    s << (long)encoding << _T(';') << facename;
     if ( charset != ANSI_CHARSET )
     {
-        s << _T(';') << charset;
+         s << _T(';') << charset;
     }
 
     return s;
@@ -143,6 +157,10 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
         case wxFONTENCODING_CP1257:
             info->charset = BALTIC_CHARSET;
             break;
+
+        case wxFONTENCODING_CP874:
+            info->charset = THAI_CHARSET;
+            break;
 #endif // !Win16
 
         case wxFONTENCODING_CP437:
@@ -154,6 +172,8 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
             return FALSE;
     }
 
+    info->encoding = encoding;
+
     return TRUE;
 }
 
@@ -164,7 +184,7 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
     wxZeroMemory(lf);       // all default values
 
     lf.lfCharSet = info.charset;
-    strncpy(lf.lfFaceName, info.facename, sizeof(lf.lfFaceName));
+    wxStrncpy(lf.lfFaceName, info.facename, sizeof(lf.lfFaceName));
 
     HFONT hfont = ::CreateFontIndirect(&lf);
     if ( !hfont )
@@ -178,6 +198,69 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
     return TRUE;
 }
 
+// ----------------------------------------------------------------------------
+// wxFontEncoding <-> CHARSET_XXX
+// ----------------------------------------------------------------------------
+
+wxFontEncoding wxGetFontEncFromCharSet(int cs)
+{
+    wxFontEncoding fontEncoding;
+
+    switch ( cs )
+    {
+        default:
+            // JACS: Silently using ANSI_CHARSET
+            // apparently works for Chinese Windows. Assume it works
+            // for all/most other languages.
+            //wxFAIL_MSG(wxT("unsupported charset"));
+            // fall through
+
+        case ANSI_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1252;
+            break;
+
+#ifdef __WIN32__
+        case EASTEUROPE_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1250;
+            break;
+
+        case BALTIC_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1257;
+            break;
+
+        case RUSSIAN_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1251;
+            break;
+
+        case ARABIC_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1256;
+            break;
+
+        case GREEK_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1253;
+            break;
+
+        case HEBREW_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1255;
+            break;
+
+        case TURKISH_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1254;
+            break;
+
+        case THAI_CHARSET:
+            fontEncoding = wxFONTENCODING_CP437;
+            break;
+#endif // Win32
+
+        case OEM_CHARSET:
+            fontEncoding = wxFONTENCODING_CP437;
+            break;
+    }
+
+    return fontEncoding;
+}
+
 // ----------------------------------------------------------------------------
 // wxFont <-> LOGFONT conversion
 // ----------------------------------------------------------------------------
@@ -256,9 +339,9 @@ void wxFillLogFont(LOGFONT *logFont, const wxFont *font)
             break;
     }
 
-#if 0
+#if wxUSE_SCREEN_DPI
     HDC dc = ::GetDC(NULL);
-    int ppInch = ::GetDeviceCaps(dc, LOGPIXELSY);
+    static const int ppInch = ::GetDeviceCaps(dc, LOGPIXELSY);
     ::ReleaseDC(NULL, dc);
 #else
     // New behaviour: apparently ppInch varies according to Large/Small Fonts
@@ -272,7 +355,8 @@ void wxFillLogFont(LOGFONT *logFont, const wxFont *font)
     int nHeight = (font->GetPointSize()*ppInch/72);
 #else
     // Correct for Windows compatibility
-    int nHeight = - (font->GetPointSize()*ppInch/72);
+//    int nHeight = - (font->GetPointSize()*ppInch/72);
+    int nHeight = - (int) ( (font->GetPointSize()*((double)ppInch)/72.0) + 0.5);
 #endif
 
     wxString facename = font->GetFaceName();
@@ -377,64 +461,20 @@ wxFont wxCreateFontFromLogFont(const LOGFONT *logFont)
 
     wxString fontFace = logFont->lfFaceName;
 
-    // font size
-    HDC dc = ::GetDC(NULL);
-
     // remember that 1pt = 1/72inch
     int height = abs(logFont->lfHeight);
-    int fontPoints = (72*height)/GetDeviceCaps(dc, LOGPIXELSY);
 
+#if wxUSE_SCREEN_DPI
+    HDC dc = ::GetDC(NULL);
+    static const int ppInch = GetDeviceCaps(dc, LOGPIXELSY);
     ::ReleaseDC(NULL, dc);
-
-    wxFontEncoding fontEncoding;
-    switch ( logFont->lfCharSet )
-    {
-        default:
-            wxFAIL_MSG(wxT("unsupported charset"));
-            // fall through
-
-        case ANSI_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1252;
-            break;
-
-#ifdef __WIN32__
-        case EASTEUROPE_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1250;
-            break;
-
-        case BALTIC_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1257;
-            break;
-
-        case RUSSIAN_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1251;
-            break;
-
-        case ARABIC_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1256;
-            break;
-
-        case GREEK_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1253;
-            break;
-
-        case HEBREW_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1255;
-            break;
-
-        case TURKISH_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1254;
-            break;
+#else
+    static const int ppInch = 96;
 #endif
-
-        case OEM_CHARSET:
-            fontEncoding = wxFONTENCODING_CP437;
-            break;
-    }
+    int fontPoints = (int) (((72.0*((double)height))/(double) ppInch) + 0.5);
 
     return wxFont(fontPoints, fontFamily, fontStyle,
                   fontWeight, fontUnderline, fontFace,
-                  fontEncoding);
+                  wxGetFontEncFromCharSet(logFont->lfCharSet));
 }
 
-