init_ob();
// prepend the openbox directories for python scripts to the sys path
PyRun_SimpleString("import sys");
- PyRun_SimpleString("sys.path.insert('0, " SCRIPTDIR "')");
+ PyRun_SimpleString("sys.path.insert(0, '" SCRIPTDIR "')");
PyRun_SimpleString(const_cast<char*>(("sys.path.insert(0, '" +
otk::expandTilde("~/.openbox/python") +
"')").c_str()));
- PyRun_SimpleString("import ob; import otk;");// import config;");
+ PyRun_SimpleString("import ob; import otk; import config;");
// set up convenience global variables
PyRun_SimpleString("ob.openbox = ob.Openbox_instance()");
PyRun_SimpleString("otk.display = otk.Display_instance()");
void python_destroy()
{
- Py_DECREF(obdict);
+ Py_Finalize();
}
bool python_exec(const std::string &path)
{
FILE *rcpyfd = fopen(path.c_str(), "r");
if (!rcpyfd) {
- printf("failed to load python file %s\n", path.c_str());
+ printf("Failed to load python file %s\n", path.c_str());
return false;
}
PyRun_SimpleFile(rcpyfd, const_cast<char*>(path.c_str()));
PyErr_SetString(PyExc_TypeError, "Invalid callback function.");
return NULL;
}
+ if(context < 0 || context >= MouseContext::NUM_MOUSE_CONTEXT) {
+ PyErr_SetString(PyExc_ValueError, "Invalid MouseContext");
+ return NULL;
+ }
+ if(action < 0 || action >= MouseAction::NUM_MOUSE_ACTION) {
+ PyErr_SetString(PyExc_ValueError, "Invalid MouseAction");
+ return NULL;
+ }
if (!ob::openbox->bindings()->addButton(button, context,
action, func)) {
Py_INCREF(Py_None); return Py_None;
}
+/*
PyObject *kunbind(PyObject *keylist, PyObject *func)
{
if (!PyList_Check(keylist)) {
}
Py_INCREF(Py_None); return Py_None;
}
+*/
void kunbind_all()
{