aboutsummaryrefslogtreecommitdiff
path: root/shm.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-08-16 18:40:32 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-08-16 18:40:32 +0000
commitbed7b34c2857ebac8028e8b7a00b0bef0d831df0 (patch)
treee55d1a6353fca0436b5a972eae467e8a9af5eca7 /shm.c
parentmeson: add pixman dependency (diff)
wip: render background and glyphs using pixman
Diffstat (limited to 'shm.c')
-rw-r--r--shm.c28
1 files changed, 27 insertions, 1 deletions
diff --git a/shm.c b/shm.c
index ca078544..19ec66db 100644
--- a/shm.c
+++ b/shm.c
@@ -7,6 +7,8 @@
#include <sys/mman.h>
#include <linux/memfd.h>
+#include <pixman.h>
+
#define LOG_MODULE "shm"
#include "log.h"
#include "tllist.h"
@@ -61,6 +63,7 @@ shm_get_buffer(struct wl_shm *shm, int width, int height, size_t copies)
cairo_surface_t **cairo_surface = NULL;
cairo_t **cairo = NULL;
+ pixman_image_t **pix = NULL;
/* Backing memory for SHM */
pool_fd = memfd_create("f00sel-wayland-shm-buffer-pool", MFD_CLOEXEC);
@@ -103,6 +106,7 @@ shm_get_buffer(struct wl_shm *shm, int width, int height, size_t copies)
/* Create a cairo surface around the mmapped memory */
cairo_surface = calloc(copies, sizeof(cairo_surface[0]));
cairo = calloc(copies, sizeof(cairo[0]));
+ pix = calloc(copies, sizeof(pix[0]));
for (size_t i = 0; i < copies; i++) {
cairo_surface[i] = cairo_image_surface_create_for_data(
@@ -120,6 +124,14 @@ shm_get_buffer(struct wl_shm *shm, int width, int height, size_t copies)
cairo_status_to_string(cairo_status(cairo[i])));
goto err;
}
+
+ pix[i] = pixman_image_create_bits_no_clear(
+ PIXMAN_a8r8g8b8, width, height, (uint32_t *)mmapped, stride);
+
+ if (pix[i] == NULL) {
+ LOG_ERR("failed to create pixman image");
+ goto err;
+ }
}
/* Push to list of available buffers, but marked as 'busy' */
@@ -128,13 +140,15 @@ shm_get_buffer(struct wl_shm *shm, int width, int height, size_t copies)
((struct buffer){
.width = width,
.height = height,
+ .stride = stride,
.busy = true,
.size = size,
.mmapped = mmapped,
.wl_buf = buf,
.copies = copies,
.cairo_surface = cairo_surface,
- .cairo = cairo}
+ .cairo = cairo,
+ .pix = pix}
)
);
@@ -155,6 +169,12 @@ err:
cairo_surface_destroy(cairo_surface[i]);
free(cairo_surface);
}
+ if (pix != NULL) {
+ for (size_t i = 0; i < copies; i++)
+ if (pix[i] != NULL)
+ pixman_image_unref(pix[i]);
+ free(pix);
+ }
if (buf != NULL)
wl_buffer_destroy(buf);
if (pool != NULL)
@@ -185,6 +205,12 @@ shm_fini(void)
cairo_surface_destroy(buf->cairo_surface[i]);
free(buf->cairo_surface);
}
+ if (buf->pix != NULL) {
+ for (size_t i = 0; i < buf->copies; i++)
+ if (buf->pix[i] != NULL)
+ pixman_image_unref(buf->pix[i]);
+ free(buf->pix);
+ }
wl_buffer_destroy(buf->wl_buf);
munmap(buf->mmapped, buf->size);