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

11
src/libdraw/string.c
View file

@ -65,6 +65,7 @@ _string(Image *dst, Point pt, Image *src, Point sp, Font *f, char *s, Rune *r, i
char **sptr;
Rune **rptr;
Font *def;
Subfont *sf;
if(s == nil){
s = "";
@ -76,6 +77,7 @@ _string(Image *dst, Point pt, Image *src, Point sp, Font *f, char *s, Rune *r, i
rptr = nil;
}else
rptr = &r;
sf = nil;
while((*s || *r) && len){
max = Max;
if(len < max)
@ -124,13 +126,18 @@ _string(Image *dst, Point pt, Image *src, Point sp, Font *f, char *s, Rune *r, i
len -= n;
}
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.
*/
}
}
return pt;

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;

14
src/libdraw/subfont.c
View file

@ -5,13 +5,14 @@
Subfont*
allocsubfont(char *name, int n, int height, int ascent, Fontchar *info, Image *i)
{
Subfont *f;
Subfont *f, *cf;
assert(height != 0 /* allocsubfont */);
f = malloc(sizeof(Subfont));
if(f == 0)
return 0;
fprint(2, "allocsubfont %p\n", f);
f->n = n;
f->height = height;
f->ascent = ascent;
@ -19,9 +20,18 @@ allocsubfont(char *name, int n, int height, int ascent, Fontchar *info, Image *i
f->bits = i;
f->ref = 1;
if(name){
/*
* if already caching this subfont, leave older
* (and hopefully more widely used) copy in cache.
* this case should not happen -- we got called
* because cachechars needed this subfont and it
* wasn't in the cache.
*/
f->name = strdup(name);
if(lookupsubfont(i->display, name) == 0)
if((cf=lookupsubfont(i->display, name)) == 0)
installsubfont(name, f);
else
freesubfont(cf); /* drop ref we just picked up */
}else
f->name = 0;
return f;