X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.i;h=508b678cf990274fb188d3bf4ae8e057ad41dc8d;hb=1f8b8425ae82c2c086f6648b7608b37685997634;hp=a3192756eee5aaa8b883cd1c6f13ddfe636a3bf5;hpb=375156c1125cfad326642d7b5882746f0b9c3554;p=chaz%2Fopenbox

diff --git a/src/openbox.i b/src/openbox.i
index a3192756..508b678c 100644
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -10,28 +10,21 @@
 #include "openbox.hh"
 #include "screen.hh"
 #include "client.hh"
+#include "bindings.hh"
+#include "actions.hh"
 %}
 
-%include stl.i
+%include "stl.i"
+%include "exception.i"
 //%include std_list.i
 //%template(ClientList) std::list<OBClient*>;
 
-
 %ignore ob::Openbox::instance;
-%ignore ob::OBScreen::clients;
-
-%import "../otk/eventdispatcher.hh"
-%import "../otk/eventhandler.hh"
-%import "widget.hh"
-
-%include "openbox.hh"
-%include "screen.hh"
-%include "client.hh"
-
 %inline %{
   ob::Openbox *Openbox_instance() { return ob::Openbox::instance; }
 %};
 
+%ignore ob::OBScreen::clients;
 %{
   #include <iterator>
 %}
@@ -39,7 +32,7 @@
   OBClient *client(int i) {
     if (i >= (int)self->clients.size())
       return NULL;
-    ob::OBScreen::ClientList::iterator it = self->clients.begin();
+    ob::OBClient::List::iterator it = self->clients.begin();
     std::advance(it,i);
     return *it;
   }
@@ -47,3 +40,16 @@
     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"