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

mothra: have to jump to fragment link after page is rendered to get correct yoff

Browse source
This commit is contained in:
cinap_lenrek 2011-10-13 18:15:55 +02:00
parent e02b84087e
commit a7768bd61f
1 changed files with 19 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -248,6 +248,8 @@ void donecurs(void){
esetcursor(current->alldone ? 0 : &readingcurs); esetcursor(current->alldone ? 0 : &readingcurs);
} }
void scrollto(char *tag);
void main(int argc, char *argv[]){ void main(int argc, char *argv[]){
Event e; Event e;
enum { Eplumb = 128 }; enum { Eplumb = 128 };
@ -333,6 +335,8 @@ void main(int argc, char *argv[]){
if(mouse.buttons==0 && current){ if(mouse.buttons==0 && current){
if(current->finished){ if(current->finished){
updtext(current); updtext(current);
if(current->url->tag[0])
scrollto(current->url->tag);
current->finished=0; current->finished=0;
current->changed=0; current->changed=0;
current->alldone=1; current->alldone=1;
@ -766,10 +770,6 @@ void gettext(Www *w, int fd, int type){
switch(rfork(RFFDG|RFPROC|RFNOWAIT|RFMEM)){ switch(rfork(RFFDG|RFPROC|RFNOWAIT|RFMEM)){
case -1: case -1:
message("Can't fork, please wait"); message("Can't fork, please wait");
if(type==HTML)
plrdhtml(w->url->fullname, fd, w);
else
plrdplain(w->url->fullname, fd, w);
break; break;
case 0: case 0:
if(type==HTML) if(type==HTML)
@ -801,27 +801,6 @@ void freetext(Rtext *t){
plrtfree(tt); plrtfree(tt);
} }
int readstr(char *buf, int nbuf, char *base, char *name)
{
char path[128];
int n, fd;
snprint(path, sizeof path, "%s/%s", base, name);
if((fd = open(path, OREAD)) < 0){
ErrOut:
memset(buf, 0, nbuf);
return 0;
}
n = read(fd, buf, nbuf-1);
close(fd);
if(n <= 0){
close(fd);
goto ErrOut;
}
buf[n] = 0;
return n;
}
int fileurlopen(Url *url){ int fileurlopen(Url *url){
char *rel, *base, *x; char *rel, *base, *x;
int fd; int fd;
@ -856,6 +835,21 @@ int fileurlopen(Url *url){
return fd; return fd;
} }
int readstr(char *buf, int nbuf, char *base, char *name){
char path[128];
int n, fd;
n = 0;
snprint(path, sizeof path, "%s/%s", base, name);
if((fd = open(path, OREAD)) >= 0){
if((n = read(fd, buf, nbuf-1)) < 0)
n = 0;
close(fd);
}
buf[n] = 0;
return n;
}
int urlopen(Url *url, int method, char *body){ int urlopen(Url *url, int method, char *body){
int conn, ctlfd, fd, n; int conn, ctlfd, fd, n;
char buf[1024+1], *p; char buf[1024+1], *p;
@ -865,7 +859,6 @@ int urlopen(Url *url, int method, char *body){
if(method == GET) if(method == GET)
if((fd = fileurlopen(url)) >= 0) if((fd = fileurlopen(url)) >= 0)
return fd; return fd;
snprint(buf, sizeof buf, "%s/clone", mtpt); snprint(buf, sizeof buf, "%s/clone", mtpt);
if((ctlfd = open(buf, ORDWR)) < 0) if((ctlfd = open(buf, ORDWR)) < 0)
return -1; return -1;
@ -875,7 +868,6 @@ int urlopen(Url *url, int method, char *body){
} }
buf[n] = 0; buf[n] = 0;
conn = atoi(buf); conn = atoi(buf);
if(url->basename[0]){ if(url->basename[0]){
n = snprint(buf, sizeof buf, "baseurl %s", url->basename); n = snprint(buf, sizeof buf, "baseurl %s", url->basename);
write(ctlfd, buf, n); write(ctlfd, buf, n);
@ -886,7 +878,6 @@ int urlopen(Url *url, int method, char *body){
close(ctlfd); close(ctlfd);
return -1; return -1;
} }
if(method == POST && body){ if(method == POST && body){
snprint(buf, sizeof buf, "%s/%d/postbody", mtpt, conn); snprint(buf, sizeof buf, "%s/%d/postbody", mtpt, conn);
if((fd = open(buf, OWRITE)) < 0) if((fd = open(buf, OWRITE)) < 0)
@ -898,11 +889,9 @@ int urlopen(Url *url, int method, char *body){
} }
close(fd); close(fd);
} }
snprint(buf, sizeof buf, "%s/%d/body", mtpt, conn); snprint(buf, sizeof buf, "%s/%d/body", mtpt, conn);
if((fd = open(buf, OREAD)) < 0) if((fd = open(buf, OREAD)) < 0)
goto ErrOut; goto ErrOut;
snprint(buf, sizeof buf, "%s/%d/parsed", mtpt, conn); snprint(buf, sizeof buf, "%s/%d/parsed", mtpt, conn);
readstr(url->fullname, sizeof(url->fullname), buf, "url"); readstr(url->fullname, sizeof(url->fullname), buf, "url");
readstr(url->tag, sizeof(url->tag), buf, "fragment"); readstr(url->tag, sizeof(url->tag), buf, "fragment");