// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-%module openbox
+%module ob
%{
#ifdef HAVE_CONFIG_H
# include "../config.h"
#endif
+#include "frame.hh"
#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*>;
+//%template(ClientList) std::list<Client*>;
-%ignore ob::Openbox::instance;
+%ignore ob::openbox;
%inline %{
- ob::Openbox *Openbox_instance() { return ob::Openbox::instance; }
+ ob::Openbox *Openbox_instance() { return ob::openbox; }
%};
-// 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, *result, *pdata;
+
+ pdata = SWIG_NewPointerObj((void *) data, SWIGTYPE_p_ob__MouseData, 0);
+ arglist = Py_BuildValue("(O)", pdata);
+ Py_DECREF(pdata);
+
+ // 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, *result, *pdata;
+
+ pdata = SWIG_NewPointerObj((void *) data, SWIGTYPE_p_ob__EventData, 0);
+ arglist = Py_BuildValue("(O)", pdata);
+ Py_DECREF(pdata);
+
+ // 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, *result, *pdata;
+
+ pdata = SWIG_NewPointerObj((void *) data, SWIGTYPE_p_ob__KeyData, 0);
+ arglist = Py_BuildValue("(O)", pdata);
+ Py_DECREF(pdata);
+
+ // 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_key) ob::python_bind_key;
-%rename(unbind_key) ob::python_unbind_key;
-%rename(set_reset_key) ob::python_set_reset_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;
+
+#ignore ob::openbox;
+
+%ignore ob::Screen::clients;
%{
#include <iterator>
%}
-%extend ob::OBScreen {
- OBClient *client(int i) {
- if (i >= (int)self->clients.size())
+%extend ob::Screen {
+ Client *client(int i) {
+ if (i < 0 || i >= (int)self->clients.size())
return NULL;
- ob::OBScreen::ClientList::iterator it = self->clients.begin();
+ ob::Client::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/ustring.i"
+
+%ignore otk::display;
+%inline %{
+ otk::Display *Display_instance() { return otk::display; }
+%};
+
+%ignore otk::Property::atoms;
+%inline %{
+ const otk::Atoms& Property_atoms() { return otk::Property::atoms; }
+%};
+
+%include "../otk/display.hh"
+%include "../otk/point.hh"
+%include "../otk/property.hh"
+%include "../otk/rect.hh"
+%include "../otk/screeninfo.hh"
+%include "../otk/strut.hh"
+
+%include "../otk/eventhandler.hh"
+%include "../otk/eventdispatcher.hh"
+
+%import "../otk/widget.hh"
+*/
+%import "../otk/otk.i"
+
+%import "widgetbase.hh"
+%import "actions.hh"
%include "openbox.hh"
%include "screen.hh"
%include "client.hh"
+%include "frame.hh"
%include "python.hh"
// for Mod1Mask etc