mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fl_Xlib_Graphics_Driver::set_fonts() with Pango: account better for variety of possible font styles.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12377 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2017-08-13 11:50:47 +00:00
parent 44a3f9fce9
commit 67a63d40e0
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
View File

@ -1343,18 +1343,34 @@ Fl_Font Fl_Xlib_Graphics_Driver::set_fonts(const char* pattern_name)
int l = strlen(fam_name);
pango_font_family_list_faces(families[fam], &faces, &n_faces);
for (int j = 0; j < n_faces; j++) {
char prefix = ' ', *q;
char *p = (char*)pango_font_face_get_face_name(faces[j]);
char prefix = ' ';
char *p = strdup(pango_font_face_get_face_name(faces[j]));
int lp = strlen(p);
// build the font's FLTK name
if (strcmp(p, "Regular") == 0) p = NULL;
else if (strcmp(p, "Bold Italic") == 0 || strcmp(p, "Bold Oblique") == 0) {p = NULL; prefix = 'P';}
else if ((q=strstr(p, "Italic")) || (q=strstr(p, "Oblique")) ) {*q = 0; prefix = 'I';}
else if ((q=strstr(p, "Bold")) ) {*q = 0; prefix = 'B';}
if (strcmp(p, "Regular") == 0) *p = 0;
else if (strcmp(p + lp - 12, "Bold Oblique") == 0 ) {
*(p+lp-12) = 0; prefix = 'P';
}
else if (strcmp(p + lp - 11, "Bold Italic") == 0 ) {
*(p+lp-11) = 0; prefix = 'P';
}
else if (strcmp(p + lp - 6, "Italic") == 0 ) {
*(p+lp-6) = 0; prefix = 'I';
}
else if (strcmp(p + lp - 7, "Oblique") == 0 ) {
*(p+lp-7) = 0; prefix = 'I';
}
else if (strcmp(p + lp - 4, "Bold") == 0 ) {
*(p+lp-4) = 0; prefix = 'B';
}
char *q = p + strlen(p) - 1;
while (*q == ' ' && q > p) q--;
int lq = l+2;
if (p) lq += strlen(p) + 1;
if (*p) lq += strlen(p) + 1;
q = new char[lq];
sprintf(q, "%c%s", prefix, fam_name);
if (p && *p) sprintf(q + strlen(q), " %s", p);
if (*p) sprintf(q + strlen(q), " %s", p);
free(p);
Fl::set_font((Fl_Font)(count++ + FL_FREE_FONT), q);
}
/*g_*/free(faces); // glib source code shows that g_free is equivalent to free