/////////////////////////////////////////////////////////////////////////////
-// Name: font.cpp
-// Purpose:
+// Name: src/gtk/font.cpp
+// Purpose: wxFont for wxGTK
// Author: Robert Roebling
// Id: $Id$
-// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright: (c) 1998 Robert Roebling and Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "font.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/font.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/utils.h"
+ #include "wx/settings.h"
+ #include "wx/gdicmn.h"
+#endif
+
#include "wx/fontutil.h"
-#include "wx/cmndata.h"
-#include "wx/utils.h"
-#include "wx/log.h"
-#include "wx/gdicmn.h"
#include "wx/tokenzr.h"
-#include "wx/settings.h"
-#include <strings.h>
+#include "wx/gtk/private.h"
-#include <gdk/gdk.h>
-#include <gdk/gdkprivate.h>
-#include <gtk/gtk.h>
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// the default size (in points) for the fonts
+static const int wxDEFAULT_FONT_SIZE = 12;
// ----------------------------------------------------------------------------
// wxFontRefData
// ----------------------------------------------------------------------------
-class wxFontRefData : public wxObjectRefData
+class wxFontRefData : public wxGDIRefData
{
public:
- wxFontRefData(int size = wxDEFAULT,
- int family = wxDEFAULT,
- int style = wxDEFAULT,
- int weight = wxDEFAULT,
- bool underlined = FALSE,
+ // from broken down font parameters, also default ctor
+ wxFontRefData(int size = -1,
+ wxFontFamily family = wxFONTFAMILY_DEFAULT,
+ wxFontStyle style = wxFONTSTYLE_NORMAL,
+ wxFontWeight weight = wxFONTWEIGHT_NORMAL,
+ bool underlined = false,
+ bool strikethrough = false,
const wxString& faceName = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+
+ wxFontRefData(const wxString& nativeFontInfoString);
+
+ // copy ctor
wxFontRefData( const wxFontRefData& data );
+
virtual ~wxFontRefData();
+ // setters: all of them also take care to modify m_nativeFontInfo if we
+ // have it so as to not lose the information not carried by our fields
+ void SetPointSize(int pointSize);
+ void SetFamily(wxFontFamily family);
+ 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);
+
+ // and this one also modifies all the other font data fields
+ void SetNativeFontInfo(const wxNativeFontInfo& info);
+
protected:
// common part of all ctors
void Init(int pointSize,
- int family,
- int style,
- int weight,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
bool underlined,
+ bool strikethrough,
const wxString& faceName,
wxFontEncoding encoding);
+ // set all fields from (already initialized and valid) m_nativeFontInfo
+ void InitFromNative();
+
private:
- wxList m_scaled_xfonts;
- int m_pointSize;
- int m_family,
- m_style,
- m_weight;
bool m_underlined;
- wxString m_faceName;
- wxFontEncoding m_encoding;
+ bool m_strikethrough;
+ // The native font info: basically a PangoFontDescription
+ wxNativeFontInfo m_nativeFontInfo;
- friend wxFont;
+ friend class wxFont;
};
-// ============================================================================
-// implementation
-// ============================================================================
+#define M_FONTDATA ((wxFontRefData*)m_refData)
// ----------------------------------------------------------------------------
// wxFontRefData
// ----------------------------------------------------------------------------
void wxFontRefData::Init(int pointSize,
- int family,
- int style,
- int weight,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
bool underlined,
+ bool strikethrough,
const wxString& faceName,
- wxFontEncoding encoding)
+ wxFontEncoding WXUNUSED(encoding))
{
- if (family == wxDEFAULT)
- m_family = wxSWISS;
- else
- m_family = family;
+ if (family == wxFONTFAMILY_DEFAULT)
+ family = wxFONTFAMILY_SWISS;
- m_faceName = faceName;
+ m_underlined = underlined;
+ m_strikethrough = strikethrough;
- if (style == wxDEFAULT)
- m_style = wxNORMAL;
- else
- m_style = style;
+ // Create native font info
+ m_nativeFontInfo.description = pango_font_description_new();
- if (weight == wxDEFAULT)
- m_weight = wxNORMAL;
+ // And set its values
+ if (!faceName.empty())
+ {
+ pango_font_description_set_family( m_nativeFontInfo.description,
+ wxGTK_CONV_SYS(faceName) );
+ }
else
- m_weight = weight;
+ {
+ SetFamily(family);
+ }
- if (pointSize == wxDEFAULT)
- m_pointSize = 12;
- else
- m_pointSize = pointSize;
+ SetStyle( style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style );
+ SetPointSize( (pointSize == wxDEFAULT || pointSize == -1)
+ ? wxDEFAULT_FONT_SIZE
+ : pointSize );
+ SetWeight( weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight );
+}
- m_underlined = underlined;
- m_encoding = encoding;
+void wxFontRefData::InitFromNative()
+{
+ // Get native info
+ PangoFontDescription *desc = m_nativeFontInfo.description;
+
+ // Pango sometimes needs to have a size
+ 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;
+ m_strikethrough = false;
}
wxFontRefData::wxFontRefData( const wxFontRefData& data )
- : m_scaled_xfonts(wxKEY_INTEGER)
+ : wxGDIRefData()
+{
+ m_underlined = data.m_underlined;
+ 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
+ // would break binary compatibility...
+ m_nativeFontInfo.FromString(data.m_nativeFontInfo.ToString());
+}
+
+wxFontRefData::wxFontRefData(int size, wxFontFamily family, wxFontStyle style,
+ wxFontWeight weight, bool underlined, bool strikethrough,
+ const wxString& faceName,
+ wxFontEncoding encoding)
{
- Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
- data.m_underlined, data.m_faceName, data.m_encoding);
+ Init(size, family, style, weight, underlined, strikethrough, faceName, encoding);
}
-wxFontRefData::wxFontRefData(int size, int family, int style,
- int weight, bool underlined, const wxString& faceName, wxFontEncoding encoding )
- : m_scaled_xfonts(wxKEY_INTEGER)
+wxFontRefData::wxFontRefData(const wxString& nativeFontInfoString)
{
- Init(size, family, style, weight,
- underlined, faceName, encoding);
+ m_nativeFontInfo.FromString( nativeFontInfoString );
+
+ InitFromNative();
}
wxFontRefData::~wxFontRefData()
{
- wxNode *node = m_scaled_xfonts.First();
- while (node)
- {
- GdkFont *font = (GdkFont*)node->Data();
- wxNode *next = node->Next();
- gdk_font_unref( font );
- node = next;
- }
}
// ----------------------------------------------------------------------------
-// wxFont
+// wxFontRefData SetXXX()
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-
-void wxFont::Init()
+void wxFontRefData::SetPointSize(int pointSize)
{
- if (wxTheFontList)
- wxTheFontList->Append( this );
+ m_nativeFontInfo.SetPointSize(pointSize);
}
-wxFont::wxFont( const wxString& fontname, const wxFontData& fontdata )
+/*
+ NOTE: disabled because pango_font_description_set_absolute_size() and
+ wxDC::GetCharHeight() do not mix well: setting with the former a pixel
+ size of "30" makes the latter return 36...
+ Besides, we need to return GetPointSize() a point size value even if
+ SetPixelSize() was used and this would require further changes
+ (and use of pango_font_description_get_size_is_absolute in some places).
+
+bool wxFontRefData::SetPixelSize(const wxSize& pixelSize)
{
- Init();
+ wxCHECK_MSG( pixelSize.GetWidth() >= 0 && pixelSize.GetHeight() > 0, false,
+ "Negative values for the pixel size or zero pixel height are not allowed" );
- wxCHECK_RET( !!fontname, _T("invalid font spec") );
+ if (wx_pango_version_check(1,8,0) != NULL ||
+ pixelSize.GetWidth() != 0)
+ {
+ // NOTE: pango_font_description_set_absolute_size() only sets the font height;
+ // if the user set the pixel width of the font explicitly or the pango
+ // library is too old, we cannot proceed
+ return false;
+ }
- m_refData = new wxFontRefData();
+ pango_font_description_set_absolute_size( m_nativeFontInfo.description,
+ pixelSize.GetHeight() * PANGO_SCALE );
- wxString tmp;
+ return true;
+}
+*/
- wxStringTokenizer tn( fontname, wxT("-") );
+void wxFontRefData::SetFamily(wxFontFamily family)
+{
+ m_nativeFontInfo.SetFamily(family);
+}
- tn.GetNextToken(); // skip initial empty token
- tn.GetNextToken(); // foundry
+void wxFontRefData::SetStyle(wxFontStyle style)
+{
+ m_nativeFontInfo.SetStyle(style);
+}
- M_FONTDATA->m_faceName = tn.GetNextToken(); // family
+void wxFontRefData::SetWeight(wxFontWeight weight)
+{
+ m_nativeFontInfo.SetWeight(weight);
+}
- tmp = tn.GetNextToken().MakeUpper(); // weight
- if (tmp == wxT("BOLD")) M_FONTDATA->m_weight = wxBOLD;
- if (tmp == wxT("BLACK")) M_FONTDATA->m_weight = wxBOLD;
- if (tmp == wxT("EXTRABOLD")) M_FONTDATA->m_weight = wxBOLD;
- if (tmp == wxT("DEMIBOLD")) M_FONTDATA->m_weight = wxBOLD;
- if (tmp == wxT("ULTRABOLD")) M_FONTDATA->m_weight = wxBOLD;
+void wxFontRefData::SetUnderlined(bool underlined)
+{
+ m_underlined = underlined;
- if (tmp == wxT("LIGHT")) M_FONTDATA->m_weight = wxLIGHT;
- if (tmp == wxT("THIN")) M_FONTDATA->m_weight = wxLIGHT;
+ // 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
+}
- tmp = tn.GetNextToken().MakeUpper(); // slant
- if (tmp == wxT("I")) M_FONTDATA->m_style = wxITALIC;
- if (tmp == wxT("O")) M_FONTDATA->m_style = wxITALIC;
+void wxFontRefData::SetStrikethrough(bool strikethrough)
+{
+ m_strikethrough = strikethrough;
+}
- tn.GetNextToken(); // set width
- tn.GetNextToken(); // add. style
- tn.GetNextToken(); // pixel size
+bool wxFontRefData::SetFaceName(const wxString& facename)
+{
+ return m_nativeFontInfo.SetFaceName(facename);
+}
- tmp = tn.GetNextToken(); // pointsize
- if (tmp != wxT("*"))
- {
- long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
- M_FONTDATA->m_pointSize = (int)(num / 10);
- }
+void wxFontRefData::SetEncoding(wxFontEncoding WXUNUSED(encoding))
+{
+ // with GTK+ 2 Pango always uses UTF8 internally, we cannot change it
+}
- tn.GetNextToken(); // x-res
- tn.GetNextToken(); // y-res
-
- tmp = tn.GetNextToken().MakeUpper(); // spacing
-
- if (tmp == wxT("M"))
- M_FONTDATA->m_family = wxMODERN;
- else if (M_FONTDATA->m_faceName == wxT("TIMES"))
- M_FONTDATA->m_family = wxROMAN;
- else if (M_FONTDATA->m_faceName == wxT("HELVETICA"))
- M_FONTDATA->m_family = wxSWISS;
- else if (M_FONTDATA->m_faceName == wxT("LUCIDATYPEWRITER"))
- M_FONTDATA->m_family = wxTELETYPE;
- else if (M_FONTDATA->m_faceName == wxT("LUCIDA"))
- M_FONTDATA->m_family = wxDECORATIVE;
- else if (M_FONTDATA->m_faceName == wxT("UTOPIA"))
- M_FONTDATA->m_family = wxSCRIPT;
-
- tn.GetNextToken(); // avg width
-
- // deal with font encoding
- M_FONTDATA->m_encoding = fontdata.GetEncoding();
- if ( M_FONTDATA->m_encoding == wxFONTENCODING_SYSTEM )
- {
- wxString registry = tn.GetNextToken().MakeUpper(),
- encoding = tn.GetNextToken().MakeUpper();
+void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)
+{
+ m_nativeFontInfo = info;
- if ( registry == _T("ISO8859") )
- {
- int cp;
- if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )
- {
- M_FONTDATA->m_encoding =
- (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
- }
- }
- else if ( registry == _T("MICROSOFT") )
- {
- int cp;
- if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )
- {
- M_FONTDATA->m_encoding =
- (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
- }
- }
- else if ( registry == _T("KOI8") )
- {
- M_FONTDATA->m_encoding = wxFONTENCODING_KOI8;
- }
- //else: unknown encoding - may be give a warning here?
- }
+ // set all the other font parameters from the native font info
+ InitFromNative();
+}
+
+// ----------------------------------------------------------------------------
+// wxFont creation
+// ----------------------------------------------------------------------------
+
+wxFont::wxFont(const wxNativeFontInfo& info)
+{
+ Create( info.GetPointSize(),
+ info.GetFamily(),
+ info.GetStyle(),
+ info.GetWeight(),
+ info.GetUnderlined(),
+ info.GetFaceName(),
+ 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,
- int family,
- int style,
- int weight,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
bool underlined,
const wxString& face,
wxFontEncoding encoding )
{
+ UnRef();
+
m_refData = new wxFontRefData(pointSize, family, style, weight,
- underlined, face, encoding);
+ underlined, false, face, encoding);
- return TRUE;
+ return true;
}
-void wxFont::Unshare()
+bool wxFont::Create(const wxString& fontname)
{
- if (!m_refData)
+ // VZ: does this really happen?
+ if ( fontname.empty() )
{
- m_refData = new wxFontRefData();
- }
- else
- {
- wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
- UnRef();
- m_refData = ref;
+ *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+
+ return true;
}
+
+ m_refData = new wxFontRefData(fontname);
+
+ return true;
}
wxFont::~wxFont()
{
- if (wxTheFontList)
- wxTheFontList->DeleteObject( this );
}
// ----------------------------------------------------------------------------
int wxFont::GetPointSize() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), 0, wxT("invalid font") );
- return M_FONTDATA->m_pointSize;
+ return M_FONTDATA->m_nativeFontInfo.GetPointSize();
}
wxString wxFont::GetFaceName() const
{
- wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
- return M_FONTDATA->m_faceName;
+ return M_FONTDATA->m_nativeFontInfo.GetFaceName();
}
-int wxFont::GetFamily() const
+wxFontFamily wxFont::DoGetFamily() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
-
- return M_FONTDATA->m_family;
+ return M_FONTDATA->m_nativeFontInfo.GetFamily();
}
-int wxFont::GetStyle() const
+wxFontStyle wxFont::GetStyle() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") );
- return M_FONTDATA->m_style;
+ return M_FONTDATA->m_nativeFontInfo.GetStyle();
}
-int wxFont::GetWeight() const
+wxFontWeight wxFont::GetWeight() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") );
- return M_FONTDATA->m_weight;
+ return M_FONTDATA->m_nativeFontInfo.GetWeight();
}
bool wxFont::GetUnderlined() const
{
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
return M_FONTDATA->m_underlined;
}
+bool wxFont::GetStrikethrough() const
+{
+ wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
+
+ return M_FONTDATA->m_strikethrough;
+}
wxFontEncoding wxFont::GetEncoding() const
{
- wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), wxFONTENCODING_SYSTEM, wxT("invalid font") );
- return M_FONTDATA->m_encoding;
+ return wxFONTENCODING_UTF8;
+ // Pango always uses UTF8... see also SetEncoding()
+}
+
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+{
+ wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") );
+
+ return &(M_FONTDATA->m_nativeFontInfo);
+}
+
+bool wxFont::IsFixedWidth() const
+{
+ wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
+
+ return wxFontBase::IsFixedWidth();
}
// ----------------------------------------------------------------------------
void wxFont::SetPointSize(int pointSize)
{
- Unshare();
+ AllocExclusive();
- M_FONTDATA->m_pointSize = pointSize;
+ M_FONTDATA->SetPointSize(pointSize);
}
-void wxFont::SetFamily(int family)
+void wxFont::SetFamily(wxFontFamily family)
{
- Unshare();
+ AllocExclusive();
- M_FONTDATA->m_family = family;
+ M_FONTDATA->SetFamily(family);
}
-void wxFont::SetStyle(int style)
+void wxFont::SetStyle(wxFontStyle style)
{
- Unshare();
+ AllocExclusive();
- M_FONTDATA->m_style = style;
+ M_FONTDATA->SetStyle(style);
}
-void wxFont::SetWeight(int weight)
+void wxFont::SetWeight(wxFontWeight weight)
{
- Unshare();
+ AllocExclusive();
- M_FONTDATA->m_weight = weight;
+ M_FONTDATA->SetWeight(weight);
}
-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)
{
- Unshare();
+ AllocExclusive();
- M_FONTDATA->m_faceName = faceName;
+ return M_FONTDATA->SetFaceName(faceName) &&
+ wxFontBase::SetFaceName(faceName);
}
void wxFont::SetUnderlined(bool underlined)
{
- Unshare();
+ AllocExclusive();
+
+ M_FONTDATA->SetUnderlined(underlined);
+}
+
+void wxFont::SetStrikethrough(bool strikethrough)
+{
+ AllocExclusive();
- M_FONTDATA->m_underlined = underlined;
+ M_FONTDATA->SetStrikethrough(strikethrough);
}
void wxFont::SetEncoding(wxFontEncoding encoding)
{
- Unshare();
+ AllocExclusive();
- M_FONTDATA->m_encoding = encoding;
+ M_FONTDATA->SetEncoding(encoding);
}
-// ----------------------------------------------------------------------------
-// get internal representation of font
-// ----------------------------------------------------------------------------
+void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
+{
+ AllocExclusive();
-static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;
+ M_FONTDATA->SetNativeFontInfo( info );
+}
-static GdkFont *GtkGetDefaultGuiFont()
+wxGDIRefData* wxFont::CreateGDIRefData() const
{
- if (!g_systemDefaultGuiFont)
- {
- GtkWidget *widget = gtk_button_new();
- GtkStyle *def = gtk_rc_get_style( widget );
- if (def)
- {
- g_systemDefaultGuiFont = gdk_font_ref( def->font );
- }
- else
- {
- def = gtk_widget_get_default_style();
- if (def)
- g_systemDefaultGuiFont = gdk_font_ref( def->font );
- }
- gtk_widget_destroy( widget );
- }
- return g_systemDefaultGuiFont;
+ return new wxFontRefData;
}
-GdkFont *wxFont::GetInternalFont( float scale ) const
+wxGDIRefData* wxFont::CloneGDIRefData(const wxGDIRefData* data) const
{
- if (!Ok())
- {
- wxFAIL_MSG( wxT("invalid font") );
+ return new wxFontRefData(*static_cast<const wxFontRefData*>(data));
+}
- return (GdkFont*) NULL;
- }
+bool wxFont::GTKSetPangoAttrs(PangoLayout* layout) const
+{
+ if (!IsOk() || !(GetUnderlined() || GetStrikethrough()))
+ return false;
- long int_scale = long(scale * 100.0 + 0.5); /* key for fontlist */
- int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100);
- GdkFont *font = (GdkFont *) NULL;
+ PangoAttrList* attrs = pango_attr_list_new();
+ PangoAttribute* a;
- wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale);
- if (node)
+ if (wx_pango_version_check(1,16,0))
{
- font = (GdkFont*)node->Data();
- }
- else
- {
- if (*this == wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT))
+ // 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] == ' '))
{
- font = GtkGetDefaultGuiFont();
+ 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 (!font)
- {
- font = wxLoadQueryNearestFont( point_scale,
- M_FONTDATA->m_family,
- M_FONTDATA->m_style,
- M_FONTDATA->m_weight,
- M_FONTDATA->m_underlined,
- M_FONTDATA->m_faceName,
- M_FONTDATA->m_encoding );
- }
-
- M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font );
+ }
+ 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);
}
- // it's quite useless to make it a wxCHECK because we're going to crash
- // anyhow...
- wxASSERT_MSG( font, wxT("could not load any font?") );
+ pango_layout_set_attributes(layout, attrs);
+ pango_attr_list_unref(attrs);
- return font;
+ return true;
}
-
projects / wxWidgets.git / blobdiff