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

buffer: always set buffer->{cairo,surface} for simplification

Browse source
This commit is contained in:
tokyo4j 2024-11-27 14:17:28 +09:00 • committed by Hiroaki Yamamoto
parent d2a864dfe7
commit c48324975d
5 changed files with 20 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/buffer.h
View file

@ -32,10 +32,11 @@
struct lab_data_buffer {
struct wlr_buffer base;
cairo_surface_t *surface; /* optional */
cairo_t *cairo; /* optional */
void *data; /* owned by surface if surface != NULL */
uint32_t format;
bool surface_owns_data;
cairo_surface_t *surface;
cairo_t *cairo;
void *data;
uint32_t format; /* currently always DRM_FORMAT_ARGB8888 */
size_t stride;
/*
* The logical size of the surface in layout pixels.
@ -50,7 +51,7 @@ struct lab_data_buffer {
* CAIRO_FORMAT_ARGB32 image surface.
*
* The logical size is set to the surface size in pixels, ignoring
* device scale. No cairo context is created.
* device scale.
*/
struct lab_data_buffer *buffer_adopt_cairo_surface(cairo_surface_t *surface);
@ -78,7 +79,6 @@ struct lab_data_buffer *buffer_convert_cairo_surface_for_icon(
* in pre-multiplied ARGB32 format.
*
* The logical size is set to the width and height of the pixel data.
* No cairo surface or context is created.
*/
struct lab_data_buffer *buffer_create_from_data(void *pixel_data, uint32_t width,
uint32_t height, uint32_t stride);

8
include/common/graphic-helpers.h
View file

@ -49,12 +49,4 @@ void draw_cairo_border(cairo_t *cairo, struct wlr_fbox fbox, double line_width);
struct lab_data_buffer;
struct surface_context {
bool is_duplicate;
cairo_surface_t *surface;
};
struct surface_context get_cairo_surface_from_lab_data_buffer(
struct lab_data_buffer *buffer);
#endif /* LABWC_GRAPHIC_HELPERS_H */

15
src/buffer.c
View file

@ -45,15 +45,11 @@ static void
data_buffer_destroy(struct wlr_buffer *wlr_buffer)
{
struct lab_data_buffer *buffer = data_buffer_from_buffer(wlr_buffer);
if (buffer->cairo) {
cairo_destroy(buffer->cairo);
}
if (buffer->surface) {
/* this also frees buffer->data */
/* this also frees buffer->data if surface_owns_data == true */
cairo_surface_destroy(buffer->surface);
} else if (buffer->data) {
if (!buffer->surface_owns_data) {
free(buffer->data);
buffer->data = NULL;
}
free(buffer);
}
@ -101,6 +97,8 @@ buffer_adopt_cairo_surface(cairo_surface_t *surface)
buffer->stride = cairo_image_surface_get_stride(buffer->surface);
buffer->logical_width = width;
buffer->logical_height = height;
buffer->cairo = cairo_create(surface);
buffer->surface_owns_data = true;
return buffer;
}
@ -130,7 +128,6 @@ buffer_create_cairo(uint32_t logical_width, uint32_t logical_height, float scale
struct lab_data_buffer *buffer = buffer_adopt_cairo_surface(surface);
buffer->logical_width = logical_width;
buffer->logical_height = logical_height;
buffer->cairo = cairo_create(surface);
return buffer;
}
@ -198,5 +195,9 @@ buffer_create_from_data(void *pixel_data, uint32_t width, uint32_t height,
buffer->data = pixel_data;
buffer->format = DRM_FORMAT_ARGB8888;
buffer->stride = stride;
buffer->surface = cairo_image_surface_create_for_data(
pixel_data, CAIRO_FORMAT_ARGB32, width, height, stride);
buffer->cairo = cairo_create(buffer->surface);
buffer->surface_owns_data = false;
return buffer;
}

29
src/common/graphic-helpers.c
View file

@ -112,32 +112,3 @@ set_cairo_color(cairo_t *cairo, const float *c)
cairo_set_source_rgba(cairo, c[0] / alpha, c[1] / alpha,
c[2] / alpha, alpha);
}
struct surface_context
get_cairo_surface_from_lab_data_buffer(struct lab_data_buffer *buffer)
{
/* Handle CAIRO_FORMAT_ARGB32 buffers */
if (buffer->cairo) {
return (struct surface_context){
.is_duplicate = false,
.surface = cairo_get_target(buffer->cairo),
};
}
/* Handle DRM_FORMAT_ARGB8888 buffers */
int w = buffer->base.width;
int h = buffer->base.height;
cairo_surface_t *surface =
cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w, h);
if (!surface) {
return (struct surface_context){0};
}
unsigned char *data = cairo_image_surface_get_data(surface);
cairo_surface_flush(surface);
memcpy(data, buffer->data, h * buffer->stride);
cairo_surface_mark_dirty(surface);
return (struct surface_context){
.is_duplicate = true,
.surface = surface,
};
}

13
src/theme.c
View file

@ -85,10 +85,9 @@ copy_icon_buffer(struct theme *theme, struct lab_data_buffer *icon_buffer)
{
assert(icon_buffer);
struct surface_context icon =
get_cairo_surface_from_lab_data_buffer(icon_buffer);
int icon_width = cairo_image_surface_get_width(icon.surface);
int icon_height = cairo_image_surface_get_height(icon.surface);
cairo_surface_t *surface = icon_buffer->surface;
int icon_width = cairo_image_surface_get_width(surface);
int icon_height = cairo_image_surface_get_height(surface);
int width = theme->window_button_width;
int height = theme->window_button_height;
@ -113,7 +112,7 @@ copy_icon_buffer(struct theme *theme, struct lab_data_buffer *icon_buffer)
buffer_width, buffer_height, 1.0);
cairo_t *cairo = buffer->cairo;
cairo_set_source_surface(cairo, icon.surface,
cairo_set_source_surface(cairo, surface,
(buffer_width - icon_width) / 2, (buffer_height - icon_height) / 2);
cairo_paint(cairo);
@ -123,10 +122,6 @@ copy_icon_buffer(struct theme *theme, struct lab_data_buffer *icon_buffer)
*/
cairo_scale(cairo, scale, scale);
if (icon.is_duplicate) {
cairo_surface_destroy(icon.surface);
}
return buffer;
}