clarify an incorrect comment, and make some funcs const

[chaz/openbox] / src / openbox.i

diff --git a/src/openbox.i b/src/openbox.i
index bde9a8cb2c48f510611c04056fbd11866c9cf167..b914ce9c52bd4d4ee0a3386bb79b06ef77a6e792 100644 (file)
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -10,19 +10,45 @@
 #include "openbox.hh"
 #include "screen.hh"
 #include "client.hh"
+#include "bindings.hh"
+#include "actions.hh"
 %}
 
-%immutable ob::Openbox::instance;
+%include "stl.i"
+//%include std_list.i
+//%template(ClientList) std::list<OBClient*>;
+
+%ignore ob::Openbox::instance;
+%inline %{
+  ob::Openbox *Openbox_instance() { return ob::Openbox::instance; }
+%};
+
+%ignore ob::OBScreen::clients;
+%{
+  #include <iterator>
+%}
+%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();
+  }
+};
+
+%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"
 
-
-%include stl.i
-%include std_list.i
-
-%{
-class OBClient;
-%}
-%template(ClientList) std::list<OBClient*>;
+// for Mod1Mask etc
+%include "X11/X.h"