X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11c7d5b6d1cb54d5ffdc11d8ff092b41e225bfb6..40d4efa81ed4e1093973177b1ad4087f149f76f3:/src/msw/fontutil.cpp?ds=sidebyside diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp index 10e1d82f7e..a885dcb794 100644 --- a/src/msw/fontutil.cpp +++ b/src/msw/fontutil.cpp @@ -6,7 +6,7 @@ // Created: 05.11.99 // RCS-ID: $Id$ // Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "fontutil.h" #endif @@ -32,6 +32,7 @@ #include "wx/string.h" #include "wx/log.h" #include "wx/intl.h" + #include "wx/encinfo.h" #endif //WX_PRECOMP #include "wx/msw/private.h" @@ -41,6 +42,11 @@ #include "wx/tokenzr.h" +// for MSVC5 and old w32api +#ifndef HANGUL_CHARSET +# define HANGUL_CHARSET 129 +#endif + // ============================================================================ // implementation // ============================================================================ @@ -50,21 +56,45 @@ // ---------------------------------------------------------------------------- // 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(); + + // 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) ) + { + // 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(); - if ( !facename ) - return FALSE; 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 @@ -72,19 +102,33 @@ bool wxNativeEncodingInfo::FromString(const wxString& s) if ( wxSscanf(tmp, _T("%u"), &charset) != 1 ) { // should be a number! - return FALSE; + return false; } } - return TRUE; + return true; } wxString wxNativeEncodingInfo::ToString() const { - wxString s(facename); + wxString s; + + 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 + << _T(';') << facename; + + // ANSI_CHARSET is assumed anyhow if ( charset != ANSI_CHARSET ) { - s << _T(';') << charset; + s << _T(';') << charset; } return s; @@ -97,64 +141,21 @@ wxString wxNativeEncodingInfo::ToString() const bool wxGetNativeFontEncoding(wxFontEncoding encoding, wxNativeEncodingInfo *info) { - wxCHECK_MSG( info, FALSE, _T("bad pointer in wxGetNativeFontEncoding") ); + wxCHECK_MSG( info, false, _T("bad pointer in wxGetNativeFontEncoding") ); 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__) - 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; -#endif // !Win16 + extern WXDLLIMPEXP_BASE long wxEncodingToCharset(wxFontEncoding encoding); + info->charset = wxEncodingToCharset(encoding); + if ( info->charset == -1 ) + return false; - case wxFONTENCODING_CP437: - info->charset = OEM_CHARSET; - break; + info->encoding = encoding; - default: - // no way to translate this encoding into a Windows charset - return FALSE; - } - - return TRUE; + return true; } bool wxTestFontEncoding(const wxNativeEncodingInfo& info) @@ -163,276 +164,135 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info) LOGFONT lf; wxZeroMemory(lf); // all default values - lf.lfCharSet = info.charset; - strncpy(lf.lfFaceName, info.facename, sizeof(lf.lfFaceName)); + lf.lfCharSet = (BYTE)info.charset; + wxStrncpy(lf.lfFaceName, info.facename, WXSIZEOF(lf.lfFaceName)); HFONT hfont = ::CreateFontIndirect(&lf); if ( !hfont ) { // no such font - return FALSE; + return false; } ::DeleteObject((HGDIOBJ)hfont); - return TRUE; + return true; } // ---------------------------------------------------------------------------- -// wxFont <-> LOGFONT conversion +// wxFontEncoding <-> CHARSET_XXX // ---------------------------------------------------------------------------- -void wxFillLogFont(LOGFONT *logFont, const wxFont *font) +wxFontEncoding wxGetFontEncFromCharSet(int cs) { - int ff_family; - wxString ff_face; + wxFontEncoding fontEncoding; - switch ( font->GetFamily() ) + switch ( cs ) { - case wxSCRIPT: - ff_family = FF_SCRIPT; - ff_face = _T("Script"); - break; + default: + wxFAIL_MSG( _T("unexpected Win32 charset") ); + // fall through and assume the system charset - case wxDECORATIVE: - ff_family = FF_DECORATIVE; + case DEFAULT_CHARSET: + fontEncoding = wxFONTENCODING_SYSTEM; break; - case wxROMAN: - ff_family = FF_ROMAN; - ff_face = _T("Times New Roman"); + case ANSI_CHARSET: + fontEncoding = wxFONTENCODING_CP1252; break; - case wxTELETYPE: - case wxMODERN: - ff_family = FF_MODERN; - ff_face = _T("Courier New"); + case SYMBOL_CHARSET: + // what can we do here? + fontEncoding = wxFONTENCODING_MAX; break; - case wxSWISS: - ff_family = FF_SWISS; - ff_face = _T("Arial"); +#if defined(__WIN32__) && !defined(__WXMICROWIN__) + case EASTEUROPE_CHARSET: + fontEncoding = wxFONTENCODING_CP1250; break; - case wxDEFAULT: - default: - ff_family = FF_SWISS; - ff_face = _T("MS Sans Serif"); - } - - BYTE ff_italic; - switch ( font->GetStyle() ) - { - case wxITALIC: - case wxSLANT: - ff_italic = 1; + case BALTIC_CHARSET: + fontEncoding = wxFONTENCODING_CP1257; 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; + case RUSSIAN_CHARSET: + fontEncoding = wxFONTENCODING_CP1251; break; - case wxLIGHT: - ff_weight = FW_LIGHT; + case ARABIC_CHARSET: + fontEncoding = wxFONTENCODING_CP1256; break; - case wxBOLD: - ff_weight = FW_BOLD; + case GREEK_CHARSET: + fontEncoding = wxFONTENCODING_CP1253; break; - } - -#if 0 - HDC dc = ::GetDC(NULL); - int ppInch = ::GetDeviceCaps(dc, LOGPIXELSY); - ::ReleaseDC(NULL, dc); -#else - // 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 // 0/1 - -#if wxFONT_SIZE_COMPATIBILITY - // Incorrect, but compatible with old wxWindows behaviour - int nHeight = (font->GetPointSize()*ppInch/72); -#else - // Correct for Windows compatibility - int nHeight = - (font->GetPointSize()*ppInch/72); -#endif - wxString facename = font->GetFaceName(); - if ( !!facename ) - { - ff_face = facename; - } - //else: ff_face is a reasonable default facename for this font family - - // deal with encoding now - wxNativeEncodingInfo info; - wxFontEncoding encoding = font->GetEncoding(); - if ( !wxGetNativeFontEncoding(encoding, &info) ) - { - if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) ) - { - // unsupported encoding, replace with the default - info.charset = ANSI_CHARSET; - } - } - - if ( !info.facename.IsEmpty() ) - { - // the facename determined by the encoding overrides everything else - ff_face = info.facename; - } - - // 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)); -} - -wxFont wxCreateFontFromLogFont(const LOGFONT *logFont) -{ - // extract family from pitch-and-family - int lfFamily = logFont->lfPitchAndFamily; - if ( lfFamily & FIXED_PITCH ) - lfFamily -= FIXED_PITCH; - if ( lfFamily & VARIABLE_PITCH ) - lfFamily -= VARIABLE_PITCH; - - int fontFamily; - switch ( lfFamily ) - { - case FF_ROMAN: - fontFamily = wxROMAN; + case HEBREW_CHARSET: + fontEncoding = wxFONTENCODING_CP1255; break; - case FF_SWISS: - fontFamily = wxSWISS; + case TURKISH_CHARSET: + fontEncoding = wxFONTENCODING_CP1254; break; - case FF_SCRIPT: - fontFamily = wxSCRIPT; + case THAI_CHARSET: + fontEncoding = wxFONTENCODING_CP874; break; - case FF_MODERN: - fontFamily = wxMODERN; + case SHIFTJIS_CHARSET: + fontEncoding = wxFONTENCODING_CP932; break; - case FF_DECORATIVE: - fontFamily = wxDECORATIVE; + case GB2312_CHARSET: + fontEncoding = wxFONTENCODING_CP936; break; - default: - fontFamily = wxSWISS; - } - - // weight and style - int fontWeight = wxNORMAL; - switch ( logFont->lfWeight ) - { - case FW_LIGHT: - fontWeight = wxLIGHT; + case HANGUL_CHARSET: + fontEncoding = wxFONTENCODING_CP949; break; - default: - case FW_NORMAL: - fontWeight = wxNORMAL; + case CHINESEBIG5_CHARSET: + fontEncoding = wxFONTENCODING_CP950; break; - case FW_BOLD: - fontWeight = wxBOLD; +#endif // Win32 + + case OEM_CHARSET: + fontEncoding = wxFONTENCODING_CP437; break; } - int fontStyle = logFont->lfItalic ? wxITALIC : wxNORMAL; - - bool fontUnderline = logFont->lfUnderline != 0; - - wxString fontFace = logFont->lfFaceName; - - // font size - HDC dc = ::GetDC(NULL); + return fontEncoding; +} - // remember that 1pt = 1/72inch - int height = abs(logFont->lfHeight); - int fontPoints = (72*height)/GetDeviceCaps(dc, LOGPIXELSY); +// ---------------------------------------------------------------------------- +// wxFont <-> LOGFONT conversion +// ---------------------------------------------------------------------------- - ::ReleaseDC(NULL, dc); +void wxFillLogFont(LOGFONT *logFont, const wxFont *font) +{ + wxNativeFontInfo fi; - wxFontEncoding fontEncoding; - switch ( logFont->lfCharSet ) + // maybe we already have LOGFONT for this font? + const wxNativeFontInfo *pFI = font->GetNativeFontInfo(); + if ( !pFI ) { - default: - wxFAIL_MSG(wxT("unsupported charset")); - // fall through - - case ANSI_CHARSET: - fontEncoding = wxFONTENCODING_CP1252; - break; + // use wxNativeFontInfo methods to build a LOGFONT for this font + fi.InitFromFont(*font); - 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; + pFI = &fi; + } - case HEBREW_CHARSET: - fontEncoding = wxFONTENCODING_CP1255; - break; + // transfer all the data to LOGFONT + *logFont = pFI->lf; +} - case TURKISH_CHARSET: - fontEncoding = wxFONTENCODING_CP1254; - break; +wxFont wxCreateFontFromLogFont(const LOGFONT *logFont) +{ + wxNativeFontInfo info; - case OEM_CHARSET: - fontEncoding = wxFONTENCODING_CP437; - break; - } + info.lf = *logFont; - return wxFont(fontPoints, fontFamily, fontStyle, - fontWeight, fontUnderline, fontFace, - fontEncoding); + return wxFont(info); } -