#include "wx/log.h"
#include "wx/utils.h"
#include "wx/settings.h"
- #include "wx/cmndata.h"
#include "wx/gdicmn.h"
#endif
wxFontStyle style = wxFONTSTYLE_NORMAL,
wxFontWeight weight = wxFONTWEIGHT_NORMAL,
bool underlined = false,
+ bool strikethrough = false,
const wxString& faceName = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
- // from XFLD
- wxFontRefData(const wxString& fontname);
+ wxFontRefData(const wxString& nativeFontInfoString);
// copy ctor
wxFontRefData( const wxFontRefData& data );
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);
wxFontStyle style,
wxFontWeight weight,
bool underlined,
+ bool strikethrough,
const wxString& faceName,
wxFontEncoding encoding);
void InitFromNative();
private:
- wxFontFamily m_family;
- 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;
wxFontStyle style,
wxFontWeight weight,
bool underlined,
+ bool strikethrough,
const wxString& faceName,
- wxFontEncoding encoding)
+ wxFontEncoding WXUNUSED(encoding))
{
- m_family = family == wxFONTFAMILY_DEFAULT ? wxFONTFAMILY_SWISS : family;
-
- m_underlined = underlined;
- m_encoding = encoding;
- if ( m_encoding == wxFONTENCODING_DEFAULT )
- m_encoding = wxFont::GetDefaultEncoding();
-
- m_noAA = false;
+ if (family == wxFONTFAMILY_DEFAULT)
+ family = wxFONTFAMILY_SWISS;
// 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
{
- switch (m_family)
- {
- case wxFONTFAMILY_MODERN:
- case wxFONTFAMILY_TELETYPE:
- pango_font_description_set_family( m_nativeFontInfo.description, "monospace" );
- break;
- case wxFONTFAMILY_ROMAN:
- pango_font_description_set_family( m_nativeFontInfo.description, "serif" );
- break;
- case wxFONTFAMILY_SWISS:
- // SWISS = sans serif
- default:
- pango_font_description_set_family( m_nativeFontInfo.description, "sans" );
- break;
- }
+ SetFamily(family);
}
SetStyle( style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style );
? 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;
int pango_size = pango_font_description_get_size( desc );
if (pango_size == 0)
m_nativeFontInfo.SetPointSize(wxDEFAULT_FONT_SIZE);
-
- wxString faceName = wxGTK_CONV_BACK_SYS(pango_font_description_get_family(desc));
- if (faceName == wxT("monospace"))
- {
- m_family = wxFONTFAMILY_TELETYPE;
- }
- else if (faceName == wxT("sans"))
- {
- m_family = wxFONTFAMILY_SWISS;
- }
- else if (faceName == wxT("serif"))
- {
- m_family = wxFONTFAMILY_ROMAN;
- }
- else
- {
- m_family = wxFONTFAMILY_UNKNOWN;
- }
-
- // Pango description are never underlined
- m_underlined = false;
-
- // always with GTK+ 2
- m_encoding = wxFONTENCODING_UTF8;
}
wxFontRefData::wxFontRefData( const wxFontRefData& data )
: wxGDIRefData()
{
- m_family = data.m_family;
- 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...
}
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& fontname)
+wxFontRefData::wxFontRefData(const wxString& nativeFontInfoString)
{
- m_nativeFontInfo.FromString( fontname );
+ m_nativeFontInfo.FromString( nativeFontInfoString );
InitFromNative();
}
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;
}
-
*/
void wxFontRefData::SetFamily(wxFontFamily family)
{
- m_family = family;
-
- // wxNativeInfo::SetFamily asserts because is currently not implemented---
- // we just save the family here FIXME
+ m_nativeFontInfo.SetFamily(family);
}
void wxFontRefData::SetStyle(wxFontStyle style)
{
- m_nativeFontInfo.SetStyle((wxFontStyle)style);
+ m_nativeFontInfo.SetStyle(style);
}
void wxFontRefData::SetWeight(wxFontWeight weight)
{
- m_nativeFontInfo.SetWeight((wxFontWeight)weight);
+ m_nativeFontInfo.SetWeight(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)
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)
// wxFont creation
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-
wxFont::wxFont(const wxNativeFontInfo& info)
{
Create( info.GetPointSize(),
info.GetUnderlined(),
info.GetFaceName(),
info.GetEncoding() );
+
+ if ( info.GetStrikethrough() )
+ SetStrikethrough(true);
+}
+
+wxFont::wxFont(const wxFontInfo& info)
+{
+ m_refData = new wxFontRefData(info.GetPointSize(),
+ info.GetFamily(),
+ info.GetStyle(),
+ info.GetWeight(),
+ info.IsUnderlined(),
+ info.IsStrikethrough(),
+ info.GetFaceName(),
+ info.GetEncoding());
+
+ wxSize pixelSize = info.GetPixelSize();
+ if ( pixelSize != wxDefaultSize )
+ SetPixelSize(pixelSize);
}
bool wxFont::Create( int pointSize,
UnRef();
m_refData = new wxFontRefData(pointSize, family, style, weight,
- underlined, face, encoding);
+ underlined, false, face, encoding);
return true;
}
return M_FONTDATA->m_nativeFontInfo.GetFaceName();
}
-wxFontFamily wxFont::GetFamily() const
+wxFontFamily wxFont::DoGetFamily() const
{
- wxCHECK_MSG( IsOk(), wxFONTFAMILY_MAX, wxT("invalid font") );
-
- wxFontFamily ret = M_FONTDATA->m_nativeFontInfo.GetFamily();
-
- if (ret == wxFONTFAMILY_DEFAULT)
- ret = M_FONTDATA->m_family;
-
- return ret;
+ return M_FONTDATA->m_nativeFontInfo.GetFamily();
}
wxFontStyle wxFont::GetStyle() 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
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
{
return new wxFontRefData(*static_cast<const wxFontRefData*>(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;
+}
projects / wxWidgets.git / blobdiff