xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
cinap_lenrek 2014-01-10 01:20:24 +01:00
parent a872d5241e aa8f8d866b
commit f4550c4d6a
2 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sys/src/libdraw/string.c
View file

@ -76,23 +76,25 @@ _string(Image *dst, Point pt, Image *src, Point sp, Font *f, char *s, Rune *r, i
rptr = nil;
}else
rptr = &r;
subfontname = nil;
sf = nil;
try = 0;
while((*s || *r) && len > 0){
max = Max;
if(len < max)
max = len;
if(subfontname){
freesubfont(sf);
if((sf=_getsubfont(f->display, subfontname)) == nil){
if(f->display->defaultfont == nil || f->display->defaultfont == f)
break;
f = f->display->defaultfont;
}
}
if((n = cachechars(f, sptr, rptr, cbuf, max, &wid, &subfontname)) <= 0){
if(subfontname){
if(++try > 10)
break;
Nextfont:
freesubfont(sf);
if((sf=_getsubfont(f->display, subfontname)) != nil)
continue;
if(f->display->defaultfont == nil || f->display->defaultfont == f)
break;
f = f->display->defaultfont;
continue;
}
if(*r)
@ -144,9 +146,6 @@ _string(Image *dst, Point pt, Image *src, Point sp, Font *f, char *s, Rune *r, i
bgp.x += wid;
agefont(f);
len -= n;
if(subfontname)
goto Nextfont;
}
freesubfont(sf);
return pt;

20
sys/src/libdraw/stringwidth.c
View file

@ -22,6 +22,7 @@ _stringnwidth(Font *f, char *s, Rune *r, int len)
rptr = nil;
}else
rptr = &r;
subfontname = nil;
sf = nil;
twid = 0;
try = 0;
@ -29,17 +30,18 @@ _stringnwidth(Font *f, char *s, Rune *r, int len)
max = Max;
if(len < max)
max = len;
if(subfontname){
freesubfont(sf);
if((sf=_getsubfont(f->display, subfontname)) == nil){
if(f->display == nil || f->display->defaultfont == nil || f->display->defaultfont == f)
break;
f = f->display->defaultfont;
}
}
if((n = cachechars(f, sptr, rptr, cbuf, max, &wid, &subfontname)) <= 0){
if(subfontname){
if(++try > 10)
break;
Nextfont:
freesubfont(sf);
if((sf=_getsubfont(f->display, subfontname)) != nil)
continue;
if(f->display == nil || f->display->defaultfont == nil || f->display->defaultfont == f)
break;
f = f->display->defaultfont;
continue;
}
if(*r)
@ -50,12 +52,10 @@ _stringnwidth(Font *f, char *s, Rune *r, int len)
continue;
}
try = 0;
agefont(f);
twid += wid;
len -= n;
if(subfontname)
goto Nextfont;
}
freesubfont(sf);
return twid;