X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=parser%2Fparse.c;h=33f80546c7c625113048037fb00571fb4ecf3117;hb=6372bd7c0d68793c2371ce7b6c1aa8017f913aee;hp=f8aed0b5b0228258eef79b2abf28cf2a48dea939;hpb=7ed0e10404e80149db3e8ef7f32a6281fcd17d9d;p=chaz%2Fopenbox diff --git a/parser/parse.c b/parser/parse.c index f8aed0b5..33f80546 100644 --- a/parser/parse.c +++ b/parser/parse.c @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- parse.c for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,6 +22,7 @@ #include #include #include +#include static gboolean xdg_start; static gchar *xdg_config_home_path; @@ -67,7 +68,7 @@ void parse_register(ObParseInst *i, const gchar *tag, struct Callback *c; if ((c = g_hash_table_lookup(i->callbacks, tag))) { - g_warning("tag '%s' already registered", tag); + g_warning("Tag '%s' already registered", tag); return; } @@ -90,7 +91,35 @@ gboolean parse_load_rc(xmlDocPtr *doc, xmlNodePtr *root) g_free(path); } if (!r) - g_warning("unable to find a valid config file, using defaults"); + g_warning("Unable to find a valid config file, using defaults"); + return r; +} + +gboolean parse_load_theme(const gchar *name, xmlDocPtr *doc, xmlNodePtr *root, + gchar **retpath) +{ + GSList *it; + gchar *path; + gboolean r = FALSE; + + /* backward compatibility.. */ + path = g_build_filename(g_get_home_dir(), ".themes", name, + "openbox-3", "themerc.xml", NULL); + if ((r = parse_load(path, "openbox_theme", doc, root))) + *retpath = g_path_get_dirname(path); + g_free(path); + + if (!r) { + for (it = xdg_data_dir_paths; !r && it; it = g_slist_next(it)) { + path = g_build_filename(it->data, "themes", name, "openbox-3", + "themerc.xml", NULL); + if ((r = parse_load(path, "openbox_theme", doc, root))) + *retpath = g_path_get_dirname(path); + g_free(path); + } + } + if (!r) + g_warning("Unable to load the theme %s", name); return r; } @@ -110,24 +139,31 @@ gboolean parse_load_menu(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root) } } if (!r) - g_warning("unable to find a valid menu file '%s'", file); + g_warning("Unable to find a valid menu file '%s'", file); return r; } gboolean parse_load(const gchar *path, const gchar *rootname, xmlDocPtr *doc, xmlNodePtr *root) { - if ((*doc = xmlParseFile(path))) { + struct stat s; + if (stat(path, &s) < 0) + return FALSE; + + /* XML_PARSE_BLANKS is needed apparently. When it loads a theme file, + without this option, the tree is weird and has extra nodes in it. */ + if ((*doc = xmlReadFile(path, NULL, + XML_PARSE_NOBLANKS | XML_PARSE_RECOVER))) { *root = xmlDocGetRootElement(*doc); if (!*root) { xmlFreeDoc(*doc); *doc = NULL; g_warning("%s is an empty document", path); } else { - if (xmlStrcasecmp((*root)->name, (const xmlChar*)rootname)) { + if (xmlStrcmp((*root)->name, (const xmlChar*)rootname)) { xmlFreeDoc(*doc); *doc = NULL; - g_warning("document %s is of wrong type. root node is " + g_warning("Document %s is of wrong type. root node is " "not '%s'", path, rootname); } } @@ -147,10 +183,10 @@ gboolean parse_load_mem(gpointer data, guint len, const gchar *rootname, *doc = NULL; g_warning("Given memory is an empty document"); } else { - if (xmlStrcasecmp((*root)->name, (const xmlChar*)rootname)) { + if (xmlStrcmp((*root)->name, (const xmlChar*)rootname)) { xmlFreeDoc(*doc); *doc = NULL; - g_warning("document in given memory is of wrong type. root " + g_warning("Document in given memory is of wrong type. root " "node is not '%s'", rootname); } } @@ -219,13 +255,35 @@ gboolean parse_contains(const gchar *val, xmlDocPtr doc, xmlNodePtr node) xmlNodePtr parse_find_node(const gchar *tag, xmlNodePtr node) { while (node) { - if (!xmlStrcasecmp(node->name, (const xmlChar*) tag)) + if (!xmlStrcmp(node->name, (const xmlChar*) tag)) return node; node = node->next; } return NULL; } +gboolean parse_attr_bool(const gchar *name, xmlNodePtr node, gboolean *value) +{ + xmlChar *c = xmlGetProp(node, (const xmlChar*) name); + gboolean r = FALSE; + if (c) { + if (!xmlStrcasecmp(c, (const xmlChar*) "true")) + *value = TRUE, r = TRUE; + else if (!xmlStrcasecmp(c, (const xmlChar*) "yes")) + *value = TRUE, r = TRUE; + else if (!xmlStrcasecmp(c, (const xmlChar*) "on")) + *value = TRUE, r = TRUE; + else if (!xmlStrcasecmp(c, (const xmlChar*) "false")) + *value = FALSE, r = TRUE; + else if (!xmlStrcasecmp(c, (const xmlChar*) "no")) + *value = FALSE, r = TRUE; + else if (!xmlStrcasecmp(c, (const xmlChar*) "off")) + *value = FALSE, r = TRUE; + } + xmlFree(c); + return r; +} + gboolean parse_attr_int(const gchar *name, xmlNodePtr node, gint *value) { xmlChar *c = xmlGetProp(node, (const xmlChar*) name); @@ -254,8 +312,9 @@ gboolean parse_attr_contains(const gchar *val, xmlNodePtr node, const gchar *name) { xmlChar *c = xmlGetProp(node, (const xmlChar*) name); - gboolean r; - r = !xmlStrcasecmp(c, (const xmlChar*) val); + gboolean r = FALSE; + if (c) + r = !xmlStrcasecmp(c, (const xmlChar*) val); xmlFree(c); return r; } @@ -276,6 +335,8 @@ static GSList* slist_path_add(GSList *list, gpointer data, GSListFunc func) if (!g_slist_find_custom(list, data, (GCompareFunc) slist_path_cmp)) list = func(list, data); + else + g_free(data); return list; } @@ -330,7 +391,7 @@ void parse_paths_startup() (GSListFunc) g_slist_append); } xdg_config_dir_paths = slist_path_add(xdg_config_dir_paths, - xdg_config_home_path, + g_strdup(xdg_config_home_path), (GSListFunc) g_slist_prepend); path = g_getenv("XDG_DATA_DIRS"); @@ -352,7 +413,7 @@ void parse_paths_startup() (GSListFunc) g_slist_append); } xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths, - xdg_data_home_path, + g_strdup(xdg_data_home_path), (GSListFunc) g_slist_prepend); } @@ -372,6 +433,10 @@ void parse_paths_shutdown() g_free(it->data); g_slist_free(xdg_data_dir_paths); xdg_data_dir_paths = NULL; + g_free(xdg_config_home_path); + xdg_config_home_path = NULL; + g_free(xdg_data_home_path); + xdg_data_home_path = NULL; } gchar *parse_expand_tilde(const gchar *f)