python interface is working!

diff --git a/src/Makefile.am b/src/Makefile.am
index 92e0b3b0ea5a93c5ba56eead1285a998f02568dc..3a4f9865cad5c6e84fd505047d33c3bd6639b319 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,7 @@ openbox.i: openbox.hh screen.hh client.hh
        touch openbox.i
 
 openbox_wrap.cc: openbox.i
-       swig -python -c++ -nodefault -module openbox -o openbox_wrap.cc openbox.i
+       swig -python -c++ -nodefault -o openbox_wrap.cc openbox.i
 #      swig -guile -c++ -nodefault -o openbox_wrap.cc openbox.i
 
 # local dependencies

diff --git a/src/openbox.i b/src/openbox.i
index bde9a8cb2c48f510611c04056fbd11866c9cf167..cf7859d4cdea40a3e199781c2beb1998f9a993bc 100644 (file)
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -12,17 +12,32 @@
 #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;
 
 %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) {
+    ob::OBScreen::ClientList::iterator it = self->clients.begin();
+    std::advance(it,i);
+    return *it;
+  }
+  int clientCount() const {
+    return (int) self->clients.size();
+  }
+};

diff --git a/src/screen.cc b/src/screen.cc
index 18c63327d7b29c5be8deda896286e09be16ece85..947471c241b8341ca50976b646b450e0b268e27a 100644 (file)
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -101,8 +101,8 @@ OBScreen::~OBScreen()
   if (! _managed) return;
 
   // unmanage all windows
-  while (!_clients.empty())
-    unmanageWindow(_clients.front());
+  while (!clients.empty())
+    unmanageWindow(clients.front());
 
   delete _image_control;
 }
@@ -243,13 +243,13 @@ void OBScreen::setClientList()
   Window *windows;
 
   // create an array of the window ids
-  if (_clients.size() > 0) {
+  if (clients.size() > 0) {
     Window *win_it;
     
-    windows = new Window[_clients.size()];
+    windows = new Window[clients.size()];
     win_it = windows;
-    ClientList::const_iterator it = _clients.begin();
-    const ClientList::const_iterator end = _clients.end();
+    ClientList::const_iterator it = clients.begin();
+    const ClientList::const_iterator end = clients.end();
     for (; it != end; ++it, ++win_it)
       *win_it = (*it)->window();
   } else
@@ -258,9 +258,9 @@ void OBScreen::setClientList()
   Openbox::instance->property()->set(_info->rootWindow(),
                                      otk::OBProperty::net_client_list,
                                      otk::OBProperty::Atom_Window,
-                                     windows, _clients.size());
+                                     windows, clients.size());
 
-  if (_clients.size())
+  if (clients.size())
     delete [] windows;
 
   setStackingList();
@@ -389,7 +389,7 @@ void OBScreen::manageWindow(Window window)
   otk::OBDisplay::ungrab();
 
   // add to the screen's list
-  _clients.push_back(client);
+  clients.push_back(client);
   // update the root properties
   setClientList();
 }
@@ -432,7 +432,7 @@ void OBScreen::unmanageWindow(OBClient *client)
   client->frame = 0;
 
   // remove from the screen's list
-  _clients.remove(client);
+  clients.remove(client);
   delete client;
 
   // update the root properties

diff --git a/src/screen.hh b/src/screen.hh
index a35e4ca0229dbd77904ffe20b3f6d9b13839c2b2..7e95d40f01bed2f36d2a67a6131ab447a8d6c5cd 100644 (file)
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -43,6 +43,9 @@ public:
                                           ButtonPressMask |
                                           ButtonReleaseMask;
 
+  //! All managed clients on the screen
+  ClientList clients;
+  
 private:
   //! Was %Openbox able to manage the screen?
   bool _managed;
@@ -64,9 +67,6 @@ private:
   //! Is the root colormap currently installed?
   bool _root_cmap_installed;
 
-  //! All managed clients on the screen
-  ClientList _clients;
-
   //! Area usable for placement etc (total - struts)
   otk::Rect _area;
 
@@ -114,8 +114,6 @@ public:
   //! Returns the style in use on the screen
   inline const otk::Style *style() const { return &_style; }
 
-  inline ClientList clients() { return _clients; }
-
   //! Adds a window's strut to the screen's list of reserved spaces
   void addStrut(otk::Strut *strut);
   //! Removes a window's strut from the screen's list of reserved spaces