1 files changed, 21 insertions, 37 deletions

diff --git a/common/pango.c b/common/pango.c
index ea71ac4a..ba74692e 100644
--- a/common/pango.c
+++ b/common/pango.c
@@ -6,67 +6,47 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "cairo.h"
 #include "log.h"
+#include "stringop.h"
 
-int escape_markup_text(const char *src, char *dest, int dest_length) {
-        int length = 0;
+size_t escape_markup_text(const char *src, char *dest) {
+        size_t length = 0;
+        if (dest) {
+                dest[0] = '\0';
+        }
 
         while (src[0]) {
                 switch (src[0]) {
                 case '&':
                         length += 5;
-                        if (dest && dest_length - length >= 0) {
-                                dest += sprintf(dest, "%s", "&amp;");
-                        } else {
-                                dest_length = -1;
-                        }
+                        lenient_strcat(dest, "&amp;");
                         break;
                 case '<':
                         length += 4;
-                        if (dest && dest_length - length >= 0) {
-                                dest += sprintf(dest, "%s", "&lt;");
-                        } else {
-                                dest_length = -1;
-                        }
+                        lenient_strcat(dest, "&lt;");
                         break;
                 case '>':
                         length += 4;
-                        if (dest && dest_length - length >= 0) {
-                                dest += sprintf(dest, "%s", "&gt;");
-                        } else {
-                                dest_length = -1;
-                        }
+                        lenient_strcat(dest, "&gt;");
                         break;
                 case '\'':
                         length += 6;
-                        if (dest && dest_length - length >= 0) {
-                                dest += sprintf(dest, "%s", "&apos;");
-                        } else {
-                                dest_length = -1;
-                        }
+                        lenient_strcat(dest, "&apos;");
                         break;
                 case '"':
                         length += 6;
-                        if (dest && dest_length - length >= 0) {
-                                dest += sprintf(dest, "%s", "&quot;");
-                        } else {
-                                dest_length = -1;
-                        }
+                        lenient_strcat(dest, "&quot;");
                         break;
                 default:
-                        length += 1;
-                        if (dest && dest_length - length >= 0) {
-                                *(dest++) = *src;
-                        } else {
-                                dest_length = -1;
+                        if (dest) {
+                                dest[length] = *src;
+                                dest[length + 1] = '\0';
                         }
+                        length += 1;
                 }
                 src++;
         }
-        // if we could not fit the escaped string in dest, return -1
-        if (dest && dest_length == -1) {
-                return -1;
-        }
         return length;
 }
 
@@ -78,7 +58,7 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
                 char *buf;
                 GError *error = NULL;
                 if (pango_parse_markup(text, -1, 0, &attrs, &buf, NULL, &error)) {
-                        pango_layout_set_markup(layout, buf, -1);
+                        pango_layout_set_text(layout, buf, -1);
                         free(buf);
                 } else {
                         wlr_log(WLR_ERROR, "pango_parse_markup '%s' -> error %s", text,
@@ -134,6 +114,10 @@ void pango_printf(cairo_t *cairo, const char *font,
         va_end(args);
 
         PangoLayout *layout = get_pango_layout(cairo, font, 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);
+        cairo_font_options_destroy(fo);
         pango_cairo_update_layout(cairo, layout);
         pango_cairo_show_layout(cairo, layout);
         g_object_unref(layout);