X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=db8856e69c71ee9172a9057079bfff06998424be;hb=185d1337e553283530e23b1edff3bb709f04e9bb;hp=b66ad5e7a2b0a9a50677d8a24be8358f9ac269e2;hpb=799fe5a8bcdc799d7621e2e97659f564b95dda05;p=chaz%2Fopenbox

diff --git a/openbox/config.c b/openbox/config.c
index b66ad5e7..db8856e6 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -1,212 +1,120 @@
 #include "config.h"
+#include "parse.h"
 
-#ifdef HAVE_STDIO_H
-#  include <stdio.h>
-#endif
-
-static void config_free_entry(ConfigEntry *entry);
-static void config_set_entry(char *name, ConfigValueType type,
-                             ConfigValue value);
-static void config_def_free(ConfigDefEntry *entry);
-static void print_config(GQuark q, gpointer data, gpointer fonk){
-    ConfigDefEntry *e = (ConfigDefEntry *)data;
-    g_message("config: %s %d", e->name, e->hasList);
-}
-
-static GData *config = NULL;
-static GData *config_def = NULL;
+gboolean config_focus_new;
+gboolean config_focus_follow;
+gboolean config_focus_last;
+gboolean config_focus_last_on_desktop;
 
-/* provided by cparse.l */
-void cparse_go(char *filename, FILE *);
+char *config_theme;
 
+int config_desktops_num;
+GSList *config_desktops_names;
 
-void config_startup()
+static void parse_focus(char *name, ParseToken *value)
 {
-    /* 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);
+    if (!g_ascii_strcasecmp(name, "focusnew")) {
+        if (value->type != TOKEN_BOOL)
+            yyerror("invalid value");
+        else {
+            config_focus_new = value->data.bool;
+        }
+    } else if (!g_ascii_strcasecmp(name, "followmouse")) {
+        if (value->type != TOKEN_BOOL)
+            yyerror("invalid value");
+        else {
+            config_focus_follow = value->data.bool;
+        }
+    } else if (!g_ascii_strcasecmp(name, "focuslast")) {
+        if (value->type != TOKEN_BOOL)
+            yyerror("invalid value");
+        else {
+            config_focus_last = value->data.bool;
+        }
+    } else if (!g_ascii_strcasecmp(name, "focuslastondesktop")) {
+        if (value->type != TOKEN_BOOL)
+            yyerror("invalid value");
+        else {
+            config_focus_last_on_desktop = value->data.bool;
+        }
+    } else
+        yyerror("invalid option");
+    parse_free_token(value);
 }
 
-void config_shutdown()
+static void parse_theme(char *name, ParseToken *value)
 {
-    g_datalist_clear(&config);
-    g_datalist_clear(&config_def);
+    if (!g_ascii_strcasecmp(name, "theme")) {
+        if (value->type != TOKEN_STRING)
+            yyerror("invalid value");
+        else {
+            g_free(config_theme);
+            config_theme = g_strdup(value->data.string);
+        }
+    } else
+        yyerror("invalid option");
+    parse_free_token(value);
 }
 
-void config_parse()
+static void parse_desktops(char *name, ParseToken *value)
 {
-    FILE *file;
-    char *path;
-
-    /* load the system wide rc file first */
-    path = g_build_filename(RCDIR, "rc3", NULL);
-    if ((file = fopen(path, "r")) != NULL) {
-        cparse_go(path, file);
-        fclose(file);
-    }
-    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(path, file);
-        fclose(file);
-    }
-    g_free(path);
+    GList *it;
+
+    if (!g_ascii_strcasecmp(name, "number")) {
+        if (value->type != TOKEN_INTEGER)
+            yyerror("invalid value");
+        else {
+            config_desktops_num = value->data.integer;
+        }
+    } else if (!g_ascii_strcasecmp(name, "names")) {
+        if (value->type == TOKEN_LIST) {
+            for (it = value->data.list; it; it = it->next)
+                if (((ParseToken*)it->data)->type != TOKEN_STRING) break;
+            if (it == NULL) {
+                /* build a string list */
+                g_free(config_desktops_names);
+                for (it = value->data.list; it; it = it->next)
+                    config_desktops_names =
+                        g_slist_append(config_desktops_names,
+                                       g_strdup
+                                       (((ParseToken*)it->data)->data.string));
+            } else {
+                yyerror("invalid string in names list");
+            }
+        } else {
+            yyerror("syntax error (expected list of strings)");
+        }
+    } else
+        yyerror("invalid option");
+    parse_free_token(value);
 }
 
-gboolean config_set(char *name, ConfigValueType type, ConfigValue value)
+void config_startup()
 {
-    ConfigDefEntry *def;
-    gboolean ret = FALSE;
-
-    name = g_ascii_strdown(name, -1);
-    g_message("Setting %s", name);
-
-    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);
-    } else {
-        if (def->hasList) {
-            gboolean found = FALSE;
-            GSList *it;
-
-            it = def->values;
-            g_assert(it != NULL);
-            do {
-                if (g_ascii_strcasecmp(it->data, value.string) == 0) {
-                    found = TRUE;
-                    break;
-                }
-            } while ((it = it->next));
-
-            if (!found)
-                g_message("Invalid value '%s' for config option '%s'",
-                          value.string, name);
-            else
-                ret = TRUE;
-        } else
-            ret = TRUE;
-
-    }
-
-    if (ret)
-        config_set_entry(name, type, value);
-    else
-        g_free(name);
-
-    return ret;
-}
+    config_focus_new = TRUE;
+    config_focus_follow = FALSE;
+    config_focus_last = TRUE;
+    config_focus_last_on_desktop = TRUE;
 
-gboolean config_get(char *name, ConfigValueType type, ConfigValue *value)
-{
-    ConfigEntry *entry;
-    gboolean ret = FALSE;
-
-    name = g_ascii_strdown(name, -1);
-    entry = g_datalist_get_data(&config, name);
-    if (entry != NULL && entry->type == type) {
-        *value = entry->value;
-        ret = TRUE;
-    }
-    g_free(name);
-    return ret;
-}
+    parse_reg_section("focus", NULL, parse_focus);
 
-static void config_set_entry(char *name, ConfigValueType type,
-                             ConfigValue value)
-{
-    ConfigEntry *entry = NULL;
-
-    entry = g_new(ConfigEntry, 1);
-    entry->name = name;
-    entry->type = type;
-    if (type == Config_String)
-        entry->value.string = g_strdup(value.string);
-    else
-        entry->value = value;
-
-    g_datalist_set_data_full(&config, name, entry,
-                             (GDestroyNotify)config_free_entry);
-}
+    config_theme = NULL;
 
-static void config_free_entry(ConfigEntry *entry)
-{
-    g_free(entry->name);
-    entry->name = NULL;
-    if(entry->type == Config_String) {
-        g_free(entry->value.string);
-        entry->value.string = NULL;
-    }
-    g_free(entry);
-}
+    parse_reg_section("theme", NULL, parse_theme);
 
-ConfigDefEntry *config_def_new(char *name, ConfigValueType type)
-{
-    ConfigDefEntry *entry;
-
-    entry = g_new(ConfigDefEntry, 1);
-    entry->name = g_ascii_strdown(name, -1);
-    entry->hasList = FALSE;
-    entry->type = type;
-    entry->values = NULL;
-    return entry;
+    config_desktops_num = 4;
+    config_desktops_names = NULL;
+
+    parse_reg_section("desktops", NULL, parse_desktops);
 }
 
-static void config_def_free(ConfigDefEntry *entry)
+void config_shutdown()
 {
     GSList *it;
 
-    g_free(entry->name);
-    if (entry->hasList) {
-        for (it = entry->values; it != NULL; it = it->next)
-            g_free(it->data);
-        g_slist_free(entry->values);
-    }
-    g_free(entry);
-}
-
-gboolean config_def_add_value(ConfigDefEntry *entry, char *value)
-{
-    if (entry->type != Config_String) {
-        g_warning("Tried adding value to non-string config definition");
-        return FALSE;
-    }
-
-    entry->hasList = TRUE;
-    entry->values = g_slist_append(entry->values, g_ascii_strdown(value, -1));
-    return TRUE;
-}
+    g_free(config_theme);
 
-gboolean config_def_set(ConfigDefEntry *entry)
-{
-    gboolean ret = FALSE;
-    ConfigDefEntry *def;
-
-    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);
-        config_def_free(entry);
-    } else {
-        g_datalist_set_data_full(&config_def, entry->name, entry,
-                                 (GDestroyNotify)config_def_free);
-        ret = TRUE;
-    }
-
-    return ret;
+    for (it = config_desktops_names; it; it = it->next)
+        g_free(it->data);
+    g_slist_free(config_desktops_names);
 }