projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move code that does not need realized GdkWinow out of realize handler
[wxWidgets.git]
/
src
/
unix
/
fontenum.cpp
diff --git
a/src/unix/fontenum.cpp
b/src/unix/fontenum.cpp
index 94520acb8d1d4a6f730a85285bf0b26778a77728..cc7ee1dad4496f94fafee16eee15b8e813e24029 100644
(file)
--- a/
src/unix/fontenum.cpp
+++ b/
src/unix/fontenum.cpp
@@
-4,7
+4,6
@@
// Author: Vadim Zeitlin
// Modified by:
// Created: 01.10.99
// Author: Vadim Zeitlin
// Modified by:
// Created: 01.10.99
-// RCS-ID: $Id$
// Copyright: (c) Vadim Zeitlin
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) Vadim Zeitlin
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@
-17,20
+16,22
@@
// headers
// ----------------------------------------------------------------------------
// 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"
// for compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#include "wx/dynarray.h"
-#include "wx/string.h"
+#if wxUSE_FONTENUM
+
+#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/regex.h"
-#include "wx/utils.h"
-#include "wx/app.h"
#include "wx/fontmap.h"
#include "wx/fontmap.h"
-#include "wx/fontenum.h"
#include "wx/fontutil.h"
#include "wx/encinfo.h"
#include "wx/fontutil.h"
#include "wx/encinfo.h"
@@
-45,58
+46,64
@@
#ifdef __WXGTK20__
#include "gtk/gtk.h"
extern GtkWidget *wxGetRootWindow();
#ifdef __WXGTK20__
#include "gtk/gtk.h"
extern GtkWidget *wxGetRootWindow();
-#endif
+#endif
// __WXGTK20__
-static int
-cmp_families (const void *a, const void *b)
+extern "C"
+{
+static 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);
{
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);
}
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)
{
bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
bool fixedWidthOnly)
{
- 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
- {
- PangoFontFamily **families = NULL;
- gint n_families = 0;
- pango_context_list_families (
+
+ PangoFontFamily **families = NULL;
+ gint n_families = 0;
+ pango_context_list_families (
#ifdef __WXGTK20__
#ifdef __WXGTK20__
-
gtk_widget_get_pango_context( wxGetRootWindow() ),
+ gtk_widget_get_pango_context( wxGetRootWindow() ),
#else
#else
-
wxTheApp->GetPangoContext(),
+ wxTheApp->GetPangoContext(),
#endif
#endif
-
&families, &n_families );
-
qsort (families, n_families, sizeof (PangoFontFamily *), cmp_f
amilies);
+ &families, &n_families );
+
qsort (families, n_families, sizeof (PangoFontFamily *), wxCompareF
amilies);
- for (int i=0; i<n_families; i++)
+ for ( int i = 0; i < n_families; i++ )
+ {
+#if defined(__WXGTK20__) || defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
+ if ( !fixedWidthOnly ||
+ pango_font_family_is_monospace(families[i]) )
+#endif
{
{
- const gchar *name = pango_font_family_get_name( families[i] );
-
- wxString tmp( name, wxConvUTF8 );
- OnFacename( tmp );
+ const gchar *name = pango_font_family_get_name(families[i]);
+ OnFacename(wxString(name, wxConvUTF8));
}
}
}
}
-
- return TRUE;
+ g_free(families);
+
+ return true;
}
}
-bool wxFontEnumerator::EnumerateEncodings(const wxString& fa
mily
)
+bool wxFontEnumerator::EnumerateEncodings(const wxString& fa
cename
)
{
{
- return
FALSE
;
+ return
EnumerateEncodingsUTF8(facename)
;
}
}
-#else
- // Pango
+#else // !wxUSE_PANGO
#ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
// The resulting warnings are switched off here
#ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
// The resulting warnings are switched off here
@@
-183,6
+190,7
@@
static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
continue;
}
continue;
}
+ // coverity[returned_null]
char *dash = strchr(font + 1, '-');
char *family = dash + 1;
dash = strchr(family, '-');
char *dash = strchr(font + 1, '-');
char *family = dash + 1;
dash = strchr(family, '-');
@@
-194,7
+202,7
@@
static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
if ( !This->OnFacename(fam) )
{
// stop enumerating
if ( !This->OnFacename(fam) )
{
// stop enumerating
- return
FALSE
;
+ return
false
;
}
families.Add(fam);
}
families.Add(fam);
@@
-202,7
+210,7
@@
static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
//else: already seen
}
//else: already seen
}
- return
TRUE
;
+ return
true
;
}
#endif
// wxUSE_NANOX
}
#endif
// wxUSE_NANOX
@@
-215,14
+223,14
@@
bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
bool fixedWidthOnly)
{
#if wxUSE_NANOX
bool fixedWidthOnly)
{
#if wxUSE_NANOX
- return
FALSE
;
+ return
false
;
#else
int nFonts;
char **fonts;
if ( fixedWidthOnly )
{
#else
int nFonts;
char **fonts;
if ( fixedWidthOnly )
{
- bool cont =
TRUE
;
+ bool cont =
true
;
fonts = CreateFontList(wxT('m'), encoding, &nFonts);
if ( fonts )
{
fonts = CreateFontList(wxT('m'), encoding, &nFonts);
if ( fonts )
{
@@
-233,13
+241,13
@@
bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
if ( !cont )
{
if ( !cont )
{
- return
TRUE
;
+ return
true
;
}
fonts = CreateFontList(wxT('c'), encoding, &nFonts);
if ( !fonts )
{
}
fonts = CreateFontList(wxT('c'), encoding, &nFonts);
if ( !fonts )
{
- return
TRUE
;
+ return
true
;
}
}
else
}
}
else
@@
-253,14
+261,14
@@
bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
wxASSERT_MSG(encoding != wxFONTENCODING_SYSTEM,
wxT("No fonts at all on this system?"));
wxASSERT_MSG(encoding != wxFONTENCODING_SYSTEM,
wxT("No fonts at all on this system?"));
- return
FALSE
;
+ return
false
;
}
}
(void)ProcessFamiliesFromFontList(this, fonts, nFonts);
XFreeFontNames(fonts);
}
}
(void)ProcessFamiliesFromFontList(this, fonts, nFonts);
XFreeFontNames(fonts);
- return
TRUE
;
+ return
true
;
#endif
// wxUSE_NANOX
}
#endif
// wxUSE_NANOX
}
@@
-268,11
+276,11
@@
bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
{
#if wxUSE_NANOX
bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
{
#if wxUSE_NANOX
- return
FALSE
;
+ return
false
;
#else
wxString pattern;
pattern.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-*-*"),
#else
wxString pattern;
pattern.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-*-*"),
- family.
IsE
mpty() ? wxT("*") : family.c_str());
+ family.
e
mpty() ? wxT("*") : family.c_str());
// get the list of all fonts
int nFonts;
// get the list of all fonts
int nFonts;
@@
-282,7
+290,7
@@
bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
if ( !fonts )
{
// unknown family?
if ( !fonts )
{
// unknown family?
- return
FALSE
;
+ return
false
;
}
// extract the list of (unique) encodings
}
// extract the list of (unique) encodings
@@
-302,7
+310,7
@@
bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
dash = strchr(familyFont, '-');
*dash = '\0'; // !NULL because Matches() above succeeded
dash = strchr(familyFont, '-');
*dash = '\0'; // !NULL because Matches() above succeeded
- if ( !family.
IsE
mpty() && (family != familyFont) )
+ if ( !family.
e
mpty() && (family != familyFont) )
{
// family doesn't match
continue;
{
// family doesn't match
continue;
@@
-333,10
+341,11
@@
bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
XFreeFontNames(fonts);
XFreeFontNames(fonts);
- return
TRUE
;
+ return
true
;
#endif
// wxUSE_NANOX
}
#endif
// wxUSE_NANOX
}
-#endif
- // __WXGTK20__
+#endif // !wxUSE_PANGO
+
+#endif // wxUSE_FONTENUM