From b333822f244fde91226eb505e70869779e11dd15 Mon Sep 17 00:00:00 2001
From: podit <podit@podit.dev>
Date: Tue, 14 Feb 2023 00:16:13 +0000
Subject: [PATCH] moved all configurable defaults to separate header

---
 .gitignore   |  1 +
 Makefile     |  5 ++++-
 config.def.h | 17 +++++++++++++++++
 dwlb.c       | 13 ++-----------
 4 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 config.def.h

diff --git a/.gitignore b/.gitignore
index 4bc8107..9d5528d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 dwlb
+config.h
 *.o
 wlr-layer-shell-unstable-v1-protocol.c
 wlr-layer-shell-unstable-v1-protocol.h
diff --git a/Makefile b/Makefile
index a4aca0b..06bafc1 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,9 @@ CFLAGS += -Wall -Wextra -Wno-unused-parameter -Wno-format-truncation -g
 
 all: $(BINS)
 
+config.h:
+	cp config.def.h $@
+
 clean:
 	$(RM) $(BINS) $(addsuffix .o,$(BINS))
 
@@ -44,7 +47,7 @@ wlr-layer-shell-unstable-v1-protocol.c:
 
 wlr-layer-shell-unstable-v1-protocol.o: wlr-layer-shell-unstable-v1-protocol.h
 
-dwlb.o: utf8.h xdg-shell-protocol.h xdg-output-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h
+dwlb.o: utf8.h config.h xdg-shell-protocol.h xdg-output-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h
 
 # Protocol dependencies
 dwlb: xdg-shell-protocol.o xdg-output-unstable-v1-protocol.o wlr-layer-shell-unstable-v1-protocol.o
diff --git a/config.def.h b/config.def.h
new file mode 100644
index 0000000..53119b4
--- /dev/null
+++ b/config.def.h
@@ -0,0 +1,17 @@
+// bar properties
+static bool hidden = false;
+static bool bottom = false;
+static bool hide_vacant = false;
+
+// define the number of tags and the tag names, if the number of tags is
+//  greater than TAGSLEN they will not be displayed, each tag also needs a name
+#define TAGSLEN 9
+static char *tags[TAGSLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+
+// set colors for bar
+// TODO: explain the formatting? or at least how a hex color code would be translated
+static pixman_color_t activecolor = { .red = 0x0000, .green = 0x5555, .blue = 0x7777, .alpha = 0xffff, };
+static pixman_color_t inactivecolor = { .red = 0x2222, .green = 0x2222, .blue = 0x2222, .alpha = 0xffff, };
+static pixman_color_t textcolor = { .red = 0xeeee, .green = 0xeeee, .blue = 0xeeee, .alpha = 0xffff, };
+static pixman_color_t urgbgcolor = { .red = 0xeeee, .green = 0xeeee, .blue = 0xeeee, .alpha = 0xffff, };
+static pixman_color_t urgtextcolor = { .red = 2222, .green = 0x2222, .blue = 0x2222, .alpha = 0xffff, };
diff --git a/dwlb.c b/dwlb.c
index 091fcb9..5d21c1f 100644
--- a/dwlb.c
+++ b/dwlb.c
@@ -23,6 +23,8 @@
 #include "xdg-output-unstable-v1-protocol.h"
 #include "wlr-layer-shell-unstable-v1-protocol.h"
 
+#include "config.h"
+
 #define DIE(fmt, ...)						\
 	do {							\
 		fprintf(stderr, fmt "\n", ##__VA_ARGS__);	\
@@ -124,22 +126,11 @@ static Bar *bars = NULL;
 
 static uint32_t height;
 static uint32_t textpadding;
-static bool hidden = false;
-static bool bottom = false;
 
 static bool run_display = true;
 static bool ready = false;
-static bool hide_vacant = false;
-
-#define TAGSLEN 9
-static char *tags[TAGSLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 
 static struct fcft_font *font;
-static pixman_color_t activecolor = { .red = 0x0000, .green = 0x5555, .blue = 0x7777, .alpha = 0xffff, };
-static pixman_color_t inactivecolor = { .red = 0x2222, .green = 0x2222, .blue = 0x2222, .alpha = 0xffff, };
-static pixman_color_t textcolor = { .red = 0xeeee, .green = 0xeeee, .blue = 0xeeee, .alpha = 0xffff, };
-static pixman_color_t urgbgcolor = { .red = 0xeeee, .green = 0xeeee, .blue = 0xeeee, .alpha = 0xffff, };
-static pixman_color_t urgtextcolor = { .red = 2222, .green = 0x2222, .blue = 0x2222, .alpha = 0xffff, };
 
 
 static void