rework focus event handling. does it basically like ob2 did now. and it seems to...

[chaz/openbox] / src / openbox.i

diff --git a/src/openbox.i b/src/openbox.i
index d4b83575e31bdc49d8e21ab32f5aa8571e195f82..b914ce9c52bd4d4ee0a3386bb79b06ef77a6e792 100644 (file)
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -10,11 +10,11 @@
 #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 std_list.i
 //%template(ClientList) std::list<OBClient*>;
 
@@ -23,43 +23,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;
-%rename(unregister_all) ob::python_unregister_all;
-%rename(bind) ob::python_bind;
-%rename(unbind) ob::python_unbind;
-%rename(unbind_all) ob::python_unbind_all;
-
 %ignore ob::OBScreen::clients;
 %{
   #include <iterator>
@@ -68,7 +31,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;
   }
@@ -80,6 +43,7 @@
 %import "../otk/eventdispatcher.hh"
 %import "../otk/eventhandler.hh"
 %import "widget.hh"
+%import "actions.hh"
 
 %include "openbox.hh"
 %include "screen.hh"