X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=parser%2Fparse.h;h=7039d8c4be17ddaed7ce5b0a4fcbebacddf71419;hb=58dc86971a86b5f843fc93bba2dd8882f60c41a0;hp=e943e1ffb19ede6eea31f2b41c9b73292e847d03;hpb=c4e4760c41f10aae6af19a4363cb247c71edee4b;p=chaz%2Fopenbox

diff --git a/parser/parse.h b/parser/parse.h
index e943e1ff..7039d8c4 100644
--- a/parser/parse.h
+++ b/parser/parse.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    parse.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
@@ -19,9 +19,13 @@
 #ifndef __parse_h
 #define __parse_h
 
+#include "version.h"
+
 #include <libxml/parser.h>
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 typedef struct _ObParseInst ObParseInst;
 
 typedef void (*ParseCallback)(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -31,38 +35,43 @@ ObParseInst* parse_startup();
 void parse_shutdown(ObParseInst *inst);
 
 /* Loads Openbox's rc, from the normal paths */
-gboolean parse_load_rc(xmlDocPtr *doc, xmlNodePtr *root);
+gboolean parse_load_rc(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root,
+                       gchar **fileused);
 /* Loads an Openbox menu, from the normal paths */
 gboolean parse_load_menu(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root);
+/* Loads an Openbox menu, from the normal paths */
+gboolean parse_load_theme(const gchar *name, xmlDocPtr *doc, xmlNodePtr *root,
+                          gchar **path);
 
-void parse_register(ObParseInst *inst, const char *tag,
+void parse_register(ObParseInst *inst, const gchar *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,
+gboolean parse_load(const gchar *path, const gchar *rootname,
                     xmlDocPtr *doc, xmlNodePtr *root);
-gboolean parse_load_mem(gpointer data, guint len, const char *rootname,
+gboolean parse_load_mem(gpointer data, guint len, const gchar *rootname,
                         xmlDocPtr *doc, xmlNodePtr *root);
 void parse_close(xmlDocPtr doc);
 
 
 /* helpers */
 
-xmlNodePtr parse_find_node(const char *tag, xmlNodePtr node);
+xmlNodePtr parse_find_node(const gchar *tag, xmlNodePtr node);
 
-char *parse_string(xmlDocPtr doc, xmlNodePtr node);
-int parse_int(xmlDocPtr doc, xmlNodePtr node);
+gchar *parse_string(xmlDocPtr doc, xmlNodePtr node);
+gint parse_int(xmlDocPtr doc, xmlNodePtr node);
 gboolean parse_bool(xmlDocPtr doc, xmlNodePtr node);
 
-gboolean parse_contains(const char *val, xmlDocPtr doc, xmlNodePtr node);
-gboolean parse_attr_contains(const char *val, xmlNodePtr node,
-                             const char *name);
+gboolean parse_contains(const gchar *val, xmlDocPtr doc, xmlNodePtr node);
+gboolean parse_attr_contains(const gchar *val, xmlNodePtr node,
+                             const gchar *name);
 
-gboolean parse_attr_string(const char *name, xmlNodePtr node, char **value);
-gboolean parse_attr_int(const char *name, xmlNodePtr node, int *value);
+gboolean parse_attr_string(const gchar *name, xmlNodePtr node, gchar **value);
+gboolean parse_attr_int(const gchar *name, xmlNodePtr node, gint *value);
+gboolean parse_attr_bool(const gchar *name, xmlNodePtr node, gboolean *value);
 
 /* paths */
 
@@ -77,7 +86,11 @@ 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 */
+gboolean parse_mkdir(const gchar *path, gint mode);
 /*! Makes a directory and all its parents */
-void parse_mkdir_path(const gchar *path, gint mode);
+gboolean parse_mkdir_path(const gchar *path, gint mode);
+
+G_END_DECLS
 
 #endif