Resolved conflict, indulging new file layout

1 files changed, 23 insertions, 0 deletions

diff --git a/core/dmenu/config.def.h b/core/dmenu/config.def.h
new file mode 100644
index 0000000..bc17068
--- /dev/null
+++ b/core/dmenu/config.def.h
@@ -0,0 +1,23 @@
+/* See LICENSE file for copyright and license details. */
+/* Default settings; can be overriden by command line. */
+
+static int topbar = 1;                      /* -b  option; if 0, dmenu appears at bottom     */
+/* -fn option overrides fonts[0]; default X11 font or font set */
+static const char *fonts[] = {
+	"monospace:size=10"
+};
+static const char *prompt      = NULL;      /* -p  option; prompt to the left of input field */
+static const char *colors[SchemeLast][2] = {
+        /*     fg         bg       */
+        [SchemeNorm] = { "#dddddd", "#000000" },
+        [SchemeSel]  = { "#ffffff", "#66ccff" },
+        [SchemeOut]  = { "#000000", "#66ccff" },
+};
+/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
+static unsigned int lines      = 0;
+
+/*
+ * Characters not considered part of a word while deleting words
+ * for example: " /?\"&[]"
+ */
+static const char worddelimiters[] = " ";