diff options
| author | Matthew Veety <mveety@mveety.com> | 2016-04-25 17:49:31 -0400 |
|---|---|---|
| committer | Matthew Veety <mveety@mveety.com> | 2016-04-25 17:49:31 -0400 |
| commit | 6d2635d5badb1825d766f16b0ad43f45f84ca495 (patch) | |
| tree | abfa4d3885c2861d348260948d77becea32a14b0 /sys/src/cmd/abaco | |
| parent | 1cf3c4666943028cccfbbed8d2bae2fee30713a4 (diff) | |
made abaco's gui respect $font and made readweb respect most installations
Diffstat (limited to 'sys/src/cmd/abaco')
| -rw-r--r-- | sys/src/cmd/abaco/main.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sys/src/cmd/abaco/main.c b/sys/src/cmd/abaco/main.c index b190e9f02..bd22eff6c 100644 --- a/sys/src/cmd/abaco/main.c +++ b/sys/src/cmd/abaco/main.c @@ -50,7 +50,7 @@ derror(Display *, char *s) static 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); exits("usage"); } @@ -61,6 +61,7 @@ threadmain(int argc, char *argv[]) Column *c; char buf[256]; int i, ncol; + char *tfnt = nil; rfork(RFENVG|RFNAMEG); @@ -80,6 +81,8 @@ threadmain(int argc, char *argv[]) case 't': charset = EARGF(usage()); break; + case 'f': + tfnt = EARGF(usage()); default: usage(); break; @@ -92,6 +95,12 @@ threadmain(int argc, char *argv[]) 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) sysfatal("can't open display: %r"); memimageinit(); |