summaryrefslogtreecommitdiff
path: root/openbox/openbox.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-04-05 20:47:16 +0000
committerDana Jansens <danakj@orodu.net>2003-04-05 20:47:16 +0000
commitbd12517c615d661fa2823f85bbbcb48555f7c3db (patch)
treef42faa3fed75a2dea76bc95577e5c27922f609f4 /openbox/openbox.c
parentcbbf90a718ecc6836ef7a77b9040aebb9da348b8 (diff)
add focus options to the new rc file
Diffstat (limited to 'openbox/openbox.c')
-rw-r--r--openbox/openbox.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/openbox/openbox.c b/openbox/openbox.c
index 90756097..3d4db6f9 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -147,22 +147,24 @@ int main(int argc, char **argv)
extensions_query_all(); /* find which extensions are present */
if (screen_annex()) { /* it will be ours! */
+ /* startup the parsing so everything can register sections of the rc */
+ parse_startup();
+
+ /* anything that is going to read data from the rc file needs to be
+ in this group */
timer_startup();
render_startup();
font_startup();
event_startup();
grab_startup();
engine_startup();
+ focus_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 */
parse_rc();
-
/* we're done with parsing now, kill it */
parse_shutdown();
@@ -170,7 +172,6 @@ int main(int argc, char **argv)
engine_load();
screen_startup();
- focus_startup();
client_startup();
/* call startup for all the plugins */
@@ -188,8 +189,8 @@ int main(int argc, char **argv)
plugin_shutdown(); /* calls all the plugins' shutdown functions */
client_shutdown();
- focus_shutdown();
screen_shutdown();
+ focus_shutdown();
engine_shutdown();
grab_shutdown();
event_shutdown();