From 762784c01baec27dffcf1437b2427a45d82a59de Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@netsurf-browser.org>
Date: Wed, 8 Apr 2009 21:39:21 +0000
Subject: add font glyph plotting support

svn path=/trunk/libnsfb/; revision=7068
---
 src/32bpp_plotters.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/plot.c           |  17 +++++++-
 2 files changed, 128 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/32bpp_plotters.c b/src/32bpp_plotters.c
index eb6d162..c52faad 100644
--- a/src/32bpp_plotters.c
+++ b/src/32bpp_plotters.c
@@ -225,10 +225,119 @@ static bool point(nsfb_t *nsfb, int x, int y, nsfb_colour_t c)
 	return true;
 }
 
+static bool
+glyph1(nsfb_t *nsfb,
+       nsfb_bbox_t *loc,
+       const uint8_t *pixel,
+       int pitch,
+       nsfb_colour_t c)
+{
+        uint32_t *pvideo;
+        int xloop, yloop;
+	int xoff, yoff; /* x and y offset into image */
+        int x = loc->x0;
+        int y = loc->y0;
+        int width = loc->x1 - loc->x0;
+        int height = loc->y1 - loc->y0;
+        uint32_t fgcol;
+        const uint8_t *fntd;
+        uint8_t row;
+
+        if (!nsfb_plot_clip_ctx(nsfb, loc))
+                return true;
+
+        if (height > (loc->y1 - loc->y0))
+                height = (loc->y1 - loc->y0);
+
+        if (width > (loc->x1 - loc->x0))
+                width = (loc->x1 - loc->x0);
+
+	xoff = loc->x0 - x;
+	yoff = loc->y0 - y;
+
+        /* plot the image */
+        pvideo = get_xy_loc(nsfb, loc->x0, loc->y0);
+
+        fgcol = colour_to_pixel(c);
+
+        for (yloop = yoff; yloop < height; yloop++) {
+                fntd = pixel + (yloop * (pitch>>3)) + (xoff>>3);
+                row = (*fntd++) << (xoff & 3);
+                for (xloop = xoff; xloop < width ; xloop++) {
+                        if (((xloop % 8) == 0) && (xloop != 0)) {
+                                row = *fntd++;
+                        }
+
+                        if ((row & 0x80) != 0) {
+                                *(pvideo + xloop) = fgcol;
+                        }
+                        row = row << 1;
+
+                }
+
+                pvideo += (nsfb->linelen >> 2);
+        }
+
+	return true;
+}
+
+static bool
+glyph8(nsfb_t *nsfb,
+       nsfb_bbox_t *loc,
+       const uint8_t *pixel,
+       int pitch,
+       nsfb_colour_t c)
+{
+        uint32_t *pvideo;
+        nsfb_colour_t abpixel; /* alphablended pixel */
+        int xloop, yloop;
+	int xoff, yoff; /* x and y offset into image */
+        int x = loc->x0;
+        int y = loc->y0;
+        int width = loc->x1 - loc->x0;
+        int height = loc->y1 - loc->y0;
+        uint32_t fgcol;
+
+        if (!nsfb_plot_clip_ctx(nsfb, loc))
+                return true;
+
+        if (height > (loc->y1 - loc->y0))
+                height = (loc->y1 - loc->y0);
+
+        if (width > (loc->x1 - loc->x0))
+                width = (loc->x1 - loc->x0);
+
+	xoff = loc->x0 - x;
+	yoff = loc->y0 - y;
+
+        /* plot the image */
+        pvideo = get_xy_loc(nsfb, loc->x0, loc->y0);
+
+        fgcol = c & 0xFFFFFF;
+
+        for (yloop = 0; yloop < height; yloop++) {
+                for (xloop = 0; xloop < width; xloop++) {
+                        abpixel = (pixel[((yoff + yloop) * pitch) + xloop + xoff] << 24) | fgcol;
+                        if ((abpixel & 0xFF000000) != 0) {
+                                /* pixel is not transparent */
+                                if ((abpixel & 0xFF000000) != 0xFF000000) {
+                                        abpixel = nsfb_plot_ablend(abpixel,
+                                                                   pixel_to_colour(*(pvideo + xloop)));
+                                }
+
+                                *(pvideo + xloop) = colour_to_pixel(abpixel);
+                        }
+                }
+                pvideo += (nsfb->linelen >> 2);
+        }
+
+	return true;
+}
+
 static bool 
 bitmap(nsfb_t *nsfb,
        nsfb_bbox_t *loc,
-       nsfb_colour_t *pixel, 
+       const nsfb_colour_t *pixel, 
        int bmp_width, 
        int bmp_height, 
        int bmp_stride,
@@ -311,6 +420,8 @@ const nsfb_plotter_fns_t _nsfb_32bpp_plotters = {
 	.fill = fill,
         .point = point,
         .bitmap = bitmap,
+        .glyph8 = glyph8,
+        .glyph1 = glyph1,
 };
 
 /*
diff --git a/src/plot.c b/src/plot.c
index 8f46cfe..99b4882 100644
--- a/src/plot.c
+++ b/src/plot.c
@@ -108,7 +108,22 @@ bool nsfb_plot_copy(nsfb_t *nsfb, int srcx, int srcy, int width, int height, int
     return nsfb->plotter_fns->copy(nsfb, srcx, srcy, width, height, dstx, dsty);
 }
 
-bool nsfb_plot_bitmap(nsfb_t *nsfb, nsfb_bbox_t *loc,  nsfb_colour_t *pixel, int bmp_width, int bmp_height, int bmp_stride, bool alpha)
+bool nsfb_plot_bitmap(nsfb_t *nsfb, nsfb_bbox_t *loc, const nsfb_colour_t *pixel, int bmp_width, int bmp_height, int bmp_stride, bool alpha)
 {
     return nsfb->plotter_fns->bitmap(nsfb, loc,  pixel, bmp_width, bmp_height, bmp_stride, alpha);
 }
+
+/** Plot an 8 bit glyph.
+ */
+bool nsfb_plot_glyph8(nsfb_t *nsfb, nsfb_bbox_t *loc, const uint8_t *pixel, int pitch, nsfb_colour_t c)
+{
+    return nsfb->plotter_fns->glyph8(nsfb, loc, pixel, pitch, c);
+}
+
+
+/** Plot an 1 bit glyph.
+ */
+bool nsfb_plot_glyph1(nsfb_t *nsfb, nsfb_bbox_t *loc, const uint8_t *pixel, int pitch, nsfb_colour_t c)
+{
+    return nsfb->plotter_fns->glyph1(nsfb, loc, pixel, pitch, c);
+}
-- 
cgit v1.2.3