summaryrefslogtreecommitdiff
path: root/openbox/openbox.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-04-02 07:46:46 +0000
committerDana Jansens <danakj@orodu.net>2003-04-02 07:46:46 +0000
commit71c8b0b7b2cf2fa79ac4c81b7756f2b230f2de7a (patch)
tree7294b08a6708be789f5f674418c7dc80809d78b4 /openbox/openbox.c
parent4875ff5f8ed227a989c699fe6d8390396e485815 (diff)
create a generic tokenizer/sectionizer for the config file. pass off the token to functions registered for each section to parse them further. some fixes for the engine irt font shadows, and fixed a bug with rendering the iconify button when it was not in the layout
Diffstat (limited to 'openbox/openbox.c')
-rw-r--r--openbox/openbox.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/openbox/openbox.c b/openbox/openbox.c
index 117349f2..a7357b2f 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -9,6 +9,7 @@
#include "extensions.h"
#include "gettext.h"
#include "config.h"
+#include "parse.h"
#include "grab.h"
#include "engine.h"
#include "plugin.h"
@@ -145,7 +146,7 @@ int main(int argc, char **argv)
prop_startup(); /* get atoms values for the display */
extensions_query_all(); /* find which extensions are present */
-
+
if (screen_annex()) { /* it will be ours! */
timer_startup();
config_startup();
@@ -153,10 +154,16 @@ int main(int argc, char **argv)
font_startup();
plugin_startup();
+ /* startup the parsing so plugins can register sections of the rc */
+ parse_startup();
+
/* load the plugins specified in the pluginrc */
plugin_loadall();
/* parse/load user options */
- config_parse();
+ parse_rc();
+
+ /* we're done with parsing now, kill it */
+ parse_shutdown();
engine_startup();
event_startup();