X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=inline;f=parser%2Fparse.h;h=ec90b47178dd4a179d45133c600a759a315757f5;hb=dbd3e9b6b2b452e853a17352560b5a4b4c568e84;hp=948bf4ba0e285935892e1b95153a369762290b3d;hpb=d1e355de2c6aae38cea3cdc0e0b902ea2b194e86;p=chaz%2Fopenbox

diff --git a/parser/parse.h b/parser/parse.h
index 948bf4ba..ec90b471 100644
--- a/parser/parse.h
+++ b/parser/parse.h
@@ -4,24 +4,30 @@
 #include <libxml/parser.h>
 #include <glib.h>
 
-typedef void (*ParseCallback)(xmlDocPtr doc, xmlNodePtr node, void *data);
+typedef struct _ObParseInst ObParseInst;
 
-void parse_startup();
-void parse_shutdown();
+typedef void (*ParseCallback)(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                              gpointer data);
 
-/* Loads Openbox's rc, from $HOME or $PREFIX as a fallback */
-gboolean parse_load_rc(xmlDocPtr *doc, xmlNodePtr *root);
+ObParseInst* parse_startup();
+void parse_shutdown(ObParseInst *inst);
 
-/* callbacks - must call parse_startup to use these */
+/* Loads Openbox's rc, from the normal paths */
+gboolean parse_load_rc(xmlDocPtr *doc, xmlNodePtr *root);
+/* Loads an Openbox menu, from the normal paths */
+gboolean parse_load_menu(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root);
 
-void parse_register(const char *tag, ParseCallback func, void *data);
-void parse_tree(xmlDocPtr doc, xmlNodePtr node, void *nothing);
+void parse_register(ObParseInst *inst, const char *tag,
+                    ParseCallback func, gpointer data);
+void parse_tree(ObParseInst *inst, xmlDocPtr doc, xmlNodePtr node);
 
 
 /* open/close */
 
 gboolean parse_load(const char *path, const char *rootname,
                     xmlDocPtr *doc, xmlNodePtr *root);
+gboolean parse_load_mem(gpointer data, guint len, const char *rootname,
+                        xmlDocPtr *doc, xmlNodePtr *root);
 void parse_close(xmlDocPtr doc);
 
 
@@ -40,4 +46,20 @@ gboolean parse_attr_contains(const char *val, xmlNodePtr node,
 gboolean parse_attr_string(const char *name, xmlNodePtr node, char **value);
 gboolean parse_attr_int(const char *name, xmlNodePtr node, int *value);
 
+/* paths */
+
+void parse_paths_startup();
+void parse_paths_shutdown();
+
+const gchar* parse_xdg_config_home_path();
+const gchar* parse_xdg_data_home_path();
+GSList* parse_xdg_config_dir_paths();
+GSList* parse_xdg_data_dir_paths();
+
+/*! Expands the ~ character to the home directory throughout the given
+  string */
+gchar *parse_expand_tilde(const gchar *f);
+/*! Makes a directory and all its parents */
+void parse_mkdir_path(const gchar *path, gint mode);
+
 #endif