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

diff --git a/include/buffer.h b/include/buffer.h
index 7bf3fbe56078705a2527846bdfabcbde9eeba671..7daa464328675f8775676744ade76a1a2639c0ca 100644 (file)
--- a/include/buffer.h
+++ b/include/buffer.h
@@ -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);

diff --git a/include/common/graphic-helpers.h b/include/common/graphic-helpers.h
index 5463d4dc7af0aade731cadd983f4fd0ec15ce290..067da644ea39e9b52ec6e4c72ae51913639afaae 100644 (file)
--- a/include/common/graphic-helpers.h
+++ b/include/common/graphic-helpers.h
@@ -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 */

diff --git a/src/buffer.c b/src/buffer.c
index d9cb8726af4e4caed424e61716e921d35afffb5e..251f69308d73b5a2e42fef7b3038581863b3d9af 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -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 */
-               cairo_surface_destroy(buffer->surface);
-       } else if (buffer->data) {
+       cairo_destroy(buffer->cairo);
+       /* this also frees buffer->data if surface_owns_data == true */
+       cairo_surface_destroy(buffer->surface);
+       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;
 }

diff --git a/src/common/graphic-helpers.c b/src/common/graphic-helpers.c
index 13b6cc4ba7a3fe79c847a9d292601e51e7646020..aed4564fd619b30a76b0e30371a8e555fd5d6216 100644 (file)
--- a/src/common/graphic-helpers.c
+++ b/src/common/graphic-helpers.c
@@ -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,
-       };
-}

diff --git a/src/theme.c b/src/theme.c
index 439a3184f64d1d1bb9b7318ce155b6b9f71501aa..b49c6cc5f3dc83bd2bbaa652fb95a88cc47e7ae8 100644 (file)
--- a/src/theme.c
+++ b/src/theme.c
@@ -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;
 }