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

buffer: create cairo_t inside buffer_create()

Browse source
This commit is contained in:
Johan Malm 2022-02-13 13:00:26 +00:00
parent ba909e4fc7
commit f22bfc96b2
3 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/buffer.h
View file

@ -38,7 +38,7 @@ struct lab_data_buffer {
size_t stride; size_t stride;
}; };
struct lab_data_buffer *buffer_create(cairo_t *cairo); struct lab_data_buffer *buffer_create(uint32_t width, uint32_t height,
void buffer_destroy(struct lab_data_buffer *buffer); float scale);
#endif /* __LABWC_BUFFER_H */ #endif /* __LABWC_BUFFER_H */

30
src/buffer.c
View file

@ -42,7 +42,12 @@ static void
data_buffer_destroy(struct wlr_buffer *wlr_buffer) data_buffer_destroy(struct wlr_buffer *wlr_buffer)
{ {
struct lab_data_buffer *buffer = data_buffer_from_buffer(wlr_buffer); struct lab_data_buffer *buffer = data_buffer_from_buffer(wlr_buffer);
free(buffer->data); if (buffer->cairo) {
cairo_destroy(buffer->cairo);
}
if (buffer->data) {
free(buffer->data);
}
free(buffer); free(buffer);
} }
@ -72,35 +77,26 @@ static const struct wlr_buffer_impl data_buffer_impl = {
}; };
struct lab_data_buffer * struct lab_data_buffer *
buffer_create(cairo_t *cairo) buffer_create(uint32_t width, uint32_t height, float scale)
{ {
struct lab_data_buffer *buffer = calloc(1, sizeof(*buffer)); struct lab_data_buffer *buffer = calloc(1, sizeof(*buffer));
if (!buffer) { if (!buffer) {
return NULL; return NULL;
} }
cairo_surface_t *surf = cairo_get_target(cairo);
int width = cairo_image_surface_get_width(surf);
int height = cairo_image_surface_get_height(surf);
wlr_buffer_init(&buffer->base, &data_buffer_impl, width, height); wlr_buffer_init(&buffer->base, &data_buffer_impl, width, height);
buffer->cairo = cairo; cairo_surface_t *surf =
cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
cairo_surface_set_device_scale(surf, scale, scale);
buffer->cairo = cairo_create(surf);
buffer->data = cairo_image_surface_get_data(surf); buffer->data = cairo_image_surface_get_data(surf);
buffer->format = DRM_FORMAT_ARGB8888; buffer->format = DRM_FORMAT_ARGB8888;
buffer->stride = cairo_image_surface_get_stride(surf); buffer->stride = cairo_image_surface_get_stride(surf);
if (!buffer->data) { if (!buffer->data) {
cairo_destroy(cairo); cairo_destroy(buffer->cairo);
free(buffer); free(buffer);
} }
return buffer; return buffer;
} }
void
buffer_destroy(struct lab_data_buffer *buffer)
{
if (!buffer) {
return;
}
cairo_destroy(buffer->cairo);
wlr_buffer_drop(&buffer->base);
}

14
src/osd.c
View file

@ -103,10 +103,13 @@ osd_update(struct server *server)
int w = (OSD_ITEM_WIDTH + (2 * OSD_BORDER_WIDTH)) * scale; int w = (OSD_ITEM_WIDTH + (2 * OSD_BORDER_WIDTH)) * scale;
int h = get_osd_height(&server->views) * scale; int h = get_osd_height(&server->views) * scale;
cairo_surface_t *surf = if (output->osd_buffer) {
cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w, h); wlr_buffer_drop(&output->osd_buffer->base);
cairo_surface_set_device_scale(surf, scale, scale); }
cairo_t *cairo = cairo_create(surf); output->osd_buffer = buffer_create(w, h, scale);
cairo_t *cairo = output->osd_buffer->cairo;
cairo_surface_t *surf = cairo_get_target(cairo);
/* background */ /* background */
set_source(cairo, theme->osd_bg_color); set_source(cairo, theme->osd_bg_color);
@ -195,10 +198,7 @@ osd_update(struct server *server)
y += OSD_ITEM_HEIGHT; y += OSD_ITEM_HEIGHT;
} }
g_object_unref(layout); g_object_unref(layout);
cairo_surface_flush(surf); cairo_surface_flush(surf);
buffer_destroy(output->osd_buffer);
output->osd_buffer = buffer_create(cairo);
struct wlr_scene_buffer *scene_buffer = wlr_scene_buffer_create( struct wlr_scene_buffer *scene_buffer = wlr_scene_buffer_create(
&server->osd_tree->node, &output->osd_buffer->base); &server->osd_tree->node, &output->osd_buffer->base);