void python_init(char *argv0)
{
- std::string path;
-
// start the python engine
- //Py_SetProgramName(argv0);
- //Py_Initialize();
+ Py_SetProgramName(argv0);
+ Py_Initialize();
// initialize the C python module
- //init_openbox();
+ init_openbox();
// include the openbox directories for python scripts in the sys path
-// PyRun_SimpleString("import sys");
-printf("SCRIPTDIR=%s\n", SCRIPTDIR);
-printf("1 getenv(DISPLAY)=%s\n", getenv("DISPLAY"));
- path = "sys.path";
-printf("2 getenv(DISPLAY)=%s\n", getenv("DISPLAY"));
- path = "sys.path.append('";
-printf("3 getenv(DISPLAY)=%s\n", getenv("DISPLAY"));
- path += SCRIPTDIR;
- path += "')";
- PyRun_SimpleString(const_cast<char*>(path.c_str()));
- path = "sys.path.append('";
- path += otk::expandTilde("~/.openbox/python");
- path += "')";
- PyRun_SimpleString(const_cast<char*>(path.c_str()));
+ PyRun_SimpleString("import sys");
+ PyRun_SimpleString("sys.path.append('" SCRIPTDIR "')");
+ 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
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;
}
-bool python_get_string(const char *name, std::string *value)
+bool python_get_string(const char *name, otk::ustring *value)
{
PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
if (!(val && PyString_Check(val))) return false;
return true;
}
-bool python_get_stringlist(const char *name, std::vector<std::string> *value)
+bool python_get_stringlist(const char *name, std::vector<otk::ustring> *value)
{
PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
if (!(val && PyList_Check(val))) return false;
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;