conflicts with python too :\

[chaz/openbox] / src / openbox.cc

diff --git a/src/openbox.cc b/src/openbox.cc
index bb0743c08ab1f19cdd2e40aa6c64e32b693ceb66..41f0c7b1cc0860f33474d2e92da074d5af70344d 100644 (file)
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #ifdef HAVE_CONFIG_H
 # include "../config.h"
@@ -9,7 +9,6 @@
 #include "client.hh"
 #include "screen.hh"
 #include "actions.hh"
-#include "python_client.hh"
 #include "otk/property.hh"
 #include "otk/display.hh"
 #include "otk/assassin.hh"
@@ -43,6 +42,13 @@ extern "C" {
 #  include <sys/select.h>
 #endif // HAVE_SYS_SELECT_H
 
+#include <Python.h>
+  
+// The initializer in openbox_wrap.cc
+extern void init_openbox(void);
+// The initializer in otk_wrap.cc
+extern void init_otk(void);
+
 #include "gettext.h"
 #define _(str) gettext(str)
 }
@@ -76,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()
@@ -90,9 +107,7 @@ Openbox::Openbox(int argc, char **argv)
   _argv0 = argv[0];
   _doshutdown = false;
   _rcfilepath = otk::expandTilde("~/.openbox/rc3");
-
-  _pyclients = (PyDictObject*) PyDict_New();
-  assert(_pyclients);
+  _scriptfilepath = otk::expandTilde("~/.openbox/user.py");
 
   parseCommandLine(argc, argv);
 
@@ -139,6 +154,18 @@ 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 run the user's startup script
+  Py_SetProgramName(argv[0]);
+  Py_Initialize();
+  init_otk();
+  init_openbox();
+  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;
   screen = new OBScreen(0, _config);
@@ -154,18 +181,6 @@ Openbox::Openbox(int argc, char **argv)
     ::exit(1);
   }
 
-  // initialize the python interface
-  Py_SetProgramName(argv[0]);
-  Py_Initialize();
-  initopenbox(); // initialize the static 'openbox' module
-  FILE *rcpyfd = fopen("/home/natas/.openbox/user.py", "r");
-  if (!rcpyfd) {
-    printf("failed to load python file /home/natas/.openbox/user.py\n");
-  } else {
-    PyRun_SimpleFile(rcpyfd, "/home/natas/.openbox/user.py");
-    fclose(rcpyfd);
-  }
-
   _state = State_Normal; // done starting
 }
 
@@ -203,6 +218,11 @@ void Openbox::parseCommandLine(int argc, char **argv)
         err = true;
       else
         _menufilepath = argv[i];
+    } else if (arg == "-script") {
+      if (++i >= argc)
+        err = true;
+      else
+        _scriptfilepath = argv[i];
     } else if (arg == "-version") {
       showVersion();
       ::exit(0);
@@ -237,6 +257,7 @@ void Openbox::showHelp()
   -display <string>  use display connection.\n\
   -rc <string>       use alternate resource file.\n\
   -menu <string>     use alternate menu file.\n\
+  -script <string>   use alternate startup script file.\n\
   -version           display version and exit.\n\
   -help              display this help text and exit.\n\n"), _argv0);
 
@@ -277,13 +298,6 @@ void Openbox::eventLoop()
 void Openbox::addClient(Window window, OBClient *client)
 {
   _clients[window] = client;
-
-  // maintain the python list here too
-  PyClientObject* pyclient = PyObject_New(PyClientObject, &PyClient_Type);
-  pyclient->window = window;
-  pyclient->client = client;
-  PyDict_SetItem((PyObject*)_pyclients, PyLong_FromLong(window),
-                 (PyObject*)pyclient);
 }