X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=491097e444f1ff663305a328eae03d83d92d51b5;hb=276b2be581c6cb138b439537761ff2ca42201805;hp=b66ad5e7a2b0a9a50677d8a24be8358f9ac269e2;hpb=799fe5a8bcdc799d7621e2e97659f564b95dda05;p=chaz%2Fopenbox diff --git a/openbox/config.c b/openbox/config.c index b66ad5e7..491097e4 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -1,212 +1,180 @@ #include "config.h" +#include "parser/parse.h" -#ifdef HAVE_STDIO_H -# include -#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; - -/* provided by cparse.l */ -void cparse_go(char *filename, FILE *); - - -void config_startup() -{ - /* test definition */ - ConfigDefEntry *def; +gboolean config_focus_new; +gboolean config_focus_follow; +gboolean config_focus_last; +gboolean config_focus_last_on_desktop; +gboolean config_focus_popup; - def = config_def_new("test", Config_String); - config_def_set(def); +char *config_theme; - def = config_def_new("test", Config_String); - config_def_set(def); +int config_desktops_num; +GSList *config_desktops_names; - def = config_def_new("testlist", Config_String); - config_def_add_value(def, "one"); - config_def_add_value(def, "two"); - config_def_set(def); +gboolean config_opaque_move; +gboolean config_opaque_resize; - g_datalist_foreach(&config_def, print_config, NULL); -} +StackLayer config_dock_layer; +DockPosition config_dock_pos; +int config_dock_x; +int config_dock_y; +gboolean config_dock_horz; +gboolean config_dock_hide; +guint config_dock_hide_timeout; -void config_shutdown() +static void parse_focus(xmlDocPtr doc, xmlNodePtr node, void *d) { - g_datalist_clear(&config); - g_datalist_clear(&config_def); + xmlNodePtr n; + + if ((n = parse_find_node("focusNew", node))) + config_focus_new = parse_bool(doc, n); + if ((n = parse_find_node("followMouse", node))) + config_focus_follow = parse_bool(doc, n); + if ((n = parse_find_node("focusLast", node))) + config_focus_last = parse_bool(doc, n); + if ((n = parse_find_node("focusLastOnDesktop", node))) + config_focus_last_on_desktop = parse_bool(doc, n); + if ((n = parse_find_node("cyclingDialog", node))) + config_focus_popup = parse_bool(doc, n); } -void config_parse() +static void parse_theme(xmlDocPtr doc, xmlNodePtr node, void *d) { - 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); + xmlNodePtr n; - /* 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); + if ((n = parse_find_node("theme", node))) { + g_free(config_theme); + config_theme = parse_string(doc, n); } - g_free(path); } -gboolean config_set(char *name, ConfigValueType type, ConfigValue value) +static void parse_desktops(xmlDocPtr doc, xmlNodePtr node, void *d) { - 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; + xmlNodePtr n; - } - - if (ret) - config_set_entry(name, type, value); - else - g_free(name); + if ((n = parse_find_node("number", node))) + config_desktops_num = parse_int(doc, n); + if ((n = parse_find_node("names", node))) { + GSList *it; + xmlNodePtr nname; - 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; + for (it = config_desktops_names; it; it = it->next) + g_free(it->data); + g_slist_free(config_desktops_names); + config_desktops_names = NULL; + + nname = parse_find_node("name", n->xmlChildrenNode); + while (nname) { + config_desktops_names = g_slist_append(config_desktops_names, + parse_string(doc, nname)); + nname = parse_find_node("name", nname->next); + } } - g_free(name); - return ret; } -static void config_set_entry(char *name, ConfigValueType type, - ConfigValue value) +static void parse_moveresize(xmlDocPtr doc, xmlNodePtr node, void *d) { - 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); + xmlNodePtr n; + + if ((n = parse_find_node("opaqueMove", node))) + config_opaque_move = parse_bool(doc, n); + if ((n = parse_find_node("opaqueResize", node))) + config_opaque_resize = parse_bool(doc, n); } -static void config_free_entry(ConfigEntry *entry) +static void parse_dock(xmlDocPtr doc, xmlNodePtr node, void *d) { - g_free(entry->name); - entry->name = NULL; - if(entry->type == Config_String) { - g_free(entry->value.string); - entry->value.string = NULL; + xmlNodePtr n; + + if ((n = parse_find_node("position", node))) { + if (parse_contains("TopLeft", doc, n)) + config_dock_pos = DockPos_TopLeft; + else if (parse_contains("Top", doc, n)) + config_dock_pos = DockPos_Top; + else if (parse_contains("TopRight", doc, n)) + config_dock_pos = DockPos_TopRight; + else if (parse_contains("Right", doc, n)) + config_dock_pos = DockPos_Right; + else if (parse_contains("BottomRight", doc, n)) + config_dock_pos = DockPos_BottomRight; + else if (parse_contains("Bottom", doc, n)) + config_dock_pos = DockPos_Bottom; + else if (parse_contains("BottomLeft", doc, n)) + config_dock_pos = DockPos_BottomLeft; + else if (parse_contains("Left", doc, n)) + config_dock_pos = DockPos_Left; + else if (parse_contains("Floating", doc, n)) + config_dock_pos = DockPos_Floating; + } + if (config_dock_pos == DockPos_Floating) { + if ((n = parse_find_node("floatingX", node))) + config_dock_x = parse_int(doc, n); + if ((n = parse_find_node("floatingY", node))) + config_dock_y = parse_int(doc, n); + } + if ((n = parse_find_node("stacking", node))) { + if (parse_contains("top", doc, n)) + config_dock_layer = Layer_Top; + else if (parse_contains("normal", doc, n)) + config_dock_layer = Layer_Normal; + else if (parse_contains("bottom", doc, n)) + config_dock_layer = Layer_Below; } - g_free(entry); + if ((n = parse_find_node("direction", node))) { + if (parse_contains("horizontal", doc, n)) + config_dock_horz = TRUE; + else if (parse_contains("vertical", doc, n)) + config_dock_horz = FALSE; + } + if ((n = parse_find_node("autoHide", node))) + config_dock_hide = parse_bool(doc, n); + if ((n = parse_find_node("hideTimeout", node))) + config_dock_hide_timeout = parse_int(doc, n); } -ConfigDefEntry *config_def_new(char *name, ConfigValueType type) +void config_startup() { - 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_focus_new = TRUE; + config_focus_follow = FALSE; + config_focus_last = TRUE; + config_focus_last_on_desktop = TRUE; + config_focus_popup = TRUE; -static void config_def_free(ConfigDefEntry *entry) -{ - GSList *it; + parse_register("focus", parse_focus, NULL); - 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); -} + config_theme = NULL; -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; - } + parse_register("theme", parse_theme, NULL); - entry->hasList = TRUE; - entry->values = g_slist_append(entry->values, g_ascii_strdown(value, -1)); - return TRUE; + config_desktops_num = 4; + config_desktops_names = NULL; + + parse_register("desktops", parse_desktops, NULL); + + config_opaque_move = TRUE; + config_opaque_resize = TRUE; + + parse_register("moveresize", parse_moveresize, NULL); + + config_dock_layer = Layer_Top; + config_dock_pos = DockPos_TopRight; + config_dock_x = 0; + config_dock_y = 0; + config_dock_horz = FALSE; + config_dock_hide = FALSE; + config_dock_hide_timeout = 3000; + + parse_register("dock", parse_dock, NULL); } -gboolean config_def_set(ConfigDefEntry *entry) +void config_shutdown() { - 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; - } + GSList *it; + + g_free(config_theme); - return ret; + for (it = config_desktops_names; it; it = it->next) + g_free(it->data); + g_slist_free(config_desktops_names); }