X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..d485bda109d5ef0fef36a3f737549e9b9f54baab:/src/msw/fontutil.cpp?ds=sidebyside diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp index 1bff1940f7..f7c3952b15 100644 --- a/src/msw/fontutil.cpp +++ b/src/msw/fontutil.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/fontutil.cpp +// Name: src/msw/fontutil.cpp // Purpose: font-related helper functions for wxMSW // Author: Vadim Zeitlin // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "fontutil.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,17 +24,18 @@ #pragma hdrstop #endif +#include "wx/fontutil.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 -#include "wx/msw/private.h" - -#include "wx/fontutil.h" +#include "wx/encinfo.h" #include "wx/fontmap.h" - #include "wx/tokenzr.h" // for MSVC5 and old w32api @@ -59,13 +56,32 @@ bool wxNativeEncodingInfo::FromString(const wxString& s) { - wxStringTokenizer tokenizer(s, _T(";")); + wxStringTokenizer tokenizer(s, wxT(";")); 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; - 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(); @@ -79,26 +95,36 @@ bool wxNativeEncodingInfo::FromString(const wxString& s) } else { - if ( wxSscanf(tmp, _T("%u"), &charset) != 1 ) + if ( wxSscanf(tmp, wxT("%u"), &charset) != 1 ) { // should be a number! - return FALSE; + return false; } } - return TRUE; + return true; } 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 ) { - s << _T(';') << charset; + s << wxT(';') << charset; } return s; @@ -111,7 +137,7 @@ wxString wxNativeEncodingInfo::ToString() const 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 ) { @@ -121,11 +147,11 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, extern WXDLLIMPEXP_BASE long wxEncodingToCharset(wxFontEncoding encoding); info->charset = wxEncodingToCharset(encoding); if ( info->charset == -1 ) - return FALSE; + return false; info->encoding = encoding; - return TRUE; + return true; } bool wxTestFontEncoding(const wxNativeEncodingInfo& info) @@ -134,19 +160,19 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info) LOGFONT lf; wxZeroMemory(lf); // all default values - lf.lfCharSet = info.charset; - wxStrncpy(lf.lfFaceName, info.facename, WXSIZEOF(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 - return FALSE; + return false; } ::DeleteObject((HGDIOBJ)hfont); - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -160,7 +186,10 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs) switch ( cs ) { default: - // assume the system charset + wxFAIL_MSG( wxT("unexpected Win32 charset") ); + // fall through and assume the system charset + + case DEFAULT_CHARSET: fontEncoding = wxFONTENCODING_SYSTEM; break; @@ -168,6 +197,11 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs) 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; @@ -198,7 +232,7 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs) break; case THAI_CHARSET: - fontEncoding = wxFONTENCODING_CP437; + fontEncoding = wxFONTENCODING_CP874; break; case SHIFTJIS_CHARSET: @@ -217,6 +251,14 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs) fontEncoding = wxFONTENCODING_CP950; break; + case VIETNAMESE_CHARSET: + fontEncoding = wxFONTENCODING_CP1258; + break; + + case JOHAB_CHARSET: + fontEncoding = wxFONTENCODING_CP1361; + break; + #endif // Win32 case OEM_CHARSET: @@ -233,36 +275,20 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs) void wxFillLogFont(LOGFONT *logFont, const wxFont *font) { + wxNativeFontInfo fi; + // maybe we already have LOGFONT for this font? - wxNativeFontInfo *fontinfo = font->GetNativeFontInfo(); - if ( !fontinfo ) + const wxNativeFontInfo *pFI = font->GetNativeFontInfo(); + if ( !pFI ) { // use wxNativeFontInfo methods to build a LOGFONT for this font - fontinfo = new wxNativeFontInfo; - - // translate all font parameters - fontinfo->SetStyle((wxFontStyle)font->GetStyle()); - fontinfo->SetWeight((wxFontWeight)font->GetWeight()); - fontinfo->SetUnderlined(font->GetUnderlined()); - fontinfo->SetPointSize(font->GetPointSize()); - - // set the family/facename - fontinfo->SetFamily((wxFontFamily)font->GetFamily()); - wxString facename = font->GetFaceName(); - if ( !facename.empty() ) - { - fontinfo->SetFaceName(facename); - } + fi.InitFromFont(*font); - // deal with encoding now (it may override the font family and facename - // so do it after setting them) - fontinfo->SetEncoding(font->GetEncoding()); + pFI = &fi; } // transfer all the data to LOGFONT - *logFont = fontinfo->lf; - - delete fontinfo; + *logFont = pFI->lf; } wxFont wxCreateFontFromLogFont(const LOGFONT *logFont)