X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=parser%2Fparse.c;h=011808fb0d3a8ab16656af775391eea1880db243;hb=2442cdfd85e5229c7ee4ac49ca66a7d55ffcb919;hp=6df247251ed09a6c7f85e34b25924849205bc22e;hpb=aeda86f46056a10126f85ad43fb51a92075bcefd;p=chaz%2Fopenbox diff --git a/parser/parse.c b/parser/parse.c index 6df24725..011808fb 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_error("Tag '%s' already registered", tag); return; } @@ -78,19 +79,55 @@ void parse_register(ObParseInst *i, const gchar *tag, g_hash_table_insert(i->callbacks, c->tag, c); } -gboolean parse_load_rc(xmlDocPtr *doc, xmlNodePtr *root) +gboolean parse_load_rc(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root, + gchar **fileused) +{ + GSList *it; + gboolean r = FALSE; + + *fileused = NULL; + + if (file) { + if ((r = parse_load(file, "openbox_config", doc, root))) + *fileused = g_strdup(file); + } else { + /* this won't run if the above code loaded a config */ + for (it = xdg_config_dir_paths; !r && it; it = g_slist_next(it)) { + gchar *path; + + path = g_build_filename(it->data, "openbox", "rc.xml", NULL); + if ((r = parse_load(path, "openbox_config", doc, root))) + *fileused = path; + else + g_free(path); + } + } + return r; +} + +gboolean parse_load_theme(const gchar *name, xmlDocPtr *doc, xmlNodePtr *root, + gchar **retpath) { GSList *it; gchar *path; gboolean r = FALSE; - for (it = xdg_config_dir_paths; !r && it; it = g_slist_next(it)) { - path = g_build_filename(it->data, "openbox", "rc.xml", NULL); - r = parse_load(path, "openbox_config", doc, root); - g_free(path); + /* 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 find a valid config file, using defaults"); return r; } @@ -109,26 +146,31 @@ gboolean parse_load_menu(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root) g_free(path); } } - if (!r) - 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); + g_message("%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 " - "not '%s'", path, rootname); + g_message("XML Document %s is of wrong type. Root " + "node is not '%s'", path, rootname); } } } @@ -145,13 +187,13 @@ gboolean parse_load_mem(gpointer data, guint len, const gchar *rootname, if (!*root) { xmlFreeDoc(*doc); *doc = NULL; - g_warning("Given memory is an empty document"); + g_message("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 " - "node is not '%s'", rootname); + g_message("XML Document in given memory is of wrong " + "type. Root node is not '%s'\n", rootname); } } } @@ -219,7 +261,7 @@ 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; } @@ -299,6 +341,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; } @@ -343,17 +387,17 @@ void parse_paths_startup() if (path && path[0] != '\0') /* not unset or empty */ xdg_config_dir_paths = split_paths(path); else { + xdg_config_dir_paths = slist_path_add(xdg_config_dir_paths, + g_strdup(CONFIGDIR), + (GSListFunc) g_slist_append); xdg_config_dir_paths = slist_path_add(xdg_config_dir_paths, g_build_filename (G_DIR_SEPARATOR_S, "etc", "xdg", NULL), (GSListFunc) g_slist_append); - xdg_config_dir_paths = slist_path_add(xdg_config_dir_paths, - g_strdup(CONFIGDIR), - (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"); @@ -375,7 +419,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); } @@ -395,6 +439,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)