Add support for config drop-ins (rudimentary includes as a bonus)

config.mk

@@ -35,7 +35,7 @@ ENABLE_WAYLAND= -DENABLE_WAYLAND
 endif
 
 # flags
-DEFAULT_CPPFLAGS = -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\" -DSYSCONFDIR=\"${SYSCONFDIR}\"
+DEFAULT_CPPFLAGS = -Wno-gnu-zero-variadic-macro-arguments -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\" -DSYSCONFDIR=\"${SYSCONFDIR}\"
 DEFAULT_CFLAGS   = -g -std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${ENABLE_WAYLAND} ${EXTRA_CFLAGS}
 DEFAULT_LDFLAGS  = -lm -lrt
 

docs/dunst.1.pod

@@ -100,38 +100,57 @@ missed notifications after returning to the computer.
 =head1 FILES
 
 These are the base directories dunst searches for configuration files in
-descending order of imortance:
+I<descending order of imortance>:
 
-=over 4
+=over 8
+
+=item C<$XDG_CONFIG_HOME>
+
+This is the most important directory. (C<$HOME/.config> if unset or empty)
 
-$XDG_CONFIG_HOME ($HOME/.config if unset or empty)
+=item C<$XDG_CONFIG_DIRS>
 
-$XDG_CONFIG_DIRS (:-separated list of base directories in descending order
-of importance; ##SYSCONFDIR## if unset or empty)
+This, like C<$PATH> for instance, is a :-separated list of base directories
+in I<descending order of importance>.
+(F<##SYSCONFDIR##> if unset or empty)
 
 =back
 
-Dunst will search these directories for the following relative path:
+Dunst will search these directories for the following relative file paths:
 
-=over 4
+=over 8
 
-dunst/dunstrc
+=item F<dunst/dunstrc>
 
-=back
+This is the base config and as such the least important in a particular base
+directory.
 
-All settings from all files get applied. Settings in more important files
-override those in less important ones. Settings not present in more imortant
-files are taken from a less important one or from the internal defaults if they
-are not found in any file.
+=item F<dunst/dunstrc.d/*.conf>
 
-=over 4
+These are "drop-ins" (mind the ".d" suffix of the directory).
+They are more important than the base dunstrc in the parent directory, as they
+are considered to be small snippets to override settings.
+The last in lexical order is the most important one, so you can easily change
+the order by renaming them.
+A common approach to naming drop-ins is to prefix them with numbers, i.e.:
 
-=item This is where the default (least important) config file is located:
+    00-least-important.conf
+    01-foo.conf
+    20-bar.conf
+    99-most-important.conf
 
-##SYSCONFDIR##/dunst/dunstrc
+The only requirements are that the name of the file must have the correct
+suffix and the first non-blank line that is not a comment must be a section or
+rule identifier.
 
 =back
 
+All settings from all files get applied. Settings in more important files
+override those in less important ones.
+Settings not present in more imortant files get their value from a less
+important one or from the internal defaults if respective key is not found in
+any file.
+
 =head1 AUTHORS
 
 Written by Sascha Kruse <[email protected]>

src/icon.c

@@ -13,11 +13,6 @@
 #include "utils.h"
 #include "icon-lookup.h"
 
-static bool is_readable_file(const char *filename)
-{
-        return (access(filename, R_OK) != -1);
-}
-
 /**
  * Reassemble the data parts of a GdkPixbuf into a cairo_surface_t's data field.
  *

src/ini.c

@@ -2,6 +2,7 @@
 
 #include "utils.h"
 #include "log.h"
+#include "settings.h"
 
 struct section *get_section(struct ini *ini, const char *name)
 {
@@ -107,7 +108,7 @@ struct ini *load_ini_file(FILE *fp)
                         *end = '\0';
 
                         g_free(current_section);
-                        current_section = (g_strdup(start + 1));
+                        current_section = g_strdup(start + 1);
                         continue;
                 }
 

src/log.h

@@ -17,24 +17,23 @@
  * @... are the arguments to above format string.
  *
  * This requires -Wno-gnu-zero-variadic-macro-arguments with clang
- * because __VA_OPTS__ seems not to be officially supported yet.
- * However, the result is the same with both gcc and clang.
+ * because of token pasting ',' and %__VA_ARGS__ being a GNU extension.
+ * However, the result is the same with both gcc and clang and since we are
+ * compiling with '-std=gnu99', this should be fine.
  */
-#if __GNUC__ >= 8
-
-#define MSG(format, ...) "[%s:%s:%04d] " format, __FILE__, __func__, __LINE__, ## __VA_ARGS__
+#if __GNUC__ >= 8 || __clang_major__ >= 6
+#define MSG(format, ...) "[%16s:%04d] " format, __func__, __LINE__, ## __VA_ARGS__
+#endif
 
+#ifdef MSG
 // These should benefit from more context
 #define LOG_E(...) g_error(MSG(__VA_ARGS__))
 #define LOG_C(...) g_critical(MSG(__VA_ARGS__))
 #define LOG_D(...) g_debug(MSG(__VA_ARGS__))
-
 #else
-
 #define LOG_E g_error
 #define LOG_C g_critical
 #define LOG_D g_debug
-
 #endif
 
 #define LOG_W g_warning

src/option_parser.c

@@ -213,7 +213,6 @@ int string_parse_bool(const void *data, const char *s, void *ret)
         return success;
 }
 
-
 int get_setting_id(const char *key, const char *section) {
         int error_code = 0;
         int partial_match_id = -1;