rowan/wmenu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pango: Remove unused format specifier

Browse source
This commit is contained in:
adnano 2023-07-15 18:51:45 -04:00
parent ccca01d3cd
commit 554f3e7445
3 changed files with 13 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
main.c
View file

@ -110,7 +110,7 @@ int render_text(struct menu_state *state, cairo_t *cairo, const char *str,
int left_padding, int right_padding) { int left_padding, int right_padding) {
int text_width, text_height; int text_width, text_height;
get_text_size(cairo, state->font, &text_width, &text_height, NULL, 1, "%s", str); get_text_size(cairo, state->font, &text_width, &text_height, NULL, 1, str);
int text_y = (state->line_height / 2.0) - (text_height / 2.0); int text_y = (state->line_height / 2.0) - (text_height / 2.0);
if (background) { if (background) {
@ -122,7 +122,7 @@ int render_text(struct menu_state *state, cairo_t *cairo, const char *str,
cairo_move_to(cairo, x + left_padding, y + text_y); cairo_move_to(cairo, x + left_padding, y + text_y);
cairo_set_source_u32(cairo, foreground); cairo_set_source_u32(cairo, foreground);
pango_printf(cairo, state->font, 1, "%s", str); pango_printf(cairo, state->font, 1, str);
return x + text_width + left_padding + right_padding; return x + text_width + left_padding + right_padding;
} }
@ -133,7 +133,7 @@ int render_horizontal_item(struct menu_state *state, cairo_t *cairo, const char
int left_padding, int right_padding) { int left_padding, int right_padding) {
int text_width, text_height; int text_width, text_height;
get_text_size(cairo, state->font, &text_width, &text_height, NULL, 1, "%s", str); get_text_size(cairo, state->font, &text_width, &text_height, NULL, 1, str);
int text_y = (state->line_height / 2.0) - (text_height / 2.0); int text_y = (state->line_height / 2.0) - (text_height / 2.0);
if (x + left_padding + text_width > width) { if (x + left_padding + text_width > width) {
@ -148,7 +148,7 @@ int render_horizontal_item(struct menu_state *state, cairo_t *cairo, const char
cairo_move_to(cairo, x + left_padding, y + text_y); cairo_move_to(cairo, x + left_padding, y + text_y);
cairo_set_source_u32(cairo, foreground); cairo_set_source_u32(cairo, foreground);
pango_printf(cairo, state->font, 1, "%s", str); pango_printf(cairo, state->font, 1, str);
} }
return x + text_width + left_padding + right_padding; return x + text_width + left_padding + right_padding;
@ -160,7 +160,7 @@ void render_vertical_item(struct menu_state *state, cairo_t *cairo, const char *
int left_padding) { int left_padding) {
int text_height; int text_height;
get_text_size(cairo, state->font, NULL, &text_height, NULL, 1, "%s", str); get_text_size(cairo, state->font, NULL, &text_height, NULL, 1, str);
int text_y = (state->line_height / 2.0) - (text_height / 2.0); int text_y = (state->line_height / 2.0) - (text_height / 2.0);
if (background) { if (background) {
@ -172,7 +172,7 @@ void render_vertical_item(struct menu_state *state, cairo_t *cairo, const char *
cairo_move_to(cairo, x + left_padding, y + text_y); cairo_move_to(cairo, x + left_padding, y + text_y);
cairo_set_source_u32(cairo, foreground); cairo_set_source_u32(cairo, foreground);
pango_printf(cairo, state->font, 1, "%s", str); pango_printf(cairo, state->font, 1, str);
} }
void scroll_matches(struct menu_state *state) { void scroll_matches(struct menu_state *state) {

41
pango.c
View file

@ -38,55 +38,25 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
} }
void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
int *baseline, double scale, const char *fmt, ...) { int *baseline, double scale, const char *text) {
va_list args; PangoLayout *layout = get_pango_layout(cairo, font, text, scale);
va_start(args, fmt);
// Add one since vsnprintf excludes null terminator.
int length = vsnprintf(NULL, 0, fmt, args) + 1;
va_end(args);
char *buf = malloc(length);
if (buf == NULL) {
return;
}
va_start(args, fmt);
vsnprintf(buf, length, fmt, args);
va_end(args);
PangoLayout *layout = get_pango_layout(cairo, font, buf, scale);
pango_cairo_update_layout(cairo, layout); pango_cairo_update_layout(cairo, layout);
pango_layout_get_pixel_size(layout, width, height); pango_layout_get_pixel_size(layout, width, height);
if (baseline) { if (baseline) {
*baseline = pango_layout_get_baseline(layout) / PANGO_SCALE; *baseline = pango_layout_get_baseline(layout) / PANGO_SCALE;
} }
g_object_unref(layout); g_object_unref(layout);
free(buf);
} }
int text_width(cairo_t *cairo, const char *font, const char *text) { int text_width(cairo_t *cairo, const char *font, const char *text) {
int text_width; int text_width;
get_text_size(cairo, font, &text_width, NULL, NULL, 1, "%s", text); get_text_size(cairo, font, &text_width, NULL, NULL, 1, text);
return text_width; return text_width;
} }
void pango_printf(cairo_t *cairo, const char *font, double scale, void pango_printf(cairo_t *cairo, const char *font, double scale,
const char *fmt, ...) { const char *text) {
va_list args; PangoLayout *layout = get_pango_layout(cairo, font, text, scale);
va_start(args, fmt);
// Add one since vsnprintf excludes null terminator.
int length = vsnprintf(NULL, 0, fmt, args) + 1;
va_end(args);
char *buf = malloc(length);
if (buf == NULL) {
return;
}
va_start(args, fmt);
vsnprintf(buf, length, fmt, args);
va_end(args);
PangoLayout *layout = get_pango_layout(cairo, font, buf, scale);
cairo_font_options_t *fo = cairo_font_options_create(); cairo_font_options_t *fo = cairo_font_options_create();
cairo_get_font_options(cairo, fo); cairo_get_font_options(cairo, fo);
pango_cairo_context_set_font_options(pango_layout_get_context(layout), fo); pango_cairo_context_set_font_options(pango_layout_get_context(layout), fo);
@ -94,5 +64,4 @@ void pango_printf(cairo_t *cairo, const char *font, double scale,
pango_cairo_update_layout(cairo, layout); pango_cairo_update_layout(cairo, layout);
pango_cairo_show_layout(cairo, layout); pango_cairo_show_layout(cairo, layout);
g_object_unref(layout); g_object_unref(layout);
free(buf);
} }

4
pango.h
View file

@ -10,9 +10,9 @@ int get_font_height(const char *font);
PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
const char *text, double scale); const char *text, double scale);
void get_text_size(cairo_t *cairo, const char *font, int *width, int *height, void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
int *baseline, double scale, const char *fmt, ...); int *baseline, double scale, const char *text);
int text_width(cairo_t *cairo, const char *font, const char *text); int text_width(cairo_t *cairo, const char *font, const char *text);
void pango_printf(cairo_t *cairo, const char *font, double scale, void pango_printf(cairo_t *cairo, const char *font, double scale,
const char *fmt, ...); const char *text);
#endif #endif