aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2021-09-13 14:07:27 +0200
committerLibravatar Kenny Levinsen <kl@kl.wtf>2021-09-13 14:22:51 +0200
commit3f7a04df22b304f10eede8cea2f0d2ceae659069 (patch)
treec2be58823b6695969bd2aa5d5b9682c55e7969e7
parentreadme: link to gamja for IRC (diff)
downloadsway-3f7a04df22b304f10eede8cea2f0d2ceae659069.tar.gz
sway-3f7a04df22b304f10eede8cea2f0d2ceae659069.tar.zst
sway-3f7a04df22b304f10eede8cea2f0d2ceae659069.zip
Rename pango_printf to render_text
This avoids using the pango_ prefix, reserved for functions coming from the Pango library.
-rw-r--r--common/pango.c2
-rw-r--r--include/pango.h2
-rw-r--r--sway/tree/container.c2
-rw-r--r--swaybar/render.c12
-rw-r--r--swaynag/render.c6
5 files changed, 12 insertions, 12 deletions
diff --git a/common/pango.c b/common/pango.c
index 88932203..89b1ac41 100644
--- a/common/pango.c
+++ b/common/pango.c
@@ -127,7 +127,7 @@ void get_text_metrics(const char *font, int *height, int *baseline) {
127 cairo_destroy(cairo); 127 cairo_destroy(cairo);
128} 128}
129 129
130void pango_printf(cairo_t *cairo, const char *font, 130void render_text(cairo_t *cairo, const char *font,
131 double scale, bool markup, const char *fmt, ...) { 131 double scale, bool markup, const char *fmt, ...) {
132 va_list args; 132 va_list args;
133 va_start(args, fmt); 133 va_start(args, fmt);
diff --git a/include/pango.h b/include/pango.h
index 7f41441b..93affc23 100644
--- a/include/pango.h
+++ b/include/pango.h
@@ -18,7 +18,7 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
18void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, 18void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
19 int *baseline, double scale, bool markup, const char *fmt, ...); 19 int *baseline, double scale, bool markup, const char *fmt, ...);
20void get_text_metrics(const char *font, int *height, int *baseline); 20void get_text_metrics(const char *font, int *height, int *baseline);
21void pango_printf(cairo_t *cairo, const char *font, 21void render_text(cairo_t *cairo, const char *font,
22 double scale, bool markup, const char *fmt, ...); 22 double scale, bool markup, const char *fmt, ...);
23 23
24#endif 24#endif
diff --git a/sway/tree/container.c b/sway/tree/container.c
index d66d3870..6a01eab3 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -544,7 +544,7 @@ static void render_titlebar_text_texture(struct sway_output *output,
544 class->text[2], class->text[3]); 544 class->text[2], class->text[3]);
545 cairo_move_to(cairo, 0, config->font_baseline * scale - baseline); 545 cairo_move_to(cairo, 0, config->font_baseline * scale - baseline);
546 546
547 pango_printf(cairo, config->font, scale, pango_markup, "%s", text); 547 render_text(cairo, config->font, scale, pango_markup, "%s", text);
548 548
549 cairo_surface_flush(surface); 549 cairo_surface_flush(surface);
550 unsigned char *data = cairo_image_surface_get_data(surface); 550 unsigned char *data = cairo_image_surface_get_data(surface);
diff --git a/swaybar/render.c b/swaybar/render.c
index 5f89d0c9..de468b4f 100644
--- a/swaybar/render.c
+++ b/swaybar/render.c
@@ -77,7 +77,7 @@ static uint32_t render_status_line_error(struct render_context *ctx, double *x)
77 double text_y = height / 2.0 - text_height / 2.0; 77 double text_y = height / 2.0 - text_height / 2.0;
78 cairo_move_to(cairo, *x, (int)floor(text_y)); 78 cairo_move_to(cairo, *x, (int)floor(text_y));
79 choose_text_aa_mode(ctx, 0xFF0000FF); 79 choose_text_aa_mode(ctx, 0xFF0000FF);
80 pango_printf(cairo, font, 1, false, "%s", error); 80 render_text(cairo, font, 1, false, "%s", error);
81 *x -= margin; 81 *x -= margin;
82 return output->height; 82 return output->height;
83} 83}
@@ -114,7 +114,7 @@ static uint32_t render_status_line_text(struct render_context *ctx, double *x) {
114 double text_y = height / 2.0 - text_height / 2.0; 114 double text_y = height / 2.0 - text_height / 2.0;
115 cairo_move_to(cairo, *x, (int)floor(text_y)); 115 cairo_move_to(cairo, *x, (int)floor(text_y));
116 choose_text_aa_mode(ctx, fontcolor); 116 choose_text_aa_mode(ctx, fontcolor);
117 pango_printf(cairo, config->font, 1, config->pango_markup, "%s", text); 117 render_text(cairo, config->font, 1, config->pango_markup, "%s", text);
118 *x -= margin; 118 *x -= margin;
119 return output->height; 119 return output->height;
120} 120}
@@ -304,7 +304,7 @@ static uint32_t render_status_block(struct render_context *ctx,
304 color = block->urgent ? config->colors.urgent_workspace.text : color; 304 color = block->urgent ? config->colors.urgent_workspace.text : color;
305 cairo_set_source_u32(cairo, color); 305 cairo_set_source_u32(cairo, color);
306 choose_text_aa_mode(ctx, color); 306 choose_text_aa_mode(ctx, color);
307 pango_printf(cairo, config->font, 1, block->markup, "%s", text); 307 render_text(cairo, config->font, 1, block->markup, "%s", text);
308 x_pos += width; 308 x_pos += width;
309 309
310 if (block->border && block->border_right > 0) { 310 if (block->border && block->border_right > 0) {
@@ -326,7 +326,7 @@ static uint32_t render_status_block(struct render_context *ctx,
326 double sep_y = height / 2.0 - sep_height / 2.0; 326 double sep_y = height / 2.0 - sep_height / 2.0;
327 cairo_move_to(cairo, offset, (int)floor(sep_y)); 327 cairo_move_to(cairo, offset, (int)floor(sep_y));
328 choose_text_aa_mode(ctx, color); 328 choose_text_aa_mode(ctx, color);
329 pango_printf(cairo, config->font, 1, false, 329 render_text(cairo, config->font, 1, false,
330 "%s", config->sep_symbol); 330 "%s", config->sep_symbol);
331 } else { 331 } else {
332 cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE); 332 cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE);
@@ -587,7 +587,7 @@ static uint32_t render_binding_mode_indicator(struct render_context *ctx,
587 cairo_set_source_u32(cairo, config->colors.binding_mode.text); 587 cairo_set_source_u32(cairo, config->colors.binding_mode.text);
588 cairo_move_to(cairo, x + width / 2 - text_width / 2, (int)floor(text_y)); 588 cairo_move_to(cairo, x + width / 2 - text_width / 2, (int)floor(text_y));
589 choose_text_aa_mode(ctx, config->colors.binding_mode.text); 589 choose_text_aa_mode(ctx, config->colors.binding_mode.text);
590 pango_printf(cairo, config->font, 1, output->bar->mode_pango_markup, 590 render_text(cairo, config->font, 1, output->bar->mode_pango_markup,
591 "%s", mode); 591 "%s", mode);
592 return output->height; 592 return output->height;
593} 593}
@@ -661,7 +661,7 @@ static uint32_t render_workspace_button(struct render_context *ctx,
661 cairo_set_source_u32(cairo, box_colors.text); 661 cairo_set_source_u32(cairo, box_colors.text);
662 cairo_move_to(cairo, *x + width / 2 - text_width / 2, (int)floor(text_y)); 662 cairo_move_to(cairo, *x + width / 2 - text_width / 2, (int)floor(text_y));
663 choose_text_aa_mode(ctx, box_colors.text); 663 choose_text_aa_mode(ctx, box_colors.text);
664 pango_printf(cairo, config->font, 1, config->pango_markup, 664 render_text(cairo, config->font, 1, config->pango_markup,
665 "%s", ws->label); 665 "%s", ws->label);
666 666
667 struct swaybar_hotspot *hotspot = calloc(1, sizeof(struct swaybar_hotspot)); 667 struct swaybar_hotspot *hotspot = calloc(1, sizeof(struct swaybar_hotspot));
diff --git a/swaynag/render.c b/swaynag/render.c
index c159294e..d72f42c2 100644
--- a/swaynag/render.c
+++ b/swaynag/render.c
@@ -22,7 +22,7 @@ static uint32_t render_message(cairo_t *cairo, struct swaynag *swaynag) {
22 22
23 cairo_set_source_u32(cairo, swaynag->type->text); 23 cairo_set_source_u32(cairo, swaynag->type->text);
24 cairo_move_to(cairo, padding, (int)(ideal_height - text_height) / 2); 24 cairo_move_to(cairo, padding, (int)(ideal_height - text_height) / 2);
25 pango_printf(cairo, swaynag->type->font, 1, false, 25 render_text(cairo, swaynag->type->font, 1, false,
26 "%s", swaynag->message); 26 "%s", swaynag->message);
27 27
28 return ideal_surface_height; 28 return ideal_surface_height;
@@ -50,7 +50,7 @@ static void render_details_scroll_button(cairo_t *cairo,
50 cairo_set_source_u32(cairo, swaynag->type->button_text); 50 cairo_set_source_u32(cairo, swaynag->type->button_text);
51 cairo_move_to(cairo, button->x + border + padding, 51 cairo_move_to(cairo, button->x + border + padding,
52 button->y + border + (button->height - text_height) / 2); 52 button->y + border + (button->height - text_height) / 2);
53 pango_printf(cairo, swaynag->type->font, 1, true, 53 render_text(cairo, swaynag->type->font, 1, true,
54 "%s", button->text); 54 "%s", button->text);
55} 55}
56 56
@@ -201,7 +201,7 @@ static uint32_t render_button(cairo_t *cairo, struct swaynag *swaynag,
201 201
202 cairo_set_source_u32(cairo, swaynag->type->button_text); 202 cairo_set_source_u32(cairo, swaynag->type->button_text);
203 cairo_move_to(cairo, button->x + padding, button->y + padding); 203 cairo_move_to(cairo, button->x + padding, button->y + padding);
204 pango_printf(cairo, swaynag->type->font, 1, true, 204 render_text(cairo, swaynag->type->font, 1, true,
205 "%s", button->text); 205 "%s", button->text);
206 206
207 *x = button->x - border; 207 *x = button->x - border;