X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=gfx%2Fgfx.h;h=324c7c59b97c272ae049491eb0116e20b65e393a;hb=c49c99e64ee64ad490b2aea2d6c6d8f9f6d225db;hp=7159cdb306b78df72f56fae19d8344a2776e54ca;hpb=d55b8fe80965724ece68c9e8467ad93ab35babe3;p=bertos.git

diff --git a/gfx/gfx.h b/gfx/gfx.h
index 7159cdb3..324c7c59 100755
--- a/gfx/gfx.h
+++ b/gfx/gfx.h
@@ -14,6 +14,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.11  2006/03/07 22:18:04  bernie
+ *#* Correctly compute text width for prop fonts; Make styles a per-bitmap attribute.
+ *#*
+ *#* Revision 1.10  2006/02/17 22:24:40  bernie
+ *#* Fix undefined preprocessor symbol.
+ *#*
+ *#* Revision 1.9  2006/02/15 09:10:15  bernie
+ *#* Implement prop fonts; Fix algo styles.
+ *#*
  *#* Revision 1.8  2006/02/10 12:28:33  bernie
  *#* Add font support in bitmaps; Make bitmap formats public.
  *#*
@@ -35,6 +44,14 @@
 
 #include <appconfig.h> /* CONFIG_GFX_* */
 
+/**
+ * \name Known pixel formats for bitmap representation.
+ * \{
+ */
+#define BITMAP_FMT_PLANAR_H_MSB  1  /**< Planar pixels, horizontal bytes, MSB left. */
+#define BITMAP_FMT_PLANAR_V_LSB  2  /**< Planar pixels, vertical bytes, LSB top. */
+/* \} */
+
 #if !defined(CONFIG_BITMAP_FMT) || (CONFIG_BITMAP_FMT != BITMAP_FMT_PLANAR_H_MSB && CONFIG_BITMAP_FMT != BITMAP_FMT_PLANAR_V_LSB)
 	#error CONFIG_BITMAP_FMT must be defined to either BITMAP_FMT_PLANAR_H_LSB or BITMAP_FMT_PLANAR_V_LSB
 #endif
@@ -45,14 +62,6 @@
 	#error CONFIG_GFX_TEXT must be defined to either 0 or 1
 #endif
 
-/**
- * \name Known pixel formats for bitmap representation.
- * \{
- */
-#define BITMAP_FMT_PLANAR_H_MSB  1  /**< Planar pixels, horizontal bytes, MSB left. */
-#define BITMAP_FMT_PLANAR_V_LSB  2  /**< Planar pixels, vertical bytes, LSB top. */
-/* \} */
-
 EXTERN_C_BEGIN
 
 /*! Common type for coordinates expressed in pixel units */
@@ -118,7 +127,16 @@ typedef struct Bitmap
 	Rect cr;                /*!< Clip drawing inside this rectangle */
 
 #if CONFIG_GFX_TEXT
-	struct Font *font;      /**< Current font for text rendering. */
+	const struct Font *font;/**< Current font for text rendering. */
+
+	/**
+	 * Algorithmic text style flags.
+	 *
+	 * The text rendering routine can apply a few simple transformations
+	 * to the current font in order to generate common styles such as
+	 * bold, italic and underline from plain glyphs.
+	 */
+	uint8_t styles;
 #endif
 #if CONFIG_GFX_VCOORDS
 	/*!
@@ -154,7 +172,7 @@ typedef struct Bitmap
 void gfx_bitmapInit (Bitmap *bm, uint8_t *raster, coord_t w, coord_t h);
 void gfx_bitmapClear(Bitmap *bm);
 void gfx_blit       (Bitmap *dst, const Rect *rect, const Bitmap *src, coord_t srcx, coord_t srcy);
-void gfx_blitRaster (Bitmap *dst, coord_t dx, coord_t dy, const uint8_t *raster, coord_t w, coord_t h);
+void gfx_blitRaster (Bitmap *dst, coord_t dx, coord_t dy, const uint8_t *raster, coord_t w, coord_t h, coord_t stride);
 void gfx_line       (Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2);
 void gfx_rectDraw   (Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2);
 void gfx_rectFillC  (Bitmap *bm, coord_t x1, coord_t y1, coord_t x2, coord_t y2, uint8_t color);
@@ -170,7 +188,7 @@ void gfx_setClipRect(Bitmap *bm, coord_t xmin, coord_t ymin, coord_t xmax, coord
 #endif
 
 #if CONFIG_GFX_TEXT
-INLINE void gfx_setFont(Bitmap *bm, Font *font)
+INLINE void gfx_setFont(Bitmap *bm, const struct Font *font)
 {
 	bm->font = font;
 }