X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.i;h=74ed301060fa72c36158c717a7fd1b93f98164b5;hb=d7a30f93b517ac76816d0acea92e9c56ad5d6594;hp=cf7859d4cdea40a3e199781c2beb1998f9a993bc;hpb=fe55bb846db1933d8d6f023236298940cab441f8;p=chaz%2Fopenbox

diff --git a/src/openbox.i b/src/openbox.i
index cf7859d4..74ed3010 100644
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -10,29 +10,66 @@
 #include "openbox.hh"
 #include "screen.hh"
 #include "client.hh"
+#include "python.hh"
 %}
 
+
 %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"
-
 %inline %{
   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_key) ob::python_bind_key;
+%rename(unbind_key) ob::python_unbind_key;
+%rename(bind_mouse) ob::python_bind_mouse;
+%rename(unbind_mouse) ob::python_unbind_mouse;
+%rename(unbind_all) ob::python_unbind_all;
+
+%ignore ob::OBScreen::clients;
 %{
   #include <iterator>
 %}
 %extend ob::OBScreen {
   OBClient *client(int i) {
+    if (i >= (int)self->clients.size())
+      return NULL;
     ob::OBScreen::ClientList::iterator it = self->clients.begin();
     std::advance(it,i);
     return *it;
@@ -41,3 +78,15 @@
     return (int) self->clients.size();
   }
 };
+
+%import "../otk/eventdispatcher.hh"
+%import "../otk/eventhandler.hh"
+%import "widget.hh"
+
+%include "openbox.hh"
+%include "screen.hh"
+%include "client.hh"
+%include "python.hh"
+
+// for Mod1Mask etc
+%include "X11/X.h"