darlinghq/darling-cocotron
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-cocotron.git synced 2025-02-25 14:31:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix FC font matching

Browse Source
This commit is contained in:
Sergey Bugaev 2018-01-12 18:26:54 +03:00
parent 52cdf986a3
commit 96ce92979c
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
AppKit/X11.subproj/O2Font_FT.m
View File

@ -53,26 +53,27 @@ FcConfig *O2FontSharedFontConfig() {
}
+(NSString*)filenameForPattern:(NSString *)pattern {
int i;
FcPattern *pat=FcNameParse((unsigned char*)[pattern UTF8String]);
FcConfig *config = O2FontSharedFontConfig();
FcObjectSet *props=FcObjectSetBuild(FC_FILE, NULL);
FcPattern *pat = FcNameParse((unsigned char*)[pattern UTF8String]);
FcConfigSubstitute(config, pat, FcMatchPattern);
FcDefaultSubstitute(pat);
FcFontSet *set = FcFontList (O2FontSharedFontConfig(), pat, props);
NSString* ret=NULL;
for(i = 0; i < set->nfont && !ret; i++) {
FcChar8 *filename;
FcResult fcResult;
FcPattern *match = FcFontMatch(config, pat, &fcResult);
FcPatternDestroy(pat);
if (match == NULL) return nil;
if (FcPatternGetString (set->fonts[i], FC_FILE, 0, &filename) == FcResultMatch) {
ret=[NSString stringWithUTF8String:(char*)filename];
}
FcChar8 *filename = NULL;
FcPatternGetString(match, FC_FILE, 0, &filename);
NSString *res = nil;
if (filename != NULL) {
res = [NSString stringWithUTF8String: (char *)filename];
}
FcPatternDestroy(pat);
FcObjectSetDestroy(props);
FcFontSetDestroy(set);
return ret;
FcPatternDestroy(match);
return res;
}
-initWithFontName:(NSString *)name {
@ -83,6 +84,7 @@ FcConfig *O2FontSharedFontConfig() {
filename=[[self class] filenameForPattern:@""];
if(filename==nil) {
NSLog(@"No font found for name %@", name);
#ifdef LINUX
filename=@"/usr/share/fonts/truetype/freefont/FreeSans.ttf";
#else
@ -90,7 +92,7 @@ FcConfig *O2FontSharedFontConfig() {
#endif
}
}
FT_Error ret=FT_New_Face(O2FontSharedFreeTypeLibrary(),[filename fileSystemRepresentation],0,&_face);
if(ret!=0)
@ -100,7 +102,7 @@ FcConfig *O2FontSharedFontConfig() {
// FT_Set_Char_Size(_face,0,2048*64,72,72);
if(!(_face->face_flags&FT_FACE_FLAG_SCALABLE))
NSLog(@"FreeType font face is not scalable");
NSLog(@"FreeType font face is not scalable: %@", filename);
_unitsPerEm=(float)_face->units_per_EM;
_ascent=_face->ascender;
@ -117,6 +119,9 @@ FcConfig *O2FontSharedFontConfig() {
_numberOfGlyphs=_face->num_glyphs;
_advances=NULL;
// TODO: set an actual value here
_coveredCharSet = [[[NSCharacterSet illegalCharacterSet] invertedSet] retain];
return self;
}