*** empty log message ***

[chaz/openbox] / src / openbox.i

diff --git a/src/openbox.i b/src/openbox.i
index bde9a8cb2c48f510611c04056fbd11866c9cf167..a3192756eee5aaa8b883cd1c6f13ddfe636a3bf5 100644 (file)
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -12,17 +12,38 @@
 #include "client.hh"
 %}
 
-%immutable ob::Openbox::instance;
+%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"
 
-
-%include stl.i
-%include std_list.i
+%inline %{
+  ob::Openbox *Openbox_instance() { return ob::Openbox::instance; }
+%};
 
 %{
-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();
+  }
+};