extern "C" {
// The initializer in openbox_wrap.cc
extern void init_openbox(void);
-// The initializer in otk_wrap.cc
-extern void init_otk(void);
}
namespace ob {
// start the python engine
Py_SetProgramName(argv0);
Py_Initialize();
- // initialize the C python modules
- init_otk();
+ // initialize the C python module
init_openbox();
// include the openbox directories for python scripts in the sys path
PyRun_SimpleString("import sys");
PyRun_SimpleString("sys.path.append('" SCRIPTDIR "')");
- PyRun_SimpleString(const_cast<char*>(((std::string)"sys.path.append('" +
+ PyRun_SimpleString(const_cast<char*>(("sys.path.append('" +
otk::expandTilde("~/.openbox/python") +
"')").c_str()));
// import the otk and openbox modules into the main namespace
PyRun_SimpleString("from openbox import *;");
// set up convenience global variables
PyRun_SimpleString("openbox = Openbox_instance()");
- PyRun_SimpleString("display = OBDisplay_display()");
// set up access to the python global variables
PyObject *obmodule = PyImport_AddModule("__main__");
bool python_get_long(const char *name, long *value)
{
PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
- if (!(val && PyLong_Check(val))) return false;
+ if (!(val && PyInt_Check(val))) return false;
- *value = PyLong_AsLong(val);
+ *value = PyInt_AsLong(val);
return true;
}
return NULL;
}
- ob::OBBindings::StringVect vectkeylist;
+ ob::Bindings::StringVect vectkeylist;
for (int i = 0, end = PyList_Size(keylist); i < end; ++i) {
PyObject *str = PyList_GetItem(keylist, i);
if (!PyString_Check(str)) {
return NULL;
}
- ob::OBBindings::StringVect vectkeylist;
+ ob::Bindings::StringVect vectkeylist;
for (int i = 0, end = PyList_Size(keylist); i < end; ++i) {
PyObject *str = PyList_GetItem(keylist, i);
if (!PyString_Check(str)) {
long data, long data1, long data2,
long data3, long data4)
{
- if (type < 0 || type >= otk::OBProperty::NUM_ATOMS) {
+ if (type < 0 || type >= otk::Property::NUM_ATOMS) {
PyErr_SetString(PyExc_TypeError,
- "Invalid atom type. Must be from otk::OBProperty::Atoms");
+ "Invalid atom type. Must be from otk::Property::Atoms");
return NULL;
}
e.xclient.type = ClientMessage;
e.xclient.format = 32;
e.xclient.message_type =
- Openbox::instance->property()->atom((otk::OBProperty::Atoms)type);
+ Openbox::instance->property()->atom((otk::Property::Atoms)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::OBDisplay::display, target, false,
+ XSendEvent(otk::Display::display, target, false,
SubstructureRedirectMask | SubstructureNotifyMask,
&e);
Py_INCREF(Py_None); return Py_None;