... |
... |
@@ -1145,7 +1145,7 @@ |
1145
|
1145
|
const char* encoding;
|
1146
|
1146
|
|
1147
|
1147
|
int line = 0;
|
1148
|
|
- int x;
|
|
1148
|
+ int x, y;
|
1149
|
1149
|
|
1150
|
1150
|
|
1151
|
1151
|
error = FTC_Manager_LookupFace( handle->cache_manager,
|
... |
... |
@@ -1160,16 +1160,19 @@ |
1160
|
1160
|
|
1161
|
1161
|
/* font and file name */
|
1162
|
1162
|
strbuf_init( buf, buffer, sizeof ( buffer ) );
|
1163
|
|
- x = strbuf_format( buf, "%.50s %.50s", face->family_name,
|
1164
|
|
- face->style_name );
|
|
1163
|
+ x = strbuf_format( buf, "%.50s %.50s",
|
|
1164
|
+ face->family_name, face->style_name );
|
1165
|
1165
|
grWriteCellString( display->bitmap, 0, line * HEADER_HEIGHT,
|
1166
|
1166
|
strbuf_value( buf ), display->fore_color );
|
1167
|
1167
|
|
1168
|
1168
|
basename = ft_basename( handle->current_font->filepathname );
|
1169
|
|
- x = display->bitmap->width - 8 * (int)strlen( basename ) > 8 * x + 8 ?
|
1170
|
|
- display->bitmap->width - 8 * (int)strlen( basename ) : 8 * x + 8;
|
|
1169
|
+ strbuf_reset( buf );
|
|
1170
|
+ y = strbuf_format( buf, face->num_faces > 1 ? "%.50s:%ld" : "%.50s",
|
|
1171
|
+ basename, face->face_index );
|
|
1172
|
+ x = display->bitmap->width - 8 * y > 8 * x + 8 ?
|
|
1173
|
+ display->bitmap->width - 8 * y : 8 * x + 8;
|
1171
|
1174
|
grWriteCellString( display->bitmap, x, line++ * HEADER_HEIGHT,
|
1172
|
|
- basename, display->fore_color );
|
|
1175
|
+ strbuf_value( buf ), display->fore_color );
|
1173
|
1176
|
|
1174
|
1177
|
/* ppem, pt and dpi, instance */
|
1175
|
1178
|
ppem = FT_IS_SCALABLE( face ) ? FT_MulFix( face->units_per_EM,
|