o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

free subfonts correctly

Browse source
This commit is contained in:
rsc 2005-07-13 03:57:24 +00:00
parent 3b634dc7e4
commit b2f9ee0de5
3 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libdraw/stringwidth.c
View file

@ -13,6 +13,7 @@ _stringnwidth(Font *f, char *s, Rune *r, int len)
Rune rune, **rptr;
char *subfontname, **sptr;
Font *def;
Subfont *sf;
if(s == nil){
s = "";
@ -30,6 +31,7 @@ _stringnwidth(Font *f, char *s, Rune *r, int len)
if(len < max)
max = len;
n = 0;
sf = nil;
while((l = cachechars(f, sptr, rptr, cbuf, max, &wid, &subfontname)) <= 0){
if(++n > 10){
if(*r)
@ -40,19 +42,26 @@ _stringnwidth(Font *f, char *s, Rune *r, int len)
name = f->name;
else
name = "unnamed font";
freesubfont(sf);
fprint(2, "stringwidth: bad character set for rune 0x%.4ux in %s\n", rune, name);
return twid;
}
if(subfontname){
if(_getsubfont(f->display, subfontname) == 0){
def = f->display->defaultfont;
freesubfont(sf);
if((sf=_getsubfont(f->display, subfontname)) == 0){
def = f->display ? f->display->defaultfont : nil;
if(def && f!=def)
f = def;
else
break;
}
/*
* must not free sf until cachechars has found it in the cache
* and picked up its own reference.
*/
}
}
freesubfont(sf);
agefont(f);
twid += wid;
len -= l;