Basic pango.

2 files changed, 7 insertions, 9 deletions

diff --git a/lib/renderers/wayland/CMakeLists.txt b/lib/renderers/wayland/CMakeLists.txt
index 4f93d18..19672da 100644
--- a/lib/renderers/wayland/CMakeLists.txt
+++ b/lib/renderers/wayland/CMakeLists.txt
@@ -2,12 +2,13 @@ FIND_PACKAGE(Wayland)
 
 if (WAYLAND_FOUND)
     FIND_PACKAGE(Cairo REQUIRED)
+    FIND_PACKAGE(Pango REQUIRED)
     FIND_PACKAGE(XKBCommon REQUIRED)
     INCLUDE(Wayland)
     WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell "xdg-shell.xml" xdg-shell)
-    INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${WAYLAND_CLIENT_INCLUDE_DIR} ${XKBCOMMON_INCLUDE_DIR} ${CAIRO_INCLUDE_DIRECTORIES})
+    INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${WAYLAND_CLIENT_INCLUDE_DIR} ${XKBCOMMON_INCLUDE_DIR} ${CAIRO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS})
     ADD_LIBRARY(bemenu-renderer-wayland SHARED wayland.c registry.c window.c ${proto-xdg-shell})
     SET_TARGET_PROPERTIES(bemenu-renderer-wayland PROPERTIES PREFIX "")
-    TARGET_LINK_LIBRARIES(bemenu-renderer-wayland ${WAYLAND_CLIENT_LIBRARIES} ${XKBCOMMON_LIBRARIES} ${CAIRO_LIBRARIES})
+    TARGET_LINK_LIBRARIES(bemenu-renderer-wayland ${WAYLAND_CLIENT_LIBRARIES} ${XKBCOMMON_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES})
     INSTALL(TARGETS bemenu-renderer-wayland DESTINATION lib/bemenu)
 endif ()
diff --git a/lib/renderers/wayland/window.c b/lib/renderers/wayland/window.c
index 58d2e2b..d70d43b 100644
--- a/lib/renderers/wayland/window.c
+++ b/lib/renderers/wayland/window.c
@@ -105,11 +105,7 @@ destroy_buffer(struct buffer *buffer)
 {
     if (buffer->buffer)
         wl_buffer_destroy(buffer->buffer);
-    if (buffer->cairo.cr)
-        cairo_destroy(buffer->cairo.cr);
-    if (buffer->cairo.surface)
-        cairo_surface_destroy(buffer->cairo.surface);
-
+    bm_cairo_destroy(&buffer->cairo);
     memset(buffer, 0, sizeof(struct buffer));
 }
 
@@ -149,10 +145,11 @@ create_buffer(struct wl_shm *shm, struct buffer *buffer, int32_t width, int32_t
 
     wl_buffer_add_listener(buffer->buffer, &buffer_listener, buffer);
 
-    if (!(buffer->cairo.surface = cairo_image_surface_create_for_data(data, CAIRO_FORMAT_ARGB32, width, height, stride)))
+    cairo_surface_t *surf;
+    if (!(surf = cairo_image_surface_create_for_data(data, CAIRO_FORMAT_ARGB32, width, height, stride)))
         goto fail;
 
-    if (!(buffer->cairo.cr = cairo_create(buffer->cairo.surface)))
+    if (!bm_cairo_create_for_surface(&buffer->cairo, surf))
         goto fail;
 
     buffer->width = width;