Browse Source

New opendefaultfont in libdraw

stats as an example

Signed-off-by: Álvaro Jurado <elbingmiss@gmail.com>
Álvaro Jurado 7 years ago
parent
commit
0dca17d681
3 changed files with 13 additions and 3 deletions
  1. 1 0
      sys/include/draw.h
  2. 1 3
      sys/src/cmd/stats.c
  3. 11 0
      sys/src/libdraw/openfont.c

+ 1 - 0
sys/include/draw.h

@@ -473,6 +473,7 @@ extern void	borderop(Image*, Rectangle, int, Image*, Point, Drawop);
  * Font management
  */
 extern Font*	openfont(Display*, char*);
+extern Font*	opendefaultfont(Display*);
 extern Font*	buildfont(Display*, char*, char*);
 extern void	freefont(Font*);
 extern Font*	mkfont(Subfont*, Rune);

+ 1 - 3
sys/src/cmd/stats.c

@@ -277,9 +277,7 @@ mkcol(int i, int c0, int c1, int c2)
 void
 colinit(void)
 {
-	mediumfont = openfont(display, "/lib/font/bit/pelm/latin1.8.font");
-	if(mediumfont == nil)
-		mediumfont = font;
+	mediumfont = opendefaultfont(display);
 
 	/* Peach */
 	mkcol(0, 0xFFAAAAFF, 0xFFAAAAFF, 0xBB5D5DFF);

+ 11 - 0
sys/src/libdraw/openfont.c

@@ -45,3 +45,14 @@ openfont(Display *d, char *name)
 	free(buf);
 	return fnt;
 }
+
+Font*
+opendefaultfont(Display *d)
+{
+	Font *fnt;
+
+	fnt = openfont(d, getenv("font"));
+	if(fnt == nil)
+		openfont(d, "/lib/font/bit/pelm/latin1.8.font");
+	return fnt;
+}