conflicts with python too :\

[chaz/openbox] / src / openbox.i

diff --git a/src/openbox.i b/src/openbox.i
index bde9a8cb2c48f510611c04056fbd11866c9cf167..ef82956b62c4534f222a33e241449ed0d7984b07 100644 (file)
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -10,19 +10,76 @@
 #include "openbox.hh"
 #include "screen.hh"
 #include "client.hh"
+#include "python.hh"
 %}
 
-%immutable ob::Openbox::instance;
 
-%include "openbox.hh"
-%include "screen.hh"
-%include "client.hh"
+%include stl.i
+//%include std_list.i
+//%template(ClientList) std::list<OBClient*>;
 
+%ignore ob::Openbox::instance;
+%inline %{
+  ob::Openbox *Openbox_instance() { return ob::Openbox::instance; }
+%};
 
-%include stl.i
-%include std_list.i
+// 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(unregister) ob::python_unregister;
 
+%ignore ob::OBScreen::clients;
 %{
-class OBClient;
+  #include <iterator>
 %}
-%template(ClientList) std::list<OBClient*>;
+%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;
+  }
+  int clientCount() const {
+    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"