/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/font.cpp
-// Purpose:
+// Name: src/gtk/font.cpp
+// Purpose: wxFont for wxGTK
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling and Julian Smart
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #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/gdkprivate.h>
// ----------------------------------------------------------------------------
// constants
// the default size (in points) for the fonts
static const int wxDEFAULT_FONT_SIZE = 12;
-// ----------------------------------------------------------------------------
-// wxScaledFontList: maps the font sizes to the GDK fonts for the given font
-// ----------------------------------------------------------------------------
-
-WX_DECLARE_HASH_MAP(int, GdkFont *, wxIntegerHash, wxIntegerEqual,
- wxScaledFontList);
-
// ----------------------------------------------------------------------------
// wxFontRefData
// ----------------------------------------------------------------------------
-class wxFontRefData : public wxObjectRefData
+class wxFontRefData : public wxGDIRefData
{
public:
// from broken down font parameters, also default ctor
wxFontRefData(int size = -1,
- int family = wxFONTFAMILY_DEFAULT,
- int style = wxFONTSTYLE_NORMAL,
- int weight = wxFONTWEIGHT_NORMAL,
- bool underlined = FALSE,
+ 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);
- // from XFLD
- wxFontRefData(const wxString& fontname);
+ wxFontRefData(const wxString& nativeFontInfoString);
// copy ctor
wxFontRefData( const wxFontRefData& data );
virtual ~wxFontRefData();
- // do we have the native font info?
- bool HasNativeFont() const
- {
-#ifdef __WXGTK20__
- // we always have a Pango font description
- return TRUE;
-#else // GTK 1.x
- // only use m_nativeFontInfo if it had been initialized
- return !m_nativeFontInfo.IsDefault();
-#endif // GTK 2.0/1.x
- }
-
// 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(int family);
- void SetStyle(int style);
- void SetWeight(int weight);
+ void SetFamily(wxFontFamily family);
+ void SetStyle(wxFontStyle style);
+ void SetWeight(wxFontWeight weight);
void SetUnderlined(bool underlined);
- void SetFaceName(const wxString& facename);
+ void SetStrikethrough(bool strikethrough);
+ bool SetFaceName(const wxString& facename);
void SetEncoding(wxFontEncoding encoding);
- void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; }
- bool GetNoAntiAliasing() { return m_noAA; }
-
// and this one also modifies all the other font data fields
void SetNativeFontInfo(const wxNativeFontInfo& info);
- // debugger helper: shows what the font really is
- //
- // VZ: I need this as my gdb either shows wildly wrong values or crashes
- // when I ask it to "p fontRefData" :-(
-#if defined(__WXDEBUG__) && !defined(__WXGTK20__)
- void Dump() const
- {
- wxPrintf(_T("%s-%s-%s-%d-%d\n"),
- m_faceName.c_str(),
- m_weight == wxFONTWEIGHT_NORMAL
- ? _T("normal")
- : m_weight == wxFONTWEIGHT_BOLD
- ? _T("bold")
- : _T("light"),
- m_style == wxFONTSTYLE_NORMAL ? _T("regular") : _T("italic"),
- m_pointSize,
- m_encoding);
- }
-#endif // Debug
-
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);
void InitFromNative();
private:
- // clear m_scaled_xfonts if any
- void ClearGdkFonts();
-
-#ifndef __WXGTK20__
- // the map of font sizes to "GdkFont *"
- wxScaledFontList m_scaled_xfonts;
-#endif // GTK 2.0/1.x
-
- int m_pointSize;
- int m_family,
- m_style,
- m_weight;
- bool m_underlined;
- wxString m_faceName;
- wxFontEncoding m_encoding; // Unused under GTK 2.0
- bool m_noAA; // No anti-aliasing
-
- // The native font info, basicly an XFLD under GTK 1.2 and
- // the pango font description under GTK 2.0.
+ // The native font info: basically a PangoFontDescription, plus
+ // 'underlined' and 'strikethrough' attributes not supported by Pango.
wxNativeFontInfo m_nativeFontInfo;
friend class wxFont;
};
+#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))
{
- m_family = family == wxFONTFAMILY_DEFAULT ? wxFONTFAMILY_SWISS : family;
+ if (family == wxFONTFAMILY_DEFAULT)
+ family = wxFONTFAMILY_SWISS;
- m_faceName = faceName;
-
- // we accept both wxDEFAULT and wxNORMAL here - should we?
- m_style = style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style;
- m_weight = weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight;
-
- // and here, do we really want to forbid creation of the font of the size
- // 90 (the value of wxDEFAULT)??
- m_pointSize = pointSize == wxDEFAULT || pointSize == -1
- ? wxDEFAULT_FONT_SIZE
- : pointSize;
-
- m_underlined = underlined;
- m_encoding = encoding;
-
- m_noAA = FALSE;
-
-#ifdef __WXGTK20__
// Create native font info
m_nativeFontInfo.description = pango_font_description_new();
// And set its values
- if (!m_faceName.empty())
+ if (!faceName.empty())
{
- pango_font_description_set_family( m_nativeFontInfo.description, wxGTK_CONV(m_faceName) );
+ 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( m_style );
- SetPointSize( m_pointSize );
- SetWeight( m_weight );
-#endif // GTK 2.0
+ SetStyle( style == wxDEFAULT ? wxFONTSTYLE_NORMAL : style );
+ SetPointSize( (pointSize == wxDEFAULT || pointSize == -1)
+ ? wxDEFAULT_FONT_SIZE
+ : pointSize );
+ SetWeight( weight == wxDEFAULT ? wxFONTWEIGHT_NORMAL : weight );
+ SetUnderlined( underlined );
+ SetStrikethrough( strikethrough );
}
void wxFontRefData::InitFromNative()
{
- m_noAA = FALSE;
-
-#ifdef __WXGTK20__
// Get native info
PangoFontDescription *desc = m_nativeFontInfo.description;
- // init fields
- m_faceName = wxGTK_CONV_BACK( pango_font_description_get_family( desc ) );
-
- m_pointSize = pango_font_description_get_size( desc ) / PANGO_SCALE;
-
- switch (pango_font_description_get_style( desc ))
- {
- case PANGO_STYLE_NORMAL:
- m_style = wxFONTSTYLE_NORMAL;
- break;
- case PANGO_STYLE_ITALIC:
- m_style = wxFONTSTYLE_ITALIC;
- break;
- case PANGO_STYLE_OBLIQUE:
- m_style = wxFONTSTYLE_SLANT;
- break;
- }
-
- switch (pango_font_description_get_weight( desc ))
- {
- case PANGO_WEIGHT_ULTRALIGHT:
- m_weight = wxFONTWEIGHT_LIGHT;
- break;
- case PANGO_WEIGHT_LIGHT:
- m_weight = wxFONTWEIGHT_LIGHT;
- break;
- case PANGO_WEIGHT_NORMAL:
- m_weight = wxFONTWEIGHT_NORMAL;
- break;
- case PANGO_WEIGHT_BOLD:
- m_weight = wxFONTWEIGHT_BOLD;
- break;
- case PANGO_WEIGHT_ULTRABOLD:
- m_weight = wxFONTWEIGHT_BOLD;
- break;
- case PANGO_WEIGHT_HEAVY:
- m_weight = wxFONTWEIGHT_BOLD;
- break;
- }
-
- if (m_faceName == wxT("monospace"))
- {
- m_family = wxFONTFAMILY_TELETYPE;
- }
- else if (m_faceName == wxT("sans"))
- {
- m_family = wxFONTFAMILY_SWISS;
- }
- else if (m_faceName == wxT("serif"))
- {
- m_family = wxFONTFAMILY_ROMAN;
- }
- else
- {
- m_family = wxFONTFAMILY_UNKNOWN;
- }
-
- // Pango description are never underlined (?)
- m_underlined = FALSE;
-
- // Cannot we choose that
- m_encoding = wxFONTENCODING_SYSTEM;
-#else // GTK 1.x
- // get the font parameters from the XLFD
- // -------------------------------------
-
- m_faceName = m_nativeFontInfo.GetXFontComponent(wxXLFD_FAMILY);
-
- m_weight = wxFONTWEIGHT_NORMAL;
-
- wxString w = m_nativeFontInfo.GetXFontComponent(wxXLFD_WEIGHT).Upper();
- if ( !w.empty() && w != _T('*') )
- {
- // the test below catches all of BOLD, EXTRABOLD, DEMIBOLD, ULTRABOLD
- // and BLACK
- if ( ((w[0u] == _T('B') && (!wxStrcmp(w.c_str() + 1, wxT("OLD")) ||
- !wxStrcmp(w.c_str() + 1, wxT("LACK"))))) ||
- wxStrstr(w.c_str() + 1, _T("BOLD")) )
- {
- m_weight = wxFONTWEIGHT_BOLD;
- }
- else if ( w == _T("LIGHT") || w == _T("THIN") )
- {
- m_weight = wxFONTWEIGHT_LIGHT;
- }
- }
-
- switch ( wxToupper(*m_nativeFontInfo.
- GetXFontComponent(wxXLFD_SLANT).c_str()) )
- {
- case _T('I'): // italique
- m_style = wxFONTSTYLE_ITALIC;
- break;
-
- case _T('O'): // oblique
- m_style = wxFONTSTYLE_SLANT;
- break;
-
- default:
- m_style = wxFONTSTYLE_NORMAL;
- }
-
- long ptSize;
- if ( m_nativeFontInfo.GetXFontComponent(wxXLFD_POINTSIZE).ToLong(&ptSize) )
- {
- // size in XLFD is in 10 point units
- m_pointSize = (int)(ptSize / 10);
- }
- else
- {
- m_pointSize = wxDEFAULT_FONT_SIZE;
- }
-
- // examine the spacing: if the font is monospaced, assume wxTELETYPE
- // family for compatibility with the old code which used it instead of
- // IsFixedWidth()
- if ( m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING).Upper() == _T('M') )
- {
- m_family = wxFONTFAMILY_TELETYPE;
- }
- else // not monospaceed
- {
- // don't even try guessing it, it doesn't work for too many fonts
- // anyhow
- m_family = wxFONTFAMILY_UNKNOWN;
- }
-
- // X fonts are never underlined...
- m_underlined = FALSE;
-
- // deal with font encoding
- wxString
- registry = m_nativeFontInfo.GetXFontComponent(wxXLFD_REGISTRY).Upper(),
- encoding = m_nativeFontInfo.GetXFontComponent(wxXLFD_ENCODING).Upper();
-
- if ( registry == _T("ISO8859") )
- {
- int cp;
- if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )
- {
- m_encoding = (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
- }
- }
- else if ( registry == _T("MICROSOFT") )
- {
- int cp;
- if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )
- {
- m_encoding = (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
- }
- }
- else if ( registry == _T("KOI8") )
- {
- m_encoding = wxFONTENCODING_KOI8;
- }
- else // unknown encoding
- {
- // may be give a warning here? or use wxFontMapper?
- m_encoding = wxFONTENCODING_SYSTEM;
- }
-#endif // GTK 2.0/1.x
+ // 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);
}
wxFontRefData::wxFontRefData( const wxFontRefData& data )
- : wxObjectRefData()
+ : wxGDIRefData()
{
- m_pointSize = data.m_pointSize;
- m_family = data.m_family;
- m_style = data.m_style;
- m_weight = data.m_weight;
-
- m_underlined = data.m_underlined;
-
- m_faceName = data.m_faceName;
- 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...
m_nativeFontInfo.FromString(data.m_nativeFontInfo.ToString());
}
-wxFontRefData::wxFontRefData(int size, int family, int style,
- int weight, bool underlined,
+wxFontRefData::wxFontRefData(int size, wxFontFamily family, wxFontStyle style,
+ 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)
{
- // VZ: FromString() should really work in both cases, doesn't it?
-#ifdef __WXGTK20__
- m_nativeFontInfo.FromString( fontname );
-#else // GTK 1.x
- m_nativeFontInfo.SetXFontName(fontname);
-#endif // GTK 2.0/1.x
+ m_nativeFontInfo.FromString( nativeFontInfoString );
InitFromNative();
}
-void wxFontRefData::ClearGdkFonts()
-{
-#ifndef __WXGTK20__
- for ( wxScaledFontList::iterator i = m_scaled_xfonts.begin();
- i != m_scaled_xfonts.end();
- ++i )
- {
- GdkFont *font = i->second;
- gdk_font_unref( font );
- }
-
- m_scaled_xfonts.clear();
-#endif // GTK 1.x
-}
-
wxFontRefData::~wxFontRefData()
{
- ClearGdkFonts();
}
// ----------------------------------------------------------------------------
void wxFontRefData::SetPointSize(int pointSize)
{
- m_pointSize = pointSize;
-
-#ifdef __WXGTK20__
- // Get native info
- PangoFontDescription *desc = m_nativeFontInfo.description;
-
- pango_font_description_set_size( desc, m_pointSize * PANGO_SCALE );
-#else
- if ( HasNativeFont() )
- {
- wxString size;
- if ( pointSize == -1 )
- size = _T('*');
- else
- size.Printf(_T("%d"), 10*pointSize);
-
- m_nativeFontInfo.SetXFontComponent(wxXLFD_POINTSIZE, size);
- }
-#endif
+ m_nativeFontInfo.SetPointSize(pointSize);
}
-void wxFontRefData::SetFamily(int family)
-{
- m_family = family;
-
- // TODO: what are we supposed to do with m_nativeFontInfo here?
-}
+/*
+ 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).
-void wxFontRefData::SetStyle(int style)
+bool wxFontRefData::SetPixelSize(const wxSize& pixelSize)
{
- m_style = style;
+ wxCHECK_MSG( pixelSize.GetWidth() >= 0 && pixelSize.GetHeight() > 0, false,
+ "Negative values for the pixel size or zero pixel height are not allowed" );
-#ifdef __WXGTK20__
- // Get native info
- PangoFontDescription *desc = m_nativeFontInfo.description;
-
- switch ( style )
+ if (wx_pango_version_check(1,8,0) != NULL ||
+ pixelSize.GetWidth() != 0)
{
- case wxFONTSTYLE_ITALIC:
- pango_font_description_set_style( desc, PANGO_STYLE_ITALIC );
- break;
- case wxFONTSTYLE_SLANT:
- pango_font_description_set_style( desc, PANGO_STYLE_OBLIQUE );
- break;
- default:
- wxFAIL_MSG( _T("unknown font style") );
- // fall through
- case wxFONTSTYLE_NORMAL:
- pango_font_description_set_style( desc, PANGO_STYLE_NORMAL );
- break;
+ // 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;
}
-#else
- if ( HasNativeFont() )
- {
- wxString slant;
- switch ( style )
- {
- case wxFONTSTYLE_ITALIC:
- slant = _T('i');
- break;
-
- case wxFONTSTYLE_SLANT:
- slant = _T('o');
- break;
- default:
- wxFAIL_MSG( _T("unknown font style") );
- // fall through
-
- case wxFONTSTYLE_NORMAL:
- slant = _T('r');
- }
+ pango_font_description_set_absolute_size( m_nativeFontInfo.description,
+ pixelSize.GetHeight() * PANGO_SCALE );
- m_nativeFontInfo.SetXFontComponent(wxXLFD_SLANT, slant);
- }
-#endif
+ return true;
}
+*/
-void wxFontRefData::SetWeight(int weight)
+void wxFontRefData::SetFamily(wxFontFamily family)
{
- m_weight = weight;
-
-#ifdef __WXGTK20__
- PangoFontDescription *desc = m_nativeFontInfo.description;
- switch ( weight )
- {
- case wxFONTWEIGHT_BOLD:
- pango_font_description_set_weight(desc, PANGO_WEIGHT_BOLD);
- break;
-
- case wxFONTWEIGHT_LIGHT:
- pango_font_description_set_weight(desc, PANGO_WEIGHT_LIGHT);
- break;
-
- default:
- wxFAIL_MSG( _T("unknown font weight") );
- // fall through
-
- case wxFONTWEIGHT_NORMAL:
- // unspecified
- pango_font_description_set_weight(desc, PANGO_WEIGHT_NORMAL);
- }
-#else //!__WXGTK20__
- if ( HasNativeFont() )
- {
- wxString boldness;
- switch ( weight )
- {
- case wxFONTWEIGHT_BOLD:
- boldness = _T("bold");
- break;
-
- case wxFONTWEIGHT_LIGHT:
- boldness = _T("light");
- break;
-
- default:
- wxFAIL_MSG( _T("unknown font weight") );
- // fall through
+ m_nativeFontInfo.SetFamily(family);
+}
- case wxFONTWEIGHT_NORMAL:
- // unspecified
- boldness = _T("medium");
- }
+void wxFontRefData::SetStyle(wxFontStyle style)
+{
+ m_nativeFontInfo.SetStyle(style);
+}
- m_nativeFontInfo.SetXFontComponent(wxXLFD_WEIGHT, boldness);
- }
-#endif
+void wxFontRefData::SetWeight(wxFontWeight weight)
+{
+ m_nativeFontInfo.SetWeight(weight);
}
void wxFontRefData::SetUnderlined(bool underlined)
{
- m_underlined = underlined;
-
- // the XLFD doesn't have "underlined" field anyhow
+ m_nativeFontInfo.SetUnderlined(underlined);
}
-void wxFontRefData::SetFaceName(const wxString& facename)
+void wxFontRefData::SetStrikethrough(bool strikethrough)
{
- m_faceName = facename;
-
-#ifndef __WXGTK20__
- if ( HasNativeFont() )
- {
- m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename);
- }
-#endif
+ m_nativeFontInfo.SetStrikethrough(strikethrough);
}
-void wxFontRefData::SetEncoding(wxFontEncoding encoding)
+bool wxFontRefData::SetFaceName(const wxString& facename)
{
- m_encoding = encoding;
+ return m_nativeFontInfo.SetFaceName(facename);
+}
-#ifndef __WXGTK20__
- if ( HasNativeFont() )
- {
- wxNativeEncodingInfo info;
- if ( wxGetNativeFontEncoding(encoding, &info) )
- {
- m_nativeFontInfo.SetXFontComponent(wxXLFD_REGISTRY, info.xregistry);
- m_nativeFontInfo.SetXFontComponent(wxXLFD_ENCODING, info.xencoding);
- }
- }
-#endif
+void wxFontRefData::SetEncoding(wxFontEncoding WXUNUSED(encoding))
+{
+ // with GTK+ 2 Pango always uses UTF8 internally, we cannot change it
}
void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)
{
- // previously cached fonts shouldn't be used
- ClearGdkFonts();
-
m_nativeFontInfo = info;
// set all the other font parameters from the native font info
// wxFont creation
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-
-void wxFont::Init()
-{
-}
-
wxFont::wxFont(const wxNativeFontInfo& info)
{
- Init();
-
-#ifdef __WXGTK20__
Create( info.GetPointSize(),
info.GetFamily(),
info.GetStyle(),
info.GetUnderlined(),
info.GetFaceName(),
info.GetEncoding() );
-#else
- (void) Create(info.GetXFontName());
-#endif
+
+ 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,
- int family,
- int style,
- int weight,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
bool underlined,
const wxString& face,
- wxFontEncoding encoding)
+ wxFontEncoding encoding )
{
UnRef();
m_refData = new wxFontRefData(pointSize, family, style, weight,
- underlined, face, encoding);
+ underlined, false, face, encoding);
- return TRUE;
+ return true;
}
bool wxFont::Create(const wxString& fontname)
{
*this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
- return TRUE;
+ return true;
}
m_refData = new wxFontRefData(fontname);
- return TRUE;
-}
-
-void wxFont::Unshare()
-{
- if (!m_refData)
- {
- m_refData = new wxFontRefData();
- }
- else
- {
- wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
- UnRef();
- m_refData = ref;
- }
+ return true;
}
wxFont::~wxFont()
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;
+ return M_FONTDATA->m_nativeFontInfo.GetUnderlined();
}
-wxFontEncoding wxFont::GetEncoding() const
+bool wxFont::GetStrikethrough() const
{
- wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
- return M_FONTDATA->m_encoding;
+ return M_FONTDATA->m_nativeFontInfo.GetStrikethrough();
}
-bool wxFont::GetNoAntiAliasing()
+wxFontEncoding wxFont::GetEncoding() const
{
- wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, 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()
}
-wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
{
- wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
+ wxCHECK_MSG( IsOk(), NULL, wxT("invalid font") );
-#ifndef __WXGTK20__
- if ( M_FONTDATA->m_nativeFontInfo.GetXFontName().empty() )
- GetInternalFont();
-#endif
-
- return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+ return &(M_FONTDATA->m_nativeFontInfo);
}
bool wxFont::IsFixedWidth() const
{
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
-
-#ifndef __WXGTK20__
- if ( M_FONTDATA->HasNativeFont() )
- {
- // the monospace fonts are supposed to have "M" in the spacing field
- wxString spacing = M_FONTDATA->
- m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING);
-
- return spacing.Upper() == _T('M');
- }
-#endif
+ wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
return wxFontBase::IsFixedWidth();
}
void wxFont::SetPointSize(int pointSize)
{
- Unshare();
+ AllocExclusive();
M_FONTDATA->SetPointSize(pointSize);
}
-void wxFont::SetFamily(int family)
+void wxFont::SetFamily(wxFontFamily family)
{
- Unshare();
+ AllocExclusive();
M_FONTDATA->SetFamily(family);
}
-void wxFont::SetStyle(int style)
+void wxFont::SetStyle(wxFontStyle style)
{
- Unshare();
+ AllocExclusive();
M_FONTDATA->SetStyle(style);
}
-void wxFont::SetWeight(int weight)
+void wxFont::SetWeight(wxFontWeight weight)
{
- Unshare();
+ AllocExclusive();
M_FONTDATA->SetWeight(weight);
}
-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)
{
- Unshare();
+ AllocExclusive();
- M_FONTDATA->SetFaceName(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->SetStrikethrough(strikethrough);
+}
+
void wxFont::SetEncoding(wxFontEncoding encoding)
{
- Unshare();
+ AllocExclusive();
M_FONTDATA->SetEncoding(encoding);
}
void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
{
- Unshare();
+ AllocExclusive();
M_FONTDATA->SetNativeFontInfo( info );
}
-void wxFont::SetNoAntiAliasing( bool no )
+wxGDIRefData* wxFont::CreateGDIRefData() const
{
- Unshare();
-
- M_FONTDATA->SetNoAntiAliasing( no );
+ return new wxFontRefData;
}
-// ----------------------------------------------------------------------------
-// get internal representation of font
-// ----------------------------------------------------------------------------
-
-#ifndef __WXGTK20__
-static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;
-
-// this is also used from tbargtk.cpp and tooltip.cpp, hence extern
-extern GdkFont *GtkGetDefaultGuiFont()
+wxGDIRefData* wxFont::CloneGDIRefData(const wxGDIRefData* data) 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 );
- }
- else
- {
- // already have it, but ref it once more before returning
- gdk_font_ref(g_systemDefaultGuiFont);
- }
-
- return g_systemDefaultGuiFont;
+ return new wxFontRefData(*static_cast<const wxFontRefData*>(data));
}
-GdkFont *wxFont::GetInternalFont( float scale ) const
+bool wxFont::GTKSetPangoAttrs(PangoLayout* layout) const
{
- GdkFont *font = (GdkFont *) NULL;
+ if (!IsOk() || !(GetUnderlined() || GetStrikethrough()))
+ return false;
- wxCHECK_MSG( Ok(), font, wxT("invalid font") )
+ PangoAttrList* attrs = pango_attr_list_new();
+ PangoAttribute* a;
- long int_scale = long(scale * 100.0 + 0.5); // key for fontlist
- int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100);
-
- wxScaledFontList& list = M_FONTDATA->m_scaled_xfonts;
- wxScaledFontList::iterator i = list.find(int_scale);
- if ( i != list.end() )
- {
- font = i->second;
- }
- else // we don't have this font in this size yet
+ if (wx_pango_version_check(1,16,0))
{
- if (*this == wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT))
- {
- font = GtkGetDefaultGuiFont();
- }
+ // 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.
- if ( !font )
+ const char* text = pango_layout_get_text(layout);
+ const size_t n = strlen(text);
+ if ((n > 0 && text[0] == ' ') || (n > 1 && text[n - 1] == ' '))
{
- // do we have the XLFD?
- if ( M_FONTDATA->HasNativeFont() )
- {
- font = wxLoadFont(M_FONTDATA->m_nativeFontInfo.GetXFontName());
- }
-
- // no XLFD of no exact match - try the approximate one now
- if ( !font )
- {
- wxString xfontname;
- 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,
- &xfontname);
- if ( font )
- {
- M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname);
- }
- }
- }
-
- if ( font )
- {
- list[int_scale] = font;
+ 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);
+ }
- // 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;
}
-#endif // not GTK 2.0
-
projects / wxWidgets.git / blobdiff