projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix naming conventions.
[bertos.git]
/
gfx
/
font.h
diff --git
a/gfx/font.h
b/gfx/font.h
index 1701b1fc94acd9c15780b8c7e8e61e861305ceb4..bdba694a131b0e8f0adc25a10d756d9459605d3c 100755
(executable)
--- a/
gfx/font.h
+++ b/
gfx/font.h
@@
-14,6
+14,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* 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.3 2006/02/10 12:29:05 bernie
*#* Add multiple font support in bitmaps.
*#*
@@
-62,14
+68,27
@@
typedef struct Font
* Data is an array of at most 256 glyphs packed together.
* Raster format must be the same of the bitmap.
*/
* Data is an array of at most 256 glyphs packed together.
* Raster format must be the same of the bitmap.
*/
- const PROGMEM uint8_t * const glyph;
+ 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). */
- uint8_t width; /**< Pixel width of character cell. */
- uint8_t height; /**< Pixel height of character cell. */
+ /** Array of glyph offsets in bytes. NULL for fixed-width fonts. */
+ const PROGMEM uint16_t *offset;
+ const PROGMEM uint8_t *widths;
} Font;
} Font;
-/**< The default font. */
-extern struct Font default_font;
+
+/** Return true if glyph \a c is available in \a font. */
+#define FONT_HAS_GLYPH(font, c) ((c) >= (font)->first && (c) <= (font)->last)
+
+
+/** The default font. */
+#define default_font font_ncenB18
+extern const struct Font default_font;
#endif /* GFX_FONT_H */
#endif /* GFX_FONT_H */