X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.i;h=657e31b741e2640a4e6c70a74ee67b5b626f73dd;hb=96a9196cbb71b7f8d5e3d98a92b2e59bb1b591a8;hp=7422d0a198f16d4b7ccec3e747f358a4f4f0a284;hpb=558b55b0c31a3cf6a7006aa78a22a4d7002d9804;p=chaz%2Fopenbox

diff --git a/src/openbox.i b/src/openbox.i
index 7422d0a1..657e31b7 100644
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -18,11 +18,11 @@
 
 %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,17 @@ void python_callback(PyObject *func, KeyData *data)
 }
 %}
 
-%ignore ob::OBScreen::clients;
+#ignore ob::openbox;
+
+%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,11 +109,13 @@ void python_callback(PyObject *func, KeyData *data)
   }
 };
 
-%ignore otk::OBDisplay::display;
+%ignore otk::display;
 %inline %{
-  Display *OBDisplay_display() { return otk::OBDisplay::display; }
+  otk::Display *Display_instance() { return otk::display; }
 %};
 
+%include "../otk/ustring.i"
+
 %include "../otk/display.hh"
 %include "../otk/point.hh"
 %include "../otk/property.hh"
@@ -119,11 +123,6 @@ void python_callback(PyObject *func, KeyData *data)
 %include "../otk/screeninfo.hh"
 %include "../otk/strut.hh"
 
-%rename(itostring_unsigned) itostring(unsigned int);
-%rename(itostring_long) itostring(long);
-%rename(itostring_unsigned_long) itostring(unsigned long);
-%include "../otk/util.hh"
-
 %include "../otk/eventhandler.hh"
 %include "../otk/eventdispatcher.hh"