X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fpython.cc;h=75b7cc13958c36952bdd592a754b6c640b200f9e;hb=cce970813f088952e05e20f13d77d6f4766863e3;hp=0741f2da940e4df8f40e4cb8ef91ab9e8ab84844;hpb=93ea4c4d2ea2b1ff3dfee40fb114f3080001e4ce;p=chaz%2Fopenbox diff --git a/src/python.cc b/src/python.cc index 0741f2da..75b7cc13 100644 --- a/src/python.cc +++ b/src/python.cc @@ -17,6 +17,8 @@ extern "C" { namespace ob { +static PyObject *get = NULL; + void python_init(char *argv0) { // start the python engine @@ -28,6 +30,21 @@ void python_init(char *argv0) PyRun_SimpleString(const_cast(("sys.path.insert(0, '" + otk::expandTilde("~/.openbox/python") + "')").c_str())); + + return; + PyObject *obmodule = PyImport_ImportModule("config"); + if (obmodule == NULL) { + PyErr_Print(); + return; + } + PyObject *configdict = PyModule_GetDict(obmodule); + Py_DECREF(obmodule); + + get = PyDict_GetItemString(configdict, "get"); + if (get == NULL) { + PyErr_Print(); + return; + } } void python_destroy() @@ -63,4 +80,62 @@ int python_exec(const std::string &path) return ret; } +bool python_get_long(const char *name, long *value) +{ + return false; + if (get == NULL) return false; + bool ret = false; + + PyObject *val = PyObject_CallFunction(get, "ss", "openbox", name); + if (val == NULL) + PyErr_Print(); + else if (PyInt_Check(val)) { + *value = PyInt_AsLong(val); + ret = true; + } else if (PyLong_Check(val)) { + *value = PyLong_AsLong(val); + ret = true; + } + Py_XDECREF(val); + return ret; +} + +bool python_get_string(const char *name, otk::ustring *value) +{ + return false; + if (get == NULL) return false; + bool ret = false; + + PyObject *val = PyObject_CallFunction(get, "ss", "openbox", name); + if (val == NULL) + PyErr_Print(); + else if (PyString_Check(val)) { + *value = std::string(PyString_AsString(val), PyString_Size(val)); + ret = true; + } + Py_XDECREF(val); + return ret; +} + +bool python_get_stringlist(const char *name, std::vector *value) +{ + return false; + if (get == NULL) return false; + bool ret = false; + + PyObject *val = PyObject_CallFunction(get, "ss", "openbox", name); + if (val == NULL) + PyErr_Print(); + else if (PyList_Check(val)) { + for (int i = 0, end = PyList_Size(val); i < end; ++i) { + PyObject *str = PyList_GET_ITEM(val, i); + if (PyString_Check(str)) + value->push_back(std::string(PyString_AsString(str), + PyString_Size(str))); + } + } + Py_XDECREF(val); + return ret; +} + }