1 files changed, 11 insertions, 5 deletions

diff --git a/swaynag/types.c b/swaynag/types.c
index fa045532..821e5b21 100644
--- a/swaynag/types.c
+++ b/swaynag/types.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <getopt.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -26,15 +25,18 @@ struct swaynag_type *swaynag_type_new(const char *name) {
         type->button_gap_close = -1;
         type->button_margin_right = -1;
         type->button_padding = -1;
+        type->layer = -1;
         return type;
 }
 
 void swaynag_types_add_default(list_t *types) {
         struct swaynag_type *type_defaults = swaynag_type_new("<defaults>");
-        type_defaults->font = strdup("pango:Monospace 10");
+        type_defaults->font_description =
+                pango_font_description_from_string("pango:Monospace 10");
         type_defaults->anchors = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
                 | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
                 | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
+        type_defaults->layer = ZWLR_LAYER_SHELL_V1_LAYER_TOP;
         type_defaults->button_background = 0x333333FF;
         type_defaults->details_background = 0x333333FF;
         type_defaults->background = 0x323232FF;
@@ -88,8 +90,8 @@ void swaynag_type_merge(struct swaynag_type *dest, struct swaynag_type *src) {
                 return;
         }
 
-        if (src->font) {
-                dest->font = strdup(src->font);
+        if (src->font_description) {
+                dest->font_description = pango_font_description_copy(src->font_description);
         }
 
         if (src->output) {
@@ -100,6 +102,10 @@ void swaynag_type_merge(struct swaynag_type *dest, struct swaynag_type *src) {
                 dest->anchors = src->anchors;
         }
 
+        if (src->layer >= 0) {
+                dest->layer = src->layer;
+        }
+
         // Colors
         if (src->button_background > 0) {
                 dest->button_background = src->button_background;
@@ -166,7 +172,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);
 }