PyRun_SimpleString("from openbox import *;");
// set up convenience global variables
PyRun_SimpleString("openbox = Openbox_instance()");
+ PyRun_SimpleString("display = Display_instance()");
// set up access to the python global variables
PyObject *obmodule = PyImport_AddModule("__main__");
return NULL;
}
- if (!ob::Openbox::instance->bindings()->addButton(button, context,
+ if (!ob::openbox->bindings()->addButton(button, context,
action, func)) {
PyErr_SetString(PyExc_RuntimeError,"Unable to add binding.");
return NULL;
return NULL;
}
- if (!ob::Openbox::instance->bindings()->addEvent(action, func)) {
+ if (!ob::openbox->bindings()->addEvent(action, func)) {
PyErr_SetString(PyExc_RuntimeError,"Unable to add binding.");
return NULL;
}
}
(void)context; // XXX use this sometime!
- if (!ob::Openbox::instance->bindings()->addKey(vectkeylist, func)) {
+ if (!ob::openbox->bindings()->addKey(vectkeylist, func)) {
PyErr_SetString(PyExc_RuntimeError,"Unable to add binding.");
return NULL;
}
vectkeylist.push_back(PyString_AsString(str));
}
- if (!ob::Openbox::instance->bindings()->removeKey(vectkeylist, func)) {
+ if (!ob::openbox->bindings()->removeKey(vectkeylist, func)) {
PyErr_SetString(PyExc_RuntimeError, "Could not remove callback.");
return NULL;
}
void kunbind_all()
{
- ob::Openbox::instance->bindings()->removeAllKeys();
+ ob::openbox->bindings()->removeAllKeys();
}
void set_reset_key(const std::string &key)
{
- ob::Openbox::instance->bindings()->setResetKey(key);
+ ob::openbox->bindings()->setResetKey(key);
}
-PyObject *send_client_msg(Window target, int type, Window about,
+PyObject *send_client_msg(Window target, Atom type, Window about,
long data, long data1, long data2,
long data3, long data4)
{
- if (type < 0 || type >= otk::Property::NUM_ATOMS) {
- PyErr_SetString(PyExc_TypeError,
- "Invalid atom type. Must be from otk::Property::Atoms");
- return NULL;
- }
-
XEvent e;
e.xclient.type = ClientMessage;
e.xclient.format = 32;
- e.xclient.message_type =
- Openbox::instance->property()->atom((otk::Property::Atoms)type);
+ e.xclient.message_type = type;
e.xclient.window = about;
e.xclient.data.l[0] = data;
e.xclient.data.l[1] = data1;
e.xclient.data.l[3] = data3;
e.xclient.data.l[4] = data4;
- XSendEvent(otk::Display::display, target, false,
+ XSendEvent(**otk::display, target, false,
SubstructureRedirectMask | SubstructureNotifyMask,
&e);
Py_INCREF(Py_None); return Py_None;