#include "otk/display.hh"
#include "otk/util.hh"
-namespace ob {
+extern "C" {
+#include <Python.h>
-static PyObject *obdict = NULL;
+#include "gettext.h"
+#define _(str) gettext(str)
+}
+
+namespace ob {
void python_init(char *argv0)
{
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 config;");
- // set up convenience global variables
- //PyRun_SimpleString("ob.openbox = ob.Openbox_instance()");
- //PyRun_SimpleString("otk.display = otk.Display_instance()");
-
- // set up access to the python global variables
- PyObject *obmodule = PyImport_AddModule("config");
- obdict = PyModule_GetDict(obmodule);
}
void python_destroy()
Py_Finalize();
}
-bool python_exec(const std::string &path)
+int 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());
- return false;
+ fprintf(stderr, _("Unabled to open python file %s\n"), path.c_str());
+ return 1;
}
- PyRun_SimpleFile(rcpyfd, const_cast<char*>(path.c_str()));
- fclose(rcpyfd);
- return true;
-}
-bool python_get_long(const char *name, long *value)
-{
- PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
- if (!(val && PyInt_Check(val))) return false;
-
- *value = PyInt_AsLong(val);
- return true;
-}
+ //PyRun_SimpleFile(rcpyfd, const_cast<char*>(path.c_str()));
-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;
+ PyObject *module = PyImport_AddModule("__main__");
+ assert(module);
+ PyObject *dict = PyModule_GetDict(module);
+ assert(dict);
+ PyObject *result = PyRun_File(rcpyfd, const_cast<char*>(path.c_str()),
+ Py_file_input, dict, dict);
+ int ret = result == NULL ? 2 : 0;
+ if (result == NULL)
+ PyErr_Print();
- *value = PyString_AsString(val);
- return true;
-}
-
-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;
+ Py_XDECREF(result);
+
+ Py_DECREF(dict);
- value->clear();
-
- for (int i = 0, end = PyList_Size(val); i < end; ++i) {
- PyObject *str = PyList_GetItem(val, i);
- if (PyString_Check(str))
- value->push_back(PyString_AsString(str));
- }
- return true;
+ fclose(rcpyfd);
+ return ret;
}
}