X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=gfx%2Fgfx.h;h=a165fd7ee446004eecd8083e7b400d996535c9a3;hb=969f9a6fd4c736973771e39a7516ba56d9453216;hp=324c7c59b97c272ae049491eb0116e20b65e393a;hpb=c66da8dee53d20f2bc02267d798530f5fb1bf37f;p=bertos.git

diff --git a/gfx/gfx.h b/gfx/gfx.h
index 324c7c59..a165fd7e 100755
--- a/gfx/gfx.h
+++ b/gfx/gfx.h
@@ -14,6 +14,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.14  2006/04/27 05:39:24  bernie
+ *#* Enhance text rendering to arbitrary x,y coords.
+ *#*
+ *#* Revision 1.13  2006/04/11 00:08:24  bernie
+ *#* text_offset(): New function, but I'm not quite confident with the design.
+ *#*
+ *#* Revision 1.12  2006/03/27 04:48:56  bernie
+ *#* gfx_blitImage(): New function; gfx_blitRaster(): Fix clipping bug.
+ *#*
  *#* Revision 1.11  2006/03/07 22:18:04  bernie
  *#* Correctly compute text width for prop fonts; Make styles a per-bitmap attribute.
  *#*
@@ -121,7 +130,7 @@ typedef struct Bitmap
 {
 	uint8_t *raster;        /*!< Pointer to byte array to hold the data */
 	coord_t width, height;  /*!< Width/Height in pixels */
-	coord_t stride;		/*!< Bytes per row. */
+	coord_t stride;         /*!< Bytes per row. */
 	coord_t penX, penY;     /*!< Current pen position MoveTo()/LineTo() */
 
 	Rect cr;                /*!< Clip drawing inside this rectangle */
@@ -135,6 +144,8 @@ typedef struct Bitmap
 	 * 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.
+	 *
+	 * \see text_style()
 	 */
 	uint8_t styles;
 #endif
@@ -150,6 +161,19 @@ typedef struct Bitmap
 
 } Bitmap;
 
+/**
+ * Hold image pixels.
+ *
+ * \todo Use this as Bitmap and change Bitmap to Drawable.
+ */
+typedef struct Image
+{
+	const uint8_t *raster;   /*!< Pointer to byte array to hold the data. */
+	coord_t width;     /*!< Raster width in pixels. */
+	coord_t height;    /*!< Raster height in pixels. */
+	coord_t stride;    /*!< Bytes per row. */
+} Image;
+
 #if CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_H_MSB
 	/**
 	 * Compute the size in bytes of a raster suitable for
@@ -173,6 +197,7 @@ 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, coord_t stride);
+void gfx_blitImage  (Bitmap *dst, coord_t dx, coord_t dy, const Image *image);
 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);