X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=4d2f102479c266d781d580d2d24f9fb657e440cd;hb=c89a13d5dee4bf5f2e7d79452d4738595454b0c4;hp=f7f2098b1bc1d608952f3a522e0470fbb6186538;hpb=66a26917a0631463df7f72c34cbeb39df466918a;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index f7f2098b..4d2f1024 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -133,6 +133,10 @@ 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"/builtins.py"); // builtin callbacks
+  // run the user's script
+  python_exec(_scriptfilepath.c_str());
 
   // initialize all the screens
   OBScreen *screen;
@@ -148,12 +152,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();
@@ -174,11 +172,10 @@ Openbox::~Openbox()
 {
   _state = State_Exiting; // time to kill everything
 
-  delete _bindings;
-  delete _actions;
-  
   std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin());
 
+  delete _bindings;
+  delete _actions;
   delete _property;
 
   python_destroy();
@@ -329,5 +326,26 @@ void Openbox::setFocusedClient(OBClient *c)
   }
 }
 
+void Openbox::execute(int screen, const std::string &bin)
+{
+#ifdef    __EMX__
+  // XXX: whats this for? windows?
+  spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", bin.c_str(), NULL);
+#else //  __EMX__
+  if (screen >= ScreenCount(otk::OBDisplay::display))
+    screen = 0;
+  const std::string &dstr =
+    otk::OBDisplay::screenInfo(screen)->displayString();
+  
+  if (! fork()) {
+      setsid();
+      int ret = putenv(const_cast<char *>(dstr.c_str()));
+      assert(ret != -1);
+      ret = execl("/bin/sh", "/bin/sh", "-c", bin.c_str(), NULL);
+      exit(ret);
+    }
+#endif // __EMX__
+}
+
 }