#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/font.h" // wxFont enums
- #include "wx/encinfo.h"
#include "wx/hash.h"
#include "wx/utils.h" // for wxGetDisplay()
#include "wx/module.h"
#endif // PCH
+#include "wx/encinfo.h"
#include "wx/fontmap.h"
#include "wx/tokenzr.h"
#include "wx/fontenum.h"
#include "wx/x11/private.h"
#include "wx/gtk/private/string.h"
- #define wxPANGO_CONV(s) (wxConvUTF8.cWX2MB((s)))
- #define wxPANGO_CONV_BACK(s) (wxConvUTF8.cMB2WX((s)))
+ #define wxPANGO_CONV(s) s.utf8_str()
+ #define wxPANGO_CONV_BACK(s) wxString::FromUTF8Unchecked(s)
#endif
// ----------------------------------------------------------------------------
void wxNativeFontInfo::Init()
{
description = NULL;
+ m_underlined = false;
+ m_strikethrough = false;
}
void wxNativeFontInfo::Init(const wxNativeFontInfo& info)
{
if (info.description)
+ {
description = pango_font_description_copy(info.description);
+ m_underlined = info.GetUnderlined();
+ m_strikethrough = info.GetStrikethrough();
+ }
else
+ {
description = NULL;
+ m_underlined = false;
+ m_strikethrough = false;
+ }
}
void wxNativeFontInfo::Free()
bool wxNativeFontInfo::GetUnderlined() const
{
- return false;
+ return m_underlined;
+}
+
+bool wxNativeFontInfo::GetStrikethrough() const
+{
+ return m_strikethrough;
}
wxString wxNativeFontInfo::GetFaceName() const
// Check for some common fonts, to salvage what we can from the current
// win32 centric wxFont API:
- if (strncasecmp( family_text, "monospace", 9 ) == 0)
+ if (wxStrnicmp( family_text, "monospace", 9 ) == 0)
ret = wxFONTFAMILY_TELETYPE; // begins with "Monospace"
- else if (strncasecmp( family_text, "courier", 7 ) == 0)
+ else if (wxStrnicmp( family_text, "courier", 7 ) == 0)
ret = wxFONTFAMILY_TELETYPE; // begins with "Courier"
#if defined(__WXGTK20__) || defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
else
-#ifdef __WXGTK20__
- if (!gtk_check_version(2,4,0))
-#endif
{
PangoFontFamily **families;
PangoFontFamily *family = NULL;
ret = wxFONTFAMILY_SWISS; // contains "Sans"
else if (strstr( family_text, "serif" ) != NULL || strstr( family_text, "Serif" ) != NULL)
ret = wxFONTFAMILY_ROMAN; // contains "Serif"
- else if (strncasecmp( family_text, "times", 5 ) == 0)
+ else if (wxStrnicmp( family_text, "times", 5 ) == 0)
ret = wxFONTFAMILY_ROMAN; // begins with "Times"
- else if (strncasecmp( family_text, "old", 3 ) == 0)
+ else if (wxStrnicmp( family_text, "old", 3 ) == 0)
ret = wxFONTFAMILY_DECORATIVE; // begins with "Old" - "Old English", "Old Town"
}
}
}
-void wxNativeFontInfo::SetUnderlined(bool WXUNUSED(underlined))
+void wxNativeFontInfo::SetUnderlined(bool underlined)
{
- // wxWindowDCImpl::DoDrawText will take care of rendering font with
- // the underline attribute!
- wxFAIL_MSG( "not implemented" );
+ // Pango doesn't have the underlined attribute so we store it separately
+ // (and handle it specially in wxWindowDCImpl::DoDrawText()).
+ m_underlined = underlined;
+}
+
+void wxNativeFontInfo::SetStrikethrough(bool strikethrough)
+{
+ // As with the underlined attribute above, we handle this one separately as
+ // Pango doesn't support it as part of the font description.
+ m_strikethrough = strikethrough;
}
bool wxNativeFontInfo::SetFaceName(const wxString& facename)
case wxFONTFAMILY_ROMAN:
// corresponds to the serif font family in the page linked above
- facename.Add(wxS("Century Schoolbook L"));
- facename.Add(wxS("URW Bookman L"));
- facename.Add(wxS("URW Palladio L"));
+ facename.Add(wxS("Serif"));
facename.Add(wxS("DejaVu Serif"));
+ facename.Add(wxS("DejaVu LGC Serif"));
+ facename.Add(wxS("Bitstream Vera Serif"));
+ facename.Add(wxS("Liberation Serif"));
facename.Add(wxS("FreeSerif"));
+ facename.Add(wxS("Luxi Serif"));
facename.Add(wxS("Times New Roman"));
+ facename.Add(wxS("Century Schoolbook L"));
+ facename.Add(wxS("URW Bookman L"));
+ facename.Add(wxS("URW Palladio L"));
facename.Add(wxS("Times"));
break;
case wxFONTFAMILY_TELETYPE:
case wxFONTFAMILY_MODERN:
// corresponds to the monospace font family in the page linked above
+ facename.Add(wxS("Monospace"));
facename.Add(wxS("DejaVu Sans Mono"));
- facename.Add(wxS("Nimbus Mono L"));
+ facename.Add(wxS("DejaVu LGC Sans Mono"));
facename.Add(wxS("Bitstream Vera Sans Mono"));
- facename.Add(wxS("Andale Mono"));
- facename.Add(wxS("Lucida Sans Typewriter"));
+ facename.Add(wxS("Liberation Mono"));
facename.Add(wxS("FreeMono"));
+ facename.Add(wxS("Luxi Mono"));
facename.Add(wxS("Courier New"));
+ facename.Add(wxS("Lucida Sans Typewriter"));
+ facename.Add(wxS("Nimbus Mono L"));
+ facename.Add(wxS("Andale Mono"));
facename.Add(wxS("Courier"));
break;
case wxFONTFAMILY_DEFAULT:
default:
// corresponds to the sans-serif font family in the page linked above
+ facename.Add(wxS("Sans"));
facename.Add(wxS("DejaVu Sans"));
- facename.Add(wxS("URW Gothic L"));
- facename.Add(wxS("Nimbus Sans L"));
+ facename.Add(wxS("DejaVu LGC Sans"));
facename.Add(wxS("Bitstream Vera Sans"));
- facename.Add(wxS("Lucida Sans"));
- facename.Add(wxS("Arial"));
+ facename.Add(wxS("Liberation Sans"));
facename.Add(wxS("FreeSans"));
+ facename.Add(wxS("Luxi Sans"));
+ facename.Add(wxS("Arial"));
+ facename.Add(wxS("Lucida Sans"));
+ facename.Add(wxS("Nimbus Sans L"));
+ facename.Add(wxS("URW Gothic L"));
break;
}
bool wxNativeFontInfo::FromString(const wxString& s)
{
+ wxString str(s);
+
+ // Pango font description doesn't have 'underlined' or 'strikethrough'
+ // attributes, so we handle them specially by extracting them from the
+ // string before passing it to Pango.
+ m_underlined = str.StartsWith(wxS("underlined "), &str);
+ m_strikethrough = str.StartsWith(wxS("strikethrough "), &str);
+
if (description)
pango_font_description_free( description );
// we do the check on the size here using same (arbitrary) limits used by
// pango > 1.13. Note that the segfault could happen also for pointsize
// smaller than this limit !!
- wxString str(s);
const size_t pos = str.find_last_of(wxS(" "));
double size;
if ( pos != wxString::npos && wxString(str, pos + 1).ToDouble(&size) )
wxString wxNativeFontInfo::ToString() const
{
wxGtkString str(pango_font_description_to_string( description ));
-
- return wxPANGO_CONV_BACK(str);
+ wxString desc = wxPANGO_CONV_BACK(str);
+
+ // Augment the string with the attributes not handled by Pango.
+ //
+ // Notice that we must add them in the same order they are extracted in
+ // FromString() above.
+ if (m_strikethrough)
+ desc.insert(0, wxS("strikethrough "));
+ if (m_underlined)
+ desc.insert(0, wxS("underlined "));
+
+ return desc;
}
bool wxNativeFontInfo::FromUserString(const wxString& s)
if ( !HasElements() )
{
- // const_cast
- if ( !((wxNativeFontInfo *)this)->FromXFontName(xFontName) )
+ if ( !const_cast<wxNativeFontInfo *>(this)->FromXFontName(xFontName) )
return wxEmptyString;
}
elt = wxT('*');
}
- // const_cast
- ((wxNativeFontInfo *)this)->xFontName << wxT('-') << elt;
+ const_cast<wxNativeFontInfo *>(this)->xFontName << wxT('-') << elt;
}
}
if ( !HasElements() )
{
- // const_cast
- if ( !((wxNativeFontInfo *)this)->FromXFontName(xFontName) )
+ if ( !const_cast<wxNativeFontInfo *>(this)->FromXFontName(xFontName) )
{
wxFAIL_MSG( wxT("can't set font element for invalid XLFD") );
// can't do this under X
}
+void wxNativeFontInfo::SetStrikethrough(bool WXUNUSED(strikethrough))
+{
+ // this is not supported by Pango fonts neither
+}
+
bool wxNativeFontInfo::SetFaceName(const wxString& facename)
{
SetXFontComponent(wxXLFD_FAMILY, facename);
{
wxString fontspec;
fontspec.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-%s-%s"),
- !info.facename ? wxT("*") : info.facename.c_str(),
- info.xregistry.c_str(),
- info.xencoding.c_str());
+ info.facename.empty() ? wxString("*") : info.facename,
+ info.xregistry,
+ info.xencoding);
return wxTestFontSpec(fontspec);
}
void wxFontModule::OnExit()
{
- delete g_fontHash;
-
- g_fontHash = NULL;
+ wxDELETE(g_fontHash);
}
#endif // GTK 2.0/1.x
projects / wxWidgets.git / blobdiff