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

libframe: translucent font fixes from Plan 9

Browse source
This commit is contained in:
Russ Cox 2008-03-07 13:20:00 -05:00
parent 4163694051
commit 57851b6412
3 changed files with 32 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/frame.h
View file

@ -60,7 +60,7 @@ void frinsert(Frame*, Rune*, Rune*, ulong);
void frselect(Frame*, Mousectl*); void frselect(Frame*, Mousectl*);
void frselectpaint(Frame*, Point, Point, Image*); void frselectpaint(Frame*, Point, Point, Image*);
void frdrawsel(Frame*, Point, ulong, ulong, int); void frdrawsel(Frame*, Point, ulong, ulong, int);
void frdrawsel0(Frame*, Point, ulong, ulong, Image*, Image*); Point frdrawsel0(Frame*, Point, ulong, ulong, Image*, Image*);
void frinit(Frame*, Rectangle, Font*, Image*, Image**); void frinit(Frame*, Rectangle, Font*, Image*, Image**);
void frsetrects(Frame*, Rectangle, Image*); void frsetrects(Frame*, Rectangle, Image*);
void frclear(Frame*, int); void frclear(Frame*, int);
@ -82,7 +82,7 @@ void _fradvance(Frame*, Point*, Frbox*);
int _frnewwid(Frame*, Point, Frbox*); int _frnewwid(Frame*, Point, Frbox*);
int _frnewwid0(Frame*, Point, Frbox*); int _frnewwid0(Frame*, Point, Frbox*);
void _frclean(Frame*, Point, int, int); void _frclean(Frame*, Point, int, int);
void _frredraw(Frame*, Point); void _frdrawtext(Frame*, Point, Image*, Image*);
void _fraddbox(Frame*, int, int); void _fraddbox(Frame*, int, int);
Point _frptofcharptb(Frame*, ulong, Point, int); Point _frptofcharptb(Frame*, ulong, Point, int);
Point _frptofcharnb(Frame*, ulong, int); Point _frptofcharnb(Frame*, ulong, int);

35
src/libframe/frdraw.c
View file

@ -5,16 +5,15 @@
#include <frame.h> #include <frame.h>
void void
_frredraw(Frame *f, Point pt) _frdrawtext(Frame *f, Point pt, Image *text, Image *back)
{ {
Frbox *b; Frbox *b;
int nb; int nb;
/* static int x; */
for(nb=0,b=f->box; nb<f->nbox; nb++, b++){ for(nb=0,b=f->box; nb<f->nbox; nb++, b++){
_frcklinewrap(f, &pt, b); _frcklinewrap(f, &pt, b);
if(!f->noredraw && b->nrune >= 0) if(!f->noredraw && b->nrune >= 0)
string(f->b, pt, f->cols[TEXT], ZP, f->font, (char *)b->ptr); stringbg(f->b, pt, text, ZP, f->font, (char*)b->ptr, back, ZP);
pt.x += b->wid; pt.x += b->wid;
} }
} }
@ -55,7 +54,7 @@ frdrawsel(Frame *f, Point pt, ulong p0, ulong p1, int issel)
frdrawsel0(f, pt, p0, p1, back, text); frdrawsel0(f, pt, p0, p1, back, text);
} }
void Point
frdrawsel0(Frame *f, Point pt, ulong p0, ulong p1, Image *back, Image *text) frdrawsel0(Frame *f, Point pt, ulong p0, ulong p1, Image *back, Image *text)
{ {
Frbox *b; Frbox *b;
@ -76,6 +75,7 @@ frdrawsel0(Frame *f, Point pt, ulong p0, ulong p1, Image *back, Image *text)
if(p >= p0){ if(p >= p0){
qt = pt; qt = pt;
_frcklinewrap(f, &pt, b); _frcklinewrap(f, &pt, b);
/* fill in the end of a wrapped line */
if(pt.y > qt.y) if(pt.y > qt.y)
draw(f->b, Rect(qt.x, qt.y, f->r.max.x, pt.y), back, nil, qt); draw(f->b, Rect(qt.x, qt.y, f->r.max.x, pt.y), back, nil, qt);
} }
@ -99,7 +99,7 @@ frdrawsel0(Frame *f, Point pt, ulong p0, ulong p1, Image *back, Image *text)
x = f->r.max.x; x = f->r.max.x;
draw(f->b, Rect(pt.x, pt.y, x, pt.y+f->font->height), back, nil, pt); draw(f->b, Rect(pt.x, pt.y, x, pt.y+f->font->height), back, nil, pt);
if(b->nrune >= 0) if(b->nrune >= 0)
stringn(f->b, pt, text, ZP, f->font, ptr, nr); stringnbg(f->b, pt, text, ZP, f->font, ptr, nr, back, ZP);
pt.x += w; pt.x += w;
Continue: Continue:
b++; b++;
@ -112,6 +112,29 @@ frdrawsel0(Frame *f, Point pt, ulong p0, ulong p1, Image *back, Image *text)
if(pt.y > qt.y) if(pt.y > qt.y)
draw(f->b, Rect(qt.x, qt.y, f->r.max.x, pt.y), back, nil, qt); draw(f->b, Rect(qt.x, qt.y, f->r.max.x, pt.y), back, nil, qt);
} }
return pt;
}
void
frredraw(Frame *f)
{
int ticked;
Point pt;
if(f->p0 == f->p1){
ticked = f->ticked;
if(ticked)
frtick(f, frptofchar(f, f->p0), 0);
frdrawsel0(f, frptofchar(f, 0), 0, f->nchars, f->cols[BACK], f->cols[TEXT]);
if(ticked)
frtick(f, frptofchar(f, f->p0), 1);
return;
}
pt = frptofchar(f, 0);
pt = frdrawsel0(f, pt, 0, f->p0, f->cols[BACK], f->cols[TEXT]);
pt = frdrawsel0(f, pt, f->p0, f->p1, f->cols[HIGH], f->cols[HTEXT]);
pt = frdrawsel0(f, pt, f->p1, f->nchars, f->cols[BACK], f->cols[TEXT]);
} }
void void
@ -150,7 +173,7 @@ _frdraw(Frame *f, Point pt)
if(b->nrune > 0){ if(b->nrune > 0){
n = _frcanfit(f, pt, b); n = _frcanfit(f, pt, b);
if(n == 0) if(n == 0)
drawerror(f->display, "_frcanfit==0"); break;
if(n != b->nrune){ if(n != b->nrune){
_frsplitbox(f, nb, n); _frsplitbox(f, nb, n);
b = &f->box[nb]; b = &f->box[nb];

2
src/libframe/frinsert.c
View file

@ -261,7 +261,7 @@ frinsert(Frame *f, Rune *sp, Rune *ep, ulong p0)
else else
col = f->cols[BACK]; col = f->cols[BACK];
frselectpaint(f, ppt0, ppt1, col); frselectpaint(f, ppt0, ppt1, col);
_frredraw(&frame, ppt0); _frdrawtext(&frame, ppt0, f->cols[TEXT], col);
_fraddbox(f, nn0, frame.nbox); _fraddbox(f, nn0, frame.nbox);
for(n=0; n<frame.nbox; n++) for(n=0; n<frame.nbox; n++)
f->box[nn0+n] = frame.box[n]; f->box[nn0+n] = frame.box[n];