From 229e8a5de102f835de1596d8adb377b6bf74b463 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Fri, 9 Dec 2011 22:19:13 +0100 Subject: acme: use $font if set, default to vga font --- sys/src/cmd/acme/acme.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/src/cmd/acme/acme.c b/sys/src/cmd/acme/acme.c index 4ce4ca993..df582d99d 100644 --- a/sys/src/cmd/acme/acme.c +++ b/sys/src/cmd/acme/acme.c @@ -35,11 +35,7 @@ enum{ }; Rune snarfrune[NSnarf+1]; -char *fontnames[2] = -{ - "/lib/font/bit/lucidasans/euro.8.font", - "/lib/font/bit/lucm/unicode.9.font" -}; +char *fontnames[2]; Command *command; @@ -105,6 +101,16 @@ threadmain(int argc, char *argv[]) exits("usage"); }ARGEND + if(fontnames[0] == nil) + fontnames[0] = getenv("font"); + if(fontnames[0] == nil) + fontnames[0] = "/lib/font/bit/vga/vga.font"; + if(access(fontnames[0], 0) < 0){ + fprint(2, "acme: can't access %s: %r\n", fontnames[0]); + exits("font open"); + } + if(fontnames[1] == nil) + fontnames[1] = fontnames[0]; fontnames[0] = estrdup(fontnames[0]); fontnames[1] = estrdup(fontnames[1]); -- cgit v1.2.3