summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2010-07-09 10:09:38 (GMT)
committer Vincent Sanders <vince@netsurf-browser.org>2010-07-09 10:09:38 (GMT)
commit7f7898eb7d743eb5741cfa31a25b0c5c68653568 (patch)
tree3f65b5d42433d975fd9e6bf6d32e3a84a478b65c
parent68932b3be67f96dff19987e2c87abc8dabc30567 (diff)
downloadlibnsfb-7f7898eb7d743eb5741cfa31a25b0c5c68653568.tar.gz
libnsfb-7f7898eb7d743eb5741cfa31a25b0c5c68653568.tar.bz2
make some of the plot code common
svn path=/trunk/libnsfb/; revision=10618
-rw-r--r--Makefile2
-rw-r--r--src/plot/16bpp.c481
-rw-r--r--src/plot/32bpp.c490
-rw-r--r--src/plot/8bpp.c479
-rw-r--r--src/plot/common.c494
5 files changed, 519 insertions, 1427 deletions
diff --git a/Makefile b/Makefile
index 232806a..bb29314 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ CFLAGS := -g -std=c99 -D_BSD_SOURCE -I$(CURDIR)/include/ \
-I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS)
# TODO: probably want to retrieve SDL from pkg-config
-TESTLDFLAGS = -Wl,--whole-archive -l$(COMPONENT) -Wl,--no-whole-archive -lSDL -lxcb-icccm -lxcb -lxcb-image
+TESTLDFLAGS = -Wl,--whole-archive -l$(COMPONENT) -Wl,--no-whole-archive -lSDL -lxcb-icccm -lxcb -lxcb-image -lxcb-keysyms
include build/makefiles/Makefile.top
diff --git a/src/plot/16bpp.c b/src/plot/16bpp.c
index b430448..0badebe 100644
--- a/src/plot/16bpp.c
+++ b/src/plot/16bpp.c
@@ -18,12 +18,14 @@
#include "nsfb.h"
#include "plot.h"
+#define UNUSED __attribute__((unused))
+
static inline uint16_t *get_xy_loc(nsfb_t *nsfb, int x, int y)
{
return (void *)(nsfb->ptr + (y * nsfb->linelen) + (x << 1));
}
-static inline nsfb_colour_t pixel_to_colour(uint16_t pixel)
+static inline nsfb_colour_t pixel_to_colour(UNUSED nsfb_t *nsfb, uint16_t pixel)
{
return ((pixel & 0x1F) << 19) |
((pixel & 0x7E0) << 5) |
@@ -31,101 +33,15 @@ static inline nsfb_colour_t pixel_to_colour(uint16_t pixel)
}
/* convert a colour value to a 16bpp pixel value ready for screen output */
-static inline uint16_t colour_to_pixel(nsfb_colour_t c)
+static inline uint16_t colour_to_pixel(UNUSED nsfb_t *nsfb, nsfb_colour_t c)
{
return ((c & 0xF8) << 8) | ((c & 0xFC00 ) >> 5) | ((c & 0xF80000) >> 19);
}
-#define SIGN(x) ((x<0) ? -1 : ((x>0) ? 1 : 0))
-
-
-static bool
-line(nsfb_t *nsfb, int linec, nsfb_bbox_t *line, nsfb_plot_pen_t *pen)
-{
- int w;
- uint16_t ent;
- uint16_t *pvideo;
- int x, y, i;
- int dx, dy, sdy;
- int dxabs, dyabs;
-
- ent = colour_to_pixel(pen->stroke_colour);
-
- for (;linec > 0; linec--) {
-
- if (line->y0 == line->y1) {
- /* horizontal line special cased */
-
- if (!nsfb_plot_clip_ctx(nsfb, line)) {
- /* line outside clipping */
- line++;
- continue;
- }
-
- pvideo = get_xy_loc(nsfb, line->x0, line->y0);
-
- w = line->x1 - line->x0;
- while (w-- > 0)
- *(pvideo + w) = ent;
-
- } else {
- /* standard bresenham line */
- if (!nsfb_plot_clip_line_ctx(nsfb, line)) {
- /* line outside clipping */
- line++;
- continue;
- }
-
- /* the horizontal distance of the line */
- dx = line->x1 - line->x0;
- dxabs = abs (dx);
-
- /* the vertical distance of the line */
- dy = line->y1 - line->y0;
- dyabs = abs (dy);
-
- sdy = dx ? SIGN(dy) * SIGN(dx) : SIGN(dy);
-
- if (dx >= 0)
- pvideo = get_xy_loc(nsfb, line->x0, line->y0);
- else
- pvideo = get_xy_loc(nsfb, line->x1, line->y1);
-
- x = dyabs >> 1;
- y = dxabs >> 1;
-
- if (dxabs >= dyabs) {
- /* the line is more horizontal than vertical */
- for (i = 0; i < dxabs; i++) {
- *pvideo = ent;
-
- pvideo++;
- y += dyabs;
- if (y >= dxabs) {
- y -= dxabs;
- pvideo += sdy * (nsfb->linelen>>1);
- }
- }
- } else {
- /* the line is more vertical than horizontal */
- for (i = 0; i < dyabs; i++) {
- *pvideo = ent;
- pvideo += sdy * (nsfb->linelen >> 1);
-
- x += dxabs;
- if (x >= dyabs) {
- x -= dyabs;
- pvideo++;
- }
- }
- }
-
- }
- line++;
- }
- return true;
-}
+#define PLOT_TYPE uint16_t
+#define PLOT_LINELEN(ll) ((ll) >> 1)
+#include "common.c"
static bool fill(nsfb_t *nsfb, nsfb_bbox_t *rect, nsfb_colour_t c)
@@ -142,7 +58,7 @@ static bool fill(nsfb_t *nsfb, nsfb_bbox_t *rect, nsfb_colour_t c)
if (!nsfb_plot_clip_ctx(nsfb, rect))
return true; /* fill lies outside current clipping region */
- ent16 = colour_to_pixel(c);
+ ent16 = colour_to_pixel(nsfb, c);
width = rect->x1 - rect->x0;
height = rect->y1 - rect->y0;
@@ -193,387 +109,6 @@ static bool fill(nsfb_t *nsfb, nsfb_bbox_t *rect, nsfb_colour_t c)
return true;
}
-
-static bool point(nsfb_t *nsfb, int x, int y, nsfb_colour_t c)
-{
- uint16_t *pvideo;
-
- /* check point lies within clipping region */
- if ((x < nsfb->clip.x0) ||
- (x >= nsfb->clip.x1) ||
- (y < nsfb->clip.y0) ||
- (y >= nsfb->clip.y1))
- return true;
-
- pvideo = get_xy_loc(nsfb, x, y);
-
- if ((c & 0xFF000000) != 0) {
- if ((c & 0xFF000000) != 0xFF000000) {
- c = nsfb_plot_ablend(c, pixel_to_colour(*pvideo));
- }
-
- *pvideo = colour_to_pixel(c);
- }
- return true;
-}
-
-static bool
-glyph1(nsfb_t *nsfb,
- nsfb_bbox_t *loc,
- const uint8_t *pixel,
- int pitch,
- nsfb_colour_t c)
-{
- uint16_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;
- uint16_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;
-
- 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 >> 1);
- }
-
- return true;
-}
-
-static bool
-glyph8(nsfb_t *nsfb,
- nsfb_bbox_t *loc,
- const uint8_t *pixel,
- int pitch,
- nsfb_colour_t c)
-{
- uint16_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;
- uint16_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;
-
- 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 >> 1);
- }
-
- return true;
-}
-
-static bool bitmap_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc,
- const nsfb_colour_t *pixel, int bmp_width, int bmp_height,
- int bmp_stride, bool alpha)
-{
- uint16_t *pvideo, *pvideo_limit;
- nsfb_colour_t abpixel; /* alphablended pixel */
- int xloop;
- int xoff, yoff, xoffs; /* x and y offsets into image */
- int x = loc->x0;
- int y = loc->y0;
- int width = loc->x1 - loc->x0; /* size to scale to */
- int height = loc->y1 - loc->y0; /* size to scale to */
- int rheight, rwidth; /* post-clipping render area dimensions */
- int dx, dy; /* scale factor (integer part) */
- int dxr, dyr; /* scale factor (remainder) */
- int rx, ry, rxs; /* remainder trackers */
- nsfb_bbox_t clipped; /* clipped display */
-
- /* The part of the scaled image actually displayed is cropped to the
- * current context.
- */
- clipped.x0 = x;
- clipped.y0 = y;
- clipped.x1 = x + width;
- clipped.y1 = y + height;
-
- if (!nsfb_plot_clip_ctx(nsfb, &clipped))
- return true;
-
- /* get height of rendering region, after clipping */
- if (height > (clipped.y1 - clipped.y0))
- rheight = (clipped.y1 - clipped.y0);
- else
- rheight = height;
-
- /* get width of rendering region, after clipping */
- if (width > (clipped.x1 - clipped.x0))
- rwidth = (clipped.x1 - clipped.x0);
- else
- rwidth = width;
-
- /* get veritcal (y) and horizontal (x) scale factors; both integer
- * part and remainder */
- dx = bmp_width / width;
- dy = (bmp_height / height) * bmp_stride;
- dxr = bmp_width % width;
- dyr = bmp_height % height;
-
- /* get start offsets to part of image being scaled, after clipping and
- * set remainder trackers to correct starting value */
- if (clipped.x0 - x != 0) {
- xoffs = ((clipped.x0 - x) * bmp_width) / width;
- rxs = ((clipped.x0 - x) * bmp_width) % width;
- } else {
- xoffs = 0;
- rxs = 0;
- }
- if (clipped.y0 - y != 0) {
- yoff = (((clipped.y0 - y) * bmp_height) / height) * bmp_stride;
- ry = ((clipped.y0 - y) * bmp_height) % height;
- } else {
- yoff = 0;
- ry = 0;
- }
-
- /* plot the image */
- pvideo = get_xy_loc(nsfb, clipped.x0, clipped.y0);
- pvideo_limit = pvideo + (nsfb->linelen >> 1) * rheight;
- if (alpha) {
- for (; pvideo < pvideo_limit; pvideo += (nsfb->linelen >> 1)) {
- /* looping through render area vertically */
- xoff = xoffs;
- rx = rxs;
- for (xloop = 0; xloop < rwidth; xloop++) {
- /* looping through render area horizontally */
- /* get value of source pixel in question */
- abpixel = pixel[yoff + xoff];
- if ((abpixel & 0xFF000000) != 0) {
- /* pixel is not transparent; have to
- * plot something */
- if ((abpixel & 0xFF000000) !=
- 0xFF000000) {
- /* pixel is not opaque; need to
- * blend */
- abpixel = nsfb_plot_ablend(
- abpixel,
- pixel_to_colour(
- *(pvideo +
- xloop)));
- }
- /* plot pixel */
- *(pvideo + xloop) = colour_to_pixel(
- abpixel);
- }
- /* handle horizontal interpolation */
- xoff += dx;
- rx += dxr;
- if (rx >= width) {
- xoff++;
- rx -= width;
- }
- }
- /* handle vertical interpolation */
- yoff += dy;
- ry += dyr;
- if (ry >= height) {
- yoff += bmp_stride;
- ry -= height;
- }
- }
- } else {
- for (; pvideo < pvideo_limit; pvideo += (nsfb->linelen >> 1)) {
- /* looping through render area vertically */
- xoff = xoffs;
- rx = rxs;
- for (xloop = 0; xloop < rwidth; xloop++) {
- /* looping through render area horizontally */
- /* get value of source pixel in question */
- abpixel = pixel[yoff + xoff];
- /* plot pixel */
- *(pvideo + xloop) = colour_to_pixel(abpixel);
-
- /* handle horizontal interpolation */
- xoff += dx;
- rx += dxr;
- if (rx >= width) {
- xoff++;
- rx -= width;
- }
- }
- /* handle vertical interpolation */
- yoff += dy;
- ry += dyr;
- if (ry >= height) {
- yoff += bmp_stride;
- ry -= height;
- }
- }
- }
- return true;
-}
-
-static bool
-bitmap(nsfb_t *nsfb,
- const nsfb_bbox_t *loc,
- const nsfb_colour_t *pixel,
- int bmp_width,
- int bmp_height,
- int bmp_stride,
- bool alpha)
-{
- uint16_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;
- nsfb_bbox_t clipped; /* clipped display */
-
- if (width == 0 || height == 0)
- return true;
-
- /* Scaled bitmaps are handled by a separate function */
- if (width != bmp_width || height != bmp_height)
- return bitmap_scaled(nsfb, loc, pixel, bmp_width, bmp_height,
- bmp_stride, alpha);
-
- /* The part of the scaled image actually displayed is cropped to the
- * current context.
- */
- clipped.x0 = x;
- clipped.y0 = y;
- clipped.x1 = x + width;
- clipped.y1 = y + height;
-
- if (!nsfb_plot_clip_ctx(nsfb, &clipped))
- return true;
-
- if (height > (clipped.y1 - clipped.y0))
- height = (clipped.y1 - clipped.y0);
-
- if (width > (clipped.x1 - clipped.x0))
- width = (clipped.x1 - clipped.x0);
-
- xoff = clipped.x0 - x;
- yoff = (clipped.y0 - y) * bmp_stride;
- height = height * bmp_stride + yoff;
-
- /* plot the image */
- pvideo = get_xy_loc(nsfb, clipped.x0, clipped.y0);
-
- if (alpha) {
- for (yloop = yoff; yloop < height; yloop += bmp_stride) {
- for (xloop = 0; xloop < width; xloop++) {
- abpixel = pixel[yloop + xloop + xoff];
- if ((abpixel & 0xFF000000) != 0) {
- /* pixel is not transparent; have to
- * plot something */
- if ((abpixel & 0xFF000000) != 0xFF000000) {
- /* pixel is not opaque; need to
- * blend */
- abpixel = nsfb_plot_ablend(abpixel,
- pixel_to_colour(*(pvideo + xloop)));
- }
-
- *(pvideo + xloop) = colour_to_pixel(abpixel);
- }
- }
- pvideo += (nsfb->linelen >> 1);
- }
- } else {
- for (yloop = yoff; yloop < height; yloop += bmp_stride) {
- for (xloop = 0; xloop < width; xloop++) {
- abpixel = pixel[yloop + xloop + xoff];
- *(pvideo + xloop) = colour_to_pixel(abpixel);
- }
- pvideo += (nsfb->linelen >> 1);
- }
- }
- return true;
-}
-
-
-static bool readrect(nsfb_t *nsfb, nsfb_bbox_t *rect, nsfb_colour_t *buffer)
-{
- uint16_t *pvideo;
- int xloop, yloop;
- int width;
-
- if (!nsfb_plot_clip_ctx(nsfb, rect)) {
- return true;
- }
-
- width = rect->x1 - rect->x0;
-
- pvideo = get_xy_loc(nsfb, rect->x0, rect->y0);
-
- for (yloop = rect->y0; yloop < rect->y1; yloop += 1) {
- for (xloop = 0; xloop < width; xloop++) {
- *buffer = pixel_to_colour(*(pvideo + xloop));
- buffer++;
- }
- pvideo += (nsfb->linelen >> 1);
- }
- return true;
-}
-
-
const nsfb_plotter_fns_t _nsfb_16bpp_plotters = {
.line = line,
.fill = fill,
diff --git a/src/plot/32bpp.c b/src/plot/32bpp.c
index e88537e..ff03ed6 100644
--- a/src/plot/32bpp.c
+++ b/src/plot/32bpp.c
@@ -18,25 +18,27 @@
#include "nsfb.h"
#include "plot.h"
-static inline uint32_t *
-get_xy_loc(nsfb_t *nsfb, int x, int y)
+
+#define UNUSED __attribute__((unused))
+
+static inline uint32_t *get_xy_loc(nsfb_t *nsfb, int x, int y)
{
return (uint32_t *)(nsfb->ptr + (y * nsfb->linelen) + (x << 2));
}
#if __BYTE_ORDER == __BIG_ENDIAN
-static inline nsfb_colour_t pixel_to_colour(uint32_t pixel)
+static inline nsfb_colour_t pixel_to_colour(UNUSED nsfb_t *nsfb, uint32_t pixel)
{
return (pixel >> 8) & ~0xFF000000U;
}
/* convert a colour value to a 32bpp pixel value ready for screen output */
-static inline uint32_t colour_to_pixel(nsfb_colour_t c)
+static inline uint32_t colour_to_pixel(UNUSED nsfb_t *nsfb, nsfb_colour_t c)
{
return (c << 8);
}
#else /* __BYTE_ORDER == __BIG_ENDIAN */
-static inline nsfb_colour_t pixel_to_colour(uint32_t pixel)
+static inline nsfb_colour_t pixel_to_colour(UNUSED nsfb_t *nsfb, uint32_t pixel)
{
return ((pixel & 0xFF) << 16) |
((pixel & 0xFF00)) |
@@ -44,103 +46,16 @@ static inline nsfb_colour_t pixel_to_colour(uint32_t pixel)
}
/* convert a colour value to a 32bpp pixel value ready for screen output */
-static inline uint32_t colour_to_pixel(nsfb_colour_t c)
+static inline uint32_t colour_to_pixel(UNUSED nsfb_t *nsfb, nsfb_colour_t c)
{
return ((c & 0xff0000) >> 16) | (c & 0xff00) | ((c & 0xff) << 16);
}
#endif
-#define SIGN(x) ((x<0) ? -1 : ((x>0) ? 1 : 0))
-
-static bool
-line(nsfb_t *nsfb, int linec, nsfb_bbox_t *line, nsfb_plot_pen_t *pen)
-{
- int w;
- uint32_t ent;
- uint32_t *pvideo;
- int x, y, i;
- int dx, dy, sdy;
- int dxabs, dyabs;
-
- ent = colour_to_pixel(pen->stroke_colour);
-
- for (;linec > 0; linec--) {
-
- if (line->y0 == line->y1) {
- /* horizontal line special cased */
-
- if (!nsfb_plot_clip_ctx(nsfb, line)) {
- /* line outside clipping */
- line++;
- continue;
- }
-
- pvideo = get_xy_loc(nsfb, line->x0, line->y0);
-
- w = line->x1 - line->x0;
- while (w-- > 0)
- *(pvideo + w) = ent;
-
- } else {
- /* standard bresenham line */
-
- if (!nsfb_plot_clip_line_ctx(nsfb, line)) {
- /* line outside clipping */
- line++;
- continue;
- }
-
- /* the horizontal distance of the line */
- dx = line->x1 - line->x0;
- dxabs = abs (dx);
-
- /* the vertical distance of the line */
- dy = line->y1 - line->y0;
- dyabs = abs (dy);
-
- sdy = dx ? SIGN(dy) * SIGN(dx) : SIGN(dy);
-
- if (dx >= 0)
- pvideo = get_xy_loc(nsfb, line->x0, line->y0);
- else
- pvideo = get_xy_loc(nsfb, line->x1, line->y1);
-
- x = dyabs >> 1;
- y = dxabs >> 1;
-
- if (dxabs >= dyabs) {
- /* the line is more horizontal than vertical */
- for (i = 0; i < dxabs; i++) {
- *pvideo = ent;
-
- pvideo++;
- y += dyabs;
- if (y >= dxabs) {
- y -= dxabs;
- pvideo += sdy * (nsfb->linelen>>2);
- }
- }
- } else {
- /* the line is more vertical than horizontal */
- for (i = 0; i < dyabs; i++) {
- *pvideo = ent;
- pvideo += sdy * (nsfb->linelen >> 2);
-
- x += dxabs;
- if (x >= dyabs) {
- x -= dyabs;
- pvideo++;
- }
- }
- }
-
- }
- line++;
- }
- return true;
-}
-
+#define PLOT_TYPE uint32_t
+#define PLOT_LINELEN(ll) ((ll) >> 2)
+#include "common.c"
static bool fill(nsfb_t *nsfb, nsfb_bbox_t *rect, nsfb_colour_t c)
{
@@ -154,7 +69,7 @@ static bool fill(nsfb_t *nsfb, nsfb_bbox_t *rect, nsfb_colour_t c)
if (!nsfb_plot_clip_ctx(nsfb, rect))
return true; /* fill lies outside current clipping region */
- ent = colour_to_pixel(c);
+ ent = colour_to_pixel(nsfb, c);
width = rect->x1 - rect->x0;
height = rect->y1 - rect->y0;
llen = (nsfb->linelen >> 2) - width;
@@ -189,387 +104,6 @@ static bool fill(nsfb_t *nsfb, nsfb_bbox_t *rect, nsfb_colour_t c)
return true;
}
-
-
-
-static bool point(nsfb_t *nsfb, int x, int y, nsfb_colour_t c)
-{
- uint32_t *pvideo;
-
- /* check point lies within clipping region */
- if ((x < nsfb->clip.x0) ||
- (x >= nsfb->clip.x1) ||
- (y < nsfb->clip.y0) ||
- (y >= nsfb->clip.y1))
- return true;
-
- pvideo = get_xy_loc(nsfb, x, y);
-
- if ((c & 0xFF000000) != 0) {
- if ((c & 0xFF000000) != 0xFF000000) {
- c = nsfb_plot_ablend(c, pixel_to_colour(*pvideo));
- }
-
- *pvideo = colour_to_pixel(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;
-
- 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;
-
- 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_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc,
- const nsfb_colour_t *pixel, int bmp_width, int bmp_height,
- int bmp_stride, bool alpha)
-{
- uint32_t *pvideo, *pvideo_limit;
- nsfb_colour_t abpixel; /* alphablended pixel */
- int xloop;
- int xoff, yoff, xoffs; /* x and y offsets into image */
- int x = loc->x0;
- int y = loc->y0;
- int width = loc->x1 - loc->x0; /* size to scale to */
- int height = loc->y1 - loc->y0; /* size to scale to */
- int rheight, rwidth; /* post-clipping render area dimensions */
- int dx, dy; /* scale factor (integer part) */
- int dxr, dyr; /* scale factor (remainder) */
- int rx, ry, rxs; /* remainder trackers */
- nsfb_bbox_t clipped; /* clipped display */
-
- /* The part of the scaled image actually displayed is cropped to the
- * current context.
- */
- clipped.x0 = x;
- clipped.y0 = y;
- clipped.x1 = x + width;
- clipped.y1 = y + height;
-
- if (!nsfb_plot_clip_ctx(nsfb, &clipped))
- return true;
-
- /* get height of rendering region, after clipping */
- if (height > (clipped.y1 - clipped.y0))
- rheight = (clipped.y1 - clipped.y0);
- else
- rheight = height;
-
- /* get width of rendering region, after clipping */
- if (width > (clipped.x1 - clipped.x0))
- rwidth = (clipped.x1 - clipped.x0);
- else
- rwidth = width;
-
- /* get veritcal (y) and horizontal (x) scale factors; both integer
- * part and remainder */
- dx = bmp_width / width;
- dy = (bmp_height / height) * bmp_stride;
- dxr = bmp_width % width;
- dyr = bmp_height % height;
-
- /* get start offsets to part of image being scaled, after clipping and
- * set remainder trackers to correct starting value */
- if (clipped.x0 - x != 0) {
- xoffs = ((clipped.x0 - x) * bmp_width) / width;
- rxs = ((clipped.x0 - x) * bmp_width) % width;
- } else {
- xoffs = 0;
- rxs = 0;
- }
- if (clipped.y0 - y != 0) {
- yoff = (((clipped.y0 - y) * bmp_height) / height) * bmp_stride;
- ry = ((clipped.y0 - y) * bmp_height) % height;
- } else {
- yoff = 0;
- ry = 0;
- }
-
- /* plot the image */
- pvideo = get_xy_loc(nsfb, clipped.x0, clipped.y0);
- pvideo_limit = pvideo + (nsfb->linelen >> 2) * rheight;
- if (alpha) {
- for (; pvideo < pvideo_limit; pvideo += (nsfb->linelen >> 2)) {
- /* looping through render area vertically */
- xoff = xoffs;
- rx = rxs;
- for (xloop = 0; xloop < rwidth; xloop++) {
- /* looping through render area horizontally */
- /* get value of source pixel in question */
- abpixel = pixel[yoff + xoff];
- if ((abpixel & 0xFF000000) != 0) {
- /* pixel is not transparent; have to
- * plot something */
- if ((abpixel & 0xFF000000) !=
- 0xFF000000) {
- /* pixel is not opaque; need to
- * blend */
- abpixel = nsfb_plot_ablend(
- abpixel,
- pixel_to_colour(
- *(pvideo +
- xloop)));
- }
- /* plot pixel */
- *(pvideo + xloop) = colour_to_pixel(
- abpixel);
- }
- /* handle horizontal interpolation */
- xoff += dx;
- rx += dxr;
- if (rx >= width) {
- xoff++;
- rx -= width;
- }
- }
- /* handle vertical interpolation */
- yoff += dy;
- ry += dyr;
- if (ry >= height) {
- yoff += bmp_stride;
- ry -= height;
- }
- }
- } else {
- for (; pvideo < pvideo_limit; pvideo += (nsfb->linelen >> 2)) {
- /* looping through render area vertically */
- xoff = xoffs;
- rx = rxs;
- for (xloop = 0; xloop < rwidth; xloop++) {
- /* looping through render area horizontally */
- /* get value of source pixel in question */
- abpixel = pixel[yoff + xoff];
- /* plot pixel */
- *(pvideo + xloop) = colour_to_pixel(abpixel);
-
- /* handle horizontal interpolation */
- xoff += dx;
- rx += dxr;
- if (rx >= width) {
- xoff++;
- rx -= width;
- }
- }
- /* handle vertical interpolation */
- yoff += dy;
- ry += dyr;
- if (ry >= height) {
- yoff += bmp_stride;
- ry -= height;
- }
- }
- }
- return true;
-}
-
-static bool
-bitmap(nsfb_t *nsfb,
- const nsfb_bbox_t *loc,
- const nsfb_colour_t *pixel,
- int bmp_width,
- int bmp_height,
- int bmp_stride,
- bool alpha)
-{
- 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;
- nsfb_bbox_t clipped; /* clipped display */
-
- if (width == 0 || height == 0)
- return true;
-
- /* Scaled bitmaps are handled by a separate function */
- if (width != bmp_width || height != bmp_height)
- return bitmap_scaled(nsfb, loc, pixel, bmp_width, bmp_height,
- bmp_stride, alpha);
-
- /* The part of the scaled image actually displayed is cropped to the
- * current context.
- */
- clipped.x0 = x;
- clipped.y0 = y;
- clipped.x1 = x + width;
- clipped.y1 = y + height;
-
- if (!nsfb_plot_clip_ctx(nsfb, &clipped))
- return true;
-
- if (height > (clipped.y1 - clipped.y0))
- height = (clipped.y1 - clipped.y0);
-
- if (width > (clipped.x1 - clipped.x0))
- width = (clipped.x1 - clipped.x0);
-
- xoff = clipped.x0 - x;
- yoff = (clipped.y0 - y) * bmp_stride;
- height = height * bmp_stride + yoff;
-
- /* plot the image */
- pvideo = get_xy_loc(nsfb, clipped.x0, clipped.y0);
-
- if (alpha) {
- for (yloop = yoff; yloop < height; yloop += bmp_stride) {
- for (xloop = 0; xloop < width; xloop++) {
- abpixel = pixel[yloop + xloop + xoff];
- if ((abpixel & 0xFF000000) != 0) {
- /* pixel is not transparent; have to
- * plot something */
- if ((abpixel & 0xFF000000) != 0xFF000000) {
- /* pixel is not opaque; need to
- * blend */
- abpixel = nsfb_plot_ablend(abpixel,
- pixel_to_colour(*(pvideo + xloop)));
- }
-
- *(pvideo + xloop) = colour_to_pixel(abpixel);
- }
- }
- pvideo += (nsfb->linelen >> 2);
- }
- } else {
- for (yloop = yoff; yloop < height; yloop += bmp_stride) {
- for (xloop = 0; xloop < width; xloop++) {
- abpixel = pixel[yloop + xloop + xoff];
- *(pvideo + xloop) = colour_to_pixel(abpixel);
- }
- pvideo += (nsfb->linelen >> 2);
- }
- }
- return true;
-}
-
-static bool readrect(nsfb_t *nsfb, nsfb_bbox_t *rect, nsfb_colour_t *buffer)
-{
- uint32_t *pvideo;
- int xloop, yloop;
- int width;
-
- if (!nsfb_plot_clip_ctx(nsfb, rect)) {
- return true;
- }
-
- width = rect->x1 - rect->x0;
-
- pvideo = get_xy_loc(nsfb, rect->x0, rect->y0);
-
- for (yloop = rect->y0; yloop < rect->y1; yloop += 1) {
- for (xloop = 0; xloop < width; xloop++) {
- *buffer = pixel_to_colour(*(pvideo + xloop));
- buffer++;
- }
- pvideo += (nsfb->linelen >> 2);
- }
- return true;
-}
-
const nsfb_plotter_fns_t _nsfb_32bpp_plotters = {
.line = line,
.fill = fill,
diff --git a/src/plot/8bpp.c b/src/plot/8bpp.c
index c5ba689..b72303d 100644
--- a/src/plot/8bpp.c
+++ b/src/plot/8bpp.c
@@ -31,8 +31,7 @@ static inline nsfb_colour_t pixel_to_colour(nsfb_t *nsfb, uint8_t pixel)
return nsfb->palette[pixel];
}
-static uint8_t
-colour_to_pixel(nsfb_t *nsfb, nsfb_colour_t c)
+static uint8_t colour_to_pixel(nsfb_t *nsfb, nsfb_colour_t c)
{
nsfb_colour_t palent;
int col;
@@ -59,96 +58,10 @@ colour_to_pixel(nsfb_t *nsfb, nsfb_colour_t c)
return best_col;
}
-#define SIGN(x) ((x<0) ? -1 : ((x>0) ? 1 : 0))
+#define PLOT_TYPE uint8_t
+#define PLOT_LINELEN(ll) (ll)
-static bool
-line(nsfb_t *nsfb, int linec, nsfb_bbox_t *line, nsfb_plot_pen_t *pen)
-{
- int w;
- uint8_t ent;
- uint8_t *pvideo;
- int x, y, i;
- int dx, dy, sdy;
- int dxabs, dyabs;
-
- ent = colour_to_pixel(nsfb, pen->stroke_colour);
-
- for (;linec > 0; linec--) {
-
- if (line->y0 == line->y1) {
- /* horizontal line special cased */
-
- if (!nsfb_plot_clip_ctx(nsfb, line)) {
- /* line outside clipping */
- line++;
- continue;
- }
-
- pvideo = get_xy_loc(nsfb, line->x0, line->y0);
-
- w = line->x1 - line->x0;
- while (w-- > 0)
- *(pvideo + w) = ent;
-
- } else {
- /* standard bresenham line */
-
- if (!nsfb_plot_clip_line_ctx(nsfb, line)) {
- /* line outside clipping */
- line++;
- continue;
- }
-
- /* the horizontal distance of the line */
- dx = line->x1 - line->x0;
- dxabs = abs (dx);
-
- /* the vertical distance of the line */
- dy = line->y1 - line->y0;
- dyabs = abs (dy);
-
- sdy = dx ? SIGN(dy) * SIGN(dx) : SIGN(dy);
-
- if (dx >= 0)
- pvideo = get_xy_loc(nsfb, line->x0, line->y0);
- else
- pvideo = get_xy_loc(nsfb, line->x1, line->y1);
-
- x = dyabs >> 1;
- y = dxabs >> 1;
-
- if (dxabs >= dyabs) {
- /* the line is more horizontal than vertical */
- for (i = 0; i < dxabs; i++) {
- *pvideo = ent;
-
- pvideo++;
- y += dyabs;
- if (y >= dxabs) {
- y -= dxabs;
- pvideo += sdy * nsfb->linelen;
- }
- }
- } else {
- /* the line is more vertical than horizontal */
- for (i = 0; i < dyabs; i++) {
- *pvideo = ent;
- pvideo += sdy * nsfb->linelen;
-
- x += dxabs;
- if (x >= dyabs) {
- x -= dyabs;
- pvideo++;
- }
- }
- }
-
- }
- line++;
- }
-
- return true;
-}
+#include "common.c"
static bool fill(nsfb_t *nsfb, nsfb_bbox_t *rect, nsfb_colour_t c)
{
@@ -171,390 +84,6 @@ static bool fill(nsfb_t *nsfb, nsfb_bbox_t *rect, nsfb_colour_t c)
return true;
}
-static bool point(nsfb_t *nsfb, int x, int y, nsfb_colour_t c)
-{
- uint8_t *pvideo;
-
- /* check point lies within clipping region */
- if ((x < nsfb->clip.x0) ||
- (x >= nsfb->clip.x1) ||
- (y < nsfb->clip.y0) ||
- (y >= nsfb->clip.y1))
- return true;
-
- pvideo = get_xy_loc(nsfb, x, y);
-
- if ((c & 0xFF000000) != 0) {
- if ((c & 0xFF000000) != 0xFF000000) {
- c = nsfb_plot_ablend(c, pixel_to_colour(nsfb, *pvideo));
- }
-
- *pvideo = colour_to_pixel(nsfb, c);
- }
- return true;
-}
-
-static bool
-glyph1(nsfb_t *nsfb,
- nsfb_bbox_t *loc,
- const uint8_t *pixel,
- int pitch,
- nsfb_colour_t c)
-{
- uint8_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;
- uint8_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;
-
- pvideo = get_xy_loc(nsfb, loc->x0, loc->y0);
-
- fgcol = colour_to_pixel(nsfb, 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;
- }
-
- return true;
-}
-
-static bool
-glyph8(nsfb_t *nsfb,
- nsfb_bbox_t *loc,
- const uint8_t *pixel,
- int pitch,
- nsfb_colour_t c)
-{
- uint8_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;
- uint8_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;
-
- 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(nsfb, *(pvideo + xloop)));
- }
-
- *(pvideo + xloop) = colour_to_pixel(nsfb, abpixel);
- }
- }
- pvideo += nsfb->linelen;
- }
-
- return true;
-}
-
-static bool bitmap_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc,
- const nsfb_colour_t *pixel, int bmp_width, int bmp_height,
- int bmp_stride, bool alpha)
-{
- uint8_t *pvideo, *pvideo_limit;
- nsfb_colour_t abpixel; /* alphablended pixel */
- int xloop;
- int xoff, yoff, xoffs; /* x and y offsets into image */
- int x = loc->x0;
- int y = loc->y0;
- int width = loc->x1 - loc->x0; /* size to scale to */
- int height = loc->y1 - loc->y0; /* size to scale to */
- int rheight, rwidth; /* post-clipping render area dimensions */
- int dx, dy; /* scale factor (integer part) */
- int dxr, dyr; /* scale factor (remainder) */
- int rx, ry, rxs; /* remainder trackers */
- nsfb_bbox_t clipped; /* clipped display */
-
- /* The part of the scaled image actually displayed is cropped to the
- * current context.
- */
- clipped.x0 = x;
- clipped.y0 = y;
- clipped.x1 = x + width;
- clipped.y1 = y + height;
-
- if (!nsfb_plot_clip_ctx(nsfb, &clipped))
- return true;
-
- /* get height of rendering region, after clipping */
- if (height > (clipped.y1 - clipped.y0))
- rheight = (clipped.y1 - clipped.y0);
- else
- rheight = height;
-
- /* get width of rendering region, after clipping */
- if (width > (clipped.x1 - clipped.x0))
- rwidth = (clipped.x1 - clipped.x0);
- else
- rwidth = width;
-
- /* get veritcal (y) and horizontal (x) scale factors; both integer
- * part and remainder */
- dx = bmp_width / width;
- dy = (bmp_height / height) * bmp_stride;
- dxr = bmp_width % width;
- dyr = bmp_height % height;
-
- /* get start offsets to part of image being scaled, after clipping and
- * set remainder trackers to correct starting value*/
- if (clipped.x0 - x != 0) {
- xoffs = ((clipped.x0 - x) * bmp_width) / width;
- rxs = ((clipped.x0 - x) * bmp_width) % width;
- } else {
- xoffs = 0;
- rxs = 0;
- }
- if (clipped.y0 - y != 0) {
- yoff = (((clipped.y0 - y) * bmp_height) / height) * bmp_stride;
- ry = ((clipped.y0 - y) * bmp_height) % height;
- } else {
- yoff = 0;
- ry = 0;
- }
-
- /* plot the image */
- pvideo = get_xy_loc(nsfb, clipped.x0, clipped.y0);
- pvideo_limit = pvideo + (nsfb->linelen) * rheight;
- if (alpha) {
- for (; pvideo < pvideo_limit; pvideo += (nsfb->linelen)) {
- /* looping through render area vertically */
- xoff = xoffs;
- rx = rxs;
- for (xloop = 0; xloop < rwidth; xloop++) {
- /* looping through render area horizontally */
- /* get value of source pixel in question */
- abpixel = pixel[yoff + xoff];
- if ((abpixel & 0xFF000000) != 0) {
- /* pixel is not transparent; have to
- * plot something */
- if ((abpixel & 0xFF000000) !=
- 0xFF000000) {
- /* pixel is not opaque; need to
- * blend */
- abpixel = nsfb_plot_ablend(
- abpixel,
- pixel_to_colour(
- nsfb,
- *(pvideo +
- xloop)));
- }
- /* plot pixel */
- *(pvideo + xloop) = colour_to_pixel(
- nsfb, abpixel);
- }
- /* handle horizontal interpolation */
- xoff += dx;
- rx += dxr;
- if (rx >= width) {
- xoff++;
- rx -= width;
- }
- }
- /* handle vertical interpolation */
- yoff += dy;
- ry += dyr;
- if (ry >= height) {
- yoff += bmp_stride;
- ry -= height;
- }
- }
- } else {
- for (; pvideo < pvideo_limit; pvideo += (nsfb->linelen)) {
- /* looping through render area vertically */
- xoff = xoffs;
- rx = rxs;
- for (xloop = 0; xloop < rwidth; xloop++) {
- /* looping through render area horizontally */
- /* get value of source pixel in question */
- abpixel = pixel[yoff + xoff];
- /* plot pixel */
- *(pvideo + xloop) = colour_to_pixel(nsfb,
- abpixel);
-
- /* handle horizontal interpolation */
- xoff += dx;
- rx += dxr;
- if (rx >= width) {
- xoff++;
- rx -= width;
- }
- }
- /* handle vertical interpolation */
- yoff += dy;
- ry += dyr;
- if (ry >= height) {
- yoff += bmp_stride;
- ry -= height;
- }
- }
- }
- return true;
-}
-
-static bool
-bitmap(nsfb_t *nsfb,
- const nsfb_bbox_t *loc,
- const nsfb_colour_t *pixel,
- int bmp_width,
- int bmp_height,
- int bmp_stride,
- bool alpha)
-{
- uint8_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;
- nsfb_bbox_t clipped; /* clipped display */
-
- if (width == 0 || height == 0)
- return true;
-
- /* Scaled bitmaps are handled by a separate function */
- if (width != bmp_width || height != bmp_height)
- return bitmap_scaled(nsfb, loc, pixel, bmp_width, bmp_height,
- bmp_stride, alpha);
-
- /* The part of the scaled image actually displayed is cropped to the
- * current context.
- */
- clipped.x0 = x;
- clipped.y0 = y;
- clipped.x1 = x + width;
- clipped.y1 = y + height;
-
- if (!nsfb_plot_clip_ctx(nsfb, &clipped))
- return true;
-
- if (height > (clipped.y1 - clipped.y0))
- height = (clipped.y1 - clipped.y0);
-
- if (width > (clipped.x1 - clipped.x0))
- width = (clipped.x1 - clipped.x0);
-
- xoff = clipped.x0 - x;
- yoff = (clipped.y0 - y) * bmp_stride;
- height = height * bmp_stride + yoff;
-
- /* plot the image */
- pvideo = get_xy_loc(nsfb, clipped.x0, clipped.y0);
-
- if (alpha) {
- for (yloop = yoff; yloop < height; yloop += bmp_stride) {
- for (xloop = 0; xloop < width; xloop++) {
- abpixel = pixel[yloop + xloop + xoff];
- if ((abpixel & 0xFF000000) != 0) {
- /* pixel is not transparent; have to
- * plot something */
- if ((abpixel & 0xFF000000) != 0xFF000000) {
- /* pixel is not opaque; need to
- * blend */
- abpixel = nsfb_plot_ablend(abpixel,
- pixel_to_colour(nsfb, *(pvideo + xloop)));
- }
-
- *(pvideo + xloop) = colour_to_pixel(nsfb, abpixel);
- }
- }
- pvideo += nsfb->linelen;
- }
- } else {
- for (yloop = yoff; yloop < height; yloop += bmp_stride) {
- for (xloop = 0; xloop < width; xloop++) {
- abpixel = pixel[yloop + xloop + xoff];
- *(pvideo + xloop) = colour_to_pixel(nsfb, abpixel);
- }
- pvideo += nsfb->linelen;
- }
- }
- return true;
-}
-
-
-static bool readrect(nsfb_t *nsfb, nsfb_bbox_t *rect, nsfb_colour_t *buffer)
-{
- uint8_t *pvideo;
- int xloop, yloop;
- int width;
-
- if (!nsfb_plot_clip_ctx(nsfb, rect)) {
- return true;
- }
-
- width = rect->x1 - rect->x0;
-
- pvideo = get_xy_loc(nsfb, rect->x0, rect->y0);
-
- for (yloop = rect->y0; yloop < rect->y1; yloop += 1) {
- for (xloop = 0; xloop < width; xloop++) {
- *buffer = pixel_to_colour(nsfb,*(pvideo + xloop));
- buffer++;
- }
- pvideo += nsfb->linelen;
- }
- return true;
-}
-
-
-
-
const nsfb_plotter_fns_t _nsfb_8bpp_plotters = {
.line = line,
.fill = fill,
diff --git a/src/plot/common.c b/src/plot/common.c
new file mode 100644
index 0000000..1fa23d8
--- a/dev/null
+++ b/src/plot/common.c
@@ -0,0 +1,494 @@
+/*
+ * Copyright 2009 Vincent Sanders <vince@simtec.co.uk>
+ * Copyright 2010 Michael Drake <tlsa@netsurf-browser.org>
+ *
+ * Plot code common to all bpp just with differing types
+ *
+ * This file is part of libnsfb, http://www.netsurf-browser.org/
+ * Licenced under the MIT License,
+ * http://www.opensource.org/licenses/mit-license.php
+ */
+
+#ifndef PLOT_TYPE
+#error PLOT_TYPE must be set to uint16_6 or uint32_t
+#endif
+#ifndef PLOT_LINELEN
+#error PLOT_LINELEN must be a macro to increment a line length
+#endif
+
+#define SIGN(x) ((x<0) ? -1 : ((x>0) ? 1 : 0))
+
+static bool
+line(nsfb_t *nsfb, int linec, nsfb_bbox_t *line, nsfb_plot_pen_t *pen)
+{
+ int w;
+ PLOT_TYPE ent;
+ PLOT_TYPE *pvideo;
+ int x, y, i;
+ int dx, dy, sdy;
+ int dxabs, dyabs;
+
+ ent = colour_to_pixel(nsfb, pen->stroke_colour);
+
+ for (;linec > 0; linec--) {
+
+ if (line->y0 == line->y1) {
+ /* horizontal line special cased */
+
+ if (!nsfb_plot_clip_ctx(nsfb, line)) {
+ /* line outside clipping */
+ line++;
+ continue;
+ }
+
+ pvideo = get_xy_loc(nsfb, line->x0, line->y0);
+
+ w = line->x1 - line->x0;
+ while (w-- > 0)
+ *(pvideo + w) = ent;
+
+ } else {
+ /* standard bresenham line */
+
+ if (!nsfb_plot_clip_line_ctx(nsfb, line)) {
+ /* line outside clipping */
+ line++;
+ continue;
+ }
+
+ /* the horizontal distance of the line */
+ dx = line->x1 - line->x0;
+ dxabs = abs (dx);
+
+ /* the vertical distance of the line */
+ dy = line->y1 - line->y0;
+ dyabs = abs (dy);
+
+ sdy = dx ? SIGN(dy) * SIGN(dx) : SIGN(dy);
+
+ if (dx >= 0)
+ pvideo = get_xy_loc(nsfb, line->x0, line->y0);
+ else
+ pvideo = get_xy_loc(nsfb, line->x1, line->y1);
+
+ x = dyabs >> 1;
+ y = dxabs >> 1;
+
+ if (dxabs >= dyabs) {
+ /* the line is more horizontal than vertical */
+ for (i = 0; i < dxabs; i++) {
+ *pvideo = ent;
+
+ pvideo++;
+ y += dyabs;
+ if (y >= dxabs) {
+ y -= dxabs;
+ pvideo += sdy * PLOT_LINELEN(nsfb->linelen);
+ }
+ }
+ } else {
+ /* the line is more vertical than horizontal */
+ for (i = 0; i < dyabs; i++) {
+ *pvideo = ent;
+ pvideo += sdy * PLOT_LINELEN(nsfb->linelen);
+
+ x += dxabs;
+ if (x >= dyabs) {
+ x -= dyabs;
+ pvideo++;
+ }
+ }
+ }
+
+ }
+ line++;
+ }
+ return true;
+}
+
+
+static bool point(nsfb_t *nsfb, int x, int y, nsfb_colour_t c)
+{
+ PLOT_TYPE *pvideo;
+
+ /* check point lies within clipping region */
+ if ((x < nsfb->clip.x0) ||
+ (x >= nsfb->clip.x1) ||
+ (y < nsfb->clip.y0) ||
+ (y >= nsfb->clip.y1))
+ return true;
+
+ pvideo = get_xy_loc(nsfb, x, y);
+
+ if ((c & 0xFF000000) != 0) {
+ if ((c & 0xFF000000) != 0xFF000000) {
+ c = nsfb_plot_ablend(c, pixel_to_colour(nsfb, *pvideo));
+ }
+
+ *pvideo = colour_to_pixel(nsfb, c);
+ }
+ return true;
+}
+
+static bool
+glyph1(nsfb_t *nsfb,
+ nsfb_bbox_t *loc,
+ const uint8_t *pixel,
+ int pitch,
+ nsfb_colour_t c)
+{
+ PLOT_TYPE *pvideo;
+ PLOT_TYPE fgcol;
+ 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;
+ 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;
+
+ pvideo = get_xy_loc(nsfb, loc->x0, loc->y0);
+
+ fgcol = colour_to_pixel(nsfb, 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 += PLOT_LINELEN(nsfb->linelen);
+ }
+
+ return true;
+}
+
+static bool
+glyph8(nsfb_t *nsfb,
+ nsfb_bbox_t *loc,
+ const uint8_t *pixel,
+ int pitch,
+ nsfb_colour_t c)
+{
+ PLOT_TYPE *pvideo;
+ PLOT_TYPE fgcol;
+ 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;
+
+ 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;
+
+ 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(nsfb, *(pvideo + xloop)));
+ }
+
+ *(pvideo + xloop) = colour_to_pixel(nsfb, abpixel);
+ }
+ }
+ pvideo += PLOT_LINELEN(nsfb->linelen);
+ }
+
+ return true;
+}
+
+static bool bitmap_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc,
+ const nsfb_colour_t *pixel, int bmp_width, int bmp_height,
+ int bmp_stride, bool alpha)
+{
+ PLOT_TYPE *pvideo;
+ PLOT_TYPE *pvideo_limit;
+ nsfb_colour_t abpixel; /* alphablended pixel */
+ int xloop;
+ int xoff, yoff, xoffs; /* x and y offsets into image */
+ int x = loc->x0;
+ int y = loc->y0;
+ int width = loc->x1 - loc->x0; /* size to scale to */
+ int height = loc->y1 - loc->y0; /* size to scale to */
+ int rheight, rwidth; /* post-clipping render area dimensions */
+ int dx, dy; /* scale factor (integer part) */
+ int dxr, dyr; /* scale factor (remainder) */
+ int rx, ry, rxs; /* remainder trackers */
+ nsfb_bbox_t clipped; /* clipped display */
+
+ /* The part of the scaled image actually displayed is cropped to the
+ * current context.
+ */
+ clipped.x0 = x;
+ clipped.y0 = y;
+ clipped.x1 = x + width;
+ clipped.y1 = y + height;
+
+ if (!nsfb_plot_clip_ctx(nsfb, &clipped))
+ return true;
+
+ /* get height of rendering region, after clipping */
+ if (height > (clipped.y1 - clipped.y0))
+ rheight = (clipped.y1 - clipped.y0);
+ else
+ rheight = height;
+
+ /* get width of rendering region, after clipping */
+ if (width > (clipped.x1 - clipped.x0))
+ rwidth = (clipped.x1 - clipped.x0);
+ else
+ rwidth = width;
+
+ /* get veritcal (y) and horizontal (x) scale factors; both integer
+ * part and remainder */
+ dx = bmp_width / width;
+ dy = (bmp_height / height) * bmp_stride;
+ dxr = bmp_width % width;
+ dyr = bmp_height % height;
+
+ /* get start offsets to part of image being scaled, after clipping and
+ * set remainder trackers to correct starting value */
+ if (clipped.x0 - x != 0) {
+ xoffs = ((clipped.x0 - x) * bmp_width) / width;
+ rxs = ((clipped.x0 - x) * bmp_width) % width;
+ } else {
+ xoffs = 0;
+ rxs = 0;
+ }
+ if (clipped.y0 - y != 0) {
+ yoff = (((clipped.y0 - y) * bmp_height) / height) * bmp_stride;
+ ry = ((clipped.y0 - y) * bmp_height) % height;
+ } else {
+ yoff = 0;
+ ry = 0;
+ }
+
+ /* plot the image */
+ pvideo = get_xy_loc(nsfb, clipped.x0, clipped.y0);
+ pvideo_limit = pvideo + PLOT_LINELEN(nsfb->linelen) * rheight;
+ if (alpha) {
+ for (; pvideo < pvideo_limit; pvideo += PLOT_LINELEN(nsfb->linelen)) {
+ /* looping through render area vertically */
+ xoff = xoffs;
+ rx = rxs;
+ for (xloop = 0; xloop < rwidth; xloop++) {
+ /* looping through render area horizontally */
+ /* get value of source pixel in question */
+ abpixel = pixel[yoff + xoff];
+ if ((abpixel & 0xFF000000) != 0) {
+ /* pixel is not transparent; have to
+ * plot something */
+ if ((abpixel & 0xFF000000) !=
+ 0xFF000000) {
+ /* pixel is not opaque; need to
+ * blend */
+ abpixel = nsfb_plot_ablend(
+ abpixel,
+ pixel_to_colour(
+ nsfb,
+ *(pvideo +
+ xloop)));
+ }
+ /* plot pixel */
+ *(pvideo + xloop) = colour_to_pixel(nsfb, abpixel);
+ }
+ /* handle horizontal interpolation */
+ xoff += dx;
+ rx += dxr;
+ if (rx >= width) {
+ xoff++;
+ rx -= width;
+ }
+ }
+ /* handle vertical interpolation */
+ yoff += dy;
+ ry += dyr;
+ if (ry >= height) {
+ yoff += bmp_stride;
+ ry -= height;
+ }
+ }
+ } else {
+ for (; pvideo < pvideo_limit; pvideo += PLOT_LINELEN(nsfb->linelen)) {
+ /* looping through render area vertically */
+ xoff = xoffs;
+ rx = rxs;
+ for (xloop = 0; xloop < rwidth; xloop++) {
+ /* looping through render area horizontally */
+ /* get value of source pixel in question */
+ abpixel = pixel[yoff + xoff];
+ /* plot pixel */
+ *(pvideo + xloop) = colour_to_pixel(nsfb, abpixel);
+
+ /* handle horizontal interpolation */
+ xoff += dx;
+ rx += dxr;
+ if (rx >= width) {
+ xoff++;
+ rx -= width;
+ }
+ }
+ /* handle vertical interpolation */
+ yoff += dy;
+ ry += dyr;
+ if (ry >= height) {
+ yoff += bmp_stride;
+ ry -= height;
+ }
+ }
+ }
+ return true;
+}
+
+static bool
+bitmap(nsfb_t *nsfb,
+ const nsfb_bbox_t *loc,
+ const nsfb_colour_t *pixel,
+ int bmp_width,
+ int bmp_height,
+ int bmp_stride,
+ bool alpha)
+{
+ PLOT_TYPE *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;
+ nsfb_bbox_t clipped; /* clipped display */
+
+ if (width == 0 || height == 0)
+ return true;
+
+ /* Scaled bitmaps are handled by a separate function */
+ if (width != bmp_width || height != bmp_height)
+ return bitmap_scaled(nsfb, loc, pixel, bmp_width, bmp_height,
+ bmp_stride, alpha);
+
+ /* The part of the scaled image actually displayed is cropped to the
+ * current context.
+ */
+ clipped.x0 = x;
+ clipped.y0 = y;
+ clipped.x1 = x + width;
+ clipped.y1 = y + height;
+
+ if (!nsfb_plot_clip_ctx(nsfb, &clipped))
+ return true;
+
+ if (height > (clipped.y1 - clipped.y0))
+ height = (clipped.y1 - clipped.y0);
+
+ if (width > (clipped.x1 - clipped.x0))
+ width = (clipped.x1 - clipped.x0);
+
+ xoff = clipped.x0 - x;
+ yoff = (clipped.y0 - y) * bmp_stride;
+ height = height * bmp_stride + yoff;
+
+ /* plot the image */
+ pvideo = get_xy_loc(nsfb, clipped.x0, clipped.y0);
+
+ if (alpha) {
+ for (yloop = yoff; yloop < height; yloop += bmp_stride) {
+ for (xloop = 0; xloop < width; xloop++) {
+ abpixel = pixel[yloop + xloop + xoff];
+ if ((abpixel & 0xFF000000) != 0) {
+ /* pixel is not transparent; have to
+ * plot something */
+ if ((abpixel & 0xFF000000) != 0xFF000000) {
+ /* pixel is not opaque; need to
+ * blend */
+ abpixel = nsfb_plot_ablend(abpixel,
+ pixel_to_colour(nsfb, *(pvideo + xloop)));
+ }
+
+ *(pvideo + xloop) = colour_to_pixel(nsfb, abpixel);
+ }
+ }
+ pvideo += PLOT_LINELEN(nsfb->linelen);
+ }
+ } else {
+ for (yloop = yoff; yloop < height; yloop += bmp_stride) {
+ for (xloop = 0; xloop < width; xloop++) {
+ abpixel = pixel[yloop + xloop + xoff];
+ *(pvideo + xloop) = colour_to_pixel(nsfb, abpixel);
+ }
+ pvideo += PLOT_LINELEN(nsfb->linelen);
+ }
+ }
+ return true;
+}
+
+static bool readrect(nsfb_t *nsfb, nsfb_bbox_t *rect, nsfb_colour_t *buffer)
+{
+ PLOT_TYPE *pvideo;
+ int xloop, yloop;
+ int width;
+
+ if (!nsfb_plot_clip_ctx(nsfb, rect)) {
+ return true;
+ }
+
+ width = rect->x1 - rect->x0;
+
+ pvideo = get_xy_loc(nsfb, rect->x0, rect->y0);
+
+ for (yloop = rect->y0; yloop < rect->y1; yloop += 1) {
+ for (xloop = 0; xloop < width; xloop++) {
+ *buffer = pixel_to_colour(nsfb, *(pvideo + xloop));
+ buffer++;
+ }
+ pvideo += PLOT_LINELEN(nsfb->linelen);
+ }
+ return true;
+}
+
+
+/*
+ * Local Variables:
+ * c-basic-offset:8
+ * End:
+ */