X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ce58684a4e0624898d13fca835a2c047e90e83c..14722c43c30918cd8fbba956b50ac3426d2fe339:/src/gtk/font.cpp?ds=inline diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index 00ab666ccd..06260392d9 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -24,7 +24,6 @@ #include "wx/log.h" #include "wx/utils.h" #include "wx/settings.h" - #include "wx/cmndata.h" #include "wx/gdicmn.h" #endif @@ -53,6 +52,7 @@ public: wxFontStyle style = wxFONTSTYLE_NORMAL, wxFontWeight weight = wxFONTWEIGHT_NORMAL, bool underlined = false, + bool strikethrough = false, const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); @@ -70,12 +70,10 @@ public: void SetStyle(wxFontStyle style); void SetWeight(wxFontWeight weight); void SetUnderlined(bool underlined); + void SetStrikethrough(bool strikethrough); bool SetFaceName(const wxString& facename); void SetEncoding(wxFontEncoding encoding); - void SetNoAntiAliasing( bool no = true ) { m_noAA = no; } - bool GetNoAntiAliasing() const { return m_noAA; } - // and this one also modifies all the other font data fields void SetNativeFontInfo(const wxNativeFontInfo& info); @@ -86,6 +84,7 @@ protected: wxFontStyle style, wxFontWeight weight, bool underlined, + bool strikethrough, const wxString& faceName, wxFontEncoding encoding); @@ -94,8 +93,7 @@ protected: private: bool m_underlined; - bool m_noAA; // No anti-aliasing - + bool m_strikethrough; // The native font info: basically a PangoFontDescription wxNativeFontInfo m_nativeFontInfo; @@ -113,6 +111,7 @@ void wxFontRefData::Init(int pointSize, wxFontStyle style, wxFontWeight weight, bool underlined, + bool strikethrough, const wxString& faceName, wxFontEncoding WXUNUSED(encoding)) { @@ -120,7 +119,7 @@ void wxFontRefData::Init(int pointSize, family = wxFONTFAMILY_SWISS; m_underlined = underlined; - m_noAA = false; + m_strikethrough = strikethrough; // Create native font info m_nativeFontInfo.description = pango_font_description_new(); @@ -145,8 +144,6 @@ void wxFontRefData::Init(int pointSize, void wxFontRefData::InitFromNative() { - m_noAA = false; - // Get native info PangoFontDescription *desc = m_nativeFontInfo.description; @@ -157,13 +154,14 @@ void wxFontRefData::InitFromNative() // Pango description are never underlined m_underlined = false; + m_strikethrough = false; } wxFontRefData::wxFontRefData( const wxFontRefData& data ) : wxGDIRefData() { m_underlined = data.m_underlined; - m_noAA = data.m_noAA; + m_strikethrough = data.m_strikethrough; // Forces a copy of the internal data. wxNativeFontInfo should probably // have a copy ctor and assignment operator to fix this properly but that @@ -172,11 +170,11 @@ wxFontRefData::wxFontRefData( const wxFontRefData& data ) } wxFontRefData::wxFontRefData(int size, wxFontFamily family, wxFontStyle style, - wxFontWeight weight, bool underlined, + wxFontWeight weight, bool underlined, bool strikethrough, const wxString& faceName, wxFontEncoding encoding) { - Init(size, family, style, weight, underlined, faceName, encoding); + Init(size, family, style, weight, underlined, strikethrough, faceName, encoding); } wxFontRefData::wxFontRefData(const wxString& nativeFontInfoString) @@ -221,7 +219,7 @@ bool wxFontRefData::SetPixelSize(const wxSize& pixelSize) return false; } - pango_font_description_set_absolute_size( m_nativeFontInfo.description, + pango_font_description_set_absolute_size( m_nativeFontInfo.description, pixelSize.GetHeight() * PANGO_SCALE ); return true; @@ -253,6 +251,11 @@ void wxFontRefData::SetUnderlined(bool underlined) // here we just need to save the underlined attribute } +void wxFontRefData::SetStrikethrough(bool strikethrough) +{ + m_strikethrough = strikethrough; +} + bool wxFontRefData::SetFaceName(const wxString& facename) { return m_nativeFontInfo.SetFaceName(facename); @@ -275,8 +278,6 @@ void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info) // wxFont creation // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - wxFont::wxFont(const wxNativeFontInfo& info) { Create( info.GetPointSize(), @@ -288,6 +289,19 @@ wxFont::wxFont(const wxNativeFontInfo& info) info.GetEncoding() ); } +wxFont::wxFont(int pointSize, + wxFontFamily family, + int flags, + const wxString& face, + wxFontEncoding encoding) +{ + m_refData = new wxFontRefData(pointSize, family, + GetStyleFromFlags(flags), + GetWeightFromFlags(flags), + GetUnderlinedFromFlags(flags), + false, face, encoding); +} + bool wxFont::Create( int pointSize, wxFontFamily family, wxFontStyle style, @@ -299,7 +313,7 @@ bool wxFont::Create( int pointSize, UnRef(); m_refData = new wxFontRefData(pointSize, family, style, weight, - underlined, face, encoding); + underlined, false, face, encoding); return true; } @@ -341,10 +355,8 @@ wxString wxFont::GetFaceName() const return M_FONTDATA->m_nativeFontInfo.GetFaceName(); } -wxFontFamily wxFont::GetFamily() const +wxFontFamily wxFont::DoGetFamily() const { - wxCHECK_MSG( IsOk(), wxFONTFAMILY_MAX, wxT("invalid font") ); - return M_FONTDATA->m_nativeFontInfo.GetFamily(); } @@ -369,19 +381,19 @@ bool wxFont::GetUnderlined() const return M_FONTDATA->m_underlined; } -wxFontEncoding wxFont::GetEncoding() const +bool wxFont::GetStrikethrough() const { - wxCHECK_MSG( IsOk(), wxFONTENCODING_SYSTEM, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); - return wxFONTENCODING_UTF8; - // Pango always uses UTF8... see also SetEncoding() + return M_FONTDATA->m_strikethrough; } -bool wxFont::GetNoAntiAliasing() const +wxFontEncoding wxFont::GetEncoding() const { - wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTENCODING_SYSTEM, wxT("invalid font") ); - return M_FONTDATA->m_noAA; + return wxFONTENCODING_UTF8; + // Pango always uses UTF8... see also SetEncoding() } const wxNativeFontInfo *wxFont::GetNativeFontInfo() const @@ -445,25 +457,25 @@ void wxFont::SetUnderlined(bool underlined) M_FONTDATA->SetUnderlined(underlined); } -void wxFont::SetEncoding(wxFontEncoding encoding) +void wxFont::SetStrikethrough(bool strikethrough) { AllocExclusive(); - M_FONTDATA->SetEncoding(encoding); + M_FONTDATA->SetStrikethrough(strikethrough); } -void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info ) +void wxFont::SetEncoding(wxFontEncoding encoding) { AllocExclusive(); - M_FONTDATA->SetNativeFontInfo( info ); + M_FONTDATA->SetEncoding(encoding); } -void wxFont::SetNoAntiAliasing( bool no ) +void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info ) { AllocExclusive(); - M_FONTDATA->SetNoAntiAliasing( no ); + M_FONTDATA->SetNativeFontInfo( info ); } wxGDIRefData* wxFont::CreateGDIRefData() const @@ -475,3 +487,66 @@ wxGDIRefData* wxFont::CloneGDIRefData(const wxGDIRefData* data) const { return new wxFontRefData(*static_cast(data)); } + +bool wxFont::GTKSetPangoAttrs(PangoLayout* layout) const +{ + if (!IsOk() || !(GetUnderlined() || GetStrikethrough())) + return false; + + PangoAttrList* attrs = pango_attr_list_new(); + PangoAttribute* a; + + if (wx_pango_version_check(1,16,0)) + { + // a PangoLayout which has leading/trailing spaces with underlined font + // is not correctly drawn by this pango version: Pango won't underline the spaces. + // This can be a problem; e.g. wxHTML rendering of underlined text relies on + // this behaviour. To workaround this problem, we use a special hack here + // suggested by pango maintainer Behdad Esfahbod: we prepend and append two + // empty space characters and give them a dummy colour attribute. + // This will force Pango to underline the leading/trailing spaces, too. + + const char* text = pango_layout_get_text(layout); + const size_t n = strlen(text); + if ((n > 0 && text[0] == ' ') || (n > 1 && text[n - 1] == ' ')) + { + wxCharBuffer buf(n + 6); + // copy the leading U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format + memcpy(buf.data(), "\342\200\214", 3); + // copy the user string + memcpy(buf.data() + 3, text, n); + // copy the trailing U+200C ZERO WIDTH NON-JOINER encoded in UTF8 format + memcpy(buf.data() + 3 + n, "\342\200\214", 3); + + pango_layout_set_text(layout, buf, n + 6); + + // Add dummy attributes (use colour as it's invisible anyhow for 0 + // width spaces) to ensure that the spaces in the beginning/end of the + // string are underlined too. + a = pango_attr_foreground_new(0x0057, 0x52A9, 0xD614); + a->start_index = 0; + a->end_index = 3; + pango_attr_list_insert(attrs, a); + + a = pango_attr_foreground_new(0x0057, 0x52A9, 0xD614); + a->start_index = n + 3; + a->end_index = n + 6; + pango_attr_list_insert(attrs, a); + } + } + if (GetUnderlined()) + { + a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE); + pango_attr_list_insert(attrs, a); + } + if (GetStrikethrough()) + { + a = pango_attr_strikethrough_new(true); + pango_attr_list_insert(attrs, a); + } + + pango_layout_set_attributes(layout, attrs); + pango_attr_list_unref(attrs); + + return true; +}