diff --git a/include/bar/status_line.h b/include/bar/status_line.h index 273542dc8..f890ff8c5 100644 --- a/include/bar/status_line.h +++ b/include/bar/status_line.h @@ -23,6 +23,7 @@ struct status_block { char *name, *instance; bool separator; int separator_block_width; + bool markup; // Airblader features uint32_t background; uint32_t border; diff --git a/include/client/pango.h b/include/client/pango.h index 97c31e381..66843041c 100644 --- a/include/client/pango.h +++ b/include/client/pango.h @@ -4,9 +4,11 @@ #include #include #include +#include -PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, const char *text); -void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, const char *fmt, ...); -void pango_printf(cairo_t *cairo, const char *font, const char *fmt, ...); +PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, const char *text, bool markup); +void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, + bool markup, const char *fmt, ...); +void pango_printf(cairo_t *cairo, const char *font, bool markup, const char *fmt, ...); #endif diff --git a/sway/border.c b/sway/border.c index 411c0427b..3613d2d68 100644 --- a/sway/border.c +++ b/sway/border.c @@ -85,7 +85,7 @@ int get_font_text_height(const char *font) { cairo_surface_t *surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 200, 200); cairo_t *cr = cairo_create(surface); int width, height; - get_text_size(cr, font, &width, &height, "Gg"); + get_text_size(cr, font, &width, &height, false, "Gg"); cairo_surface_destroy(surface); cairo_destroy(cr); return height; @@ -162,7 +162,7 @@ static void render_with_title_bar(swayc_t *view, cairo_t *cr, struct border_colo int y = MIN(view->actual_geometry.origin.y - height - 2, 2); cairo_move_to(cr, x, y); cairo_set_source_u32(cr, colors->text); - pango_printf(cr, config->font, "%s", view->name); + pango_printf(cr, config->font, false, "%s", view->name); } // header bottom line diff --git a/swaybar/render.c b/swaybar/render.c index fff47ab04..3eb824fea 100644 --- a/swaybar/render.c +++ b/swaybar/render.c @@ -136,7 +136,7 @@ static void render_block(struct window *window, struct config *config, struct st cairo_move_to(window->cairo, offset, margin); cairo_set_source_u32(window->cairo, block->color); - pango_printf(window->cairo, window->font, "%s", block->full_text); + pango_printf(window->cairo, window->font, block->markup, "%s", block->full_text); pos += width; @@ -159,7 +159,7 @@ static void render_block(struct window *window, struct config *config, struct st if (config->sep_symbol) { offset = pos + (block->separator_block_width - sep_width) / 2; cairo_move_to(window->cairo, offset, margin); - pango_printf(window->cairo, window->font, "%s", config->sep_symbol); + pango_printf(window->cairo, window->font, false, "%s", config->sep_symbol); } else { cairo_set_line_width(window->cairo, 1); cairo_move_to(window->cairo, pos + block->separator_block_width/2, @@ -228,7 +228,7 @@ static void render_workspace_button(struct window *window, struct config *config // text 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, "%s", name); + pango_printf(window->cairo, window->font, false, "%s", name); *x += width + ws_horizontal_padding * 2 + ws_spacing; @@ -254,7 +254,7 @@ static void render_binding_mode_indicator(struct window *window, struct config * // text cairo_set_source_u32(window->cairo, config->colors.binding_mode.text); cairo_move_to(window->cairo, (int)pos + ws_horizontal_padding, margin); - pango_printf(window->cairo, window->font, "%s", config->mode); + pango_printf(window->cairo, window->font, false, "%s", config->mode); } void render(struct output *output, struct config *config, struct status_line *line) { @@ -280,7 +280,7 @@ void render(struct output *output, struct config *config, struct status_line *li if (line->protocol == TEXT) { get_text_size(window->cairo, window->font, &width, &height, "%s", line->text_line); cairo_move_to(cairo, window->width - margin - width, margin); - pango_printf(window->cairo, window->font, "%s", line->text_line); + pango_printf(window->cairo, window->font, true, "%s", line->text_line); } else if (line->protocol == I3BAR && line->block_line) { double pos = window->width - 0.5; bool edge = true; @@ -312,7 +312,8 @@ void render(struct output *output, struct config *config, struct status_line *li void set_window_height(struct window *window, int height) { int text_width, text_height; - get_text_size(window->cairo, window->font, &text_width, &text_height, "Test string for measuring purposes"); + get_text_size(window->cairo, window->font, &text_width, &text_height, false, + "Test string for measuring purposes"); if (height > 0) { margin = (height - text_height) / 2; ws_vertical_padding = margin - 1.5; diff --git a/swaybar/status_line.c b/swaybar/status_line.c index ba6de6a15..63db702fd 100644 --- a/swaybar/status_line.c +++ b/swaybar/status_line.c @@ -71,7 +71,7 @@ static void parse_json(struct bar *bar, const char *text) { json_object *full_text, *short_text, *color, *min_width, *align, *urgent; json_object *name, *instance, *separator, *separator_block_width; json_object *background, *border, *border_top, *border_bottom; - json_object *border_left, *border_right; + json_object *border_left, *border_right, *markup; json_object *json = json_object_array_get_idx(results, i); if (!json) { @@ -86,6 +86,7 @@ static void parse_json(struct bar *bar, const char *text) { json_object_object_get_ex(json, "urgent", &urgent); json_object_object_get_ex(json, "name", &name); json_object_object_get_ex(json, "instance", &instance); + json_object_object_get_ex(json, "markup", &markup); json_object_object_get_ex(json, "separator", &separator); json_object_object_get_ex(json, "separator_block_width", &separator_block_width); json_object_object_get_ex(json, "background", &background); @@ -139,6 +140,10 @@ static void parse_json(struct bar *bar, const char *text) { new->instance = strdup(json_object_get_string(instance)); } + if (markup) { + new->markup = json_object_get_boolean(markup); + } + if (separator) { new->separator = json_object_get_int(separator); } else { diff --git a/wayland/pango.c b/wayland/pango.c index da0b0bfcc..f143aa6c2 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);