trasitioning for new button event handling

[chaz/openbox] / src / openbox.cc

diff --git a/src/openbox.cc b/src/openbox.cc
index 01316d795c276762d6c6c23b1e698eb2196db16a..437e5ead23c0b94f3e561cb507737946e4a116db 100644 (file)
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -128,9 +128,16 @@ Openbox::Openbox(int argc, char **argv)
   _cursors.ul_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ul_angle);
   _cursors.ur_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ur_angle);
 
-  // start up python and load config values
+  // initialize scripting
   python_init(argv[0]);
+  
+  // 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;
@@ -146,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();
@@ -179,6 +180,8 @@ Openbox::~Openbox()
 
   delete _property;
 
+  python_destroy();
+  
   // close the X display
   otk::OBDisplay::destroy();
 }
@@ -325,10 +328,5 @@ void Openbox::setFocusedClient(OBClient *c)
   }
 }
 
-
-bool Openbox::getConfigString(const char *name, std::string *value) {
-  return python_get_string(name, value);
-}
-
 }