Merge pull request #936 from thejan2009/pango-numeric-char-ref

parse pango markup in workspace names (and bugfix)
swaywm · Oct 7, 2016 · 77433f0 · 77433f0
2 parents fa11966 + 6f2c396
commit 77433f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/swaybar/render.c b/swaybar/render.c
@@ -205,7 +205,7 @@ void workspace_button_size(struct window *window, const char *workspace_name, in
 	const char *stripped_name = strip_workspace_name(swaybar.config->strip_workspace_numbers, workspace_name);
 
 	get_text_size(window->cairo, window->font, width, height,
-			window->scale, false, "%s", stripped_name);
+			window->scale, true, "%s", stripped_name);
 	*width += 2 * ws_horizontal_padding;
 	*height += 2 * ws_vertical_padding;
 }
@@ -241,7 +241,7 @@ static void render_workspace_button(struct window *window, struct config *config
 	cairo_set_source_u32(window->cairo, box_colors.text);
 	cairo_move_to(window->cairo, (int)*x + ws_horizontal_padding, margin);
 	pango_printf(window->cairo, window->font, window->scale,
-			false, "%s", stripped_name);
+			true, "%s", stripped_name);
 
 	*x += width + ws_spacing;
 }

diff --git 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
 		int32_t scale, bool markup) {
 	PangoLayout *layout = pango_cairo_create_layout(cairo);
 	PangoAttrList *attrs = pango_attr_list_new();
+	char *buf = malloc(2048);
 	if (markup) {
-		pango_parse_markup(text, -1, 0, &attrs, NULL, NULL, NULL);
-		pango_layout_set_markup(layout, text, -1);
+		pango_parse_markup(text, -1, 0, &attrs, &buf, NULL, NULL);
+		pango_layout_set_markup(layout, buf, -1);
 	} else {
 		pango_layout_set_text(layout, text, -1);
 	}
@@ -24,6 +25,7 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, const char *text
 	pango_layout_set_attributes(layout, attrs);
 	pango_attr_list_unref(attrs);
 	pango_font_description_free(desc);
+	free(buf);
 	return layout;
 }