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

mc: fix crash in acme with hidpi display

Browse source
This commit is contained in:
Xiao-Yong Jin 2018-03-22 23:16:53 -05:00 • committed by David du Colombier
parent 75ea8515a5
commit 96025b1ec8
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/cmd/draw/mc.c
View file

@ -268,8 +268,8 @@ void
getwidth(void) getwidth(void)
{ {
CFsys *fs; CFsys *fs;
char buf[500], *p, *q, *f[10]; char buf[500], *p, *q, *f[10], *fname;
int fd, n, nf; int fd, n, nf, scale;
struct winsize ws; struct winsize ws;
Font *f1; Font *f1;
@ -285,15 +285,19 @@ getwidth(void)
buf[n] = 0; buf[n] = 0;
if((nf=tokenize(buf, f, nelem(f))) < 7) if((nf=tokenize(buf, f, nelem(f))) < 7)
return; return;
// hidpi font in stringwidth(3) will call scalesubfont,
// which aborts in bytesperline, due to unknow depth,
// without initdraw. We scale by ourselves.
scale = parsefontscale(f[6], &fname);
tabwid = 0; tabwid = 0;
if(nf >= 8 && (tabwid = atoi(f[7])) == 0) if(nf >= 8 && (tabwid = atoi(f[7])/scale) == 0)
return; return;
if((font = openfont(nil, f[6])) == nil) if((font = openfont(nil, fname)) == nil)
return; return;
mintab = stringwidth(font, "0"); mintab = stringwidth(font, "0");
if(tabwid == 0) if(tabwid == 0)
tabwid = mintab*4; tabwid = mintab*4;
linewidth = atoi(f[5]); linewidth = atoi(f[5]) / scale;
tabflag = 1; tabflag = 1;
return; return;
} }