M openbox/config.c → openbox/config.c

@@ -22,21 +22,16 @@ 
 
 void config_startup()
 {
-    /* test definition */
-    ConfigDefEntry *def;
+    /* set up built in variables! and their default values! */
 
-    def = config_def_new("test", Config_String);
-    config_def_set(def);
+    config_def_set(config_def_new("engine", Config_String));
+    config_def_set(config_def_new("theme", Config_String));
+    config_def_set(config_def_new("font", Config_String));
+    config_def_set(config_def_new("font.shadow.offset", Config_Integer));
+    config_def_set(config_def_new("font.shadow.tint", Config_Integer));
+    config_def_set(config_def_new("titlebar.layout", Config_String));
 
-    def = config_def_new("test", Config_String);
-    config_def_set(def);
-
-    def = config_def_new("testlist", Config_String);
-    config_def_add_value(def, "one");
-    config_def_add_value(def, "two");
-    config_def_set(def);
-
-    g_datalist_foreach(&config_def, print_config, NULL);
+    /*g_datalist_foreach(&config_def, print_config, NULL);*/
 }
 
 void config_shutdown()
@@ -75,7 +70,7 @@ 
     name = g_ascii_strdown(name, -1);
     g_message("Setting %s", name);
 
-    g_datalist_foreach(&config_def, print_config, NULL);
+    /*g_datalist_foreach(&config_def, print_config, NULL);*/
     def = g_datalist_get_data(&config_def, name);
 
     if (def == NULL) {

M openbox/engine.c → openbox/engine.c

@@ -1,4 +1,5 @@ 
 #include "engine.h"
+#include "config.h"
 
 #include <glib.h>
 #include <gmodule.h>
@@ -58,14 +59,17 @@ 
     return TRUE;
 }
 
-void engine_startup(char *engine)
+void engine_startup()
 {
+    ConfigValue engine;
+
     module = NULL;
-
-    if (engine != NULL) {
-	if (load(engine))
+    g_message("ENGINE STARTUP");
+    if (config_get("engine", Config_String, &engine)) {
+        g_warning("GOT ENGINE %s", engine.string);
+	if (load(engine.string))
 	    return;
-	g_warning("Failed to load the engine '%s'", engine);
+	g_warning("Failed to load the engine '%s'", engine.string);
 	g_message("Falling back to the default: '%s'", DEFAULT_ENGINE);
     }
     if (!load(DEFAULT_ENGINE)) {

M openbox/engine.h → openbox/engine.h

@@ -3,7 +3,7 @@ #define __engine_h
 
 #include "../engines/engineinterface.h"
 
-void engine_startup(char *engine);
+void engine_startup();
 void engine_shutdown();
 
 EngineFrameNew *engine_frame_new;

M openbox/openbox.c → openbox/openbox.c

@@ -148,7 +148,7 @@ config_startup();
 	render_startup();
 	font_startup();
 	themerc_startup();
-	engine_startup(themerc_engine);
+	engine_startup();
 	event_startup();
 	screen_startup();
 	focus_startup();
@@ -156,14 +156,14 @@ client_startup();
         grab_startup();
         plugin_startup();
 
-        config_parse();
-
         /* XXX load all plugins!! */
         plugin_open("focus");
         plugin_open("keyboard");
         plugin_open("mouse");
         plugin_open("placement");
         plugin_open("resistance");
+
+        config_parse();
 
 	/* get all the existing windows */
 	client_manage_all();