#include "openbox.hh"
#include "screen.hh"
#include "client.hh"
-#include "python.hh"
#include "bindings.hh"
+#include "actions.hh"
+#include "python.hh"
+#include "otk/otk.hh"
%}
-%include stl.i
+%include "stl.i"
//%include std_list.i
//%template(ClientList) std::list<OBClient*>;
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
- };
+%{
+namespace ob {
+void python_callback(PyObject *func, MouseData *data)
+{
+ PyObject *arglist;
+ PyObject *result;
+
+ arglist = Py_BuildValue("(O)", SWIG_NewPointerObj((void *) data,
+ SWIGTYPE_p_ob__MouseData,
+ 0));
+
+ // call the callback
+ result = PyEval_CallObject(func, arglist);
+ if (!result || PyErr_Occurred()) {
+ // an exception occured in the script, display it
+ PyErr_Print();
+ }
+
+ Py_XDECREF(result);
+ Py_DECREF(arglist);
+}
+
+void python_callback(PyObject *func, EventData *data)
+{
+ PyObject *arglist;
+ PyObject *result;
+
+ arglist = Py_BuildValue("(O)", SWIG_NewPointerObj((void *) data,
+ SWIGTYPE_p_ob__EventData,
+ 0));
+
+ // call the callback
+ result = PyEval_CallObject(func, arglist);
+ if (!result || PyErr_Occurred()) {
+ // an exception occured in the script, display it
+ PyErr_Print();
+ }
+
+ Py_XDECREF(result);
+ Py_DECREF(arglist);
+}
+
+void python_callback(PyObject *func, KeyData *data)
+{
+ PyObject *arglist;
+ PyObject *result;
+
+ arglist = Py_BuildValue("(O)", SWIG_NewPointerObj((void *) data,
+ SWIGTYPE_p_ob__KeyData,
+ 0));
+
+ // call the callback
+ result = PyEval_CallObject(func, arglist);
+ if (!result || PyErr_Occurred()) {
+ // an exception occured in the script, display it
+ PyErr_Print();
+ }
+
+ Py_XDECREF(result);
+ Py_DECREF(arglist);
+}
+
+}
%}
-%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;
-%rename(set_reset_key) ob::python_set_reset_key;
%ignore ob::OBScreen::clients;
%{
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;
}
}
};
-%import "../otk/eventdispatcher.hh"
-%import "../otk/eventhandler.hh"
-%import "widget.hh"
+%include "../otk/display.hh"
+%include "../otk/point.hh"
+%include "../otk/property.hh"
+%include "../otk/rect.hh"
+%include "../otk/screeninfo.hh"
+%include "../otk/strut.hh"
+
+%rename(itostring_unsigned) itostring(unsigned int);
+%rename(itostring_long) itostring(long);
+%rename(itostring_unsigned_long) itostring(unsigned long);
+%include "../otk/util.hh"
+
+%include "../otk/eventhandler.hh"
+%include "../otk/eventdispatcher.hh"
+
+%import "widgetbase.hh"
+%import "actions.hh"
%include "openbox.hh"
%include "screen.hh"