X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=3a5a1c60d4ec79ceb76be0b437b7b76aa75330f4;hb=a6815038d61b64d5f13d28b6e5f67fe1630213e9;hp=adb18359ac6623873c7e5dbf17ed3061052a3d0a;hpb=8b02e6b51ae81b264297057edd33d7594480ca5d;p=chaz%2Fopenbox

diff --git a/openbox/config.c b/openbox/config.c
index adb18359..3a5a1c60 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -17,26 +17,38 @@ static GData *config = NULL;
 static GData *config_def = NULL;
 
 /* provided by cparse.l */
-void cparse_go(FILE *);
+void cparse_go(char *filename, FILE *);
 
 
 void config_startup()
 {
-    /* test definition */
-    ConfigDefEntry *def;
-
-    def = config_def_new("test", Config_String);
-    config_def_set(def);
-
-    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);
+    /* set up options exported by the kernel */
+    config_def_set(config_def_new("engine", Config_String,
+                                  "Engine",
+                                  "The name of the theming engine to be used "
+                                  "to decorate windows."));
+    config_def_set(config_def_new("theme", Config_String,
+                                  "Theme",
+                                  "The name of the theme to load with the "
+                                  "chosen engine."));
+    config_def_set(config_def_new("font", Config_String,
+                                  "Titlebar Font",
+                                  "The fontstring specifying the font to "
+                                  "be used in window titlebars."));
+    config_def_set(config_def_new("font.shadow", Config_Bool,
+                                  "Titlebar Font Shadow",
+                                  "Whether or not the text in the window "
+                                  "titlebars gets a drop shadow."));
+    config_def_set(config_def_new("font.shadow.offset", Config_Integer,
+                                  "Titlebar Font Shadow Offset",
+                                  "The offset of the drop shadow for text "
+                                  "in the window titlebars."));
+    config_def_set(config_def_new("titlebar.layout", Config_String,
+                                  "Titlebar Layout",
+                                  "The ordering of the elements in the "
+                                  "window titlebars."));
+
+    /*g_datalist_foreach(&config_def, print_config, NULL);*/
 }
 
 void config_shutdown()
@@ -49,22 +61,26 @@ void config_parse()
 {
     FILE *file;
     char *path;
+    gboolean load = FALSE;
 
-    /* load the system wide rc file first */
-    path = g_build_filename(RCDIR, "rc3", NULL);
+    /* load the user rc */
+    path = g_build_filename(g_get_home_dir(), ".openbox", "rc3", NULL);
     if ((file = fopen(path, "r")) != NULL) {
-        cparse_go(file);
+        cparse_go(path, file);
         fclose(file);
+        load = TRUE;
     }
     g_free(path);
 
-    /* then load the user one which can override it */
-    path = g_build_filename(g_get_home_dir(), ".openbox", "rc3", NULL);
-    if ((file = fopen(path, "r")) != NULL) {
-        cparse_go(file);
-        fclose(file);
+    if (!load) {
+        /* load the system wide rc */
+        path = g_build_filename(RCDIR, "rc3", NULL);
+        if ((file = fopen(path, "r")) != NULL) {
+            /*cparse_go(path, file);*/
+            fclose(file);
+        }
+        g_free(path);
     }
-    g_free(path);
 }
 
 gboolean config_set(char *name, ConfigValueType type, ConfigValue value)
@@ -73,13 +89,12 @@ gboolean config_set(char *name, ConfigValueType type, ConfigValue value)
     gboolean ret = FALSE;
 
     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) {
-        g_message("Invalid config option '%s'", name);
+        g_warning("Invalid config option '%s'", name);
     } else {
         if (def->hasList) {
             gboolean found = FALSE;
@@ -95,10 +110,12 @@ gboolean config_set(char *name, ConfigValueType type, ConfigValue value)
             } while ((it = it->next));
 
             if (!found)
-                g_message("Invalid value '%s' for config option '%s'",
+                g_warning("Invalid value '%s' for config option '%s'",
                           value.string, name);
             else
                 ret = TRUE;
+        } else if (type != def->type) {
+            g_warning("Incorrect type of value for config option '%s'", name);
         } else
             ret = TRUE;
 
@@ -155,12 +172,15 @@ static void config_free_entry(ConfigEntry *entry)
     g_free(entry);
 }
 
-ConfigDefEntry *config_def_new(char *name, ConfigValueType type)
+ConfigDefEntry *config_def_new(char *name, ConfigValueType type,
+                                char *descriptive_name, char *long_description)
 {
     ConfigDefEntry *entry;
 
     entry = g_new(ConfigDefEntry, 1);
     entry->name = g_ascii_strdown(name, -1);
+    entry->descriptive_name = g_strdup(descriptive_name);
+    entry->long_description = g_strdup(long_description);
     entry->hasList = FALSE;
     entry->type = type;
     entry->values = NULL;
@@ -172,6 +192,8 @@ static void config_def_free(ConfigDefEntry *entry)
     GSList *it;
 
     g_free(entry->name);
+    g_free(entry->descriptive_name);
+    g_free(entry->long_description);
     if (entry->hasList) {
         for (it = entry->values; it != NULL; it = it->next)
             g_free(it->data);
@@ -197,7 +219,7 @@ gboolean config_def_set(ConfigDefEntry *entry)
     gboolean ret = FALSE;
     ConfigDefEntry *def;
 
-    if ((entry = g_datalist_get_data(&config_def, entry->name))) {
+    if ((def = g_datalist_get_data(&config_def, entry->name))) {
         g_assert(def != entry); /* adding it twice!? */
         g_warning("Definition already set for config option '%s'. ",
                   entry->name);