X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b82d89473972919c10d264efc94dd1ea4d64d9f..94e2ed3b8db0220160c0b939782cd46914ec073a:/src/msw/fontutil.cpp?ds=inline diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp index 04ad8a0548..22d308ceec 100644 --- a/src/msw/fontutil.cpp +++ b/src/msw/fontutil.cpp @@ -41,12 +41,6 @@ #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 // ============================================================================ @@ -94,7 +88,7 @@ bool wxNativeEncodingInfo::FromString(const wxString& s) wxString wxNativeEncodingInfo::ToString() const { wxString s; - + s << (long)encoding << _T(';') << facename; if ( charset != ANSI_CHARSET ) { @@ -129,7 +123,7 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, info->charset = ANSI_CHARSET; break; -#if !defined(__WIN16__) +#if !defined(__WIN16__) && !defined(__WXMICROWIN__) case wxFONTENCODING_CP1250: info->charset = EASTEUROPE_CHARSET; break; @@ -173,7 +167,7 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, } info->encoding = encoding; - + return TRUE; } @@ -198,6 +192,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; + +#if defined(__WIN32__) && !defined(__WXMICROWIN__) + 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 // ---------------------------------------------------------------------------- @@ -276,24 +333,28 @@ void wxFillLogFont(LOGFONT *logFont, const wxFont *font) break; } -#if wxUSE_SCREEN_DPI - HDC dc = ::GetDC(NULL); - static const int ppInch = ::GetDeviceCaps(dc, LOGPIXELSY); - ::ReleaseDC(NULL, dc); -#else + // 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 // 0/1 +#endif // 1/0 + int pointSize = font->GetPointSize(); #if wxFONT_SIZE_COMPATIBILITY // Incorrect, but compatible with old wxWindows behaviour - int nHeight = (font->GetPointSize()*ppInch/72); + int nHeight = (pointSize*ppInch)/72; #else // Correct for Windows compatibility -// int nHeight = - (font->GetPointSize()*ppInch/72); - int nHeight = - (int) ( (font->GetPointSize()*((double)ppInch)/72.0) + 0.5); + int nHeight = -(int)((pointSize*((double)ppInch)/72.0) + 0.5); #endif wxString facename = font->GetFaceName(); @@ -308,7 +369,9 @@ void wxFillLogFont(LOGFONT *logFont, const wxFont *font) wxFontEncoding encoding = font->GetEncoding(); if ( !wxGetNativeFontEncoding(encoding, &info) ) { +#if wxUSE_FONTMAP if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) ) +#endif // wxUSE_FONTMAP { // unsupported encoding, replace with the default info.charset = ANSI_CHARSET; @@ -340,129 +403,10 @@ void wxFillLogFont(LOGFONT *logFont, const wxFont *font) 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; - break; - - case FF_SWISS: - fontFamily = wxSWISS; - break; - - case FF_SCRIPT: - fontFamily = wxSCRIPT; - break; - - case FF_MODERN: - fontFamily = wxMODERN; - break; - - case FF_DECORATIVE: - fontFamily = wxDECORATIVE; - break; + wxNativeFontInfo info; - default: - fontFamily = wxSWISS; - } - - // weight and style - int fontWeight = wxNORMAL; - switch ( logFont->lfWeight ) - { - case FW_LIGHT: - fontWeight = wxLIGHT; - break; - - default: - case FW_NORMAL: - fontWeight = wxNORMAL; - break; - - case FW_BOLD: - fontWeight = wxBOLD; - break; - } - - int fontStyle = logFont->lfItalic ? wxITALIC : wxNORMAL; - - bool fontUnderline = logFont->lfUnderline != 0; - - wxString fontFace = logFont->lfFaceName; - - // remember that 1pt = 1/72inch - int height = abs(logFont->lfHeight); - -#if wxUSE_SCREEN_DPI - HDC dc = ::GetDC(NULL); - static const int ppInch = GetDeviceCaps(dc, LOGPIXELSY); - ::ReleaseDC(NULL, dc); -#else - static const int ppInch = 96; -#endif - int fontPoints = (int) (((72.0*((double)height))/(double) ppInch) + 0.5); + info.lf = *logFont; - 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; - - case THAI_CHARSET: - fontEncoding = wxFONTENCODING_CP437; - break; -#endif - - case OEM_CHARSET: - fontEncoding = wxFONTENCODING_CP437; - break; - } - - return wxFont(fontPoints, fontFamily, fontStyle, - fontWeight, fontUnderline, fontFace, - fontEncoding); + return wxFont(info); } -