X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.i;h=f43856072a006b139dfd94768635d2dabd1c0616;hb=af1ac846ccb5fab8a3c83d8688db3d3f96f5a98b;hp=dd1368a06e78be074ad5962b1ac9250a0ca80bcb;hpb=88b7de4aaa417512552003ccf20344766234e0e3;p=chaz%2Fopenbox

diff --git a/src/openbox.i b/src/openbox.i
index dd1368a0..f4385607 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,6 +109,18 @@ void python_callback(PyObject *func, KeyData *data)
   }
 };
 
+%include "../otk/ustring.i"
+
+%ignore otk::display;
+%inline %{
+  otk::Display *Display_instance() { return otk::display; }
+%};
+
+%ignore otk::Property::atoms;
+%inline %{
+  const otk::Atoms& Property_atoms() { return otk::Property::atoms; }
+%};
+
 %include "../otk/display.hh"
 %include "../otk/point.hh"
 %include "../otk/property.hh"
@@ -114,11 +128,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"