From: Dana Jansens Date: Sat, 22 Mar 2003 21:53:41 +0000 (+0000) Subject: config system fleshed out. many thanks to woodlbock for his code! yay! X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=94f2b4a7b8b62ed031fe96da4d24b2d5dbb4aded;p=chaz%2Fopenbox config system fleshed out. many thanks to woodlbock for his code! yay! --- diff --git a/openbox/Makefile.am b/openbox/Makefile.am index 7e1e7d64..758d3998 100644 --- a/openbox/Makefile.am +++ b/openbox/Makefile.am @@ -2,6 +2,7 @@ localedir=$(datadir)/locale themercdir=$(datadir)/openbox enginedir=$(libdir)/openbox/engines plugindir=$(libdir)/openbox/plugins +rcdir=$(datadir)/openbox binary=openbox3 url=http://icculus.org/openbox @@ -11,6 +12,7 @@ CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) \ @CPPFLAGS@ \ -DLOCALEDIR=\"$(localedir)\" \ -DTHEMERCDIR=\"$(themercdir)\" \ +-DRCDIR=\"$(rcdir)\" \ -DPLUGINDIR=\"$(plugindir)\" \ -DENGINEDIR=\"$(enginedir)\" \ -DDEFAULT_ENGINE=\"openbox\" \ diff --git a/openbox/config.c b/openbox/config.c index 2ec6d5f7..03fac801 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -4,7 +4,17 @@ # include #endif -static GSList *config = NULL; +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; /* provided by cparse.l */ void cparse_go(FILE *); @@ -12,10 +22,27 @@ void cparse_go(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); } void config_shutdown() { + g_datalist_clear(&config); + g_datalist_clear(&config_def); } void config_parse() @@ -23,15 +50,161 @@ void config_parse() 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(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(file); fclose(file); } + g_free(path); } gboolean config_set(char *name, ConfigValueType type, ConfigValue value) { - g_message("Setting %s\n", name); + 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; +} + +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; +} + +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); +} + +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); +} + +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; +} + +static void config_def_free(ConfigDefEntry *entry) +{ + 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; } + +gboolean config_def_set(ConfigDefEntry *entry) +{ + gboolean ret = FALSE; + + if (g_datalist_get_data(&config_def, entry->name)) { + 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; +} diff --git a/openbox/config.h b/openbox/config.h index 9797f9e4..45ef015d 100644 --- a/openbox/config.h +++ b/openbox/config.h @@ -19,11 +19,36 @@ typedef struct { ConfigValue value; } ConfigEntry; +typedef struct { + char *name; + ConfigValueType type; + /* if it is a string type optionally provide a list of valid strings */ + gboolean hasList; + GSList *values; +} ConfigDefEntry; + void config_startup(); void config_shutdown(); +/* Set a config variable's value. The variable must have already been defined + with a call to config_def_set */ gboolean config_set(char *name, ConfigValueType type, ConfigValue value); +/* Get a config variable's value. Returns FALSE if the value has not been + set. */ +gboolean config_get(char *name, ConfigValueType type, ConfigValue *value); + +/* Create a new config definition to add to the config system */ +ConfigDefEntry *config_def_new(char *name, ConfigValueType type); + +/* Add a value to a String type config definition */ +gboolean config_def_add_value(ConfigDefEntry *entry, char *value); + +/* Sets up the definition in the config system, Don't free or touch the entry + after setting it with this. It is invalidated even if the function returns + FALSE. */ +gboolean config_def_set(ConfigDefEntry *entry); + void config_parse(); #endif