X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.i;h=aeae40dd051188937098bfd488e4374f79e3d659;hb=a4a8d09f4b9431d6d831cb7aa220e6c952802c95;hp=bde9a8cb2c48f510611c04056fbd11866c9cf167;hpb=5f78b51429b204f89b654d634bb4cc8cb78b95f6;p=chaz%2Fopenbox

diff --git a/src/openbox.i b/src/openbox.i
index bde9a8cb..aeae40dd 100644
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -10,19 +10,48 @@
 #include "openbox.hh"
 #include "screen.hh"
 #include "client.hh"
+#include "bindings.hh"
+#include "actions.hh"
 %}
 
-%immutable ob::Openbox::instance;
+%include "stl.i"
+%include "exception.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; }
+%};
 
+%rename(register) python_register;
 
-%include stl.i
-%include std_list.i
-
+%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::OBScreen::ClientList::iterator it = self->clients.begin();
+    std::advance(it,i);
+    return *it;
+  }
+  int clientCount() const {
+    return (int) self->clients.size();
+  }
+};
+
+%import "../otk/eventdispatcher.hh"
+%import "../otk/eventhandler.hh"
+%import "widget.hh"
+%import "actions.hh"
+
+%include "openbox.hh"
+%include "screen.hh"
+%include "client.hh"
+%include "python.hh"
+
+// for Mod1Mask etc
+%include "X11/X.h"