From 0500cdbfce49f11a2b010b4d66565cab2549c2a9 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Wed, 21 Dec 2022 11:22:21 +0100 Subject: [PATCH] swaynag: fix NULL font description The font description was only set if provided on the CLI. It was left NULL for the defaults and when reading from the config file. Closes: https://github.com/swaywm/sway/issues/7186 (cherry picked from commit fd0af78e43f4dd67a404f475c676b25ae38a4b82) --- swaynag/types.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/swaynag/types.c b/swaynag/types.c index 7bef0f87..a46aacd5 100644 --- a/swaynag/types.c +++ b/swaynag/types.c @@ -33,6 +33,8 @@ struct swaynag_type *swaynag_type_new(const char *name) { void swaynag_types_add_default(list_t *types) { struct swaynag_type *type_defaults = swaynag_type_new(""); type_defaults->font = strdup("pango:Monospace 10"); + type_defaults->font_description = + pango_font_description_from_string(type_defaults->font); type_defaults->anchors = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; @@ -94,6 +96,10 @@ void swaynag_type_merge(struct swaynag_type *dest, struct swaynag_type *src) { dest->font = strdup(src->font); } + if (src->font_description) { + dest->font_description = pango_font_description_copy(src->font_description); + } + if (src->output) { dest->output = strdup(src->output); } @@ -173,6 +179,7 @@ void swaynag_type_merge(struct swaynag_type *dest, struct swaynag_type *src) { void swaynag_type_free(struct swaynag_type *type) { free(type->name); free(type->font); + pango_font_description_free(type->font_description); free(type->output); free(type); }