updated wrappers

[chaz/openbox] / src / openbox.i

diff --git a/src/openbox.i b/src/openbox.i
index bde9a8cb2c48f510611c04056fbd11866c9cf167..7422d0a198f16d4b7ccec3e747f358a4f4f0a284 100644 (file)
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -10,19 +10,130 @@
 #include "openbox.hh"
 #include "screen.hh"
 #include "client.hh"
+#include "bindings.hh"
+#include "actions.hh"
+#include "python.hh"
+#include "otk/otk.hh"
 %}
 
-%immutable ob::Openbox::instance;
+%include "stl.i"
+//%include std_list.i
+//%template(ClientList) std::list<OBClient*>;
 
-%include "openbox.hh"
-%include "screen.hh"
-%include "client.hh"
+%ignore ob::Openbox::instance;
+%inline %{
+  ob::Openbox *Openbox_instance() { return ob::Openbox::instance; }
+%};
+
+%{
+namespace ob {
+void python_callback(PyObject *func, MouseData *data)
+{
+  PyObject *arglist;
+  PyObject *result;
+
+  arglist = Py_BuildValue("(O)", SWIG_NewPointerObj((void *) data,
+                                                    SWIGTYPE_p_ob__MouseData,
+                                                    0));
+  
+  // call the callback
+  result = PyEval_CallObject(func, arglist);
+  if (!result || PyErr_Occurred()) {
+    // an exception occured in the script, display it
+    PyErr_Print();
+  }
 
+  Py_XDECREF(result);
+  Py_DECREF(arglist);
+}
 
-%include stl.i
-%include std_list.i
+void python_callback(PyObject *func, EventData *data)
+{
+  PyObject *arglist;
+  PyObject *result;
 
+  arglist = Py_BuildValue("(O)", SWIG_NewPointerObj((void *) data,
+                                                    SWIGTYPE_p_ob__EventData,
+                                                    0));
+  
+  // call the callback
+  result = PyEval_CallObject(func, arglist);
+  if (!result || PyErr_Occurred()) {
+    // an exception occured in the script, display it
+    PyErr_Print();
+  }
+
+  Py_XDECREF(result);
+  Py_DECREF(arglist);
+}
+
+void python_callback(PyObject *func, KeyData *data)
+{
+  PyObject *arglist;
+  PyObject *result;
+
+  arglist = Py_BuildValue("(O)", SWIG_NewPointerObj((void *) data,
+                                                    SWIGTYPE_p_ob__KeyData,
+                                                    0));
+  
+  // call the callback
+  result = PyEval_CallObject(func, arglist);
+  if (!result || PyErr_Occurred()) {
+    // an exception occured in the script, display it
+    PyErr_Print();
+  }
+
+  Py_XDECREF(result);
+  Py_DECREF(arglist);
+}
+
+}
+%}
+
+%ignore ob::OBScreen::clients;
 %{
-class OBClient;
+  #include <iterator>
 %}
-%template(ClientList) std::list<OBClient*>;
+%extend ob::OBScreen {
+  OBClient *client(int i) {
+    if (i >= (int)self->clients.size())
+      return NULL;
+    ob::OBClient::List::iterator it = self->clients.begin();
+    std::advance(it,i);
+    return *it;
+  }
+  int clientCount() const {
+    return (int) self->clients.size();
+  }
+};
+
+%ignore otk::OBDisplay::display;
+%inline %{
+  Display *OBDisplay_display() { return otk::OBDisplay::display; }
+%};
+
+%include "../otk/display.hh"
+%include "../otk/point.hh"
+%include "../otk/property.hh"
+%include "../otk/rect.hh"
+%include "../otk/screeninfo.hh"
+%include "../otk/strut.hh"
+
+%rename(itostring_unsigned) itostring(unsigned int);
+%rename(itostring_long) itostring(long);
+%rename(itostring_unsigned_long) itostring(unsigned long);
+%include "../otk/util.hh"
+
+%include "../otk/eventhandler.hh"
+%include "../otk/eventdispatcher.hh"
+
+%import "widgetbase.hh"
+%import "actions.hh"
+
+%include "openbox.hh"
+%include "screen.hh"
+%include "client.hh"
+%include "python.hh"
+
+// for Mod1Mask etc
+%include "X11/X.h"