Make the TWI driver more generic to work with devices other than EEPROMS.

[bertos.git] / gfx / text.h

diff --git a/gfx/text.h b/gfx/text.h
index d131e0144db0185b4771d4d5fd001cc5797d971f..1f00e7fa3aa58b7eb49453bd171fa28cf4c30c64 100755 (executable)
--- a/gfx/text.h
+++ b/gfx/text.h
@@ -15,6 +15,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.4  2006/03/07 22:18:04  bernie
+ *#* Correctly compute text width for prop fonts; Make styles a per-bitmap attribute.
+ *#*
+ *#* Revision 1.3  2006/02/10 12:26:19  bernie
+ *#* Add STYLEF_TALL (unimplemented).
+ *#*
+ *#* 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/.
  *#*
@@ -50,8 +59,8 @@
  *#*
  *#*/
 
-#ifndef MWARE_TEXT_H
-#define MWARE_TEXT_H
+#ifndef GFX_TEXT_H
+#define GFX_TEXT_H
 
 #include <cfg/compiler.h>
 #include <cfg/macros.h> /* BV() */
@@ -71,10 +80,12 @@
 #define STYLEF_EXPANDED    BV(4)
 #define STYLEF_CONDENSED   BV(5)
 #define STYLEF_STRIKEOUT   BV(6)  /*<! Not implemented */
+#define STYLEF_TALL        BV(7)  /*<! Not implemented */
 
 #define STYLEF_MASK \
-       (STYLEF_BOLD | STYLEF_ITALIC | STYLEF_UNDERLINE | \
-       STYLEF_EXPANDED | STYLEF_CONDENSED | STYLEF_INVERT)
+       (STYLEF_BOLD | STYLEF_ITALIC | STYLEF_UNDERLINE \
+       | STYLEF_INVERT | STYLEF_EXPANDED | STYLEF_CONDENSED \
+       | STYLEF_STRIKEOUT | STYLEF_TALL)
 /*\}*/
 
 /*!
@@ -83,9 +94,9 @@
  * \{
  */
 #define TEXT_NORMAL   0       /*!< Normal mode */
-#define TEXT_FILL     BV(7)   /*!< Fill rest of line with spaces */
-#define TEXT_CENTER   BV(8)   /*!< Center string in line */
-#define TEXT_RIGHT    BV(9)   /*!< Right aligned */
+#define TEXT_FILL     BV(13)  /*!< Fill rest of line with spaces */
+#define TEXT_CENTER   BV(14)  /*!< Center string in line */
+#define TEXT_RIGHT    BV(15)  /*!< Right aligned */
 /*\}*/
 
 /*! Escape sequences codes */
@@ -99,7 +110,7 @@ struct Bitmap;
 void text_moveto(struct Bitmap *bm, int row, int col);
 void text_setcoord(struct Bitmap *bm, int x, int y);
 int text_putchar(char c, struct Bitmap *bm);
-uint8_t text_style(uint8_t flags, uint8_t mask);
+uint8_t text_style(struct Bitmap *bm, uint8_t flags, uint8_t mask);
 void text_clear(struct Bitmap *bm);
 void text_clearLine(struct Bitmap *bm, int line);
 
@@ -122,4 +133,4 @@ int text_vwidthf_P(struct Bitmap *bm, const char * PROGMEM fmt, va_list ap);
 int text_widthf_P(struct Bitmap *bm, const char * PROGMEM fmt, ...);
 #endif /* CPU_HARVARD */
 
-#endif /* MWARE_TEXT_H */
+#endif /* GFX_TEXT_H */