nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Be more picky than Pango when validating a Pango font description

Browse Source 
string. Without this, Richard B reports that Pango 1.18 will treat
_anything_ as valid, which means PuTTY can never fall back to X
fonts.

[originally from svn r7956]
This commit is contained in:
Simon Tatham 2008-03-29 15:44:32 +00:00
parent 9adbc97e91
commit bef50d3fd2
1 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
unix/gtkfont.c
View File

@ -715,6 +715,55 @@ static const struct unifont_vtable pangofont_vtable = {
"client"
};
/*
* This function is used to rigorously validate a
* PangoFontDescription. Later versions of Pango have a nasty
* habit of accepting _any_ old string as input to
* pango_font_description_from_string and returning a font
* description which can actually be used to display text, even if
* they have to do it by falling back to their most default font.
* This is doubtless helpful in some situations, but not here,
* because we need to know if a Pango font string actually _makes
* sense_ in order to fall back to treating it as an X font name
* if it doesn't. So we check that the font family is actually one
* supported by Pango.
*/
static int pangofont_check_desc_makes_sense(PangoContext *ctx,
PangoFontDescription *desc)
{
#ifndef PANGO_PRE_1POINT6
PangoFontMap *map;
#endif
PangoFontFamily **families;
int i, nfamilies, matched;
/*
* Ask Pango for a list of font families, and iterate through
* them to see if one of them matches the family in the
* PangoFontDescription.
*/
#ifndef PANGO_PRE_1POINT6
map = pango_context_get_font_map(ctx);
if (!map)
return FALSE;
pango_font_map_list_families(map, &families, &nfamilies);
#else
pango_context_list_families(ctx, &families, &nfamilies);
#endif
matched = FALSE;
for (i = 0; i < nfamilies; i++) {
if (!g_strcasecmp(pango_font_family_get_name(families[i]),
pango_font_description_get_family(desc))) {
matched = TRUE;
break;
}
}
g_free(families);
return matched;
}
static unifont *pangofont_create(GtkWidget *widget, const char *name,
int wide, int bold,
int shadowoffset, int shadowalways)
@ -736,6 +785,10 @@ static unifont *pangofont_create(GtkWidget *widget, const char *name,
pango_font_description_free(desc);
return NULL;
}
if (!pangofont_check_desc_makes_sense(ctx, desc)) {
pango_font_description_free(desc);
return NULL;
}
#ifndef PANGO_PRE_1POINT6
map = pango_context_get_font_map(ctx);
if (!map) {
@ -1031,6 +1084,10 @@ static char *pangofont_canonify_fontname(GtkWidget *widget, const char *name,
pango_font_description_free(desc);
return NULL;
}
if (!pangofont_check_desc_makes_sense(ctx, desc)) {
pango_font_description_free(desc);
return NULL;
}
#ifndef PANGO_PRE_1POINT6
map = pango_context_get_font_map(ctx);
if (!map) {