github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-05 17:44:55 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

*Draw: fixed CJK glyph issues

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3417 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2011-05-13 10:21:59 +00:00
parent f8fc27de41
commit 2fbbc9989d
3 changed files with 46 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
uppsrc/CtrlCore/DrawTextWin32.cpp
View file

@ -13,10 +13,9 @@ void SystemDraw::DrawTextOp(int x, int y, int angle, const wchar *text, Font fon
Std(font);
while(n > 30000) {
DrawTextOp(x, y, angle, text, font, ink, 30000, dx);
if(dx) {
if(dx)
for(int i = 0; i < 30000; i++)
x += *dx++;
}
else
x += GetTextSize(text, font, 30000).cx;
n -= 30000;

13
uppsrc/Draw/DrawText.cpp
View file

@ -85,6 +85,19 @@ void Draw::DrawText(int x, int y, int angle, const wchar *text, Font font,
}
GlyphMetrics(gi, font, chr);
}
else {
Font fnt = Arial(font.GetHeight());
wchar chr = 0x25a1;
gi = GetGlyphInfo(fnt, chr);
if(!gi.IsNormal()) {
chr = ' ';
gi = GetGlyphInfo(fnt, chr);
}
if(angle)
DrawTextOp(int(x + cosa * d), int(y - sina * d), angle, &chr, fnt, ink, 1, NULL);
else
DrawTextOp(x + d, y, 0, &chr, fnt, ink, 1, NULL);
}
d += dx ? *dx++ : gi.width;
}
}

62
uppsrc/Draw/FontCR.cpp
View file

@ -229,29 +229,36 @@ struct sRFace {
dword l, h;
} sFontReplacements[] = {
{ "sans-serif", 0xffee0008, 0xdc000801 },
{ "Arial", 0xfffe0000, 0x09c00080 },
{ "Arial Unicode MS", 0xfffc3fef, 0xfa7ff7e7 },
{ "SimSun", 0xfd800000, 0x09ffff00 },
{ "MS UI Gothic", 0xffc01008, 0x0fffff00 },
{ "MS Mincho", 0xffc01008, 0x0fffff00 },
{ "WenQuanYi Zen Hei Mono", 0xfd800000, 0x0ae7ff7e },
{ "WenQuanYi Zen Hei", 0xfd800000, 0x0ae7ff7e },
{ "VL Gothic", 0xfd800000, 0x09a7ff80 },
{ "VL PGothic", 0xffe00008, 0x0de7ff80 },
{ "UnDotum", 0xe5800000, 0x0aa7ff7e },
{ "UnBatang", 0xe5800000, 0x0aa7ff7e },
{ "DejaVu Sans Mono", 0xffec0004, 0x0fc00080 },
{ "DejaVu Sans", 0xfffd000c, 0x0fc40080 },
{ "AlArabiyaFreeSerif", 0xffdc0008, 0xd8000007 },
{ "Kochi Mincho", 0xffdc0008, 0xd8000007 },
{ "Kochi Gothic", 0xffdc0008, 0xd8000007 },
{ "Sazanami Mincho", 0xffdc0008, 0xd8000007 },
{ "Sazanami Gothic", 0xffdc0008, 0xd8000007 },
{ "Gulim", 0xf7c00000, 0x0ba7ff7e },
{ "PMingLiU", 0xff800000, 0x09ffff00 },
{ "FreeSans", 0xfff23d00, 0x0fc00000 },
{ "FreeSerif", 0xfffd3938, 0x0fc00080 },
{ "Symbol", 0xe4000000, 0x88000002 },
{ "Arial", 0xfffe0000, 0x9c000801 },
{"\346\226\260\345\256\213\344\275\223", 0xfd800000, 0x9ffff00d },//SimSun (or New Song Ti)
{"SimSun", 0xfd800000, 0x9ffff00d },//SimSun (or New Song Ti)
{"\345\256\213\344\275\223", 0xfd800000, 0x9ffff00d }, // Song Ti
{"\345\276\256\350\275\257\351\233\205\351\273\221", 0xfd800000, 0x9ffff00f }, //MS Ya Hei
{"Microsoft YaHei", 0xfd800000, 0x9ffff00f }, //MS Ya Hei
// {"\351\273\221\344\275\223", 0xfd800000, 0x09ffff00 }, // Hei Ti
// {"\346\226\207\346\263\211\351\251\277\346\255\243\351\273\221", 0xfd800000, 0x09ffff00 }, //WenQuanYi Zheng Hi
// {"\346\226\207\346\263\211\351\251\277\347\255\211\345\256\275\345\276\256\347\261\263\351\273\221", 0xfd800000, 0x09ffff00 },//WenQuanYi Wei Hei
// {"\344\273\277\345\256\213", 0xfd800000, 0x09ffff00 }, //Fang Song
// {"\346\245\267\344\275\223", 0xfd800000, 0x09ffff00 }, // Kai Ti
{ "Arial Unicode MS", 0xfffc3fef, 0xfa7ff7ef },
{ "MS UI Gothic", 0xffc01008, 0xfffff001 },
{ "MS Mincho", 0xffc01008, 0xfffff001 },
{ "VL Gothic", 0xfd800000, 0x9a7ff80f },
{ "VL PGothic", 0xffe00008, 0xde7ff80f },
{ "UnDotum", 0xe5800000, 0xaa7ff7ef },
{ "UnBatang", 0xe5800000, 0xaa7ff7ef },
{ "DejaVu Sans Mono", 0xffec0004, 0xfc00080f },
{ "DejaVu Sans", 0xfffd000c, 0xfc40080f },
{ "AlArabiyaFreeSerif", 0xffdc0008, 0xd800000f },
{ "Kochi Mincho", 0xffdc0008, 0xd800000f },
{ "Kochi Gothic", 0xffdc0008, 0xd800000f },
{ "Sazanami Mincho", 0xffdc0008, 0xd800000f },
{ "Sazanami Gothic", 0xffdc0008, 0xd800000f },
{ "Gulim", 0xf7c00000, 0xba7ff7e1 },
{ "PMingLiU", 0xff800000, 0x9ffff001 }, // <--- SHOULD MOVE UP
{ "FreeSans", 0xfff23d00, 0xfc00000f },
{ "FreeSerif", 0xfffd3938, 0xfc00080f },
{ "Symbol", 0xe4000000, 0x8800000f },
};
struct sFontMetricsReplacement {
@ -277,14 +284,9 @@ bool Replace(Font fnt, int chr, Font& rfnt)
Font f = fnt;
dword tl = chr < 4096 ? 0x80000000 >> (chr >> 7) : 0;
dword th = 0x8000000 >> ((dword)chr >> 11);
// DDUMP(FormatIntHex(chr));
// DDUMP(FormatIntHex(th));
dword th = 0x80000000 >> ((dword)chr >> 11);
for(int i = 0; i < rface.GetCount(); i++) {
// DDUMP(Font(rface[i], 10));
// DDUMP(FormatIntHex(h[i]));
// DDUMP(FormatIntHex(h[i] & th));
if(((l[i] & tl) || (h[i] & th)) && IsNormal(f.Face(rface[i]), chr)) {
if(/*((l[i] & tl) || (h[i] & th)) && */IsNormal(f.Face(rface[i]), chr)) {
int a = fnt.GetAscent();
int d = fnt.GetDescent();
if(f.GetAscent() > a || f.GetDescent() > d) {