X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.i;h=59dbecdd20bc32396eb381e5a9597fbbe17e6903;hb=9e77a88d269bfafb78e56a646bfacebdd6ff4c5a;hp=7edc794232fb7c9ccbec685cf8daaf12bf529e00;hpb=c8e246f8de5af9963b22cc104d22ca10772028dd;p=chaz%2Fopenbox

diff --git a/src/openbox.i b/src/openbox.i
index 7edc7942..59dbecdd 100644
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -13,16 +13,16 @@
 #include "bindings.hh"
 #include "actions.hh"
 #include "python.hh"
-#include "otk/display.hh"
+#include "otk/otk.hh"
 %}
 
 %include "stl.i"
 //%include std_list.i
-//%template(ClientList) std::list<OBClient*>;
+//%template(ClientList) std::list<Client*>;
 
-%ignore ob::Openbox::instance;
+%ignore ob::openbox;
 %inline %{
-  ob::Openbox *Openbox_instance() { return ob::Openbox::instance; }
+  ob::Openbox *Openbox_instance() { return ob::openbox; }
 %};
 
 %{
@@ -90,15 +90,15 @@ void python_callback(PyObject *func, KeyData *data)
 }
 %}
 
-%ignore ob::OBScreen::clients;
+%ignore ob::Screen::clients;
 %{
   #include <iterator>
 %}
-%extend ob::OBScreen {
-  OBClient *client(int i) {
-    if (i >= (int)self->clients.size())
+%extend ob::Screen {
+  Client *client(int i) {
+    if (i < 0 || i >= (int)self->clients.size())
       return NULL;
-    ob::OBClient::List::iterator it = self->clients.begin();
+    ob::Client::List::iterator it = self->clients.begin();
     std::advance(it,i);
     return *it;
   }
@@ -107,7 +107,22 @@ void python_callback(PyObject *func, KeyData *data)
   }
 };
 
-%include "../otk/otk.i"
+%ignore otk::Display::display;
+%inline %{
+  Display *Display_display() { return otk::Display::display; }
+%};
+
+%include "../otk/ustring.i"
+
+%include "../otk/display.hh"
+%include "../otk/point.hh"
+%include "../otk/property.hh"
+%include "../otk/rect.hh"
+%include "../otk/screeninfo.hh"
+%include "../otk/strut.hh"
+
+%include "../otk/eventhandler.hh"
+%include "../otk/eventdispatcher.hh"
 
 %import "widgetbase.hh"
 %import "actions.hh"