diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/python.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/python.cc b/src/python.cc index 9ea93b4d..cdb7d431 100644 --- a/src/python.cc +++ b/src/python.cc @@ -21,26 +21,24 @@ static PyObject *obdict = NULL; void python_init(char *argv0) { + // start the python engine Py_SetProgramName(argv0); Py_Initialize(); + // initialize the C python modules init_otk(); 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('" + otk::expandTilde("~/.openbox/python") + "')").c_str())); -// PyRun_SimpleString("from _otk import *; from _openbox import *;"); + // import the otk and openbox modules into the main namespace PyRun_SimpleString("from otk import *; from openbox import *;"); + // set up convenience global variables PyRun_SimpleString("openbox = Openbox_instance()"); PyRun_SimpleString("display = OBDisplay_display()"); - /* XXX - sys.path.append('stuff') - install the .py wrappers, and include their path with this, then import em - and ~/.openbox/python/ !! - */ - // set up access to the python global variables PyObject *obmodule = PyImport_AddModule("__main__"); obdict = PyModule_GetDict(obmodule); |