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

button/common.c: share button_filename() to reduce duplication

Browse source
This commit is contained in:
Johan Malm 2023-08-21 21:03:46 +01:00 • committed by Johan Malm
parent 143714f1c9
commit a8951c4b75
7 changed files with 38 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/button/button-png.c
View file

@ -12,7 +12,7 @@
#include <wlr/util/log.h>
#include "buffer.h"
#include "button/button-png.h"
#include "common/dir.h"
#include "button/common.h"
#include "labwc.h"
#include "theme.h"
@ -24,15 +24,6 @@ file_exists(const char *path)
return (!stat(path, &st));
}
/* Share with xbm.c:xbm_path() */
static char *
button_path(const char *filename)
{
static char buffer[4096] = { 0 };
snprintf(buffer, sizeof(buffer), "%s/%s", theme_dir(rc.theme_name), filename);
return buffer;
}
/*
* cairo_image_surface_create_from_png() does not gracefully handle non-png
* files, so we verify the header before trying to read the rest of the file.
@ -62,14 +53,15 @@ ispng(const char *filename)
#undef PNG_BYTES_TO_CHECK
void
png_load(const char *filename, struct lab_data_buffer **buffer)
png_load(const char *button_name, struct lab_data_buffer **buffer)
{
if (*buffer) {
wlr_buffer_drop(&(*buffer)->base);
*buffer = NULL;
}
char *path = button_path(filename);
char path[4096] = { 0 };
button_filename(button_name, path, sizeof(path));
if (!file_exists(path) || !ispng(path)) {
return;
}