void *data;
};
-static GHashTable *callbacks;
+struct _ObParseInst {
+ GHashTable *callbacks;
+};
static void destfunc(struct Callback *c)
{
g_free(c);
}
-void parse_startup()
+ObParseInst* parse_startup()
{
- callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
- (GDestroyNotify)destfunc);
+ ObParseInst *i = g_new(ObParseInst, 1);
+ i->callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
+ (GDestroyNotify)destfunc);
+ return i;
}
-void parse_shutdown()
+void parse_shutdown(ObParseInst *i)
{
- g_hash_table_destroy(callbacks);
+ if (i) {
+ g_hash_table_destroy(i->callbacks);
+ g_free(i);
+ }
}
-void parse_register(const char *tag, ParseCallback func, void *data)
+void parse_register(ObParseInst *i, const char *tag,
+ ParseCallback func, void *data)
{
struct Callback *c;
- if ((c = g_hash_table_lookup(callbacks, tag))) {
+ if ((c = g_hash_table_lookup(i->callbacks, tag))) {
g_warning("tag '%s' already registered", tag);
return;
}
c->tag = g_strdup(tag);
c->func = func;
c->data = data;
- g_hash_table_insert(callbacks, c->tag, c);
+ g_hash_table_insert(i->callbacks, c->tag, c);
}
gboolean parse_load_rc(xmlDocPtr *doc, xmlNodePtr *root)
char *path;
gboolean r = FALSE;
- path = g_build_filename(g_get_home_dir(), ".openbox", "rc3", NULL);
+ path = g_build_filename(g_get_home_dir(), ".openbox", "rc.xml", NULL);
if (parse_load(path, "openbox_config", doc, root)) {
r = TRUE;
} else {
g_free(path);
- path = g_build_filename(RCDIR, "rc3", NULL);
+ path = g_build_filename(RCDIR, "rc.xml", NULL);
if (parse_load(path, "openbox_config", doc, root)) {
r = TRUE;
}
gboolean parse_load(const char *path, const char *rootname,
xmlDocPtr *doc, xmlNodePtr *root)
{
-
- xmlLineNumbersDefault(1);
-
if ((*doc = xmlParseFile(path))) {
*root = xmlDocGetRootElement(*doc);
if (!*root) {
if (xmlStrcasecmp((*root)->name, (const xmlChar*)rootname)) {
xmlFreeDoc(*doc);
*doc = NULL;
- g_warning("document %s is of wrong type. root *root is "
- "not 'openbox_config'", path);
+ g_warning("document %s is of wrong type. root node is "
+ "not '%s'", path, rootname);
+ }
+ }
+ }
+ if (!*doc)
+ return FALSE;
+ return TRUE;
+}
+
+gboolean parse_load_mem(gpointer data, guint len, const char *rootname,
+ xmlDocPtr *doc, xmlNodePtr *root)
+{
+ if ((*doc = xmlParseMemory(data, len))) {
+ *root = xmlDocGetRootElement(*doc);
+ if (!*root) {
+ xmlFreeDoc(*doc);
+ *doc = NULL;
+ g_warning("Given memory is an empty document");
+ } else {
+ if (xmlStrcasecmp((*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);
}
}
}
xmlFree(doc);
}
-void parse_tree(xmlDocPtr doc, xmlNodePtr node, void *nothing)
+void parse_tree(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
{
while (node) {
- struct Callback *c = g_hash_table_lookup(callbacks, node->name);
+ struct Callback *c = g_hash_table_lookup(i->callbacks, node->name);
if (c)
- c->func(doc, node, c->data);
+ c->func(i, doc, node, c->data);
node = node->next;
}
char *parse_string(xmlDocPtr doc, xmlNodePtr node)
{
- xmlChar *c = xmlNodeListGetString(doc, node->xmlChildrenNode, TRUE);
+ xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
char *s = g_strdup(c ? (char*)c : "");
xmlFree(c);
return s;
int parse_int(xmlDocPtr doc, xmlNodePtr node)
{
- xmlChar *c = xmlNodeListGetString(doc, node->xmlChildrenNode, TRUE);
+ xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
int i = atoi((char*)c);
xmlFree(c);
return i;
gboolean parse_bool(xmlDocPtr doc, xmlNodePtr node)
{
- xmlChar *c = xmlNodeListGetString(doc, node->xmlChildrenNode, TRUE);
+ xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
gboolean b = FALSE;
if (!xmlStrcasecmp(c, (const xmlChar*) "true"))
b = TRUE;
gboolean parse_contains(const char *val, xmlDocPtr doc, xmlNodePtr node)
{
- xmlChar *c = xmlNodeListGetString(doc, node->xmlChildrenNode, TRUE);
+ xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
gboolean r;
r = !xmlStrcasecmp(c, (const xmlChar*) val);
xmlFree(c);