From 5bf68f762b8fc87cf5583b645b948b4fe55f179f Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sat, 22 Mar 2003 23:26:43 +0000 Subject: make the openbox engine use the new config shit instead of the themerc shit. order te startup so that plugins can set up their config shit before parsing the config, then the config is parsed, engine is loaded, and finally the plugins are officially started. --- openbox/openbox.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'openbox/openbox.c') diff --git a/openbox/openbox.c b/openbox/openbox.c index b32977b1..6645f5bb 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -147,23 +147,22 @@ int main(int argc, char **argv) config_startup(); render_startup(); font_startup(); - themerc_startup(); + plugin_startup(); + + /* load the plugins specified in the pluginrc */ + plugin_loadall(); + /* parse/load user options */ + config_parse(); + engine_startup(); event_startup(); screen_startup(); focus_startup(); client_startup(); grab_startup(); - plugin_startup(); - - /* XXX load all plugins!! */ - plugin_open("focus"); - plugin_open("keyboard"); - plugin_open("mouse"); - plugin_open("placement"); - plugin_open("resistance"); - config_parse(); + /* call startup for all the plugins */ + plugin_startall(); /* get all the existing windows */ client_manage_all(); -- cgit v1.2.3