g_free(c);
}
-ObParseInst* parse_startup()
+ObParseInst* parse_startup(void)
{
ObParseInst *i = g_new(ObParseInst, 1);
i->callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
g_hash_table_insert(i->callbacks, c->tag, c);
}
-gboolean parse_load_rc(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root,
- gchar **fileused)
+gboolean parse_load_rc(const gchar *type, xmlDocPtr *doc, xmlNodePtr *root)
{
GSList *it;
gboolean r = FALSE;
+ gchar *fname;
- *fileused = NULL;
+ if (type == NULL)
+ fname = g_strdup("rc.xml");
+ else
+ fname = g_strdup_printf("rc-%s.xml", type);
- 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;
+ 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);
- }
+ path = g_build_filename(it->data, "openbox", fname, NULL);
+ r = parse_load(path, "openbox_config", doc, root);
+ g_free(path);
}
+ g_free(fname);
+
return r;
}
GSList *it;
gchar *path;
gboolean r = FALSE;
+ gchar *eng;
/* 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);
+ if (parse_load(path, "openbox_theme", doc, root) &&
+ parse_attr_string("engine", *root, &eng))
+ {
+ if (!strcmp(eng, "box")) {
+ *retpath = g_path_get_dirname(path);
+ r = TRUE;
+ }
+ g_free(eng);
+ }
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);
+ if (parse_load(path, "openbox_theme", doc, root) &&
+ parse_attr_string("engine", *root, &eng))
+ {
+ if (!strcmp(eng, "box")) {
+ *retpath = g_path_get_dirname(path);
+ r = TRUE;
+ }
+ g_free(eng);
+ }
g_free(path);
}
}
xmlDocPtr *doc, xmlNodePtr *root)
{
struct stat s;
+
if (stat(path, &s) < 0)
return FALSE;
gint parse_int(xmlDocPtr doc, xmlNodePtr node)
{
xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
- gint i = atoi((gchar*)c);
+ gint i = c ? atoi((gchar*)c) : 0;
xmlFree(c);
return i;
}
{
xmlChar *c = xmlNodeListGetString(doc, node->children, TRUE);
gboolean b = FALSE;
- if (!xmlStrcasecmp(c, (const xmlChar*) "true"))
+ if (c && !xmlStrcasecmp(c, (const xmlChar*) "true"))
b = TRUE;
- else if (!xmlStrcasecmp(c, (const xmlChar*) "yes"))
+ else if (c && !xmlStrcasecmp(c, (const xmlChar*) "yes"))
b = TRUE;
- else if (!xmlStrcasecmp(c, (const xmlChar*) "on"))
+ else if (c && !xmlStrcasecmp(c, (const xmlChar*) "on"))
b = TRUE;
xmlFree(c);
return b;
return list;
}
-void parse_paths_startup()
+void parse_paths_startup(void)
{
const gchar *path;
xdg_config_dir_paths = slist_path_add(xdg_config_dir_paths,
g_strdup(xdg_config_home_path),
(GSListFunc) g_slist_prepend);
-
+
path = g_getenv("XDG_DATA_DIRS");
if (path && path[0] != '\0') /* not unset or empty */
xdg_data_dir_paths = split_paths(path);
else {
+ xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
+ g_strdup(DATADIR),
+ (GSListFunc) g_slist_append);
xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
g_build_filename
(G_DIR_SEPARATOR_S,
(G_DIR_SEPARATOR_S,
"usr", "share", NULL),
(GSListFunc) g_slist_append);
- xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
- g_strdup(DATADIR),
- (GSListFunc) g_slist_append);
}
xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
g_strdup(xdg_data_home_path),
(GSListFunc) g_slist_prepend);
}
-void parse_paths_shutdown()
+void parse_paths_shutdown(void)
{
GSList *it;
return ret;
}
-const gchar* parse_xdg_config_home_path()
+const gchar* parse_xdg_config_home_path(void)
{
return xdg_config_home_path;
}
-const gchar* parse_xdg_data_home_path()
+const gchar* parse_xdg_data_home_path(void)
{
return xdg_data_home_path;
}
-GSList* parse_xdg_config_dir_paths()
+GSList* parse_xdg_config_dir_paths(void)
{
return xdg_config_dir_paths;
}
-GSList* parse_xdg_data_dir_paths()
+GSList* parse_xdg_data_dir_paths(void)
{
return xdg_data_dir_paths;
}