#include "otk/util.hh"
extern "C" {
-// The initializer in openbox_wrap.cc
+// The initializer in openbox_wrap.cc / otk_wrap.cc
extern void init_ob(void);
+extern void init_otk(void);
}
namespace ob {
Py_SetProgramName(argv0);
Py_Initialize();
// initialize the C python module
+ init_otk();
init_ob();
- // include the openbox directories for python scripts in the sys path
+ // prepend the openbox directories for python scripts to the sys path
PyRun_SimpleString("import sys");
- PyRun_SimpleString(const_cast<char*>(("sys.path.append('" +
+ PyRun_SimpleString("sys.path.insert(0, '" SCRIPTDIR "')");
+ PyRun_SimpleString(const_cast<char*>(("sys.path.insert(0, '" +
otk::expandTilde("~/.openbox/python") +
"')").c_str()));
- PyRun_SimpleString("sys.path.append('" SCRIPTDIR "')");
- PyRun_SimpleString("import ob;");
+ PyRun_SimpleString("import ob; import otk; import config;");
// set up convenience global variables
PyRun_SimpleString("ob.openbox = ob.Openbox_instance()");
- PyRun_SimpleString("ob.display = ob.Display_instance()");
+ PyRun_SimpleString("otk.display = otk.Display_instance()");
// set up access to the python global variables
PyObject *obmodule = PyImport_AddModule("config");
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()));
Py_INCREF(Py_None); return Py_None;
}
+PyObject *mgrab(int screen)
+{
+ if (!ob::openbox->bindings()->grabPointer(screen)) {
+ PyErr_SetString(PyExc_RuntimeError,"Unable to grab pointer.");
+ return NULL;
+ }
+ Py_INCREF(Py_None); return Py_None;
+}
+
+PyObject *mungrab()
+{
+ ob::openbox->bindings()->ungrabPointer();
+ Py_INCREF(Py_None); return Py_None;
+}
+
PyObject *kbind(PyObject *keylist, ob::KeyContext::KC context, PyObject *func)
{
if (!PyCallable_Check(func)) {