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

cairo: drop all remaining references to cairo

Browse source 
We now use pixman (and freetype + fontconfig) exclusively.
This commit is contained in:
Daniel Eklöf 2019-09-22 11:52:37 +02:00
parent 01e71590e0
commit 4ce314e328
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bar/meson.build
View file

@ -1,8 +1,7 @@
bar_backends = []
if backend_x11
bar_x11 = declare_dependency(
sources: ['xcb.c', 'xcb.h'], dependencies: [xcb_stuff, cairo, cairo_ft])
bar_x11 = declare_dependency(sources: ['xcb.c', 'xcb.h'], dependencies: [xcb_stuff])
bar_backends += [bar_x11]
endif
@ -37,7 +36,7 @@ if backend_wayland
bar_wayland = declare_dependency(
sources: ['wayland.c', 'wayland.h'] + wl_proto_src + wl_proto_headers,
dependencies: [wayland_client, wayland_cursor, cairo, cairo_ft])
dependencies: [wayland_client, wayland_cursor])
bar_backends += [bar_wayland]
endif

3
bar/wayland.c
View file

@ -10,7 +10,6 @@
#include <sys/mman.h>
#include <linux/memfd.h>
//#include <cairo.h>
#include <pixman.h>
#include <wayland-client.h>
#include <wayland-cursor.h>
@ -697,7 +696,7 @@ setup(struct bar *_bar)
//wl_surface_commit(backend->surface);
//wl_display_roundtrip(backend->display);
/* Prepare a buffer + cairo context for bar to draw to */
/* Prepare a buffer + pixman image for bar to draw to */
backend->next_buffer = get_buffer(backend);
assert(backend->next_buffer != NULL && backend->next_buffer->busy);
bar->pix = backend->next_buffer->pix;