Commit Diff

Commit:
96dc2330918909c925a5c3a6407116dad7f93c3a
From:
Xiao-Yong Jin <xjin@anl.gov>
Via:
David du Colombier <0intro@gmail.com>
Date:
Message:
fontsrv: enlarge drawing buffer for subfonts on macOS Double the width returned by CTFontGetBoundingBox when drawing. Add box drawing characters for determining the line height. Call freememimage(1) for the character memimage. Fixes #18. Fixes #120. Fixes #146.
Actions:
Patch | Tree
commit - a5b24c22a865f2ea3ee389b9d0a235bf7d93f5a6
commit + 96dc2330918909c925a5c3a6407116dad7f93c3a
blob - adb007c2e432e16d68e5194af519f20408dd2d45
blob + 18197a23d365a17cb5b925a44e999ae9bce06172
--- src/cmd/fontsrv/osx.c
+++ src/cmd/fontsrv/osx.c
@@ -104,6 +104,7 @@ static char *lines[] = {
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZ",
 	"abcdefghijklmnopqrstuvwxyz",
 	"g",
+	"┌┬┐├┼┤└┴┘│─",
 	"ὕαλον ϕαγεῖν δύναμαι· τοῦτο οὔ με βλάπτει.",
 	"私はガラスを食べられます。それは私を傷つけません。",
 	"Aš galiu valgyti stiklą ir jis manęs nežeidžia",
@@ -234,7 +235,7 @@ mksubfont(XFont *f, char *name, int lo, int hi, int si
 	
 	
 	bbox = CTFontGetBoundingBox(font);
-	x = (int)(bbox.size.width + 0.99999999);
+	x = (int)(bbox.size.width*2 + 0.99999999);
 
 	fontheight(f, size, &height, &ascent);
 	y = height;
@@ -343,6 +344,7 @@ mksubfont(XFont *f, char *name, int lo, int hi, int si
 	m1 = allocmemimage(Rect(0, 0, x, y), antialias ? GREY8 : GREY1);
 	memimagedraw(m1, m1->r, m, m->r.min, memopaque, ZP, S);
 	freememimage(m);
+	freememimage(mc);
 
 	sf->name = nil;
 	sf->n = hi+1 - lo;