mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-10 13:30:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

icon-loader: update PNG and XPM loaders to use new buffer helper

Browse source
This commit is contained in:
John Lindgren 2024-10-06 22:38:03 -04:00
parent 2e9b5886ce
commit 36f754e662
6 changed files with 34 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/img/img-png.c
View file

@ -43,7 +43,8 @@ ispng(const char *filename)
#undef PNG_BYTES_TO_CHECK
void
img_png_load(const char *filename, struct lab_data_buffer **buffer)
img_png_load(const char *filename, struct lab_data_buffer **buffer, int size,
float scale)
{
if (*buffer) {
wlr_buffer_drop(&(*buffer)->base);
@ -62,22 +63,6 @@ img_png_load(const char *filename, struct lab_data_buffer **buffer)
cairo_surface_destroy(image);
return;
}
cairo_surface_flush(image);
if (cairo_image_surface_get_format(image) == CAIRO_FORMAT_ARGB32) {
/* we can wrap ARGB32 image surfaces directly */
*buffer = buffer_adopt_cairo_surface(image);
return;
}
/* convert to ARGB32 by painting to a new surface */
uint32_t w = cairo_image_surface_get_width(image);
uint32_t h = cairo_image_surface_get_height(image);
*buffer = buffer_create_cairo(w, h, 1);
cairo_t *cairo = (*buffer)->cairo;
cairo_set_source_surface(cairo, image, 0, 0);
cairo_paint(cairo);
cairo_surface_flush((*buffer)->surface);
/* destroy original surface */
cairo_surface_destroy(image);
*buffer = buffer_convert_cairo_surface_for_icon(image, size, scale);
}

37
src/img/img-xpm.c
View file

@ -286,9 +286,8 @@ file_buffer(enum buf_op op, struct file_handle *h)
return NULL;
}
/* This function does all the work. */
static struct lab_data_buffer *
pixbuf_create_from_xpm(struct file_handle *handle)
static cairo_surface_t *
xpm_load_to_surface(struct file_handle *handle)
{
const char *buffer = file_buffer(op_header, handle);
if (!buffer) {
@ -332,7 +331,7 @@ pixbuf_create_from_xpm(struct file_handle *handle)
char *name_buf = xzalloc(n_col * (cpp + 1));
struct xpm_color *colors = znew_n(struct xpm_color, n_col);
uint32_t *data = znew_n(uint32_t, w * h);
cairo_surface_t *surface = NULL;
struct xpm_color *fallbackcolor = NULL;
char pixel_str[32]; /* cpp < 32 */
@ -357,14 +356,20 @@ pixbuf_create_from_xpm(struct file_handle *handle)
}
}
surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w, h);
uint32_t *data = (uint32_t *)cairo_image_surface_get_data(surface);
int stride = cairo_image_surface_get_stride(surface) / sizeof(uint32_t);
for (int ycnt = 0; ycnt < h; ycnt++) {
uint32_t *pixtmp = data + w * ycnt;
uint32_t *pixtmp = data + stride * ycnt;
int wbytes = w * cpp;
buffer = file_buffer(op_body, handle);
if (!buffer || (strlen(buffer) < (size_t)wbytes)) {
/* Advertised width doesn't match pixels */
wlr_log(WLR_DEBUG, "Dimensions do not match data");
cairo_surface_destroy(surface);
surface = NULL;
goto out;
}
@ -382,24 +387,19 @@ pixbuf_create_from_xpm(struct file_handle *handle)
*pixtmp++ = color->argb;
}
}
g_hash_table_destroy(color_hash);
free(colors);
free(name_buf);
return buffer_create_from_data(data, w, h, 4 * w);
/* let cairo know pixel data has been modified */
cairo_surface_mark_dirty(surface);
out:
g_hash_table_destroy(color_hash);
free(colors);
free(name_buf);
free(data);
return NULL;
return surface;
}
void
img_xpm_load(const char *filename, struct lab_data_buffer **buffer)
img_xpm_load(const char *filename, struct lab_data_buffer **buffer, int size,
float scale)
{
if (*buffer) {
wlr_buffer_drop(&(*buffer)->base);
@ -413,8 +413,11 @@ img_xpm_load(const char *filename, struct lab_data_buffer **buffer)
return;
}
*buffer = pixbuf_create_from_xpm(&h);
if (!(*buffer)) {
cairo_surface_t *surface = xpm_load_to_surface(&h);
if (surface) {
*buffer = buffer_convert_cairo_surface_for_icon(surface, size,
scale);
} else {
wlr_log(WLR_ERROR, "error loading '%s'", filename);
}