missing commit

[wxWidgets.git] / src / msw / fontutil.cpp

diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp
index 22d308ceecc83a28559ef680f71c548b34f22fbe..f7c3952b154bc910f7f8ec572d95caf1c88486b3 100644 (file)
--- a/src/msw/fontutil.cpp
+++ b/src/msw/fontutil.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/fontutil.cpp
+// Name:        src/msw/fontutil.cpp

 // Purpose:     font-related helper functions for wxMSW
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     05.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Purpose:     font-related helper functions for wxMSW
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     05.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "fontutil.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,19 +24,25 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/fontutil.h"
+

 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"

+    #include "wx/wxcrtvararg.h"
+    #include "wx/msw/private.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/msw/private.h"
-
-#include "wx/fontutil.h"
+#include "wx/encinfo.h"

 #include "wx/fontmap.h"
 #include "wx/fontmap.h"

-

 #include "wx/tokenzr.h"
 
 #include "wx/tokenzr.h"
 

+// for MSVC5 and old w32api
+#ifndef HANGUL_CHARSET
+#    define HANGUL_CHARSET  129
+#endif
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -54,45 +56,75 @@
 
 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {
 
 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {

-    wxStringTokenizer tokenizer(s, _T(";"));
+    wxStringTokenizer tokenizer(s, wxT(";"));

 
     wxString encid = tokenizer.GetNextToken();
 
     wxString encid = tokenizer.GetNextToken();

+
+    // we support 2 formats: the old one (and still used if !wxUSE_FONTMAP)
+    // used the raw encoding values but the new one uses the encoding names

     long enc;
     long enc;

-    if ( !encid.ToLong(&enc) )
-        return FALSE;
-    encoding = (wxFontEncoding)enc;
+    if ( encid.ToLong(&enc) )
+    {
+        // old format, intepret as encoding -- but after minimal checks
+        if ( enc < 0 || enc >= wxFONTENCODING_MAX )
+            return false;
+
+        encoding = (wxFontEncoding)enc;
+    }
+    else // not a number, interpret as an encoding name
+    {
+#if wxUSE_FONTMAP
+        encoding = wxFontMapper::GetEncodingFromName(encid);
+        if ( encoding == wxFONTENCODING_MAX )
+#endif // wxUSE_FONTMAP
+        {
+            // failed to parse the name (or couldn't even try...)
+            return false;
+        }
+    }

 
     facename = tokenizer.GetNextToken();
 
     facename = tokenizer.GetNextToken();

-    if ( !facename )
-        return FALSE;

 
     wxString tmp = tokenizer.GetNextToken();
 
     wxString tmp = tokenizer.GetNextToken();

-    if ( !tmp )
+    if ( tmp.empty() )

     {
     {

-        // default charset (don't use DEFAULT_CHARSET though because of subtle
-        // Windows 9x/NT differences in handling it)
+        // default charset: but don't use DEFAULT_CHARSET here because it might
+        // be different from the machine on which the file we had read this
+        // encoding desc from was created

         charset = ANSI_CHARSET;
     }
     else
     {
         charset = ANSI_CHARSET;
     }
     else
     {

-        if ( wxSscanf(tmp, _T("%u"), &charset) != 1 )
+        if ( wxSscanf(tmp, wxT("%u"), &charset) != 1 )

         {
             // should be a number!
         {
             // should be a number!

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 wxString wxNativeEncodingInfo::ToString() const
 {
     wxString s;
 
 }
 
 wxString wxNativeEncodingInfo::ToString() const
 {
     wxString s;
 

-    s << (long)encoding << _T(';') << facename;
+    s
+#if wxUSE_FONTMAP
+      // use the encoding names as this is safer than using the numerical
+      // values which may change with time (because new encodings are
+      // inserted...)
+      << wxFontMapper::GetEncodingName(encoding)
+#else // !wxUSE_FONTMAP
+      // we don't have any choice but to use the raw value
+      << (long)encoding
+#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
+      << wxT(';') << facename;
+
+    // ANSI_CHARSET is assumed anyhow

     if ( charset != ANSI_CHARSET )
     {
     if ( charset != ANSI_CHARSET )
     {

-         s << _T(';') << charset;
+         s << wxT(';') << charset;

     }
 
     return s;
     }
 
     return s;


@@ -105,70 +137,21 @@ wxString wxNativeEncodingInfo::ToString() const
 bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                              wxNativeEncodingInfo *info)
 {
 bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                              wxNativeEncodingInfo *info)
 {

-    wxCHECK_MSG( info, FALSE, _T("bad pointer in wxGetNativeFontEncoding") );
+    wxCHECK_MSG( info, false, wxT("bad pointer in wxGetNativeFontEncoding") );

 
     if ( encoding == wxFONTENCODING_DEFAULT )
     {
         encoding = wxFont::GetDefaultEncoding();
     }
 
 
     if ( encoding == wxFONTENCODING_DEFAULT )
     {
         encoding = wxFont::GetDefaultEncoding();
     }
 

-    switch ( encoding )
-    {
-        // although this function is supposed to return an exact match, do do
-        // some mappings here for the most common case of "standard" encoding
-        case wxFONTENCODING_SYSTEM:
-        case wxFONTENCODING_ISO8859_1:
-        case wxFONTENCODING_ISO8859_15:
-        case wxFONTENCODING_CP1252:
-            info->charset = ANSI_CHARSET;
-            break;
-
-#if !defined(__WIN16__) && !defined(__WXMICROWIN__)
-        case wxFONTENCODING_CP1250:
-            info->charset = EASTEUROPE_CHARSET;
-            break;
-
-        case wxFONTENCODING_CP1251:
-            info->charset = RUSSIAN_CHARSET;
-            break;
-
-        case wxFONTENCODING_CP1253:
-            info->charset = GREEK_CHARSET;
-            break;
-
-        case wxFONTENCODING_CP1254:
-            info->charset = TURKISH_CHARSET;
-            break;
-
-        case wxFONTENCODING_CP1255:
-            info->charset = HEBREW_CHARSET;
-            break;
-
-        case wxFONTENCODING_CP1256:
-            info->charset = ARABIC_CHARSET;
-            break;
-
-        case wxFONTENCODING_CP1257:
-            info->charset = BALTIC_CHARSET;
-            break;
-
-        case wxFONTENCODING_CP874:
-            info->charset = THAI_CHARSET;
-            break;
-#endif // !Win16
-
-        case wxFONTENCODING_CP437:
-            info->charset = OEM_CHARSET;
-            break;
-
-        default:
-            // no way to translate this encoding into a Windows charset
-            return FALSE;
-    }
+    extern WXDLLIMPEXP_BASE long wxEncodingToCharset(wxFontEncoding encoding);
+    info->charset = wxEncodingToCharset(encoding);
+    if ( info->charset == -1 )
+        return false;

 
     info->encoding = encoding;
 
 
     info->encoding = encoding;
 

-    return TRUE;
+    return true;

 }
 
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
 }
 
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info)


@@ -177,19 +160,19 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
     LOGFONT lf;
     wxZeroMemory(lf);       // all default values
 
     LOGFONT lf;
     wxZeroMemory(lf);       // all default values
 

-    lf.lfCharSet = info.charset;
-    wxStrncpy(lf.lfFaceName, info.facename, sizeof(lf.lfFaceName));
+    lf.lfCharSet = (BYTE)info.charset;
+    wxStrlcpy(lf.lfFaceName, info.facename.c_str(), WXSIZEOF(lf.lfFaceName));

 
     HFONT hfont = ::CreateFontIndirect(&lf);
     if ( !hfont )
     {
         // no such font
 
     HFONT hfont = ::CreateFontIndirect(&lf);
     if ( !hfont )
     {
         // no such font

-        return FALSE;
+        return false;

     }
 
     ::DeleteObject((HGDIOBJ)hfont);
 
     }
 
     ::DeleteObject((HGDIOBJ)hfont);
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -203,16 +186,22 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs)
     switch ( cs )
     {
         default:
     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
+            wxFAIL_MSG( wxT("unexpected Win32 charset") );
+            // fall through and assume the system charset
+
+        case DEFAULT_CHARSET:
+            fontEncoding = wxFONTENCODING_SYSTEM;
+            break;

 
         case ANSI_CHARSET:
             fontEncoding = wxFONTENCODING_CP1252;
             break;
 
 
         case ANSI_CHARSET:
             fontEncoding = wxFONTENCODING_CP1252;
             break;
 

+        case SYMBOL_CHARSET:
+            // what can we do here?
+            fontEncoding = wxFONTENCODING_MAX;
+            break;
+

 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
         case EASTEUROPE_CHARSET:
             fontEncoding = wxFONTENCODING_CP1250;
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
         case EASTEUROPE_CHARSET:
             fontEncoding = wxFONTENCODING_CP1250;


@@ -243,162 +232,63 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs)
             break;
 
         case THAI_CHARSET:
             break;
 
         case THAI_CHARSET:

-            fontEncoding = wxFONTENCODING_CP437;
+            fontEncoding = wxFONTENCODING_CP874;

             break;
             break;

-#endif // Win32

 
 

-        case OEM_CHARSET:
-            fontEncoding = wxFONTENCODING_CP437;
+        case SHIFTJIS_CHARSET:
+            fontEncoding = wxFONTENCODING_CP932;

             break;
             break;

-    }
-
-    return fontEncoding;
-}
-
-// ----------------------------------------------------------------------------
-// wxFont <-> LOGFONT conversion
-// ----------------------------------------------------------------------------
-
-void wxFillLogFont(LOGFONT *logFont, const wxFont *font)
-{
-    int ff_family;
-    wxString ff_face;

 
 

-    switch ( font->GetFamily() )
-    {
-        case wxSCRIPT:
-            ff_family = FF_SCRIPT;
-            ff_face = _T("Script");
+        case GB2312_CHARSET:
+            fontEncoding = wxFONTENCODING_CP936;

             break;
 
             break;
 

-        case wxDECORATIVE:
-            ff_family = FF_DECORATIVE;
+        case HANGUL_CHARSET:
+            fontEncoding = wxFONTENCODING_CP949;

             break;
 
             break;
 

-        case wxROMAN:
-            ff_family = FF_ROMAN;
-            ff_face = _T("Times New Roman");
+        case CHINESEBIG5_CHARSET:
+            fontEncoding = wxFONTENCODING_CP950;

             break;
 
             break;
 

-        case wxTELETYPE:
-        case wxMODERN:
-            ff_family = FF_MODERN;
-            ff_face = _T("Courier New");
+        case VIETNAMESE_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1258;

             break;
 
             break;
 

-        case wxSWISS:
-            ff_family = FF_SWISS;
-            ff_face = _T("Arial");
+        case JOHAB_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1361;

             break;
 
             break;
 

-        case wxDEFAULT:
-        default:
-            ff_family = FF_SWISS;
-            ff_face = _T("MS Sans Serif");
-    }
+#endif // Win32

 
 

-    BYTE ff_italic;
-    switch ( font->GetStyle() )
-    {
-        case wxITALIC:
-        case wxSLANT:
-            ff_italic = 1;
+        case OEM_CHARSET:
+            fontEncoding = wxFONTENCODING_CP437;

             break;
             break;

-
-        default:
-            wxFAIL_MSG(wxT("unknown font slant"));
-            // fall through
-
-        case wxNORMAL:
-            ff_italic = 0;

     }
 
     }
 

-    int ff_weight;
-    switch ( font->GetWeight() )
-    {
-        default:
-            wxFAIL_MSG(_T("unknown font weight"));
-            // fall through
-
-        case wxNORMAL:
-            ff_weight = FW_NORMAL;
-            break;
-
-        case wxLIGHT:
-            ff_weight = FW_LIGHT;
-            break;
-
-        case wxBOLD:
-            ff_weight = FW_BOLD;
-            break;
-    }
+    return fontEncoding;
+}

 
 

-    // VZ: I'm reverting this as we clearly must use the real screen
-    //     resolution instead of hardcoded one or it surely will fail to work
-    //     in some cases.
-    //
-    //     If there are any problems with this code, please let me know about
-    //     it instead of reverting this change, thanks!
-#if 1 // wxUSE_SCREEN_DPI
-    const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
-#else // 0
-    // New behaviour: apparently ppInch varies according to Large/Small Fonts
-    // setting in Windows. This messes up fonts. So, set ppInch to a constant
-    // 96 dpi.
-    static const int ppInch = 96;
-#endif // 1/0
-
-    int pointSize = font->GetPointSize();
-#if wxFONT_SIZE_COMPATIBILITY
-    // Incorrect, but compatible with old wxWindows behaviour
-    int nHeight = (pointSize*ppInch)/72;
-#else
-    // Correct for Windows compatibility
-    int nHeight = -(int)((pointSize*((double)ppInch)/72.0) + 0.5);
-#endif
+// ----------------------------------------------------------------------------
+// wxFont <-> LOGFONT conversion
+// ----------------------------------------------------------------------------

 
 

-    wxString facename = font->GetFaceName();
-    if ( !!facename )
-    {
-        ff_face = facename;
-    }
-    //else: ff_face is a reasonable default facename for this font family
+void wxFillLogFont(LOGFONT *logFont, const wxFont *font)
+{
+    wxNativeFontInfo fi;

 
 

-    // deal with encoding now
-    wxNativeEncodingInfo info;
-    wxFontEncoding encoding = font->GetEncoding();
-    if ( !wxGetNativeFontEncoding(encoding, &info) )
+    // maybe we already have LOGFONT for this font?
+    const wxNativeFontInfo *pFI = font->GetNativeFontInfo();
+    if ( !pFI )

     {
     {

-#if wxUSE_FONTMAP
-        if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
-#endif // wxUSE_FONTMAP
-        {
-            // unsupported encoding, replace with the default
-            info.charset = ANSI_CHARSET;
-        }
-    }
+        // use wxNativeFontInfo methods to build a LOGFONT for this font
+        fi.InitFromFont(*font);

 
 

-    if ( !info.facename.IsEmpty() )
-    {
-        // the facename determined by the encoding overrides everything else
-        ff_face = info.facename;
+        pFI = &fi;

     }
 
     // transfer all the data to LOGFONT
     }
 
     // transfer all the data to LOGFONT

-    logFont->lfHeight = nHeight;
-    logFont->lfWidth = 0;
-    logFont->lfEscapement = 0;
-    logFont->lfOrientation = 0;
-    logFont->lfWeight = ff_weight;
-    logFont->lfItalic = ff_italic;
-    logFont->lfUnderline = (BYTE)font->GetUnderlined();
-    logFont->lfStrikeOut = 0;
-    logFont->lfCharSet = info.charset;
-    logFont->lfOutPrecision = OUT_DEFAULT_PRECIS;
-    logFont->lfClipPrecision = CLIP_DEFAULT_PRECIS;
-    logFont->lfQuality = PROOF_QUALITY;
-    logFont->lfPitchAndFamily = DEFAULT_PITCH | ff_family;
-    wxStrncpy(logFont->lfFaceName, ff_face, WXSIZEOF(logFont->lfFaceName));
+    *logFont = pFI->lf;

 }
 
 wxFont wxCreateFontFromLogFont(const LOGFONT *logFont)
 }
 
 wxFont wxCreateFontFromLogFont(const LOGFONT *logFont)