pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

cairo: replace cairo with pixman in decos, particles and modules

Browse source 
All decoration, particle and module interfaces now takes a
pixman_image_t parameter, and all drawing is done using pixman APIs.

The wayland/xcb backends implement a new interface functions,
get_pixman_image(), that should return a pixman image instance that is
suitable for rendering.

In the wayland backend, the image uses the same backing data as the
cairo surface.

In the XCB backend, we create a new image each time, and then blit it
to the cairo surface at commit time.
This commit is contained in:
Daniel Eklöf 2019-09-22 01:56:58 +02:00
parent 95385863ae
commit c11fee4ce3
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
24 changed files with 162 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

51
bar/xcb.c
View file

@ -370,10 +370,56 @@ loop(struct bar *_bar,
}
static void
commit_surface(const struct bar *_bar)
free_pixman_bits(pixman_image_t *pix, void *data)
{
free(data);
}
static pixman_image_t *
get_pixman_image(const struct bar *_bar)
{
const struct private *bar = _bar->private;
uint32_t *bits = malloc(
bar->width * bar->height_with_border * sizeof(uint32_t));
pixman_image_t *ret = pixman_image_create_bits_no_clear(
PIXMAN_a8r8g8b8,
bar->width,
bar->height_with_border,
bits,
bar->width * sizeof(uint32_t));
if (ret == NULL) {
free(bits);
return NULL;
}
pixman_image_set_destroy_function(ret, &free_pixman_bits, bits);
return ret;
}
static void
commit_pixman(const struct bar *_bar, pixman_image_t *pix)
{
const struct private *bar = _bar->private;
const struct xcb_backend *backend = bar->backend.data;
/* Blit pixman image to our XCB surface */
cairo_surface_t *surf = cairo_image_surface_create_for_data(
(unsigned char *)pixman_image_get_data(pix),
CAIRO_FORMAT_ARGB32,
bar->width,
bar->height_with_border,
cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, bar->width));
cairo_set_source_surface(bar->cairo, surf, 0, 0);
cairo_set_operator(bar->cairo, CAIRO_OPERATOR_SOURCE);
cairo_paint(bar->cairo);
cairo_surface_flush(bar->cairo_surface);
cairo_surface_destroy(surf);
pixman_image_unref(pix);
xcb_copy_area(backend->conn, backend->pixmap, backend->win, backend->gc,
0, 0, 0, 0, bar->width, bar->height_with_border);
xcb_flush(backend->conn);
@ -430,7 +476,8 @@ const struct backend xcb_backend_iface = {
.setup = &setup,
.cleanup = &cleanup,
.loop = &loop,
.commit_surface = &commit_surface,
.get_pixman_image = &get_pixman_image,
.commit_pixman = &commit_pixman,
.refresh = &refresh,
.set_cursor = &set_cursor,
};