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

mothra: join underlined links

Browse source
This commit is contained in:
cinap_lenrek 2012-07-01 16:59:28 +02:00
parent 8ac89d66a5
commit 1c4d78b03b
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sys/src/cmd/mothra/libpanel/rtext.c
View file

@ -150,7 +150,7 @@ int pl_rtfmt(Rtext *t, int wid){
return p.y; return p.y;
} }
void pl_rtdraw(Image *b, Rectangle r, Rtext *t, int yoffs){ void pl_rtdraw(Image *b, Rectangle r, Rtext *t, int yoffs){
Point offs; Point offs, lp;
Rectangle dr; Rectangle dr;
Rectangle cr; Rectangle cr;
Rectangle xr; Rectangle xr;
@ -161,6 +161,7 @@ void pl_rtdraw(Image *b, Rectangle r, Rtext *t, int yoffs){
return; return;
replclipr(b, b->repl, xr); replclipr(b, b->repl, xr);
pl_clr(b, r); pl_clr(b, r);
lp=ZP;
offs=subpt(r.min, Pt(0, yoffs)); offs=subpt(r.min, Pt(0, yoffs));
for(;t;t=t->next) if(!eqrect(t->r, Rect(0,0,0,0))){ for(;t;t=t->next) if(!eqrect(t->r, Rect(0,0,0,0))){
dr=rectaddpt(t->r, offs); dr=rectaddpt(t->r, offs);
@ -176,12 +177,17 @@ void pl_rtdraw(Image *b, Rectangle r, Rtext *t, int yoffs){
} }
else{ else{
string(b, dr.min, display->black, ZP, t->font, t->text); string(b, dr.min, display->black, ZP, t->font, t->text);
if(t->hot) if(t->hot){
line(b, Pt(dr.min.x, dr.max.y-1), if(lp.y+1 != dr.max.y)
Pt(dr.max.x, dr.max.y-1), lp = Pt(dr.min.x, dr.max.y-1);
line(b, lp, Pt(dr.max.x, dr.max.y-1),
Endsquare, Endsquare, 0, Endsquare, Endsquare, 0,
display->black, ZP); display->black, ZP);
lp = Pt(dr.max.x, dr.max.y-1);
continue;
}
} }
lp=ZP;
} }
} }
replclipr(b, b->repl, cr); replclipr(b, b->repl, cr);
@ -222,13 +228,23 @@ void pl_rtredraw(Image *b, Rectangle r, Rtext *t, int yoffs, int oldoffs){
} }
} }
Rtext *pl_rthit(Rtext *t, int yoffs, Point p, Point ul){ Rtext *pl_rthit(Rtext *t, int yoffs, Point p, Point ul){
Rectangle r;
Point lp;
if(t==0) return 0; if(t==0) return 0;
p.x-=ul.x; p.x-=ul.x;
p.y+=yoffs-ul.y; p.y+=yoffs-ul.y;
while(t->nextline && t->nextline->topy<=p.y) t=t->nextline; while(t->nextline && t->nextline->topy<=p.y) t=t->nextline;
lp=ZP;
for(;t!=0;t=t->next){ for(;t!=0;t=t->next){
if(t->topy>p.y) return 0; if(t->topy>p.y) return 0;
if(ptinrect(p, t->r)) return t; r = t->r;
if(t->hot && t->b == nil && t->p == nil){
if(lp.y == r.max.y && lp.x < r.min.x)
r.min.x=lp.x;
lp=r.max;
} else
lp=ZP;
if(ptinrect(p, r)) return t;
} }
return 0; return 0;
} }