}
}
-static const XCharStruct *x11_char_struct(XFontStruct *xfs,
- int byte1, int byte2)
+static const XCharStruct *x11_char_struct(
+ XFontStruct *xfs, unsigned char byte1, unsigned char byte2)
{
int index;
return &xfs->per_char[index];
}
-static int x11_font_has_glyph(XFontStruct *xfs, int byte1, int byte2)
+static int x11_font_has_glyph(
+ XFontStruct *xfs, unsigned char byte1, unsigned char byte2)
{
/*
* Not to be confused with x11font_has_glyph, which is a method of
#undef FLIPPED_SIZE
- if (xlfd_best)
- returned_name = xlfd_recompose(xlfd_best);
+ if (xlfd_best) {
+ char *bare_returned_name = xlfd_recompose(xlfd_best);
+ returned_name = dupcat(
+ xfont->u.vt->prefix, ":", bare_returned_name,
+ (const char *)NULL);
+ sfree(bare_returned_name);
+ }
XFreeFontNames(fontnames);
sfree(xlfd);
} else {
pango_font_description_set_size(desc, size);
newname = pango_font_description_to_string(desc);
- retname = dupstr(newname);
+ retname = dupcat(pfont->u.vt->prefix, ":",
+ newname, (const char *)NULL);
g_free(newname);
}