X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d508a9d979ca5924979a53865fc5d4e38f16a07c..5778dedc92f6d31435aa1cda6846979a0e9ad35b:/src/msw/font.cpp diff --git a/src/msw/font.cpp b/src/msw/font.cpp index d8d678fe8f..b1e347d674 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -43,6 +43,7 @@ #include "wx/sysopt.h" #endif +#include "wx/scopeguard.h" #include "wx/tokenzr.h" #if wxUSE_EXTENDED_RTTI @@ -182,7 +183,19 @@ public: wxString GetFaceName() const { - return m_nativeFontInfo.GetFaceName(); + wxString facename = m_nativeFontInfo.GetFaceName(); + if ( facename.empty() ) + { + facename = GetMSWFaceName(); + if ( !facename.empty() ) + { + // cache the face name, it shouldn't change unless the family + // does and wxNativeFontInfo::SetFamily() resets the face name + const_cast(this)->SetFaceName(facename); + } + } + + return facename; } wxFontEncoding GetEncoding() const @@ -192,8 +205,7 @@ public: WXHFONT GetHFONT() const { - if ( !m_hFont ) - const_cast(this)->Alloc(); + AllocIfNeeded(); return (WXHFONT)m_hFont; } @@ -216,6 +228,9 @@ public: void SetPixelSize(const wxSize& pixelSize) { + wxCHECK_RET( pixelSize.GetWidth() >= 0, "negative font width" ); + wxCHECK_RET( pixelSize.GetHeight() != 0, "zero font height" ); + Free(); m_nativeFontInfo.SetPixelSize(pixelSize); @@ -265,7 +280,18 @@ public: } const wxNativeFontInfo& GetNativeFontInfo() const - { return m_nativeFontInfo; } + { + // we need to create the font now to get the corresponding LOGFONT if + // it hadn't been done yet + AllocIfNeeded(); + + // ensure that we have a valid face name in our font information: + // GetFaceName() will try to retrieve it from our HFONT and save it if + // it was successful + (void)GetFaceName(); + + return m_nativeFontInfo; + } void SetNativeFontInfo(const wxNativeFontInfo& nativeFontInfo) { @@ -288,6 +314,48 @@ protected: void Init(const wxNativeFontInfo& info, WXHFONT hFont = 0); + void AllocIfNeeded() const + { + if ( !m_hFont ) + const_cast(this)->Alloc(); + } + + // retrieve the face name really being used by the font: this is used to + // get the face name selected by the system when we don't specify it (but + // use just the family for example) + wxString GetMSWFaceName() const + { + ScreenHDC hdc; + SelectInHDC selectFont(hdc, m_hFont); + + UINT otmSize = GetOutlineTextMetrics(hdc, 0, NULL); + if ( !otmSize ) + { + wxLogLastError("GetOutlineTextMetrics(NULL)"); + return wxString(); + } + + OUTLINETEXTMETRIC * const + otm = static_cast(malloc(otmSize)); + wxON_BLOCK_EXIT1( free, otm ); + + otm->otmSize = otmSize; + if ( !GetOutlineTextMetrics(hdc, otmSize, otm) ) + { + wxLogLastError("GetOutlineTextMetrics()"); + return wxString(); + } + + // in spite of its type, the otmpFamilyName field of OUTLINETEXTMETRIC + // gives an offset in _bytes_ of the face (not family!) name from the + // struct start while the name itself is an array of TCHARs + // + // FWIW otmpFaceName contains the same thing as otmpFamilyName followed + // by a possible " Italic" or " Bold" or something else suffix + return reinterpret_cast(otm) + + wxPtrToUInt(otm->otmpFamilyName)/sizeof(wxChar); + } + // are we using m_nativeFontInfo.lf.lfHeight for point size or pixel size? bool m_sizeUsingPixels; @@ -503,13 +571,16 @@ void wxNativeFontInfo::SetPointSize(int pointsize) void wxNativeFontInfo::SetPixelSize(const wxSize& pixelSize) { - // NOTE: although the MSW port allows for negative pixel size heights, - // other ports don't and since it's a very useful feature assert - // here if we get a negative height: - wxCHECK_RET( pixelSize.GetWidth() >= 0 && pixelSize.GetHeight() > 0, - "Negative values for the pixel size or zero pixel height are not allowed" ); - - lf.lfHeight = pixelSize.GetHeight(); + // MSW accepts both positive and negative heights here but they mean + // different things: positive specifies the cell height while negative + // specifies the character height. We used to just pass the value to MSW + // unchanged but changed the behaviour for positive values in 2.9.1 to + // match other ports and, more importantly, the expected behaviour. So now + // passing the negative height doesn't make sense at all any more but we + // still accept it for compatibility with the existing code which worked + // around the wrong interpretation of the height argument in older wxMSW + // versions by passing a negative value explicitly itself. + lf.lfHeight = -abs(pixelSize.GetHeight()); lf.lfWidth = pixelSize.GetWidth(); } @@ -567,78 +638,39 @@ bool wxNativeFontInfo::SetFaceName(const wxString& facename) void wxNativeFontInfo::SetFamily(wxFontFamily family) { - BYTE ff_family; - wxArrayString facename; - - // the list of fonts associated with a family was partially - // taken from http://www.codestyle.org/css/font-family + BYTE ff_family = FF_DONTCARE; switch ( family ) { case wxFONTFAMILY_SCRIPT: ff_family = FF_SCRIPT; - facename.Add(wxS("Script")); - facename.Add(wxS("Brush Script MT")); - facename.Add(wxS("Comic Sans MS")); - facename.Add(wxS("Lucida Handwriting")); break; case wxFONTFAMILY_DECORATIVE: ff_family = FF_DECORATIVE; - facename.Add(wxS("Old English Text MT")); - facename.Add(wxS("Comic Sans MS")); - facename.Add(wxS("Lucida Handwriting")); break; case wxFONTFAMILY_ROMAN: ff_family = FF_ROMAN; - facename.Add(wxS("Times New Roman")); - facename.Add(wxS("Georgia")); - facename.Add(wxS("Garamond")); - facename.Add(wxS("Bookman Old Style")); - facename.Add(wxS("Book Antiqua")); break; case wxFONTFAMILY_TELETYPE: case wxFONTFAMILY_MODERN: ff_family = FF_MODERN; - facename.Add(wxS("Courier New")); - facename.Add(wxS("Lucida Console")); - facename.Add(wxS("Andale Mono")); - facename.Add(wxS("OCR A Extended")); - facename.Add(wxS("Terminal")); break; case wxFONTFAMILY_SWISS: + case wxFONTFAMILY_DEFAULT: ff_family = FF_SWISS; - facename.Add(wxS("Arial")); - facename.Add(wxS("Century Gothic")); - facename.Add(wxS("Lucida Sans Unicode")); - facename.Add(wxS("Tahoma")); - facename.Add(wxS("Trebuchet MS")); - facename.Add(wxS("Verdana")); break; - case wxFONTFAMILY_DEFAULT: - default: - { - // We want Windows 2000 or later to have new fonts even MS Shell Dlg - // is returned as default GUI font for compatibility - int verMaj; - ff_family = FF_SWISS; - if(wxGetOsVersion(&verMaj) == wxOS_WINDOWS_NT && verMaj >= 5) - facename.Add(wxS("MS Shell Dlg 2")); - else - facename.Add(wxS("MS Shell Dlg")); - - // Quoting the MSDN: - // "MS Shell Dlg is a mapping mechanism that enables - // U.S. English Microsoft Windows NT, and Microsoft Windows 2000 to - // support locales that have characters that are not contained in code - // page 1252. It is not a font but a face name for a nonexistent font." - } + case wxFONTFAMILY_UNKNOWN: + wxFAIL_MSG( "invalid font family" ); + return; } + wxCHECK_RET( ff_family != FF_DONTCARE, "unknown wxFontFamily" ); + lf.lfPitchAndFamily = (BYTE)(DEFAULT_PITCH) | ff_family; // reset the facename so that CreateFontIndirect() will automatically choose a @@ -753,7 +785,7 @@ bool wxNativeFontInfo::FromString(const wxString& s) return false; // the face name may be empty - wxStrcpy(lf.lfFaceName, tokenizer.GetNextToken()); + SetFaceName(tokenizer.GetNextToken()); return true; } @@ -1031,32 +1063,23 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const return IsOk() ? &(M_FONTDATA->GetNativeFontInfo()) : NULL; } -wxString wxFont::GetNativeFontInfoDesc() const -{ - wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); - - // be sure we have an HFONT associated... - const_cast(this)->RealizeResource(); - return wxFontBase::GetNativeFontInfoDesc(); -} - -wxString wxFont::GetNativeFontInfoUserDesc() const -{ - wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); - - // be sure we have an HFONT associated... - const_cast(this)->RealizeResource(); - return wxFontBase::GetNativeFontInfoUserDesc(); -} - bool wxFont::IsFixedWidth() const { wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); - // the two low-order bits specify the pitch of the font, the rest is - // family - BYTE pitch = - (BYTE)(M_FONTDATA->GetNativeFontInfo().lf.lfPitchAndFamily & PITCH_MASK); + // LOGFONT doesn't contain the correct pitch information so we need to call + // GetTextMetrics() to get it + ScreenHDC hdc; + SelectInHDC selectFont(hdc, M_FONTDATA->GetHFONT()); + + TEXTMETRIC tm; + if ( !::GetTextMetrics(hdc, &tm) ) + { + wxLogLastError(wxT("GetTextMetrics")); + return false; + } - return pitch == FIXED_PITCH; + // Quoting MSDN description of TMPF_FIXED_PITCH: "Note very carefully that + // those meanings are the opposite of what the constant name implies." + return !(tm.tmPitchAndFamily & TMPF_FIXED_PITCH); }