// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "fontenum.h"
-#endif
-
// for compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#include "wx/dynarray.h"
-#include "wx/string.h"
+#include "wx/fontenum.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/dynarray.h"
+ #include "wx/string.h"
+ #include "wx/app.h"
+ #include "wx/utils.h"
+#endif
+
#include "wx/regex.h"
-#include "wx/utils.h"
-#include "wx/app.h"
#include "wx/fontmap.h"
-#include "wx/fontenum.h"
#include "wx/fontutil.h"
#include "wx/encinfo.h"
#ifdef __WXGTK20__
#include "gtk/gtk.h"
extern GtkWidget *wxGetRootWindow();
-#endif
+#endif // __WXGTK20__
-static int
-cmp_families (const void *a, const void *b)
+extern "C" int wxCMPFUNC_CONV
+wxCompareFamilies (const void *a, const void *b)
{
const char *a_name = pango_font_family_get_name (*(PangoFontFamily **)a);
const char *b_name = pango_font_family_get_name (*(PangoFontFamily **)b);
-
+
return g_utf8_collate (a_name, b_name);
}
-// I admit I don't yet understand encodings with Pango
bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
bool fixedWidthOnly)
{
-#ifndef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
- if ( fixedWidthOnly )
+ if ( encoding != wxFONTENCODING_SYSTEM && encoding != wxFONTENCODING_UTF8 )
{
- OnFacename( wxT("monospace") );
+ // Pango supports only UTF-8 encoding (and system means any, so we
+ // accept it too)
+ return false;
}
- else
+
+#if defined(__WXGTK20__) || !defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
+ if ( fixedWidthOnly
+#if defined(__WXGTK24__)
+ && (gtk_check_version(2,4,0) != NULL)
#endif
+ )
+ {
+ OnFacename( wxT("monospace") );
+ }
+ else // !fixedWidthOnly
+#endif // __WXGTK20__ || !HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
{
PangoFontFamily **families = NULL;
gint n_families = 0;
- pango_context_list_families (
+ pango_context_list_families (
#ifdef __WXGTK20__
gtk_widget_get_pango_context( wxGetRootWindow() ),
#else
wxTheApp->GetPangoContext(),
#endif
&families, &n_families );
- qsort (families, n_families, sizeof (PangoFontFamily *), cmp_families);
+ qsort (families, n_families, sizeof (PangoFontFamily *), wxCompareFamilies);
for (int i=0; i<n_families; i++)
{
-#ifdef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
- if (!fixedWidthOnly ||
- pango_font_family_is_monospace(families[i]))
+#if defined(__WXGTK24__) || defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
+ if (!fixedWidthOnly || (
+#ifdef __WXGTK24__
+ !gtk_check_version(2,4,0) &&
+#endif
+ pango_font_family_is_monospace(families[i])
+ ) )
#endif
{
const gchar *name = pango_font_family_get_name(families[i]);
OnFacename(wxString(name, wxConvUTF8));
}
}
+ g_free(families);
}
-
- return TRUE;
+
+ return true;
}
-bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
+bool wxFontEnumerator::EnumerateEncodings(const wxString& facename)
{
- return FALSE;
+ // name of UTF-8 encoding: no need to use wxFontMapper for it as it's
+ // unlikely to change
+ const wxString utf8(_T("UTF-8"));
+
+
+ // all fonts are in UTF-8 only when using Pango
+ if ( !facename.empty() )
+ {
+ OnFontEncoding(facename, utf8);
+ return true;
+ }
+
+ // so enumerating all facenames supporting this encoding is the same as
+ // enumerating all facenames
+ const wxArrayString facenames(GetFacenames(wxFONTENCODING_UTF8));
+ const size_t count = facenames.size();
+ if ( !count )
+ return false;
+
+ for ( size_t n = 0; n < count; n++ )
+ {
+ OnFontEncoding(facenames[n], utf8);
+ }
+
+ return true;
}
-#else
- // Pango
+#else // !wxUSE_PANGO
#ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
// The resulting warnings are switched off here
continue;
}
+ // coverity[returned_null]
char *dash = strchr(font + 1, '-');
char *family = dash + 1;
dash = strchr(family, '-');
if ( !This->OnFacename(fam) )
{
// stop enumerating
- return FALSE;
+ return false;
}
families.Add(fam);
//else: already seen
}
- return TRUE;
+ return true;
}
#endif
// wxUSE_NANOX
bool fixedWidthOnly)
{
#if wxUSE_NANOX
- return FALSE;
+ return false;
#else
int nFonts;
char **fonts;
if ( fixedWidthOnly )
{
- bool cont = TRUE;
+ bool cont = true;
fonts = CreateFontList(wxT('m'), encoding, &nFonts);
if ( fonts )
{
if ( !cont )
{
- return TRUE;
+ return true;
}
fonts = CreateFontList(wxT('c'), encoding, &nFonts);
if ( !fonts )
{
- return TRUE;
+ return true;
}
}
else
wxASSERT_MSG(encoding != wxFONTENCODING_SYSTEM,
wxT("No fonts at all on this system?"));
- return FALSE;
+ return false;
}
}
(void)ProcessFamiliesFromFontList(this, fonts, nFonts);
XFreeFontNames(fonts);
- return TRUE;
+ return true;
#endif
// wxUSE_NANOX
}
bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
{
#if wxUSE_NANOX
- return FALSE;
+ return false;
#else
wxString pattern;
pattern.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-*-*"),
- family.IsEmpty() ? wxT("*") : family.c_str());
+ family.empty() ? wxT("*") : family.c_str());
// get the list of all fonts
int nFonts;
if ( !fonts )
{
// unknown family?
- return FALSE;
+ return false;
}
// extract the list of (unique) encodings
dash = strchr(familyFont, '-');
*dash = '\0'; // !NULL because Matches() above succeeded
- if ( !family.IsEmpty() && (family != familyFont) )
+ if ( !family.empty() && (family != familyFont) )
{
// family doesn't match
continue;
XFreeFontNames(fonts);
- return TRUE;
+ return true;
#endif
// wxUSE_NANOX
}
-#endif
- // __WXGTK20__
+#endif // !wxUSE_PANGO
projects / wxWidgets.git / blobdiff