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

vt: handle nocolor flag and reversed background colors

Browse source
This commit is contained in:
cinap_lenrek 2017-04-22 22:19:17 +02:00
parent c029a0c913
commit 13a74150ac
1 changed files with 38 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

51
sys/src/cmd/vt/main.c
View file

@ -47,6 +47,11 @@ Rune hist[HISTSIZ];
Rune *onscreenrbuf; Rune *onscreenrbuf;
uchar *onscreenabuf; uchar *onscreenabuf;
uchar *onscreencbuf; uchar *onscreencbuf;
#define onscreenr(x, y) &onscreenrbuf[((y)*(xmax+2) + (x))]
#define onscreena(x, y) &onscreenabuf[((y)*(xmax+2) + (x))]
#define onscreenc(x, y) &onscreencbuf[((y)*(xmax+2) + (x))]
int yscrmin, yscrmax; int yscrmin, yscrmax;
int attr, defattr; int attr, defattr;
@ -300,18 +305,40 @@ initialize(int argc, char **argv)
} }
} }
#define onscreenr(x, y) &onscreenrbuf[((y)*(xmax+2) + (x))] Image*
#define onscreena(x, y) &onscreenabuf[((y)*(xmax+2) + (x))] bgcol(int a, int c)
#define onscreenc(x, y) &onscreencbuf[((y)*(xmax+2) + (x))] {
if(nocolor || (c & (1<<0)) == 0){
if(a & TReverse)
return fgcolor;
return bgcolor;
}
if((a & TReverse) != 0)
c >>= 4;
return colors[(c>>1)&7];
}
#define bgcol(a, c) (((a)&TReverse)!=0 ? (c)>>4 : (c&15)) Image*
#define fgcol(a, c) ((((a)&TReverse)==0 ? (c)>>4 : (c&15)) | (((a)&THighIntensity)!=0)<<4) fgcol(int a, int c)
{
if(nocolor || (c & (1<<4)) == 0){
if(a & TReverse)
return bgcolor;
return fgcolor;
}
if((a & TReverse) == 0)
c >>= 4;
if(a & THighIntensity)
return hicolors[(c>>1)&7];
return colors[(c>>1)&7];
}
void void
drawscreen(void) drawscreen(void)
{ {
int x, y, n; int x, y, n;
uchar c, *ap, *cp; uchar *ap, *cp;
Image *c;
Rune *rp; Rune *rp;
draw(screen, screen->r, bgcolor, nil, ZP); draw(screen, screen->r, bgcolor, nil, ZP);
@ -320,15 +347,15 @@ drawscreen(void)
for(y = 0; y <= ymax; y++){ for(y = 0; y <= ymax; y++){
for(x = 0; x <= xmax; x += n){ for(x = 0; x <= xmax; x += n){
cp = onscreenc(x, y); cp = onscreenc(x, y);
if((*cp & 1) == 0){ ap = onscreena(x, y);
c = bgcol(*ap, *cp);
if(c == bgcolor){
n = 1; n = 1;
continue; continue;
} }
ap = onscreena(x, y);
c = bgcol(*ap, *cp);
for(n = 1; x+n <= xmax && bgcol(ap[n], cp[n]) == c; n++) for(n = 1; x+n <= xmax && bgcol(ap[n], cp[n]) == c; n++)
; ;
draw(screen, Rpt(pt(x, y), pt(x+n, y+1)), colors[c>>1], nil, ZP); draw(screen, Rpt(pt(x, y), pt(x+n, y+1)), c, nil, ZP);
} }
} }
@ -345,9 +372,7 @@ drawscreen(void)
c = fgcol(*ap, *cp); c = fgcol(*ap, *cp);
for(n = 1; x+n <= xmax && rp[n] != 0 && fgcol(ap[n], cp[n]) == c; n++) for(n = 1; x+n <= xmax && rp[n] != 0 && fgcol(ap[n], cp[n]) == c; n++)
; ;
runestringn(screen, pt(x, y), runestringn(screen, pt(x, y), c, ZP, font, rp, n);
(c&1) ? (((c&16) ? hicolors : colors)[(c&15)>>1]) : fgcolor,
ZP, font, rp, n);
} }
if(*onscreenr(x, y) == 0) if(*onscreenr(x, y) == 0)
runestringn(screen, pt(x, y), runestringn(screen, pt(x, y),