run scripts before initializing screens. kill the globals.py. add the python_get_stri...

[chaz/openbox] / src / openbox.cc

diff --git a/src/openbox.cc b/src/openbox.cc
index f7f2098b1bc1d608952f3a522e0470fbb6186538..436c09fadb6ec9c6eb5bfd3976b812bc790adebe 100644 (file)
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -133,6 +133,11 @@ Openbox::Openbox(int argc, char **argv)
   
   // load config values
   python_exec(SCRIPTDIR"/config.py"); // load openbox config values
+  // run all of the python scripts
+  python_exec(SCRIPTDIR"/clientmotion.py"); // moving and resizing clients
+  python_exec(SCRIPTDIR"/clicks.py"); // titlebar/root clicks and dblclicks
+  // run the user's script
+  python_exec(_scriptfilepath.c_str());
 
   // initialize all the screens
   OBScreen *screen;
@@ -148,12 +153,6 @@ Openbox::Openbox(int argc, char **argv)
     ::exit(1);
   }
 
-  // run all of the python scripts, including the user's
-  python_exec(SCRIPTDIR"/globals.py"); // create/set global vars
-  python_exec(SCRIPTDIR"/clientmotion.py"); // moving and resizing clients
-  python_exec(SCRIPTDIR"/clicks.py"); // titlebar/root clicks and dblclicks
-  python_exec(_scriptfilepath.c_str());
-
   ScreenList::iterator it, end = _screens.end();
   for (it = _screens.begin(); it != end; ++it) {
     (*it)->manageExisting();