/*#*
*#* $Log$
+ *#* Revision 1.7 2006/03/07 22:18:04 bernie
+ *#* Correctly compute text width for prop fonts; Make styles a per-bitmap attribute.
+ *#*
+ *#* Revision 1.6 2006/02/23 11:17:16 bernie
+ *#* Documentation fixes.
+ *#*
+ *#* Revision 1.5 2006/02/15 09:10:15 bernie
+ *#* Implement prop fonts; Fix algo styles.
+ *#*
+ *#* Revision 1.4 2006/02/10 12:32:33 bernie
+ *#* Add multiple font support in bitmaps; gfx_blitRaster(): New function.
+ *#*
+ *#* Revision 1.3 2006/01/26 00:36:48 bernie
+ *#* Const correctness for some new functions.
+ *#*
*#* Revision 1.2 2006/01/24 21:55:43 aleph
*#* gfx_blit_P(): use RASTER_SIZE() to calculate raster size
*#*
#include <string.h> /* memset() */
+#if CONFIG_GFX_TEXT
+#include <gfx/font.h> /* default_font */
+#endif
+
+
/*!
* Initialize a Bitmap structure with the provided parameters.
*
bm->penX = 0;
bm->penY = 0;
+#if CONFIG_GFX_TEXT
+ gfx_setFont(bm, &default_font);
+ bm->styles = 0;
+#endif
+
#if CONFIG_GFX_CLIPPING
bm->cr.xmin = 0;
bm->cr.ymin = 0;
*
* \note Using the same bitmap for \a src and \a dst is unsupported.
*
- * \param dst Bitmap where the operation writes
- *
+ * \param dst Bitmap where the operation writes.
+ * \param rect The (xmin;ymin) coordinates provide the top/left offset
+ * for drawing in the destination bitmap. If the source
+ * bitmap is larger than the rectangle, drawing is clipped.
+ * \param src Bitmap containing the source pixels.
+ * \param srcx Starting X offset in the source bitmap.
+ * \param srcy Starting Y offset in the source bitmap.
*/
-void gfx_blit(Bitmap *dst, Rect *rect, Bitmap *src, coord_t srcx, coord_t srcy)
+void gfx_blit(Bitmap *dst, const Rect *rect, const Bitmap *src, coord_t srcx, coord_t srcy)
{
coord_t dxmin, dymin, dxmax, dymax;
coord_t dx, dy, sx, sy;
}
+void gfx_blitRaster(Bitmap *dst, coord_t dxmin, coord_t dymin, const uint8_t *raster, coord_t w, coord_t h, coord_t stride)
+{
+ coord_t dxmax, dymax;
+ coord_t sxmin = 0, symin = 0;
+ coord_t dx, dy, sx, sy;
+
+ /*
+ * Clip coordinates inside dst->cr.
+ */
+ if (dxmin < dst->cr.xmin)
+ {
+ sxmin += dst->cr.xmin - dxmin;
+ dxmin = dst->cr.xmin;
+ }
+ if (dymin < dst->cr.ymin)
+ {
+ symin += dst->cr.ymin - dymin;
+ dymin = dst->cr.ymin;
+ }
+ dxmax = MIN(dxmin + w, dst->cr.xmax);
+ dymax = MIN(dymin + h, dst->cr.ymax);
+
+ /* TODO: make it not as dog slow as this */
+ for (dx = dxmin, sx = sxmin; dx < dxmax; ++dx, ++sx)
+ for (dy = dymin, sy = symin; dy < dymax; ++dy, ++sy)
+ BM_DRAWPIXEL(dst, dx, dy, RAST_READPIXEL(raster, sx, sy, stride));
+}
+
+
/*!
* Set the bitmap clipping rectangle to the specified coordinates.
*
bm->cr.xMin, bm->cr.ymin, bm->cr.xmax, bm->cr.ymax);
*/
}
+