Merge pull request #1430 from bynect/add-format

Add format options "%c" "%S"

Author: bynect

docs/dunst.5.pod

@@ -397,10 +397,10 @@ the notification window.
 
 Regardless of the status of the B<markup> setting, any markup tags that are
 present in the format will be parsed. Note that because of that, if a literal
-ampersand (&) is needed it needs to be escaped as '&amp;'
+ampersand (&) is needed it needs to be escaped as '&amp;'.
 
-If '\n' is present anywhere in the format, it will be replaced with
-a literal newline.
+If '\n' or '\t' is present anywhere in the format, it will be replaced with
+a literal newline or tab respectively.
 
 If any of the following strings are present, they will be replaced with the
 equivalent notification attribute.
@@ -416,6 +416,10 @@ For a complete markup reference, see
 
 =item B<%b>  body
 
+=item B<%c>  category
+
+=item B<%S>  stack_tag
+
 =item B<%i>  iconname (including its path)
 
 =item B<%I>  iconname (without its path)

dunstrc

@@ -178,6 +178,8 @@
     #   %a  appname
     #   %s  summary
     #   %b  body
+    #   %c  category
+    #   %U  urgency (LOW, NORMAL, CRITICAL)
     #   %i  iconname (including its path)
     #   %I  iconname (without its path)
     #   %p  progress value if set ([  0%] to [100%]) or nothing

src/notification.c

@@ -566,6 +566,7 @@ static void notification_format_message(struct notification *n)
         g_clear_pointer(&n->msg, g_free);
 
         n->msg = string_replace_all("\\n", "\n", g_strdup(n->format));
+        n->msg = string_replace_all("\\t", "\t", n->msg);
 
         /* replace all formatter */
         for(char *substr = strchr(n->msg, '%');
@@ -597,6 +598,20 @@ static void notification_format_message(struct notification *n)
                                 n->body,
                                 n->markup);
                         break;
+                case 'c':
+                        notification_replace_single_field(
+                                &n->msg,
+                                &substr,
+                                n->category,
+                                MARKUP_NO);
+                        break;
+                case 'S':
+                        notification_replace_single_field(
+                                &n->msg,
+                                &substr,
+                                n->stack_tag,
+                                MARKUP_NO);
+                        break;
                 case 'I':
                         icon_tmp = g_strdup(n->iconname);
                         notification_replace_single_field(

test/notification.c

@@ -264,23 +264,27 @@ SUITE(suite_notification)
 
         // TEST notification_format_message
         struct notification *a = notification_create();
-        a->appname = g_strdup("MyApp");
-        a->summary = g_strdup("I've got a summary!");
-        a->body =    g_strdup("Look at my shiny <notification>");
-        a->iconname =    g_strdup("/this/is/my/icoknpath.png");
+        a->appname  = g_strdup("MyApp");
+        a->summary  = g_strdup("I've got a summary!");
+        a->body     = g_strdup("Look at my shiny <notification>");
+        a->category = g_strdup("This category");
+        a->iconname = g_strdup("/this/is/my/icoknpath.png");
+        a->stack_tag = g_strdup("test");
         a->progress = 95;
 
         const char *strings[] = {
                 "%a", "MyApp",
                 "%s", "I&apos;ve got a summary!",
                 "%b", "Look at my shiny <notification>",
+                "%c", "This category",
+                "%S", "test",
                 "%I", "icoknpath.png",
                 "%i", "/this/is/my/icoknpath.png",
                 "%p", "[ 95%]",
                 "%n", "95",
                 "%%", "%",
                 "%",  "%",
-                "%UNKNOWN", "%UNKNOWN",
+                "%WHATEVER", "%WHATEVER",
                 NULL
         };