rework focus event handling. does it basically like ob2 did now. and it seems to...

[chaz/openbox] / src / openbox.i

diff --git a/src/openbox.i b/src/openbox.i
index 3dbe190cc417f76985630b6948c2e99d159756a1..b914ce9c52bd4d4ee0a3386bb79b06ef77a6e792 100644 (file)
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -10,34 +10,28 @@
 #include "openbox.hh"
 #include "screen.hh"
 #include "client.hh"
+#include "bindings.hh"
+#include "actions.hh"
 %}
 
-%include stl.i
+%include "stl.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>
 %}
 %extend ob::OBScreen {
   OBClient *client(int i) {
-    ob::OBScreen::ClientList::iterator it = self->clients.begin();
+    if (i >= (int)self->clients.size())
+      return NULL;
+    ob::OBClient::List::iterator it = self->clients.begin();
     std::advance(it,i);
     return *it;
   }
@@ -45,3 +39,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"