github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Fixing new draw in X11

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1377 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-07-06 22:45:26 +00:00
parent 6c73ab6284
commit f619ba907d
5 changed files with 931 additions and 924 deletions
Download patch file Download diff file Expand all files Collapse all files

7
uppsrc/Draw/FontFc.cpp
View file

@ -1,5 +1,8 @@
#include "Draw.h"
#include <fontconfig/fontconfig.h>
#include <fontconfig/fcfreetype.h>
NAMESPACE_UPP
#ifdef PLATFORM_POSIX
@ -45,7 +48,7 @@ FcPattern *CreateFcPattern(Font font, int angle)
FcPatternAddMatrix(p, FC_MATRIX, &mx);
}
FcResult result;
FcPattern *m = XftFontMatch(Xdisplay, Xscreenno, p, &result);
FcPattern *m = FcFontMatch(0, p, &result);
FcPatternDestroy(p);
return m;
}
@ -198,7 +201,7 @@ Vector<FaceInfo> GetAllFacesSys()
fi.info = (i == 3 || i == 6) ? Font::SCALEABLE|Font::FIXEDPITCH : Font::SCALEABLE;
}
FcPattern *p = FcPatternCreate();
FcObjectSet *os = FcObjectSetBuild(XFT_FAMILY, XFT_SPACING, XFT_SCALABLE, (void *)0);
FcObjectSet *os = FcObjectSetBuild(FC_FAMILY, FC_SPACING, FC_SCALABLE, (void *)0);
FcFontSet *fs = FcFontList(NULL, p, os);
FcPatternDestroy(p);
FcObjectSetDestroy(os);