diff options
Diffstat (limited to 'swaynag')
-rw-r--r-- | swaynag/config.c | 4 | ||||
-rw-r--r-- | swaynag/main.c | 4 | ||||
-rw-r--r-- | swaynag/types.c | 8 |
3 files changed, 5 insertions, 11 deletions
diff --git a/swaynag/config.c b/swaynag/config.c index a0bf3197..6c8c26fc 100644 --- a/swaynag/config.c +++ b/swaynag/config.c | |||
@@ -226,10 +226,8 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag, | |||
226 | break; | 226 | break; |
227 | case 'f': // Font | 227 | case 'f': // Font |
228 | if (type) { | 228 | if (type) { |
229 | free(type->font); | ||
230 | pango_font_description_free(type->font_description); | 229 | pango_font_description_free(type->font_description); |
231 | type->font = strdup(optarg); | 230 | type->font_description = pango_font_description_from_string(optarg); |
232 | type->font_description = pango_font_description_from_string(type->font); | ||
233 | } | 231 | } |
234 | break; | 232 | break; |
235 | case 'l': // Detailed Message | 233 | case 'l': // Detailed Message |
diff --git a/swaynag/main.c b/swaynag/main.c index 2ce37831..679afbce 100644 --- a/swaynag/main.c +++ b/swaynag/main.c | |||
@@ -98,7 +98,9 @@ int main(int argc, char **argv) { | |||
98 | sway_log(SWAY_DEBUG, "Anchors: %" PRIu32, swaynag.type->anchors); | 98 | sway_log(SWAY_DEBUG, "Anchors: %" PRIu32, swaynag.type->anchors); |
99 | sway_log(SWAY_DEBUG, "Type: %s", swaynag.type->name); | 99 | sway_log(SWAY_DEBUG, "Type: %s", swaynag.type->name); |
100 | sway_log(SWAY_DEBUG, "Message: %s", swaynag.message); | 100 | sway_log(SWAY_DEBUG, "Message: %s", swaynag.message); |
101 | sway_log(SWAY_DEBUG, "Font: %s", swaynag.type->font); | 101 | char *font = pango_font_description_to_string(swaynag.type->font_description); |
102 | sway_log(SWAY_DEBUG, "Font: %s", font); | ||
103 | free(font); | ||
102 | sway_log(SWAY_DEBUG, "Buttons"); | 104 | sway_log(SWAY_DEBUG, "Buttons"); |
103 | for (int i = 0; i < swaynag.buttons->length; i++) { | 105 | for (int i = 0; i < swaynag.buttons->length; i++) { |
104 | struct swaynag_button *button = swaynag.buttons->items[i]; | 106 | struct swaynag_button *button = swaynag.buttons->items[i]; |
diff --git a/swaynag/types.c b/swaynag/types.c index a46aacd5..409cc668 100644 --- a/swaynag/types.c +++ b/swaynag/types.c | |||
@@ -32,9 +32,8 @@ struct swaynag_type *swaynag_type_new(const char *name) { | |||
32 | 32 | ||
33 | void swaynag_types_add_default(list_t *types) { | 33 | void swaynag_types_add_default(list_t *types) { |
34 | struct swaynag_type *type_defaults = swaynag_type_new("<defaults>"); | 34 | struct swaynag_type *type_defaults = swaynag_type_new("<defaults>"); |
35 | type_defaults->font = strdup("pango:Monospace 10"); | ||
36 | type_defaults->font_description = | 35 | type_defaults->font_description = |
37 | pango_font_description_from_string(type_defaults->font); | 36 | pango_font_description_from_string("pango:Monospace 10"); |
38 | type_defaults->anchors = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | 37 | type_defaults->anchors = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
39 | | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | 38 | | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
40 | | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; | 39 | | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; |
@@ -92,10 +91,6 @@ void swaynag_type_merge(struct swaynag_type *dest, struct swaynag_type *src) { | |||
92 | return; | 91 | return; |
93 | } | 92 | } |
94 | 93 | ||
95 | if (src->font) { | ||
96 | dest->font = strdup(src->font); | ||
97 | } | ||
98 | |||
99 | if (src->font_description) { | 94 | if (src->font_description) { |
100 | dest->font_description = pango_font_description_copy(src->font_description); | 95 | dest->font_description = pango_font_description_copy(src->font_description); |
101 | } | 96 | } |
@@ -178,7 +173,6 @@ void swaynag_type_merge(struct swaynag_type *dest, struct swaynag_type *src) { | |||
178 | 173 | ||
179 | void swaynag_type_free(struct swaynag_type *type) { | 174 | void swaynag_type_free(struct swaynag_type *type) { |
180 | free(type->name); | 175 | free(type->name); |
181 | free(type->font); | ||
182 | pango_font_description_free(type->font_description); | 176 | pango_font_description_free(type->font_description); |
183 | free(type->output); | 177 | free(type->output); |
184 | free(type); | 178 | free(type); |