X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=41f0c7b1cc0860f33474d2e92da074d5af70344d;hb=3c61812e588fb3c34d0713d7f82ccbf21091f032;hp=7a025242ee7b359e06bbddbd61dc91b11cc9fe47;hpb=bcb8de973abcbf6bc0cb1c46e764276c34fa5380;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index 7a025242..41f0c7b1 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -82,6 +82,17 @@ void Openbox::signalHandler(int signal)
 }
 
 
+static void runPython(const char *s) {
+  FILE *rcpyfd = fopen(s, "r");
+  if (!rcpyfd) {
+    printf("failed to load python file %s\n", s);
+  } else {
+    PyRun_SimpleFile(rcpyfd, const_cast<char*>(s));
+    fclose(rcpyfd);
+  }
+}
+
+
 Openbox::Openbox(int argc, char **argv)
   : otk::OtkEventDispatcher(),
     otk::OtkEventHandler()
@@ -148,16 +159,12 @@ Openbox::Openbox(int argc, char **argv)
   Py_Initialize();
   init_otk();
   init_openbox();
-  // i wish...
-  //PyRun_String("from _otk import *; from _openbox import *;", Py_file_input,
-  //             Py_None, Py_None);
-  FILE *rcpyfd = fopen(_scriptfilepath.c_str(), "r");
-  if (!rcpyfd) {
-    printf("failed to load python file %s\n", _scriptfilepath.c_str());
-  } else {
-    PyRun_SimpleFile(rcpyfd, const_cast<char*>(_scriptfilepath.c_str()));
-    fclose(rcpyfd);
-  }
+  PyRun_SimpleString("from _otk import *; from _openbox import *;");
+  PyRun_SimpleString("openbox = Openbox_instance()");
+
+  runPython(SCRIPTDIR"/clientmotion.py"); // moving and resizing clients
+  runPython(SCRIPTDIR"/clicks.py"); // titlebar/root clicks and dblclicks
+  runPython(_scriptfilepath.c_str());
  
   // initialize all the screens
   OBScreen *screen;