python interface is working!

[chaz/openbox] / src / openbox.cc

diff --git a/src/openbox.cc b/src/openbox.cc
index bb0743c08ab1f19cdd2e40aa6c64e32b693ceb66..2254f9efae570d858a319c88fa3de6946c8073dc 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 <guile/gh.h>
+
+#include <Python.h>
+  
+// The initializer in openbox_wrap.cc
+extern void init_openbox(void);
+
 #include "gettext.h"
 #define _(str) gettext(str)
 }
@@ -91,9 +97,6 @@ Openbox::Openbox(int argc, char **argv)
   _doshutdown = false;
   _rcfilepath = otk::expandTilde("~/.openbox/rc3");
 
-  _pyclients = (PyDictObject*) PyDict_New();
-  assert(_pyclients);
-
   parseCommandLine(argc, argv);
 
   // TEMPORARY: using the xrdb rc3
@@ -154,10 +157,24 @@ Openbox::Openbox(int argc, char **argv)
     ::exit(1);
   }
 
-  // initialize the python interface
+  /*
+  // make our guile interfaces exist
+  SWIG_init();
+  
+  // run the guile of d3th
+  FILE *rcpyfd = fopen("/home/natas/.openbox/user.scm", "r");
+  if (!rcpyfd) {
+    printf("failed to load guile script /home/natas/.openbox/user.scm\n");
+  } else {
+    fclose(rcpyfd);
+    gh_load("/home/natas/.openbox/user.scm");
+  }
+  */
+  
   Py_SetProgramName(argv[0]);
   Py_Initialize();
-  initopenbox(); // initialize the static 'openbox' module
+  //initopenbox(); // initialize the static 'openbox' module
+  init_openbox();
   FILE *rcpyfd = fopen("/home/natas/.openbox/user.py", "r");
   if (!rcpyfd) {
     printf("failed to load python file /home/natas/.openbox/user.py\n");
@@ -165,6 +182,7 @@ Openbox::Openbox(int argc, char **argv)
     PyRun_SimpleFile(rcpyfd, "/home/natas/.openbox/user.py");
     fclose(rcpyfd);
   }
+  
 
   _state = State_Normal; // done starting
 }
@@ -277,13 +295,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);
 }