X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6aea1e4a7067d8e7cbac03833b64a363baefcb16..4e15d1caa03346c126015019c1fdf093033ef40b:/src/gtk/font.cpp diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index 7c678b3fb6..f2e48c3ca8 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); @@ -93,11 +92,8 @@ protected: void InitFromNative(); private: - wxFontEncoding m_encoding; - bool m_underlined; - bool m_noAA; // No anti-aliasing - - // The native font info: basically a PangoFontDescription + // The native font info: basically a PangoFontDescription, plus + // 'underlined' and 'strikethrough' attributes not supported by Pango. wxNativeFontInfo m_nativeFontInfo; friend class wxFont; @@ -114,26 +110,20 @@ void wxFontRefData::Init(int pointSize, wxFontStyle style, wxFontWeight weight, bool underlined, + bool strikethrough, const wxString& faceName, - wxFontEncoding encoding) + wxFontEncoding WXUNUSED(encoding)) { if (family == wxFONTFAMILY_DEFAULT) family = wxFONTFAMILY_SWISS; - m_underlined = underlined; - m_encoding = encoding; - if ( m_encoding == wxFONTENCODING_DEFAULT ) - m_encoding = wxFont::GetDefaultEncoding(); - - m_noAA = false; - // Create native font info m_nativeFontInfo.description = pango_font_description_new(); // And set its values if (!faceName.empty()) { - pango_font_description_set_family( m_nativeFontInfo.description, + pango_font_description_set_family( m_nativeFontInfo.description, wxGTK_CONV_SYS(faceName) ); } else @@ -146,12 +136,12 @@ void wxFontRefData::Init(int pointSize, ? wxDEFAULT_FONT_SIZE : pointSize ); SetWeight( weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight ); + SetUnderlined( underlined ); + SetStrikethrough( strikethrough ); } void wxFontRefData::InitFromNative() { - m_noAA = false; - // Get native info PangoFontDescription *desc = m_nativeFontInfo.description; @@ -159,21 +149,11 @@ void wxFontRefData::InitFromNative() int pango_size = pango_font_description_get_size( desc ); if (pango_size == 0) m_nativeFontInfo.SetPointSize(wxDEFAULT_FONT_SIZE); - - // Pango description are never underlined - m_underlined = false; - - // always with GTK+ 2 - m_encoding = wxFONTENCODING_UTF8; } wxFontRefData::wxFontRefData( const wxFontRefData& data ) : wxGDIRefData() { - m_underlined = data.m_underlined; - m_encoding = data.m_encoding; - m_noAA = data.m_noAA; - // Forces a copy of the internal data. wxNativeFontInfo should probably // have a copy ctor and assignment operator to fix this properly but that // would break binary compatibility... @@ -181,11 +161,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) @@ -230,7 +210,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; @@ -254,12 +234,12 @@ void wxFontRefData::SetWeight(wxFontWeight weight) void wxFontRefData::SetUnderlined(bool underlined) { - m_underlined = underlined; + m_nativeFontInfo.SetUnderlined(underlined); +} - // the Pango font descriptor does not have an underlined attribute - // (and wxNativeFontInfo::SetUnderlined asserts); rather it's - // wxWindowDCImpl::DoDrawText that handles underlined fonts, so we - // here we just need to save the underlined attribute +void wxFontRefData::SetStrikethrough(bool strikethrough) +{ + m_nativeFontInfo.SetStrikethrough(strikethrough); } bool wxFontRefData::SetFaceName(const wxString& facename) @@ -267,13 +247,9 @@ bool wxFontRefData::SetFaceName(const wxString& facename) return m_nativeFontInfo.SetFaceName(facename); } -void wxFontRefData::SetEncoding(wxFontEncoding encoding) +void wxFontRefData::SetEncoding(wxFontEncoding WXUNUSED(encoding)) { - m_encoding = encoding; - - // the internal Pango encoding is always UTF8; here we save the - // encoding just to make it possible to return it from GetEncoding() - // FIXME: this seems wrong; shouldn't GetEncoding() always return wxFONTENCODING_UTF8? + // with GTK+ 2 Pango always uses UTF8 internally, we cannot change it } void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info) @@ -288,8 +264,6 @@ void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info) // wxFont creation // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - wxFont::wxFont(const wxNativeFontInfo& info) { Create( info.GetPointSize(), @@ -299,6 +273,23 @@ wxFont::wxFont(const wxNativeFontInfo& info) info.GetUnderlined(), info.GetFaceName(), info.GetEncoding() ); + + if ( info.GetStrikethrough() ) + SetStrikethrough(true); +} + +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), + GetStrikethroughFromFlags(flags), + face, encoding); } bool wxFont::Create( int pointSize, @@ -312,7 +303,7 @@ bool wxFont::Create( int pointSize, UnRef(); m_refData = new wxFontRefData(pointSize, family, style, weight, - underlined, face, encoding); + underlined, false, face, encoding); return true; } @@ -354,10 +345,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(); } @@ -379,21 +368,22 @@ bool wxFont::GetUnderlined() const { wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); - return M_FONTDATA->m_underlined; + return M_FONTDATA->m_nativeFontInfo.GetUnderlined(); } -wxFontEncoding wxFont::GetEncoding() const +bool wxFont::GetStrikethrough() const { - wxCHECK_MSG( IsOk(), wxFONTENCODING_SYSTEM, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); - return M_FONTDATA->m_encoding; + return M_FONTDATA->m_nativeFontInfo.GetStrikethrough(); } -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 @@ -457,25 +447,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 @@ -487,3 +477,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; +}