Gitweb links: ...log http://git.netsurf-browser.org/libnsfb.git/shortlog/0804bb7e067e66d4b05a6... ...commit http://git.netsurf-browser.org/libnsfb.git/commit/0804bb7e067e66d4b05a6c4... ...tree http://git.netsurf-browser.org/libnsfb.git/tree/0804bb7e067e66d4b05a6c45f... The branch, master has been updated via 0804bb7e067e66d4b05a6c45f9736b1e20505b96 (commit) via 46f3c9ea3793d146337c81bf8858d99238c05e86 (commit) from 1983c37933d2a753c4c913527c94392682bf7b98 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libnsfb.git/commitdiff/0804bb7e067e66d4b05... commit 0804bb7e067e66d4b05a6c45f9736b1e20505b96 Author: Michael Drake <tlsa(a)netsurf-browser.org&gt; Commit: Michael Drake <tlsa(a)netsurf-browser.org&gt; Add error diffusion to palette based rendering. Only used for bitmap and scaled bitmap plots. Doesn't do serpentine path, since that would need changes to the common bitmap rendering code. diff --git a/include/palette.h b/include/palette.h index 845c1bc..f975ef2 100644 --- a/include/palette.h +++ b/include/palette.h @@ -27,21 +27,35 @@ struct nsfb_palette_s { enum nsfb_palette_type_e type; /**< Palette type */ uint8_t last; /**< Last used palette index */ nsfb_colour_t data[256]; /**< Palette for index modes */ + + bool dither; /**< Whether to use error diffusion */ + struct { + int width; /**< Length of error value buffer ring*/ + int current; /**< Current pos in ring buffer*/ + int *data; /**< Ring buffer error values */ + int data_len; /**< Max size of ring */ + } dither_ctx; }; + /** Create an empty palette object. */ -bool nsfb_palette_new(struct nsfb_palette_s **palette); +bool nsfb_palette_new(struct nsfb_palette_s **palette, int width); /** Free a palette object. */ void nsfb_palette_free(struct nsfb_palette_s *palette); +/** Init error diffusion for a plot. */ +void nsfb_palette_dither_init(struct nsfb_palette_s *palette, int width); + +/** Finalise error diffusion after a plot. */ +void nsfb_palette_dither_fini(struct nsfb_palette_s *palette); + /** Generate libnsfb 8bpp default palette. */ void nsfb_palette_generate_nsfb_8bpp(struct nsfb_palette_s *palette); - -static inline uint8_t nsfb_palette_best_match( - const struct nsfb_palette_s *palette, - nsfb_colour_t c) +/** Find best palette match for given colour. */ +static inline uint8_t nsfb_palette_best_match(struct nsfb_palette_s *palette, + nsfb_colour_t c, int *r_error, int *g_error, int *b_error) { uint8_t best_col = 0; @@ -68,6 +82,9 @@ static inline uint8_t nsfb_palette_best_match( best_col = col; best_distance = cur_distance; + *r_error = dr; + *g_error = dg; + *b_error = db; /* Index into grayscale part */ col = (( c & 0xFF) + @@ -82,6 +99,9 @@ static inline uint8_t nsfb_palette_best_match( if (cur_distance < best_distance) { best_distance = cur_distance; best_col = col; + *r_error = dr; + *g_error = dg; + *b_error = db; } break; @@ -97,6 +117,9 @@ static inline uint8_t nsfb_palette_best_match( if (cur_distance < best_distance) { best_distance = cur_distance; best_col = col; + *r_error = dr; + *g_error = dg; + *b_error = db; } } break; @@ -108,4 +131,101 @@ static inline uint8_t nsfb_palette_best_match( return best_col; } +/** Find best palette match for given colour, with error diffusion. */ +static inline uint8_t nsfb_palette_best_match_dither( + struct nsfb_palette_s *palette, nsfb_colour_t c) +{ + int r, g, b; + int current; + int error; + int width = palette->dither_ctx.width; + uint8_t best_col_index; + + if (palette == NULL) + return 0; + + if (palette->dither == false) + return nsfb_palette_best_match(palette, c, &r, &g, &b); + + current = palette->dither_ctx.current; + + /* Get RGB components of colour, and apply error */ + r = ( c & 0xFF) + palette->dither_ctx.data[current ]; + g = ((c >> 8) & 0xFF) + palette->dither_ctx.data[current + 1]; + b = ((c >> 16) & 0xFF) + palette->dither_ctx.data[current + 2]; + + /* Clamp new RGB components to range */ + if (r < 0) r = 0; + if (r > 255) r = 255; + if (g < 0) g = 0; + if (g > 255) g = 255; + if (b < 0) b = 0; + if (b > 255) b = 255; + + /* Reset error diffusion slots to 0 */ + palette->dither_ctx.data[current ] = 0; + palette->dither_ctx.data[current + 1] = 0; + palette->dither_ctx.data[current + 2] = 0; + + /* Rebuild colour from modified components */ + c = r + (g << 8) + (b << 16); + + /* Get best match for pixel, and find errors for each component */ + best_col_index = nsfb_palette_best_match(palette, c, &r, &g, &b); + + /* Advance one set of error diffusion slots */ + current += 3; + if (current >= width) + current = 0; + palette->dither_ctx.current = current; + + /* Save errors + * + * [*]-[N] + * / | \ + * [l]-[m]-[r] + */ + error = current; + + /* Error for [N] (next) */ + if (error != 0) { + /* The pixel exists */ + palette->dither_ctx.data[error ] += r * 7 / 16; + palette->dither_ctx.data[error + 1] += g * 7 / 16; + palette->dither_ctx.data[error + 2] += b * 7 / 16; + } + + error += width - 2 * 3; + if (error >= width) + error -= width; + /* Error for [l] (below, left) */ + if (error >= 0 && error != 3) { + /* The pixel exists */ + palette->dither_ctx.data[error ] += r * 3 / 16; + palette->dither_ctx.data[error + 1] += g * 3 / 16; + palette->dither_ctx.data[error + 2] += b * 3 / 16; + } + + error += 3; + if (error >= width) + error -= width; + /* Error for [m] (below, middle) */ + palette->dither_ctx.data[error ] += r * 5 / 16; + palette->dither_ctx.data[error + 1] += g * 5 / 16; + palette->dither_ctx.data[error + 2] += b * 5 / 16; + + error += 3; + if (error >= width) + error -= width; + /* Error for [r] (below, right) */ + if (error != 0) { + /* The pixel exists */ + palette->dither_ctx.data[error ] += r / 16; + palette->dither_ctx.data[error + 1] += g / 16; + palette->dither_ctx.data[error + 2] += b / 16; + } + + return best_col_index; +} + #endif /* PALETTE_H */ diff --git a/src/palette.c b/src/palette.c index eba95cd..d600001 100644 --- a/src/palette.c +++ b/src/palette.c @@ -13,12 +13,13 @@ #include <assert.h> #include <stdbool.h> #include <stdlib.h> +#include <string.h> #include "palette.h" /** Create an empty palette object. */ -bool nsfb_palette_new(struct nsfb_palette_s **palette) +bool nsfb_palette_new(struct nsfb_palette_s **palette, int width) { *palette = malloc(sizeof(struct nsfb_palette_s)); if (*palette == NULL) { @@ -28,14 +29,41 @@ bool nsfb_palette_new(struct nsfb_palette_s **palette) (*palette)->type = NSFB_PALETTE_EMPTY; (*palette)->last = 0; + (*palette)->dither = false; + (*palette)->dither_ctx.data_len = width * 3; + (*palette)->dither_ctx.data = malloc(width * 3 * sizeof(int)); + if ((*palette)->dither_ctx.data == NULL) { + nsfb_palette_free(*palette); + return false; + } + return true; } /** Free a palette object. */ void nsfb_palette_free(struct nsfb_palette_s *palette) { - if (palette != NULL) + if (palette != NULL) { + if (palette->dither_ctx.data != NULL) { + free(palette->dither_ctx.data); + } free(palette); + } +} + +/** Init error diffusion for a plot. */ +void nsfb_palette_dither_init(struct nsfb_palette_s *palette, int width) +{ + palette->dither = true; + memset(palette->dither_ctx.data, 0, palette->dither_ctx.data_len); + palette->dither_ctx.width = width * 3; + palette->dither_ctx.current = 0; +} + +/** Finalise error diffusion after a plot. */ +void nsfb_palette_dither_fini(struct nsfb_palette_s *palette) +{ + palette->dither = false; } /** Generate libnsfb 8bpp default palette. */ diff --git a/src/plot/8bpp.c b/src/plot/8bpp.c index 05574d8..0245542 100644 --- a/src/plot/8bpp.c +++ b/src/plot/8bpp.c @@ -39,7 +39,7 @@ static uint8_t colour_to_pixel(nsfb_t *nsfb, nsfb_colour_t c) if (nsfb->palette == NULL) return 0; - return nsfb_palette_best_match(nsfb->palette, c); + return nsfb_palette_best_match_dither(nsfb->palette, c); } #define PLOT_TYPE uint8_t diff --git a/src/plot/common.c b/src/plot/common.c index 185e323..c9f9dc1 100644 --- a/src/plot/common.c +++ b/src/plot/common.c @@ -16,6 +16,8 @@ #error PLOT_LINELEN must be a macro to increment a line length #endif +#include "palette.h" + #define SIGN(x) ((x<0) ? -1 : ((x>0) ? 1 : 0)) static bool @@ -249,8 +251,7 @@ static bool bitmap_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc, nsfb_bbox_t clipped; /* clipped display */ /* The part of the scaled image actually displayed is cropped to the - * current context. - */ + * current context. */ clipped.x0 = x; clipped.y0 = y; clipped.x1 = x + width; @@ -271,6 +272,10 @@ static bool bitmap_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc, else rwidth = width; + if (nsfb->palette != NULL) { + nsfb_palette_dither_init(nsfb->palette, rwidth); + } + /* get veritcal (y) and horizontal (x) scale factors; both integer * part and remainder */ dx = bmp_width / width; @@ -299,7 +304,8 @@ static bool bitmap_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc, 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)) { + for (; pvideo < pvideo_limit; + pvideo += PLOT_LINELEN(nsfb->linelen)) { /* looping through render area vertically */ xoff = xoffs; rx = rxs; @@ -322,7 +328,8 @@ static bool bitmap_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc, xloop))); } /* plot pixel */ - *(pvideo + xloop) = colour_to_pixel(nsfb, abpixel); + *(pvideo + xloop) = colour_to_pixel( + nsfb, abpixel); } /* handle horizontal interpolation */ xoff += dx; @@ -341,7 +348,8 @@ static bool bitmap_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc, } } } else { - for (; pvideo < pvideo_limit; pvideo += PLOT_LINELEN(nsfb->linelen)) { + for (; pvideo < pvideo_limit; + pvideo += PLOT_LINELEN(nsfb->linelen)) { /* looping through render area vertically */ xoff = xoffs; rx = rxs; @@ -350,7 +358,8 @@ static bool bitmap_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc, /* get value of source pixel in question */ abpixel = pixel[yoff + xoff]; /* plot pixel */ - *(pvideo + xloop) = colour_to_pixel(nsfb, abpixel); + *(pvideo + xloop) = colour_to_pixel( + nsfb, abpixel); /* handle horizontal interpolation */ xoff += dx; @@ -369,6 +378,11 @@ static bool bitmap_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc, } } } + + if (nsfb->palette != NULL) { + nsfb_palette_dither_fini(nsfb->palette); + } + return true; } @@ -391,17 +405,16 @@ bitmap(nsfb_t *nsfb, int height = loc->y1 - loc->y0; nsfb_bbox_t clipped; /* clipped display */ - if (width == 0 || height == 0) - return true; + 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. - */ + /* The part of the image actually displayed is cropped to the + * current context. */ clipped.x0 = x; clipped.y0 = y; clipped.x1 = x + width; @@ -416,6 +429,10 @@ bitmap(nsfb_t *nsfb, if (width > (clipped.x1 - clipped.x0)) width = (clipped.x1 - clipped.x0); + if (nsfb->palette != NULL) { + nsfb_palette_dither_init(nsfb->palette, width); + } + xoff = clipped.x0 - x; yoff = (clipped.y0 - y) * bmp_stride; height = height * bmp_stride + yoff; @@ -428,16 +445,22 @@ bitmap(nsfb_t *nsfb, 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))); + /* 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 + xloop) = colour_to_pixel( + nsfb, abpixel); } } pvideo += PLOT_LINELEN(nsfb->linelen); @@ -446,11 +469,17 @@ bitmap(nsfb_t *nsfb, 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 + xloop) = colour_to_pixel( + nsfb, abpixel); } pvideo += PLOT_LINELEN(nsfb->linelen); } } + + if (nsfb->palette != NULL) { + nsfb_palette_dither_fini(nsfb->palette); + } + return true; } diff --git a/src/surface/sdl.c b/src/surface/sdl.c index 7a86dc1..0554e26 100644 --- a/src/surface/sdl.c +++ b/src/surface/sdl.c @@ -458,7 +458,7 @@ static int sdl_initialise(nsfb_t *nsfb) nsfb->surface_priv = sdl_screen; if (nsfb->bpp == 8) { - nsfb_palette_new(&nsfb->palette); + nsfb_palette_new(&nsfb->palette, nsfb->width); set_palette(nsfb); } commitdiff http://git.netsurf-browser.org/libnsfb.git/commitdiff/46f3c9ea3793d146337... commit 46f3c9ea3793d146337c81bf8858d99238c05e86 Author: Michael Drake <tlsa(a)netsurf-browser.org&gt; Commit: Michael Drake <tlsa(a)netsurf-browser.org&gt; Add palette object. Optimise matching colour in case where we chose the palette. In other cases, we still have to seach all the colours, but that doesn't ever seem to be used. diff --git a/include/libnsfb.h b/include/libnsfb.h index 739617e..da8e5f6 100644 --- a/include/libnsfb.h +++ b/include/libnsfb.h @@ -13,6 +13,7 @@ #include <stdint.h> +typedef struct nsfb_palette_s nsfb_palette_t; typedef struct nsfb_cursor_s nsfb_cursor_t; typedef struct nsfb_s nsfb_t; typedef struct nsfb_event_s nsfb_event_t; diff --git a/include/nsfb.h b/include/nsfb.h index 5caff9b..9a61775 100644 --- a/include/nsfb.h +++ b/include/nsfb.h @@ -28,7 +28,7 @@ struct nsfb_s { uint8_t *ptr; /**< Base of video memory. */ int linelen; /**< length of a video line. */ - nsfb_colour_t palette[256]; /**< palette for index modes */ + struct nsfb_palette_s *palette; /**< palette for index modes */ nsfb_cursor_t *cursor; /**< cursor */ struct nsfb_surface_rtns_s *surface_rtns; /**< surface routines. */ diff --git a/include/palette.h b/include/palette.h new file mode 100644 index 0000000..845c1bc --- /dev/null +++ b/include/palette.h @@ -0,0 +1,111 @@ +/* + * Copyright 2012 Michael Drake <tlsa(a)netsurf-browser.org&gt; + * + * This file is part of libnsfb, http://www.netsurf-browser.org/ + * Licenced under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * + * This is the *internal* interface for the cursor. + */ + +#ifndef PALETTE_H +#define PALETTE_H 1 + +#include <stdint.h> +#include <limits.h> + +#include "libnsfb.h" +#include "libnsfb_plot.h" + +enum nsfb_palette_type_e { + NSFB_PALETTE_EMPTY, /**< empty palette object */ + NSFB_PALETTE_NSFB_8BPP, /**< libnsfb's own 8bpp palette */ + NSFB_PALETTE_OTHER /**< any other palette */ +}; + +struct nsfb_palette_s { + enum nsfb_palette_type_e type; /**< Palette type */ + uint8_t last; /**< Last used palette index */ + nsfb_colour_t data[256]; /**< Palette for index modes */ +}; + +/** Create an empty palette object. */ +bool nsfb_palette_new(struct nsfb_palette_s **palette); + +/** Free a palette object. */ +void nsfb_palette_free(struct nsfb_palette_s *palette); + +/** Generate libnsfb 8bpp default palette. */ +void nsfb_palette_generate_nsfb_8bpp(struct nsfb_palette_s *palette); + + +static inline uint8_t nsfb_palette_best_match( + const struct nsfb_palette_s *palette, + nsfb_colour_t c) +{ + uint8_t best_col = 0; + + nsfb_colour_t palent; + int col; + int dr, dg, db; /* delta red, green blue values */ + + int cur_distance; + int best_distance = INT_MAX; + + switch (palette->type) { + case NSFB_PALETTE_NSFB_8BPP: + /* Index into colour cube part */ + dr = ((( c & 0xFF) * 5) + 128) / 256; + dg = ((((c >> 8) & 0xFF) * 7) + 128) / 256; + db = ((((c >> 16) & 0xFF) * 4) + 128) / 256; + col = 40 * dr + 5 * dg + db; + + palent = palette->data[col]; + dr = ( c & 0xFF) - ( palent & 0xFF); + dg = ((c >> 8) & 0xFF) - ((palent >> 8 ) & 0xFF); + db = ((c >> 16) & 0xFF) - ((palent >> 16) & 0xFF); + cur_distance = (dr * dr) + (dg * dg) + (db * db); + + best_col = col; + best_distance = cur_distance; + + /* Index into grayscale part */ + col = (( c & 0xFF) + + ((c >> 8) & 0xFF) + + ((c >> 16) & 0xFF) + (45 / 2)) / (15 * 3) - 1 + 240; + palent = palette->data[col]; + + dr = ( c & 0xFF) - ( palent & 0xFF); + dg = ((c >> 8) & 0xFF) - ((palent >> 8) & 0xFF); + db = ((c >> 16) & 0xFF) - ((palent >> 16) & 0xFF); + cur_distance = (dr * dr) + (dg * dg) + (db * db); + if (cur_distance < best_distance) { + best_distance = cur_distance; + best_col = col; + } + break; + + case NSFB_PALETTE_OTHER: + /* Try all colours in palette */ + for (col = 0; col <= palette->last; col++) { + palent = palette->data[col]; + + dr = ( c & 0xFF) - ( palent & 0xFF); + dg = ((c >> 8) & 0xFF) - ((palent >> 8) & 0xFF); + db = ((c >> 16) & 0xFF) - ((palent >> 16) & 0xFF); + cur_distance = (dr * dr) + (dg * dg) + (db * db); + if (cur_distance < best_distance) { + best_distance = cur_distance; + best_col = col; + } + } + break; + + default: + break; + } + + return best_col; +} + +#endif /* PALETTE_H */ diff --git a/src/Makefile b/src/Makefile index 283a99f..3c6e2f0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,4 @@ # Sources -DIR_SOURCES := libnsfb.c dump.c cursor.c +DIR_SOURCES := libnsfb.c dump.c cursor.c palette.c include $(NSBUILD)/Makefile.subdir diff --git a/src/libnsfb.c b/src/libnsfb.c index 6f14c99..a341088 100644 --- a/src/libnsfb.c +++ b/src/libnsfb.c @@ -15,6 +15,7 @@ #include "libnsfb_plot.h" #include "libnsfb_event.h" #include "nsfb.h" +#include "palette.h" #include "surface.h" /* exported interface documented in libnsfb.h */ @@ -50,6 +51,10 @@ int nsfb_free(nsfb_t *nsfb) { int ret; + + if (nsfb->palette != NULL) + nsfb_palette_free(nsfb->palette); + ret = nsfb->surface_rtns->finalise(nsfb); free(nsfb); return ret; diff --git a/src/palette.c b/src/palette.c new file mode 100644 index 0000000..eba95cd --- /dev/null +++ b/src/palette.c @@ -0,0 +1,89 @@ +/* + * Copyright 2012 Michael Drake <tlsa(a)netsurf-browser.org&gt; + * + * This file is part of libnsfb, http://www.netsurf-browser.org/ + * Licenced under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + */ + +/** \file + * Palette (implementation). + */ + +#include <assert.h> +#include <stdbool.h> +#include <stdlib.h> + +#include "palette.h" + + +/** Create an empty palette object. */ +bool nsfb_palette_new(struct nsfb_palette_s **palette) +{ + *palette = malloc(sizeof(struct nsfb_palette_s)); + if (*palette == NULL) { + return false; + } + + (*palette)->type = NSFB_PALETTE_EMPTY; + (*palette)->last = 0; + + return true; +} + +/** Free a palette object. */ +void nsfb_palette_free(struct nsfb_palette_s *palette) +{ + if (palette != NULL) + free(palette); +} + +/** Generate libnsfb 8bpp default palette. */ +void nsfb_palette_generate_nsfb_8bpp(struct nsfb_palette_s *palette) +{ + int rloop, gloop, bloop; + int loop = 0; + uint8_t r, g, b; + + /* Build a linear 6-8-5 levels RGB colour cube palette. + * This accounts for 240 colours */ +#define RLIM 6 +#define GLIM 8 +#define BLIM 5 + for (rloop = 0; rloop < RLIM; rloop++) { + for (gloop = 0; gloop < GLIM; gloop++) { + for (bloop = 0; bloop < BLIM; bloop++) { + r = ((rloop * 255 * 2) + RLIM - 1) / + (2 * (RLIM - 1)); + g = ((gloop * 255 * 2) + GLIM - 1) / + (2 * (GLIM - 1)); + b = ((bloop * 255 * 2) + BLIM - 1) / + (2 * (BLIM - 1)); + + palette->data[loop] = r | g << 8 | b << 16; + loop++; + } + } + } +#undef RLIM +#undef GLIM +#undef BLIM + + /* Should have 240 colours set */ + assert(loop == 240); + + /* Fill index 240 to index 255 with grayscales */ + /* Note: already have full black and full white from RGB cube */ + for (; loop < 256; loop++) { + int ngray = loop - 240 + 1; + r = ngray * 15; /* 17*15 = 255 */ + + g = b = r; + + palette->data[loop] = r | g << 8 | b << 16; + } + + /* Set palette details */ + palette->type = NSFB_PALETTE_NSFB_8BPP; + palette->last = 255; +} diff --git a/src/plot/8bpp.c b/src/plot/8bpp.c index b72303d..05574d8 100644 --- a/src/plot/8bpp.c +++ b/src/plot/8bpp.c @@ -10,7 +10,6 @@ #include <stdbool.h> #include <endian.h> #include <stdlib.h> -#include <limits.h> #include <string.h> #include "libnsfb.h" @@ -18,6 +17,7 @@ #include "libnsfb_plot_util.h" #include "nsfb.h" +#include "palette.h" #include "plot.h" static inline uint8_t *get_xy_loc(nsfb_t *nsfb, int x, int y) @@ -28,34 +28,18 @@ static inline uint8_t *get_xy_loc(nsfb_t *nsfb, int x, int y) static inline nsfb_colour_t pixel_to_colour(nsfb_t *nsfb, uint8_t pixel) { - return nsfb->palette[pixel]; + if (nsfb->palette == NULL) + return 0; + + return nsfb->palette->data[pixel]; } static uint8_t colour_to_pixel(nsfb_t *nsfb, nsfb_colour_t c) { - nsfb_colour_t palent; - int col; - - int dr, dg, db; /* delta red, green blue values */ - - int cur_distance; - int best_distance = INT_MAX; - uint8_t best_col = 0; - - for (col = 0; col < 256; col++) { - palent = nsfb->palette[col]; - - dr = (c & 0xFF) - (palent & 0xFF); - dg = ((c >> 8) & 0xFF) - ((palent >> 8) & 0xFF); - db = ((c >> 16) & 0xFF) - ((palent >> 16) & 0xFF); - cur_distance = ((dr * dr) + (dg * dg) + (db *db)); - if (cur_distance < best_distance) { - best_distance = cur_distance; - best_col = col; - } - } + if (nsfb->palette == NULL) + return 0; - return best_col; + return nsfb_palette_best_match(nsfb->palette, c); } #define PLOT_TYPE uint8_t diff --git a/src/surface/sdl.c b/src/surface/sdl.c index d598b8a..7a86dc1 100644 --- a/src/surface/sdl.c +++ b/src/surface/sdl.c @@ -6,7 +6,6 @@ * http://www.opensource.org/licenses/mit-license.php */ -#include <assert.h> #include <stdbool.h> #include <stdlib.h> #include <SDL/SDL.h> @@ -18,6 +17,7 @@ #include "nsfb.h" #include "surface.h" +#include "palette.h" #include "plot.h" #include "cursor.h" @@ -353,49 +353,19 @@ set_palette(nsfb_t *nsfb) { SDL_Surface *sdl_screen = nsfb->surface_priv; SDL_Color palette[256]; - int rloop, gloop, bloop; int loop = 0; - /* Build a linear 6-8-5 levels RGB colour cube palette. - * This accounts for 240 colours */ -#define RLIM 6 -#define GLIM 8 -#define BLIM 5 - for (rloop = 0; rloop < RLIM; rloop++) { - for (gloop = 0; gloop < GLIM; gloop++) { - for (bloop = 0; bloop < BLIM; bloop++) { - palette[loop].r = ((rloop * 255 * 2) + RLIM - 1) / (2 * (RLIM - 1)); - palette[loop].g = ((gloop * 255 * 2) + GLIM - 1) / (2 * (GLIM - 1)); - palette[loop].b = ((bloop * 255 * 2) + BLIM - 1) / (2 * (BLIM - 1)); - - nsfb->palette[loop] = palette[loop].r | - palette[loop].g << 8 | - palette[loop].b << 16; - loop++; - } - } - } -#undef RLIM -#undef GLIM -#undef BLIM - - /* Should have 240 colours set */ - assert(loop == 240); + /* Get libnsfb palette */ + nsfb_palette_generate_nsfb_8bpp(nsfb->palette); - /* Fill index 240 to index 255 with grayscales */ - /* Note: already have full black and full white from RGB cube */ - for (; loop < 256; loop++) { - int ngray = loop - 240 + 1; - palette[loop].r = ngray * 15; /* 17*15 = 255 */ - - palette[loop].g = palette[loop].b = palette[loop].r; - - nsfb->palette[loop] = palette[loop].r | - palette[loop].g << 8 | - palette[loop].b << 16; + /* Create SDL palette from nsfb palette */ + for (loop = 0; loop < 256; loop++) { + palette[loop].r = (nsfb->palette->data[loop] ) & 0xFF; + palette[loop].g = (nsfb->palette->data[loop] >> 8) & 0xFF; + palette[loop].b = (nsfb->palette->data[loop] >> 16) & 0xFF; } - /* Set palette */ + /* Set SDL palette */ SDL_SetColors(sdl_screen, palette, 0, 256); } @@ -487,8 +457,10 @@ static int sdl_initialise(nsfb_t *nsfb) nsfb->surface_priv = sdl_screen; - if (nsfb->bpp == 8) + if (nsfb->bpp == 8) { + nsfb_palette_new(&nsfb->palette); set_palette(nsfb); + } nsfb->ptr = sdl_screen->pixels; nsfb->linelen = sdl_screen->pitch; ----------------------------------------------------------------------- Summary of changes: include/libnsfb.h | 1 + include/nsfb.h | 2 +- include/palette.h | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/Makefile | 2 +- src/libnsfb.c | 5 + src/palette.c | 117 +++++++++++++++++++++++++++ src/plot/8bpp.c | 32 ++------ src/plot/common.c | 69 +++++++++++----- src/surface/sdl.c | 52 +++--------- 9 files changed, 425 insertions(+), 86 deletions(-) create mode 100644 include/palette.h create mode 100644 src/palette.c diff --git a/include/libnsfb.h b/include/libnsfb.h index 739617e..da8e5f6 100644 --- a/include/libnsfb.h +++ b/include/libnsfb.h @@ -13,6 +13,7 @@ #include <stdint.h> +typedef struct nsfb_palette_s nsfb_palette_t; typedef struct nsfb_cursor_s nsfb_cursor_t; typedef struct nsfb_s nsfb_t; typedef struct nsfb_event_s nsfb_event_t; diff --git a/include/nsfb.h b/include/nsfb.h index 5caff9b..9a61775 100644 --- a/include/nsfb.h +++ b/include/nsfb.h @@ -28,7 +28,7 @@ struct nsfb_s { uint8_t *ptr; /**< Base of video memory. */ int linelen; /**< length of a video line. */ - nsfb_colour_t palette[256]; /**< palette for index modes */ + struct nsfb_palette_s *palette; /**< palette for index modes */ nsfb_cursor_t *cursor; /**< cursor */ struct nsfb_surface_rtns_s *surface_rtns; /**< surface routines. */ diff --git a/include/palette.h b/include/palette.h new file mode 100644 index 0000000..f975ef2 --- /dev/null +++ b/include/palette.h @@ -0,0 +1,231 @@ +/* + * Copyright 2012 Michael Drake <tlsa(a)netsurf-browser.org&gt; + * + * This file is part of libnsfb, http://www.netsurf-browser.org/ + * Licenced under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * + * This is the *internal* interface for the cursor. + */ + +#ifndef PALETTE_H +#define PALETTE_H 1 + +#include <stdint.h> +#include <limits.h> + +#include "libnsfb.h" +#include "libnsfb_plot.h" + +enum nsfb_palette_type_e { + NSFB_PALETTE_EMPTY, /**< empty palette object */ + NSFB_PALETTE_NSFB_8BPP, /**< libnsfb's own 8bpp palette */ + NSFB_PALETTE_OTHER /**< any other palette */ +}; + +struct nsfb_palette_s { + enum nsfb_palette_type_e type; /**< Palette type */ + uint8_t last; /**< Last used palette index */ + nsfb_colour_t data[256]; /**< Palette for index modes */ + + bool dither; /**< Whether to use error diffusion */ + struct { + int width; /**< Length of error value buffer ring*/ + int current; /**< Current pos in ring buffer*/ + int *data; /**< Ring buffer error values */ + int data_len; /**< Max size of ring */ + } dither_ctx; +}; + + +/** Create an empty palette object. */ +bool nsfb_palette_new(struct nsfb_palette_s **palette, int width); + +/** Free a palette object. */ +void nsfb_palette_free(struct nsfb_palette_s *palette); + +/** Init error diffusion for a plot. */ +void nsfb_palette_dither_init(struct nsfb_palette_s *palette, int width); + +/** Finalise error diffusion after a plot. */ +void nsfb_palette_dither_fini(struct nsfb_palette_s *palette); + +/** Generate libnsfb 8bpp default palette. */ +void nsfb_palette_generate_nsfb_8bpp(struct nsfb_palette_s *palette); + +/** Find best palette match for given colour. */ +static inline uint8_t nsfb_palette_best_match(struct nsfb_palette_s *palette, + nsfb_colour_t c, int *r_error, int *g_error, int *b_error) +{ + uint8_t best_col = 0; + + nsfb_colour_t palent; + int col; + int dr, dg, db; /* delta red, green blue values */ + + int cur_distance; + int best_distance = INT_MAX; + + switch (palette->type) { + case NSFB_PALETTE_NSFB_8BPP: + /* Index into colour cube part */ + dr = ((( c & 0xFF) * 5) + 128) / 256; + dg = ((((c >> 8) & 0xFF) * 7) + 128) / 256; + db = ((((c >> 16) & 0xFF) * 4) + 128) / 256; + col = 40 * dr + 5 * dg + db; + + palent = palette->data[col]; + dr = ( c & 0xFF) - ( palent & 0xFF); + dg = ((c >> 8) & 0xFF) - ((palent >> 8 ) & 0xFF); + db = ((c >> 16) & 0xFF) - ((palent >> 16) & 0xFF); + cur_distance = (dr * dr) + (dg * dg) + (db * db); + + best_col = col; + best_distance = cur_distance; + *r_error = dr; + *g_error = dg; + *b_error = db; + + /* Index into grayscale part */ + col = (( c & 0xFF) + + ((c >> 8) & 0xFF) + + ((c >> 16) & 0xFF) + (45 / 2)) / (15 * 3) - 1 + 240; + palent = palette->data[col]; + + dr = ( c & 0xFF) - ( palent & 0xFF); + dg = ((c >> 8) & 0xFF) - ((palent >> 8) & 0xFF); + db = ((c >> 16) & 0xFF) - ((palent >> 16) & 0xFF); + cur_distance = (dr * dr) + (dg * dg) + (db * db); + if (cur_distance < best_distance) { + best_distance = cur_distance; + best_col = col; + *r_error = dr; + *g_error = dg; + *b_error = db; + } + break; + + case NSFB_PALETTE_OTHER: + /* Try all colours in palette */ + for (col = 0; col <= palette->last; col++) { + palent = palette->data[col]; + + dr = ( c & 0xFF) - ( palent & 0xFF); + dg = ((c >> 8) & 0xFF) - ((palent >> 8) & 0xFF); + db = ((c >> 16) & 0xFF) - ((palent >> 16) & 0xFF); + cur_distance = (dr * dr) + (dg * dg) + (db * db); + if (cur_distance < best_distance) { + best_distance = cur_distance; + best_col = col; + *r_error = dr; + *g_error = dg; + *b_error = db; + } + } + break; + + default: + break; + } + + return best_col; +} + +/** Find best palette match for given colour, with error diffusion. */ +static inline uint8_t nsfb_palette_best_match_dither( + struct nsfb_palette_s *palette, nsfb_colour_t c) +{ + int r, g, b; + int current; + int error; + int width = palette->dither_ctx.width; + uint8_t best_col_index; + + if (palette == NULL) + return 0; + + if (palette->dither == false) + return nsfb_palette_best_match(palette, c, &r, &g, &b); + + current = palette->dither_ctx.current; + + /* Get RGB components of colour, and apply error */ + r = ( c & 0xFF) + palette->dither_ctx.data[current ]; + g = ((c >> 8) & 0xFF) + palette->dither_ctx.data[current + 1]; + b = ((c >> 16) & 0xFF) + palette->dither_ctx.data[current + 2]; + + /* Clamp new RGB components to range */ + if (r < 0) r = 0; + if (r > 255) r = 255; + if (g < 0) g = 0; + if (g > 255) g = 255; + if (b < 0) b = 0; + if (b > 255) b = 255; + + /* Reset error diffusion slots to 0 */ + palette->dither_ctx.data[current ] = 0; + palette->dither_ctx.data[current + 1] = 0; + palette->dither_ctx.data[current + 2] = 0; + + /* Rebuild colour from modified components */ + c = r + (g << 8) + (b << 16); + + /* Get best match for pixel, and find errors for each component */ + best_col_index = nsfb_palette_best_match(palette, c, &r, &g, &b); + + /* Advance one set of error diffusion slots */ + current += 3; + if (current >= width) + current = 0; + palette->dither_ctx.current = current; + + /* Save errors + * + * [*]-[N] + * / | \ + * [l]-[m]-[r] + */ + error = current; + + /* Error for [N] (next) */ + if (error != 0) { + /* The pixel exists */ + palette->dither_ctx.data[error ] += r * 7 / 16; + palette->dither_ctx.data[error + 1] += g * 7 / 16; + palette->dither_ctx.data[error + 2] += b * 7 / 16; + } + + error += width - 2 * 3; + if (error >= width) + error -= width; + /* Error for [l] (below, left) */ + if (error >= 0 && error != 3) { + /* The pixel exists */ + palette->dither_ctx.data[error ] += r * 3 / 16; + palette->dither_ctx.data[error + 1] += g * 3 / 16; + palette->dither_ctx.data[error + 2] += b * 3 / 16; + } + + error += 3; + if (error >= width) + error -= width; + /* Error for [m] (below, middle) */ + palette->dither_ctx.data[error ] += r * 5 / 16; + palette->dither_ctx.data[error + 1] += g * 5 / 16; + palette->dither_ctx.data[error + 2] += b * 5 / 16; + + error += 3; + if (error >= width) + error -= width; + /* Error for [r] (below, right) */ + if (error != 0) { + /* The pixel exists */ + palette->dither_ctx.data[error ] += r / 16; + palette->dither_ctx.data[error + 1] += g / 16; + palette->dither_ctx.data[error + 2] += b / 16; + } + + return best_col_index; +} + +#endif /* PALETTE_H */ diff --git a/src/Makefile b/src/Makefile index 283a99f..3c6e2f0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,4 @@ # Sources -DIR_SOURCES := libnsfb.c dump.c cursor.c +DIR_SOURCES := libnsfb.c dump.c cursor.c palette.c include $(NSBUILD)/Makefile.subdir diff --git a/src/libnsfb.c b/src/libnsfb.c index 6f14c99..a341088 100644 --- a/src/libnsfb.c +++ b/src/libnsfb.c @@ -15,6 +15,7 @@ #include "libnsfb_plot.h" #include "libnsfb_event.h" #include "nsfb.h" +#include "palette.h" #include "surface.h" /* exported interface documented in libnsfb.h */ @@ -50,6 +51,10 @@ int nsfb_free(nsfb_t *nsfb) { int ret; + + if (nsfb->palette != NULL) + nsfb_palette_free(nsfb->palette); + ret = nsfb->surface_rtns->finalise(nsfb); free(nsfb); return ret; diff --git a/src/palette.c b/src/palette.c new file mode 100644 index 0000000..d600001 --- /dev/null +++ b/src/palette.c @@ -0,0 +1,117 @@ +/* + * Copyright 2012 Michael Drake <tlsa(a)netsurf-browser.org&gt; + * + * This file is part of libnsfb, http://www.netsurf-browser.org/ + * Licenced under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + */ + +/** \file + * Palette (implementation). + */ + +#include <assert.h> +#include <stdbool.h> +#include <stdlib.h> +#include <string.h> + +#include "palette.h" + + +/** Create an empty palette object. */ +bool nsfb_palette_new(struct nsfb_palette_s **palette, int width) +{ + *palette = malloc(sizeof(struct nsfb_palette_s)); + if (*palette == NULL) { + return false; + } + + (*palette)->type = NSFB_PALETTE_EMPTY; + (*palette)->last = 0; + + (*palette)->dither = false; + (*palette)->dither_ctx.data_len = width * 3; + (*palette)->dither_ctx.data = malloc(width * 3 * sizeof(int)); + if ((*palette)->dither_ctx.data == NULL) { + nsfb_palette_free(*palette); + return false; + } + + return true; +} + +/** Free a palette object. */ +void nsfb_palette_free(struct nsfb_palette_s *palette) +{ + if (palette != NULL) { + if (palette->dither_ctx.data != NULL) { + free(palette->dither_ctx.data); + } + free(palette); + } +} + +/** Init error diffusion for a plot. */ +void nsfb_palette_dither_init(struct nsfb_palette_s *palette, int width) +{ + palette->dither = true; + memset(palette->dither_ctx.data, 0, palette->dither_ctx.data_len); + palette->dither_ctx.width = width * 3; + palette->dither_ctx.current = 0; +} + +/** Finalise error diffusion after a plot. */ +void nsfb_palette_dither_fini(struct nsfb_palette_s *palette) +{ + palette->dither = false; +} + +/** Generate libnsfb 8bpp default palette. */ +void nsfb_palette_generate_nsfb_8bpp(struct nsfb_palette_s *palette) +{ + int rloop, gloop, bloop; + int loop = 0; + uint8_t r, g, b; + + /* Build a linear 6-8-5 levels RGB colour cube palette. + * This accounts for 240 colours */ +#define RLIM 6 +#define GLIM 8 +#define BLIM 5 + for (rloop = 0; rloop < RLIM; rloop++) { + for (gloop = 0; gloop < GLIM; gloop++) { + for (bloop = 0; bloop < BLIM; bloop++) { + r = ((rloop * 255 * 2) + RLIM - 1) / + (2 * (RLIM - 1)); + g = ((gloop * 255 * 2) + GLIM - 1) / + (2 * (GLIM - 1)); + b = ((bloop * 255 * 2) + BLIM - 1) / + (2 * (BLIM - 1)); + + palette->data[loop] = r | g << 8 | b << 16; + loop++; + } + } + } +#undef RLIM +#undef GLIM +#undef BLIM + + /* Should have 240 colours set */ + assert(loop == 240); + + /* Fill index 240 to index 255 with grayscales */ + /* Note: already have full black and full white from RGB cube */ + for (; loop < 256; loop++) { + int ngray = loop - 240 + 1; + r = ngray * 15; /* 17*15 = 255 */ + + g = b = r; + + palette->data[loop] = r | g << 8 | b << 16; + } + + /* Set palette details */ + palette->type = NSFB_PALETTE_NSFB_8BPP; + palette->last = 255; +} diff --git a/src/plot/8bpp.c b/src/plot/8bpp.c index b72303d..0245542 100644 --- a/src/plot/8bpp.c +++ b/src/plot/8bpp.c @@ -10,7 +10,6 @@ #include <stdbool.h> #include <endian.h> #include <stdlib.h> -#include <limits.h> #include <string.h> #include "libnsfb.h" @@ -18,6 +17,7 @@ #include "libnsfb_plot_util.h" #include "nsfb.h" +#include "palette.h" #include "plot.h" static inline uint8_t *get_xy_loc(nsfb_t *nsfb, int x, int y) @@ -28,34 +28,18 @@ static inline uint8_t *get_xy_loc(nsfb_t *nsfb, int x, int y) static inline nsfb_colour_t pixel_to_colour(nsfb_t *nsfb, uint8_t pixel) { - return nsfb->palette[pixel]; + if (nsfb->palette == NULL) + return 0; + + return nsfb->palette->data[pixel]; } static uint8_t colour_to_pixel(nsfb_t *nsfb, nsfb_colour_t c) { - nsfb_colour_t palent; - int col; - - int dr, dg, db; /* delta red, green blue values */ - - int cur_distance; - int best_distance = INT_MAX; - uint8_t best_col = 0; - - for (col = 0; col < 256; col++) { - palent = nsfb->palette[col]; - - dr = (c & 0xFF) - (palent & 0xFF); - dg = ((c >> 8) & 0xFF) - ((palent >> 8) & 0xFF); - db = ((c >> 16) & 0xFF) - ((palent >> 16) & 0xFF); - cur_distance = ((dr * dr) + (dg * dg) + (db *db)); - if (cur_distance < best_distance) { - best_distance = cur_distance; - best_col = col; - } - } + if (nsfb->palette == NULL) + return 0; - return best_col; + return nsfb_palette_best_match_dither(nsfb->palette, c); } #define PLOT_TYPE uint8_t diff --git a/src/plot/common.c b/src/plot/common.c index 185e323..c9f9dc1 100644 --- a/src/plot/common.c +++ b/src/plot/common.c @@ -16,6 +16,8 @@ #error PLOT_LINELEN must be a macro to increment a line length #endif +#include "palette.h" + #define SIGN(x) ((x<0) ? -1 : ((x>0) ? 1 : 0)) static bool @@ -249,8 +251,7 @@ static bool bitmap_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc, nsfb_bbox_t clipped; /* clipped display */ /* The part of the scaled image actually displayed is cropped to the - * current context. - */ + * current context. */ clipped.x0 = x; clipped.y0 = y; clipped.x1 = x + width; @@ -271,6 +272,10 @@ static bool bitmap_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc, else rwidth = width; + if (nsfb->palette != NULL) { + nsfb_palette_dither_init(nsfb->palette, rwidth); + } + /* get veritcal (y) and horizontal (x) scale factors; both integer * part and remainder */ dx = bmp_width / width; @@ -299,7 +304,8 @@ static bool bitmap_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc, 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)) { + for (; pvideo < pvideo_limit; + pvideo += PLOT_LINELEN(nsfb->linelen)) { /* looping through render area vertically */ xoff = xoffs; rx = rxs; @@ -322,7 +328,8 @@ static bool bitmap_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc, xloop))); } /* plot pixel */ - *(pvideo + xloop) = colour_to_pixel(nsfb, abpixel); + *(pvideo + xloop) = colour_to_pixel( + nsfb, abpixel); } /* handle horizontal interpolation */ xoff += dx; @@ -341,7 +348,8 @@ static bool bitmap_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc, } } } else { - for (; pvideo < pvideo_limit; pvideo += PLOT_LINELEN(nsfb->linelen)) { + for (; pvideo < pvideo_limit; + pvideo += PLOT_LINELEN(nsfb->linelen)) { /* looping through render area vertically */ xoff = xoffs; rx = rxs; @@ -350,7 +358,8 @@ static bool bitmap_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc, /* get value of source pixel in question */ abpixel = pixel[yoff + xoff]; /* plot pixel */ - *(pvideo + xloop) = colour_to_pixel(nsfb, abpixel); + *(pvideo + xloop) = colour_to_pixel( + nsfb, abpixel); /* handle horizontal interpolation */ xoff += dx; @@ -369,6 +378,11 @@ static bool bitmap_scaled(nsfb_t *nsfb, const nsfb_bbox_t *loc, } } } + + if (nsfb->palette != NULL) { + nsfb_palette_dither_fini(nsfb->palette); + } + return true; } @@ -391,17 +405,16 @@ bitmap(nsfb_t *nsfb, int height = loc->y1 - loc->y0; nsfb_bbox_t clipped; /* clipped display */ - if (width == 0 || height == 0) - return true; + 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. - */ + /* The part of the image actually displayed is cropped to the + * current context. */ clipped.x0 = x; clipped.y0 = y; clipped.x1 = x + width; @@ -416,6 +429,10 @@ bitmap(nsfb_t *nsfb, if (width > (clipped.x1 - clipped.x0)) width = (clipped.x1 - clipped.x0); + if (nsfb->palette != NULL) { + nsfb_palette_dither_init(nsfb->palette, width); + } + xoff = clipped.x0 - x; yoff = (clipped.y0 - y) * bmp_stride; height = height * bmp_stride + yoff; @@ -428,16 +445,22 @@ bitmap(nsfb_t *nsfb, 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))); + /* 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 + xloop) = colour_to_pixel( + nsfb, abpixel); } } pvideo += PLOT_LINELEN(nsfb->linelen); @@ -446,11 +469,17 @@ bitmap(nsfb_t *nsfb, 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 + xloop) = colour_to_pixel( + nsfb, abpixel); } pvideo += PLOT_LINELEN(nsfb->linelen); } } + + if (nsfb->palette != NULL) { + nsfb_palette_dither_fini(nsfb->palette); + } + return true; } diff --git a/src/surface/sdl.c b/src/surface/sdl.c index d598b8a..0554e26 100644 --- a/src/surface/sdl.c +++ b/src/surface/sdl.c @@ -6,7 +6,6 @@ * http://www.opensource.org/licenses/mit-license.php */ -#include <assert.h> #include <stdbool.h> #include <stdlib.h> #include <SDL/SDL.h> @@ -18,6 +17,7 @@ #include "nsfb.h" #include "surface.h" +#include "palette.h" #include "plot.h" #include "cursor.h" @@ -353,49 +353,19 @@ set_palette(nsfb_t *nsfb) { SDL_Surface *sdl_screen = nsfb->surface_priv; SDL_Color palette[256]; - int rloop, gloop, bloop; int loop = 0; - /* Build a linear 6-8-5 levels RGB colour cube palette. - * This accounts for 240 colours */ -#define RLIM 6 -#define GLIM 8 -#define BLIM 5 - for (rloop = 0; rloop < RLIM; rloop++) { - for (gloop = 0; gloop < GLIM; gloop++) { - for (bloop = 0; bloop < BLIM; bloop++) { - palette[loop].r = ((rloop * 255 * 2) + RLIM - 1) / (2 * (RLIM - 1)); - palette[loop].g = ((gloop * 255 * 2) + GLIM - 1) / (2 * (GLIM - 1)); - palette[loop].b = ((bloop * 255 * 2) + BLIM - 1) / (2 * (BLIM - 1)); - - nsfb->palette[loop] = palette[loop].r | - palette[loop].g << 8 | - palette[loop].b << 16; - loop++; - } - } - } -#undef RLIM -#undef GLIM -#undef BLIM - - /* Should have 240 colours set */ - assert(loop == 240); + /* Get libnsfb palette */ + nsfb_palette_generate_nsfb_8bpp(nsfb->palette); - /* Fill index 240 to index 255 with grayscales */ - /* Note: already have full black and full white from RGB cube */ - for (; loop < 256; loop++) { - int ngray = loop - 240 + 1; - palette[loop].r = ngray * 15; /* 17*15 = 255 */ - - palette[loop].g = palette[loop].b = palette[loop].r; - - nsfb->palette[loop] = palette[loop].r | - palette[loop].g << 8 | - palette[loop].b << 16; + /* Create SDL palette from nsfb palette */ + for (loop = 0; loop < 256; loop++) { + palette[loop].r = (nsfb->palette->data[loop] ) & 0xFF; + palette[loop].g = (nsfb->palette->data[loop] >> 8) & 0xFF; + palette[loop].b = (nsfb->palette->data[loop] >> 16) & 0xFF; } - /* Set palette */ + /* Set SDL palette */ SDL_SetColors(sdl_screen, palette, 0, 256); } @@ -487,8 +457,10 @@ static int sdl_initialise(nsfb_t *nsfb) nsfb->surface_priv = sdl_screen; - if (nsfb->bpp == 8) + if (nsfb->bpp == 8) { + nsfb_palette_new(&nsfb->palette, nsfb->width); set_palette(nsfb); + } nsfb->ptr = sdl_screen->pixels; nsfb->linelen = sdl_screen->pitch; -- NetSurf Framebuffer library