#include "openbox.hh"
#include "screen.hh"
#include "client.hh"
-#include "python.hh"
+#include "bindings.hh"
+#include "actions.hh"
%}
-
%include stl.i
+%include exception.i
//%include std_list.i
//%template(ClientList) std::list<OBClient*>;
%inline %{
enum ActionType {
Action_ButtonPress,
- Action_ButtonRelease,
Action_Click,
Action_DoubleClick,
Action_EnterWindow,
Action_LeaveWindow,
Action_KeyPress,
- Action_MouseMotion
+ Action_MouseMotion,
+ Action_NewWindow,
+ Action_CloseWindow
};
enum WidgetType {
Type_Frame,
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;
+%rename(register) python_register;
+%inline %{
+PyObject * python_register(int action, PyObject *func, bool infront = false)
+{
+ if (!PyCallable_Check(func)) {
+ PyErr_SetString(PyExc_TypeError, "Invalid callback function.");
+ return NULL;
+ }
+
+ if (!ob::Openbox::instance->actions()->registerCallback(
+ (ob::OBActions::ActionType)action, func, infront)) {
+ PyErr_SetString(PyExc_RuntimeError, "Unable to register action callback.");
+ return NULL;
+ }
+ Py_INCREF(Py_None); return Py_None;
+}
+
+PyObject * unregister(int action, PyObject *func)
+{
+ if (!PyCallable_Check(func)) {
+ PyErr_SetString(PyExc_TypeError, "Invalid callback function.");
+ return NULL;
+ }
+
+ if (!ob::Openbox::instance->actions()->unregisterCallback(
+ (ob::OBActions::ActionType)action, func)) {
+ PyErr_SetString(PyExc_RuntimeError, "Unable to unregister action callback.");
+ return NULL;
+ }
+ Py_INCREF(Py_None); return Py_None;
+}
+
+PyObject * unregister_all(int action)
+{
+ if (!ob::Openbox::instance->actions()->unregisterAllCallbacks(
+ (ob::OBActions::ActionType)action)) {
+ PyErr_SetString(PyExc_RuntimeError,
+ "Unable to unregister action callbacks.");
+ return NULL;
+ }
+ Py_INCREF(Py_None); return Py_None;
+}
+
+PyObject * bind(PyObject *keylist, PyObject *func)
+{
+ if (!PyCallable_Check(func)) {
+ PyErr_SetString(PyExc_TypeError, "Invalid callback function.");
+ return NULL;
+ }
+ if (!PyList_Check(keylist)) {
+ PyErr_SetString(PyExc_TypeError, "Invalid keylist. Not a list.");
+ return NULL;
+ }
+
+ ob::OBBindings::StringVect vectkeylist;
+ for (int i = 0, end = PyList_Size(keylist); i < end; ++i) {
+ PyObject *str = PyList_GetItem(keylist, i);
+ if (!PyString_Check(str)) {
+ PyErr_SetString(PyExc_TypeError,
+ "Invalid keylist. It must contain only strings.");
+ return NULL;
+ }
+ vectkeylist.push_back(PyString_AsString(str));
+ }
+
+ if (!ob::Openbox::instance->bindings()->add(vectkeylist, func)) {
+ PyErr_SetString(PyExc_RuntimeError,"Unable to add binding.");
+ return NULL;
+ }
+ Py_INCREF(Py_None); return Py_None;
+}
+
+PyObject * unbind(PyObject *keylist)
+{
+ if (!PyList_Check(keylist)) {
+ PyErr_SetString(PyExc_TypeError, "Invalid keylist. Not a list.");
+ return NULL;
+ }
+
+ ob::OBBindings::StringVect vectkeylist;
+ for (int i = 0, end = PyList_Size(keylist); i < end; ++i) {
+ PyObject *str = PyList_GetItem(keylist, i);
+ if (!PyString_Check(str)) {
+ PyErr_SetString(PyExc_TypeError,
+ "Invalid keylist. It must contain only strings.");
+ return NULL;
+ }
+ vectkeylist.push_back(PyString_AsString(str));
+ }
+
+ ob::Openbox::instance->bindings()->remove(vectkeylist);
+ Py_INCREF(Py_None); return Py_None;
+}
+
+void unbind_all()
+{
+ ob::Openbox::instance->bindings()->removeAll();
+}
+
+void set_reset_key(const std::string &key)
+{
+ ob::Openbox::instance->bindings()->setResetKey(key);
+}
+%}
%ignore ob::OBScreen::clients;
%{
%import "../otk/eventdispatcher.hh"
%import "../otk/eventhandler.hh"
%import "widget.hh"
+%import "actions.hh"
%include "openbox.hh"
%include "screen.hh"
%include "client.hh"
-%include "python.hh"
// for Mod1Mask etc
%include "X11/X.h"