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

made abaco's gui respect $font and made readweb respect most installations

Browse source
This commit is contained in:
Matthew Veety 2016-04-25 17:49:31 -04:00
parent 1cf3c46669
commit 6d2635d5ba
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
rc/bin/readweb
View file

@ -1,10 +1,15 @@
#!/bin/rc #!/bin/rc
# start abaco and its prerequisites # start abaco and its prerequisites
rfork n rfork ne
if(~ $#1 0){
# outside && bind /net.alt /net rimport '$cpu' /net
}
if not {
rimport $1 /net
shift
}
webfs webfs
webcookies webcookies
echo useragent netscape 1.0 >/mnt/web/ctl # probably not needed
# echo useragent netscape 1.0 >/mnt/web/ctl
exec /$cputype/bin/abaco $* exec /$cputype/bin/abaco $*

11
sys/src/cmd/abaco/main.c
View file

@ -50,7 +50,7 @@ derror(Display *, char *s)
static void static void
usage(void) usage(void)
{ {
fprint(2, "usage: %s [-c ncol] [-m mtpt] [-t charset] [url...]\n", fprint(2, "usage: %s [-c ncol] [-m mtpt] [-t charset] [-f font] [url...]\n",
argv0); argv0);
exits("usage"); exits("usage");
} }
@ -61,6 +61,7 @@ threadmain(int argc, char *argv[])
Column *c; Column *c;
char buf[256]; char buf[256];
int i, ncol; int i, ncol;
char *tfnt = nil;
rfork(RFENVG|RFNAMEG); rfork(RFENVG|RFNAMEG);
@ -80,6 +81,8 @@ threadmain(int argc, char *argv[])
case 't': case 't':
charset = EARGF(usage()); charset = EARGF(usage());
break; break;
case 'f':
tfnt = EARGF(usage());
default: default:
usage(); usage();
break; break;
@ -92,6 +95,12 @@ threadmain(int argc, char *argv[])
snarffd = open("/dev/snarf", OREAD|OCEXEC); snarffd = open("/dev/snarf", OREAD|OCEXEC);
if(tfnt == nil){
tfnt = getenv("font");
if(tfnt != nil)
fontnames[0] = tfnt;
}
if(initdraw(derror, fontnames[0], "abaco") < 0) if(initdraw(derror, fontnames[0], "abaco") < 0)
sysfatal("can't open display: %r"); sysfatal("can't open display: %r");
memimageinit(); memimageinit();