From 84fae94ab9ca7fd148c786d224c49205a212882e Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 17 Apr 2016 11:35:22 -0400 Subject: Flesh out pango markup implementation --- wayland/pango.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'wayland') diff --git a/wayland/pango.c b/wayland/pango.c index da0b0bfc..f143aa6c 100644 --- a/wayland/pango.c +++ b/wayland/pango.c @@ -4,11 +4,16 @@ #include #include #include +#include #include "log.h" -PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, const char *text) { +PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, const char *text, bool markup) { PangoLayout *layout = pango_cairo_create_layout(cairo); - pango_layout_set_markup(layout, text, -1); + if (markup) { + pango_layout_set_markup(layout, text, -1); + } else { + pango_layout_set_text(layout, text, -1); + } PangoFontDescription *desc = pango_font_description_from_string(font); pango_layout_set_font_description(layout, desc); pango_layout_set_single_paragraph_mode(layout, 1); @@ -16,7 +21,8 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, const char *text return layout; } -void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, const char *fmt, ...) { +void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, + bool markup, const char *fmt, ...) { char *buf = malloc(2048); va_list args; @@ -26,7 +32,7 @@ void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, co } va_end(args); - PangoLayout *layout = get_pango_layout(cairo, font, buf); + PangoLayout *layout = get_pango_layout(cairo, font, buf, markup); pango_cairo_update_layout(cairo, layout); pango_layout_get_pixel_size(layout, width, height); @@ -36,7 +42,7 @@ void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, co free(buf); } -void pango_printf(cairo_t *cairo, const char *font, const char *fmt, ...) { +void pango_printf(cairo_t *cairo, const char *font, bool markup, const char *fmt, ...) { char *buf = malloc(2048); va_list args; @@ -46,7 +52,7 @@ void pango_printf(cairo_t *cairo, const char *font, const char *fmt, ...) { } va_end(args); - PangoLayout *layout = get_pango_layout(cairo, font, buf); + PangoLayout *layout = get_pango_layout(cairo, font, buf, markup); pango_cairo_update_layout(cairo, layout); pango_cairo_show_layout(cairo, layout); -- cgit v1.2.3-54-g00ecf