config: add loading of basic JSON config data

Lokaltog · Mar 2, 2014 · b20a7a0 · nHurD · Mar 2, 2014 · Lokaltog
1 parent e8ba723
commit b20a7a0
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 3 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,6 +1,7 @@
 bin_PROGRAMS = wkline
 wkline_SOURCES = \
 	util/log.c \
+	src/load_config.c \
 	src/wkline.c \
 	src/widgets/desktops.c
 

diff --git a/config.def.json b/config.def.json
@@ -2,9 +2,7 @@
 	"height": 26,
 	"position": "top",
 	"theme_uri": "http://lokaltog.github.io/wkline-default-theme/",
-	"background": {
-		"color": "#111"
-	},
+	"background": "#111",
 	"widgets": [
 		{
 			"name": "desktops",

diff --git a/src/load_config.c b/src/load_config.c
@@ -0,0 +1,24 @@
+#include "load_config.h"
+
+#include <string.h>
+
+int
+load_config_file (wkline_config_t *config) {
+	const char *user_config_file = g_build_filename(g_get_user_config_dir(), "wkline", "config.json", NULL);
+	json_error_t err;
+	json_t *json_config = json_load_file(user_config_file, 0, &err);
+
+	if (! json_config) {
+		fprintf(stderr, "\n***************************\nFailed to load config file!\n***************************\n\n%s\n\nPlease make sure that '%s' exists and contains valid JSON data.\n\n", err.text, user_config_file);
+		exit(1);
+	}
+
+	config->height = json_integer_value(json_object_get(json_config, "height"));
+	config->position = json_string_value(json_object_get(json_config, "position")) == "top" ? WKLINE_POSITION_TOP : WKLINE_POSITION_BOTTOM;
+	strcpy(config->theme_uri, json_string_value(json_object_get(json_config, "theme_uri")));
+	strcpy(config->background, json_string_value(json_object_get(json_config, "background")));
+
+	json_decref(json_config);
+
+	return 0;
+}
diff --git a/src/load_config.h b/src/load_config.h
@@ -0,0 +1,16 @@
+#include <glib.h>
+#include <jansson.h>
+
+#define CONFIG_BUF_SIZE 256
+
+enum wkline_position {
+	WKLINE_POSITION_TOP,
+	WKLINE_POSITION_BOTTOM
+};
+
+typedef struct wkline_config_t {
+	int height;
+	enum wkline_position position;
+	char theme_uri[CONFIG_BUF_SIZE];
+	char background[CONFIG_BUF_SIZE];
+} wkline_config_t;
diff --git a/src/wkline.c b/src/wkline.c
@@ -1,5 +1,6 @@
 #include "config.h"
 #include "wkline.h"
+#include "load_config.h"
 #include "util/log.h"
 #include "widgets/widgets.h"
 
@@ -68,6 +69,9 @@ main (int argc, char *argv[]) {
 	GtkWindow *window;
 	GtkLayout *layout;
 
+	wkline_config_t config;
+	load_config_file(&config);
+
 	gtk_init(&argc, &argv);
 
 	// GtkScrolledWindow fails to lock small heights (<25px), so a GtkLayout is used instead