From mboxrd@z Thu Jan  1 00:00:00 1970
To: 9fans@cse.psu.edu
From: erik quanstrom <quanstro@quanstro.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Message-Id: <20051202184050.9D2DB18AE1A@dexter-peak.quanstro.net>
Date: Fri,  2 Dec 2005 12:40:50 -0600
Subject: [9fans] p9p acme startup fonts.
Topicbox-Message-UUID: b5923b26-ead0-11e9-9d60-3106f5b1d025

i modified acme to not use /lib/font and to try $font
(like 9term) for p9p:

RCS file: RCS/acme.c,v
retrieving revision 1.1
diff -r1.1 acme.c
39,40c39,40
< 	"/lib/font/bit/lucidasans/euro.8.font",
< 	"/lib/font/bit/lucm/unicode.9.font",
---
> 	"lucidasans/euro.8.font",
> 	"lucm/unicode.9.font",
49a50,68
> static char*
> _getfont(char* f, const char* envname, char* fallback){
> 	if (f)
> 		return estrdup(f);
> 	f=getenv(envname);
> 	if (f)
> 		return f;
> 	return smprint("%s/%s", get9root(), fallback);
> }
> 
> static void
> fixfontnames(char* f, char* F){
> 	fontnames[0] = _getfont(f, "font", fontnames[0]);
> 	fontnames[1] = _getfont(F, "fixedfont", fontnames[1]);
> 
> 	//fprint(2, "%s\n", fontnames[0]);
> 	//fprint(2, "%s\n", fontnames[1]);
> }
> 
64a84,85
> 	char* f;
> 	char* F;
69c90,91
< 
---
> 	f=0;
> 	F=0;
95,96c117,118
< 		fontnames[0] = ARGF();
< 		if(fontnames[0] == nil)
---
> 		f = ARGF();
> 		if(f == nil)
100,101c122,123
< 		fontnames[1] = ARGF();
< 		if(fontnames[1] == nil)
---
> 		F = ARGF();
> 		if(F == nil)
123,124c145
< 	fontnames[0] = estrdup(fontnames[0]);
< 	fontnames[1] = estrdup(fontnames[1]);
---
> 	fixfontnames(f,F);