diff options
| -rw-r--r-- | main.c | 79 | ||||
| -rw-r--r-- | svg.c | 80 | ||||
| -rw-r--r-- | svg.h | 5 |
3 files changed, 100 insertions, 64 deletions
@@ -78,6 +78,7 @@ render(struct output *output) const int width = output->render_width; const int height = output->render_height; const int scale = output->scale; + pixman_image_t *pix; struct buffer *buf = shm_get_buffer( shm, width * scale, height * scale, (uintptr_t)(void *)output); @@ -85,43 +86,57 @@ render(struct output *output) if (buf == NULL) return; - uint32_t *data = pixman_image_get_data(image); - int img_width = pixman_image_get_width(image); - int img_height = pixman_image_get_height(image); - int img_stride = pixman_image_get_stride(image); - pixman_format_code_t img_fmt = pixman_image_get_format(image); +#if defined(WBG_HAVE_SVG) + if (image == NULL) { + pix = svg_render(width * scale, height * scale); + LOG_INFO("render: %dx%d", width * scale, height * scale); + } else +#endif + { + + uint32_t *data = pixman_image_get_data(image); + int img_width = pixman_image_get_width(image); + int img_height = pixman_image_get_height(image); + int img_stride = pixman_image_get_stride(image); + pixman_format_code_t img_fmt = pixman_image_get_format(image); - pixman_image_t *pix = pixman_image_create_bits_no_clear( - img_fmt, img_width, img_height, data, img_stride); + pix = pixman_image_create_bits_no_clear( + img_fmt, img_width, img_height, data, img_stride); - double sx = (double)img_width / (width * scale); - double sy = (double)img_height / (height * scale); + double sx = (double)img_width / (width * scale); + double sy = (double)img_height / (height * scale); - float s = sx > sy ? sy : sx; - sx = s; - sy = s; + float s = sx > sy ? sy : sx; + sx = s; + sy = s; - float tx = (img_width / sx - width) / 2 / sx; - float ty = (img_height / sy - height) / 2 / sy; + float tx = (img_width / sx - width) / 2 / sx; + float ty = (img_height / sy - height) / 2 / sy; - pixman_f_transform_t t; - pixman_transform_t t2; - pixman_f_transform_init_translate(&t, tx, ty); - pixman_f_transform_init_scale(&t, sx, sy); - pixman_transform_from_pixman_f_transform(&t2, &t); - pixman_image_set_transform(pix, &t2); - pixman_image_set_filter(pix, PIXMAN_FILTER_BEST, NULL, 0); + pixman_f_transform_t t; + pixman_transform_t t2; + pixman_f_transform_init_translate(&t, tx, ty); + pixman_f_transform_init_scale(&t, sx, sy); + pixman_transform_from_pixman_f_transform(&t2, &t); + pixman_image_set_transform(pix, &t2); + pixman_image_set_filter(pix, PIXMAN_FILTER_BEST, NULL, 0); + + LOG_INFO("render: %dx%d (scaled from %dx%d)", + width * scale, height * scale, + img_width, img_height); + } pixman_image_composite32( PIXMAN_OP_SRC, pix, NULL, buf->pix, 0, 0, 0, 0, 0, 0, width * scale, height * scale); - pixman_image_unref(pix); - LOG_INFO("render: %dx%d (scaled from %dx%d)", - width * scale, height * scale, - img_width, img_height); +#if defined(WBG_HAVE_SVG) + if (image == NULL) + free(pixman_image_get_data(pix)); +#endif + pixman_image_unref(pix); wl_surface_set_buffer_scale(output->surf, scale); wl_surface_attach(output->surf, buf->wl_buf, 0, 0); @@ -243,6 +258,7 @@ output_scale(void *data, struct wl_output *wl_output, int32_t factor) { struct output *output = data; output->scale = factor; + if (output->configured) render(output); } @@ -418,15 +434,15 @@ main(int argc, const char *const *argv) if (image == NULL) image = webp_load(fp, image_path); #endif -#if defined(WBG_HAVE_SVG) - if (image == NULL) - image = svg_load(fp, image_path); -#endif #if defined(WBG_HAVE_JXL) if (image == NULL) image = jxl_load(fp, image_path); #endif - if (image == NULL) { + if (image == NULL +#if defined(WBG_HAVE_SVG) + && !svg_load(fp, image_path) +#endif + ) { LOG_ERR("%s: failed to load", image_path); fclose(fp); return EXIT_FAILURE; @@ -560,6 +576,9 @@ out: free(pixman_image_get_data(image)); pixman_image_unref(image); } +#if defined(WBG_HAVE_SVG) + svg_free(); +#endif log_deinit(); fclose(fp); return exit_code; @@ -9,47 +9,60 @@ #include "log.h" #include "stride.h" -pixman_image_t * +struct NSVGimage *svg_image = NULL; +struct NSVGrasterizer *rast = NULL; + +bool svg_load(FILE *fp, const char *path) { - pixman_image_t *pix = NULL; - uint8_t *data = NULL; - int width, height, stride; - bool ok = false; - struct NSVGimage *image = NULL; - struct NSVGrasterizer *rast = NULL; - - image = nsvgParseFromFile(path, "px", 96); - width = image->width; - height = image->height; - if (width == 0 || height == 0) { + svg_image = nsvgParseFromFile(path, "px", 96); + if (svg_image == NULL) + return false; + if (svg_image->width == 0 || svg_image->height == 0) { LOG_DBG("%s: width and/or heigth is zero, not a SVG?", path); - nsvgDelete(image); - return NULL; + nsvgDelete(svg_image); + svg_image = NULL; + return false; } - stride = stride_for_format_and_width(PIXMAN_a8b8g8r8, image->width); + rast = nsvgCreateRasterizer(); + if (rast == NULL) + return false; + return true; +} + +pixman_image_t * +svg_render(const int width, const int height) +{ + pixman_image_t *pix = NULL; + uint8_t *data = NULL; + int stride = stride_for_format_and_width(PIXMAN_a8b8g8r8, width); if (!(data = calloc(1, height * stride))) - goto out; + return NULL; + + double sx = width / (double)svg_image->width; + double sy = height / (double)svg_image->height; - if (!(rast = nsvgCreateRasterizer())) - goto out; + float s = sx > sy ? sy : sx; - nsvgRasterize(rast, image, 0, 0, 1, data, width, height, stride); + float tx = (width - svg_image->width * s) / 2; + float ty = (height - svg_image->height * s) / 2; - ok = NULL != (pix = pixman_image_create_bits_no_clear( - PIXMAN_a8b8g8r8, width, height, (uint32_t *)data, stride)); + nsvgRasterize(rast, svg_image, tx, ty, s, data, width, height, stride); - if (!ok) { - LOG_ERR("%s: failed to instanciate pixman image", path); - goto out; + pix = pixman_image_create_bits_no_clear(PIXMAN_a8b8g8r8, width, + height, (uint32_t *)data, stride); + if (pix == NULL) { + LOG_ERR("failed to render svg image"); + free(data); + return NULL; } /* Copied from fuzzel */ /* Nanosvg produces non-premultiplied ABGR, while pixman expects * premultiplied */ for (uint32_t *abgr = (uint32_t *)data; - abgr < (uint32_t *)(data + (size_t)image->width * (size_t)image->height * 4); + abgr < (uint32_t *)(data + (size_t)width * (size_t)height * 4); abgr++) { uint8_t alpha = (*abgr >> 24) & 0xff; uint8_t blue = (*abgr >> 16) & 0xff; @@ -70,13 +83,14 @@ svg_load(FILE *fp, const char *path) *abgr = (uint32_t)alpha << 24 | blue << 16 | green << 8 | red; } -out: - if (image) - nsvgDelete(image); - if (rast) - nsvgDeleteRasterizer(rast); - - if (!ok) - free(data); return pix; } + +void +svg_free() +{ + if (svg_image != NULL) + nsvgDelete(svg_image); + if (rast != NULL) + nsvgDeleteRasterizer(rast); +} @@ -1,6 +1,9 @@ #pragma once #include <stdio.h> +#include <stdbool.h> #include <pixman.h> -pixman_image_t *svg_load(FILE *fp, const char *path); +bool svg_load(FILE *fp, const char *path); +pixman_image_t *svg_render(const int width, const int height); +void svg_free(); |