X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=gfx%2Ffont.c;h=767c269e855351daea42c8206a59d91d7f3b361a;hb=dd10467603da0be5d35d91bae7c62b0079128d09;hp=fe7988fecd6b31e27dc2a0c827c273d1e2058a54;hpb=41ee2287b2f2d7ec3e73e998b06076888608ed72;p=bertos.git

diff --git a/gfx/font.c b/gfx/font.c
index fe7988fe..767c269e 100755
--- a/gfx/font.c
+++ b/gfx/font.c
@@ -1,8 +1,8 @@
 /*!
  * \file
  * <!--
- * Copyright (C) 2001 Bernardo Innocenti <bernie@codewiz.org>
- * Copyright (C) 2003,2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2001 Bernardo Innocenti <bernie@codewiz.org>
  * This file is part of DevLib - See README.devlib for information.
  * -->
  *
@@ -15,6 +15,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.3  2006/02/10 12:29:05  bernie
+ *#* Add multiple font support in bitmaps.
+ *#*
+ *#* Revision 1.2  2005/11/04 18:17:45  bernie
+ *#* Fix header guards and includes for new location of gfx module.
+ *#*
  *#* Revision 1.1  2005/11/04 18:11:35  bernie
  *#* Move graphics stuff from mware/ to gfx/.
  *#*
@@ -35,27 +41,11 @@
  *#*
  *#* Revision 1.1  2004/05/23 15:43:16  bernie
  *#* Import mware modules.
- *#*
- *#* Revision 1.5  2004/03/24 15:48:53  bernie
- *#* Remove Copyright messages from Doxygen output
- *#*
- *#* Revision 1.4  2004/03/03 18:30:17  bernie
- *#* Substitute left triangle glyph with left arrow
- *#*
- *#* Revision 1.3  2004/02/28 14:48:33  aleph
- *#* Improve arrow glyphs
- *#*
- *#* Revision 1.2  2004/01/13 12:15:28  aleph
- *#* Move font table in program memory; add font.h
- *#*
- *#* Revision 1.1  2004/01/07 23:31:54  aleph
- *#* Add text routines
- *#*
  *#*/
 
 #include "font.h"
 
-const PROGMEM uint8_t font[256 * 6] =
+static const PROGMEM uint8_t default_font_glyphs[256 * 6] =
 {
 /* 0x00 */
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*   */
@@ -346,3 +336,11 @@ const PROGMEM uint8_t font[256 * 6] =
 	0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x00, /* þ */
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00  /* ÿ */
 };
+
+struct Font default_font =
+{
+	/* .glyph = */  default_font_glyphs,
+	/* .width = */  6,
+	/* .height = */ 8
+};
+