X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.i;h=1b2275689471bb768f9f6a34943284c30b19b617;hb=527697d6aee92ab3780eb34af158ac9d2207939c;hp=20c8ea06ce2cdbd0133564b174d199ad7ca38cdb;hpb=2ae2b257d39ea62640c2590f794e4275c6db1cd4;p=chaz%2Fopenbox

diff --git a/src/openbox.i b/src/openbox.i
index 20c8ea06..1b227568 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,39 +24,6 @@
   ob::Openbox *Openbox_instance() { return ob::Openbox::instance; }
 %};
 
-// stuff for scripting callbacks!
-%inline %{
-  enum ActionType {
-    Action_ButtonPress,
-    Action_ButtonRelease,
-    Action_Click,
-    Action_DoubleClick,
-    Action_EnterWindow,
-    Action_LeaveWindow,
-    Action_KeyPress,
-    Action_MouseMotion
-  };
-  enum WidgetType {
-    Type_Frame,
-    Type_Titlebar,
-    Type_Handle,
-    Type_Plate,
-    Type_Label,
-    Type_MaximizeButton,
-    Type_CloseButton,
-    Type_IconifyButton,
-    Type_StickyButton,
-    Type_LeftGrip,
-    Type_RightGrip,
-    Type_Client,
-    Type_Root
-  };
-%}
-%ignore ob::python_callback;
-%rename(register) ob::python_register;
-%rename(preregister) ob::python_preregister;
-%rename(unregister) ob::python_unregister;
-
 %ignore ob::OBScreen::clients;
 %{
   #include <iterator>
@@ -76,6 +44,7 @@
 %import "../otk/eventdispatcher.hh"
 %import "../otk/eventhandler.hh"
 %import "widget.hh"
+%import "actions.hh"
 
 %include "openbox.hh"
 %include "screen.hh"