1 files changed, 25 insertions, 25 deletions

diff --git a/common/pango.c b/common/pango.c
index fc3d0688..288569b3 100644
--- a/common/pango.c
+++ b/common/pango.c
@@ -1,4 +1,4 @@
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <pango/pangocairo.h>
 #include <stdarg.h>
 #include <stdbool.h>
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "cairo.h"
+#include "cairo_util.h"
 #include "log.h"
 #include "stringop.h"
 
@@ -50,7 +50,7 @@ size_t escape_markup_text(const char *src, char *dest) {
         return length;
 }
 
-PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
+PangoLayout *get_pango_layout(cairo_t *cairo, const PangoFontDescription *desc,
                 const char *text, double scale, bool markup) {
         PangoLayout *layout = pango_cairo_create_layout(cairo);
         PangoAttrList *attrs;
@@ -73,60 +73,59 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
         }
 
         pango_attr_list_insert(attrs, pango_attr_scale_new(scale));
-        PangoFontDescription *desc = pango_font_description_from_string(font);
         pango_layout_set_font_description(layout, desc);
         pango_layout_set_single_paragraph_mode(layout, 1);
         pango_layout_set_attributes(layout, attrs);
         pango_attr_list_unref(attrs);
-        pango_font_description_free(desc);
         return layout;
 }
 
-void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
+void get_text_size(cairo_t *cairo, const PangoFontDescription *desc, int *width, int *height,
                 int *baseline, double scale, bool markup, const char *fmt, ...) {
         va_list args;
         va_start(args, fmt);
-        // Add one since vsnprintf excludes null terminator.
-        int length = vsnprintf(NULL, 0, fmt, args) + 1;
+        char *buf = vformat_str(fmt, args);
         va_end(args);
-
-        char *buf = malloc(length);
         if (buf == NULL) {
-                sway_log(SWAY_ERROR, "Failed to allocate memory");
                 return;
         }
-        va_start(args, fmt);
-        vsnprintf(buf, length, fmt, args);
-        va_end(args);
 
-        PangoLayout *layout = get_pango_layout(cairo, font, buf, scale, markup);
+        PangoLayout *layout = get_pango_layout(cairo, desc, buf, scale, markup);
         pango_cairo_update_layout(cairo, layout);
         pango_layout_get_pixel_size(layout, width, height);
         if (baseline) {
                 *baseline = pango_layout_get_baseline(layout) / PANGO_SCALE;
         }
         g_object_unref(layout);
+
         free(buf);
 }
 
-void pango_printf(cairo_t *cairo, const char *font,
+void get_text_metrics(const PangoFontDescription *description, int *height, int *baseline) {
+        cairo_t *cairo = cairo_create(NULL);
+        PangoContext *pango = pango_cairo_create_context(cairo);
+        // When passing NULL as a language, pango uses the current locale.
+        PangoFontMetrics *metrics = pango_context_get_metrics(pango, description, NULL);
+
+        *baseline = pango_font_metrics_get_ascent(metrics) / PANGO_SCALE;
+        *height = *baseline + pango_font_metrics_get_descent(metrics) / PANGO_SCALE;
+
+        pango_font_metrics_unref(metrics);
+        g_object_unref(pango);
+        cairo_destroy(cairo);
+}
+
+void render_text(cairo_t *cairo, const PangoFontDescription *desc,
                 double scale, bool markup, const char *fmt, ...) {
         va_list args;
         va_start(args, fmt);
-        // Add one since vsnprintf excludes null terminator.
-        int length = vsnprintf(NULL, 0, fmt, args) + 1;
+        char *buf = vformat_str(fmt, args);
         va_end(args);
-
-        char *buf = malloc(length);
         if (buf == NULL) {
-                sway_log(SWAY_ERROR, "Failed to allocate memory");
                 return;
         }
-        va_start(args, fmt);
-        vsnprintf(buf, length, fmt, args);
-        va_end(args);
 
-        PangoLayout *layout = get_pango_layout(cairo, font, buf, scale, markup);
+        PangoLayout *layout = get_pango_layout(cairo, desc, buf, scale, markup);
         cairo_font_options_t *fo = cairo_font_options_create();
         cairo_get_font_options(cairo, fo);
         pango_cairo_context_set_font_options(pango_layout_get_context(layout), fo);
@@ -134,5 +133,6 @@ void pango_printf(cairo_t *cairo, const char *font,
         pango_cairo_update_layout(cairo, layout);
         pango_cairo_show_layout(cairo, layout);
         g_object_unref(layout);
+
         free(buf);
 }