diff options
author | Drew DeVault <sir@cmpwn.com> | 2016-10-07 08:39:50 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-07 08:39:50 -0400 |
commit | 77433f0029b6bb07352647a512de810b72568260 (patch) | |
tree | 7fa83cd7b67b7ae3cece083580ac2d6035ae4acd /wayland/pango.c | |
parent | Merge pull request #934 from alkino/fix_click_title_bar (diff) | |
parent | parse pango markup in workspace names (and bugfix) (diff) | |
download | sway-77433f0029b6bb07352647a512de810b72568260.tar.gz sway-77433f0029b6bb07352647a512de810b72568260.tar.zst sway-77433f0029b6bb07352647a512de810b72568260.zip |
Merge pull request #936 from thejan2009/pango-numeric-char-ref
parse pango markup in workspace names (and bugfix)
Diffstat (limited to 'wayland/pango.c')
-rw-r--r-- | wayland/pango.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/wayland/pango.c b/wayland/pango.c index 38993243..5781541b 100644 --- a/wayland/pango.c +++ b/wayland/pango.c | |||
@@ -11,9 +11,10 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, const char *text | |||
11 | int32_t scale, bool markup) { | 11 | int32_t scale, bool markup) { |
12 | PangoLayout *layout = pango_cairo_create_layout(cairo); | 12 | PangoLayout *layout = pango_cairo_create_layout(cairo); |
13 | PangoAttrList *attrs = pango_attr_list_new(); | 13 | PangoAttrList *attrs = pango_attr_list_new(); |
14 | char *buf = malloc(2048); | ||
14 | if (markup) { | 15 | if (markup) { |
15 | pango_parse_markup(text, -1, 0, &attrs, NULL, NULL, NULL); | 16 | pango_parse_markup(text, -1, 0, &attrs, &buf, NULL, NULL); |
16 | pango_layout_set_markup(layout, text, -1); | 17 | pango_layout_set_markup(layout, buf, -1); |
17 | } else { | 18 | } else { |
18 | pango_layout_set_text(layout, text, -1); | 19 | pango_layout_set_text(layout, text, -1); |
19 | } | 20 | } |
@@ -24,6 +25,7 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, const char *text | |||
24 | pango_layout_set_attributes(layout, attrs); | 25 | pango_layout_set_attributes(layout, attrs); |
25 | pango_attr_list_unref(attrs); | 26 | pango_attr_list_unref(attrs); |
26 | pango_font_description_free(desc); | 27 | pango_font_description_free(desc); |
28 | free(buf); | ||
27 | return layout; | 29 | return layout; |
28 | } | 30 | } |
29 | 31 | ||