X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.i;h=508b678cf990274fb188d3bf4ae8e057ad41dc8d;hb=1f8b8425ae82c2c086f6648b7608b37685997634;hp=1ff7d357e4543041329dc0b0a9ea3cc87c90aeef;hpb=3827c1a76e27865a9e2cc9da43c42399ea354e18;p=chaz%2Fopenbox

diff --git a/src/openbox.i b/src/openbox.i
index 1ff7d357..508b678c 100644
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -10,11 +10,12 @@
 #include "openbox.hh"
 #include "screen.hh"
 #include "client.hh"
-#include "python.hh"
+#include "bindings.hh"
+#include "actions.hh"
 %}
 
-
-%include stl.i
+%include "stl.i"
+%include "exception.i"
 //%include std_list.i
 //%template(ClientList) std::list<OBClient*>;
 
@@ -23,22 +24,6 @@
   ob::Openbox *Openbox_instance() { return ob::Openbox::instance; }
 %};
 
-// stuff for registering callbacks!
-
-%inline %{
-  enum ActionType {
-    Action_ButtonPress,
-    Action_ButtonRelease,
-    Action_EnterWindow,
-    Action_LeaveWindow,
-    Action_KeyPress,
-    Action_MouseMotion
-  };
-%}
-%ignore ob::python_callback;
-%rename(register) ob::python_register;
-%rename(unregister) ob::python_unregister;
-
 %ignore ob::OBScreen::clients;
 %{
   #include <iterator>
@@ -47,7 +32,7 @@
   OBClient *client(int i) {
     if (i >= (int)self->clients.size())
       return NULL;
-    ob::OBScreen::ClientList::iterator it = self->clients.begin();
+    ob::OBClient::List::iterator it = self->clients.begin();
     std::advance(it,i);
     return *it;
   }
@@ -59,6 +44,7 @@
 %import "../otk/eventdispatcher.hh"
 %import "../otk/eventhandler.hh"
 %import "widget.hh"
+%import "actions.hh"
 
 %include "openbox.hh"
 %include "screen.hh"