X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=gfx%2Ffont.h;h=80bc5db4170cc3bf636c4bd5e50fffe3e07343f9;hb=7c03b1e47ddefae9577cfe0d2dd3f6fff83b57ec;hp=049db533b02da79fbbfb58a457b77d6daf4fbfd3;hpb=41ee2287b2f2d7ec3e73e998b06076888608ed72;p=bertos.git

diff --git a/gfx/font.h b/gfx/font.h
index 049db533..80bc5db4 100755
--- a/gfx/font.h
+++ b/gfx/font.h
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
@@ -14,6 +14,24 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.7  2006/07/19 12:56:26  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.6  2006/05/27 22:31:34  bernie
+ *#* Switch to a smaller default fount.
+ *#*
+ *#* Revision 1.5  2006/03/13 02:06:04  bernie
+ *#* FONT_HAS_GLYPH(): New macro.
+ *#*
+ *#* Revision 1.4  2006/02/15 09:10:15  bernie
+ *#* Implement prop fonts; Fix algo styles.
+ *#*
+ *#* 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/.
  *#*
@@ -42,21 +60,41 @@
  *#* Move font table in program memory; add font.h
  *#*
  *#*/
-#ifndef MWARE_FONT_H
-#define MWARE_FONT_H
+#ifndef GFX_FONT_H
+#define GFX_FONT_H
 
 #include <cfg/compiler.h> /* uint8_t */
 #include <mware/pgm.h> /* PROGMEM */
 
-/*!
- * \name Font size (in pixel)
- * \{
- */
-#define FONT_WIDTH   6
-#define FONT_HEIGHT  8
-/* \} */
+typedef struct Font
+{
+	/**
+	 * Pointer to glyph data.
+	 *
+	 * Data is an array of at most 256 glyphs packed together.
+	 * Raster format must be the same of the bitmap.
+	 */
+	const PROGMEM uint8_t *glyph;
+
+	uint8_t width;     /**< Pixel width of character cell. */
+	uint8_t height;    /**< Pixel height of character cell. */
+
+	uint8_t first;     /**< First encoded character in glyph array. */
+	uint8_t last;      /**< Last encoded character in glyph array (inclusive). */
+
+	/** Array of glyph offsets in bytes. NULL for fixed-width fonts. */
+	const PROGMEM uint16_t *offset;
+	const PROGMEM uint8_t *widths;
+
+} Font;
+
+
+/** Return true if glyph \a c is available in \a font. */
+#define FONT_HAS_GLYPH(font, c) ((c) >= (font)->first && (c) <= (font)->last)
+
 
-/*! Font table */
-extern const PROGMEM uint8_t font[256 * FONT_WIDTH];
+/** The default font. */
+#define default_font font_luBS14
+extern const struct Font default_font;
 
-#endif /* MWARE_FONT_H */
+#endif /* GFX_FONT_H */