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

mothra: dont make all images into links (only in mothmode)

Browse source
This commit is contained in:
cinap_lenrek 2012-09-26 18:28:10 +02:00
parent 03f2668d68
commit 2b7330765a
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
sys/src/cmd/mothra/mothra.c
View file

@ -718,17 +718,19 @@ void dolink(Panel *p, int buttons, Rtext *word){
Action *a;
a=word->user;
if(a == nil || a->image == nil && a->link == nil)
if(a == nil || (a->link == nil && a->image == nil))
return;
if(mothmode)
hiturl(buttons, a->image ? a->image : a->link, 0);
else if(a->ismap){
yoffs=plgetpostextview(p);
coord=subpt(subpt(mouse.xy, word->r.min), p->r.min);
snprint(mapurl, sizeof(mapurl), "%s?%d,%d", a->link, coord.x, coord.y+yoffs);
hiturl(buttons, mapurl, 1);
} else
hiturl(buttons, a->link ? a->link : a->image, 0);
else if(a->link){
if(a->ismap){
yoffs=plgetpostextview(p);
coord=subpt(subpt(mouse.xy, word->r.min), p->r.min);
snprint(mapurl, sizeof(mapurl), "%s?%d,%d", a->link, coord.x, coord.y+yoffs);
hiturl(buttons, mapurl, 1);
} else
hiturl(buttons, a->link, 0);
}
}
void filter(char *cmd, int fd){
@ -982,8 +984,15 @@ mothon(Www *w, int on)
*/
for(t=w->text;t;t=t->next){
a=t->user;
if(a == nil || a->image == nil || a->link == nil)
if(a == nil || a->image == nil)
continue;
if(a->link == nil){
if(on)
t->flags |= PL_HOT;
else
t->flags &= ~PL_HOT;
continue;
}
x = t->next;
if(on){
t->next = nil;

2
sys/src/cmd/mothra/rdhtml.c
View file

@ -144,7 +144,7 @@ void pl_htmloutput(Hglob *g, int nsp, char *s, Field *field){
}
}
plrtstr(&g->dst->text, space, indent, f->font, strdup(s),
(g->state->link[0] || g->state->image[0]) ? PL_HOT : 0, ap);
g->state->link[0] ? PL_HOT : 0, ap);
g->para=0;
g->linebrk=0;
g->dst->changed=1;