X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=75b7cc13958c36952bdd592a754b6c640b200f9e;hb=577038b2c7b51329050256b2ed9a22ae7353828f;hp=ed71463c8489f1b68ddd9aee5dc69aa1481a94c0;hpb=d4853f108c1d22c344c1cb9a8a8b7cdc46648983;p=chaz%2Fopenbox diff --git a/src/python.cc b/src/python.cc index ed71463c..75b7cc13 100644 --- a/src/python.cc +++ b/src/python.cc @@ -2,245 +2,140 @@ #include "python.hh" #include "openbox.hh" +#include "actions.hh" +#include "python.hh" +#include "bindings.hh" +#include "otk/display.hh" +#include "otk/util.hh" -#include -#include - -namespace ob { - -typedef std::vector FunctionList; - -static FunctionList callbacks[OBActions::NUM_ACTIONS]; -static FunctionList keyfuncs; -static FunctionList mousefuncs; +extern "C" { +#include -bool python_register(int action, PyObject *callback) -{ - if (action < 0 || action >= OBActions::NUM_ACTIONS) { - PyErr_SetString(PyExc_AssertionError, "Invalid action type."); - return false; - } - if (!PyCallable_Check(callback)) { - PyErr_SetString(PyExc_AssertionError, "Invalid callback function."); - return false; - } - - FunctionList::iterator it = std::find(callbacks[action].begin(), - callbacks[action].end(), - callback); - if (it == callbacks[action].end()) { // not already in there - Py_XINCREF(callback); // Add a reference to new callback - callbacks[action].push_back(callback); - } - return true; -} - -bool python_preregister(int action, PyObject *callback) -{ - if (action < 0 || action >= OBActions::NUM_ACTIONS) { - PyErr_SetString(PyExc_AssertionError, "Invalid action type."); - return false; - } - if (!PyCallable_Check(callback)) { - PyErr_SetString(PyExc_AssertionError, "Invalid callback function."); - return false; - } - - FunctionList::iterator it = std::find(callbacks[action].begin(), - callbacks[action].end(), - callback); - if (it == callbacks[action].end()) { // not already in there - Py_XINCREF(callback); // Add a reference to new callback - callbacks[action].insert(callbacks[action].begin(), callback); - } - return true; +#include "gettext.h" +#define _(str) gettext(str) } -bool python_unregister(int action, PyObject *callback) -{ - if (action < 0 || action >= OBActions::NUM_ACTIONS) { - PyErr_SetString(PyExc_AssertionError, "Invalid action type."); - return false; - } - if (!PyCallable_Check(callback)) { - PyErr_SetString(PyExc_AssertionError, "Invalid callback function."); - return false; - } +namespace ob { - FunctionList::iterator it = std::find(callbacks[action].begin(), - callbacks[action].end(), - callback); - if (it != callbacks[action].end()) { // its been registered before - Py_XDECREF(*it); // Dispose of previous callback - callbacks[action].erase(it); - } - return true; -} +static PyObject *get = NULL; -bool python_unregister_all(int action) +void python_init(char *argv0) { - if (action < 0 || action >= OBActions::NUM_ACTIONS) { - PyErr_SetString(PyExc_AssertionError, "Invalid action type."); - return false; + // start the python engine + Py_SetProgramName(argv0); + Py_Initialize(); + // prepend the openbox directories for python scripts to the sys path + PyRun_SimpleString("import sys"); + PyRun_SimpleString("sys.path.insert(0, '" SCRIPTDIR "')"); + 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; } - - while (!callbacks[action].empty()) { - Py_XDECREF(callbacks[action].back()); - callbacks[action].pop_back(); - } - return true; } -void python_callback(OBActions::ActionType action, Window window, - OBWidget::WidgetType type, unsigned int state, - long d1, long d2, long d3, long d4) +void python_destroy() { - PyObject *arglist; - PyObject *result; - - assert(action >= 0 && action < OBActions::NUM_ACTIONS); - - if (d4 != LONG_MIN) - arglist = Py_BuildValue("iliillll", action, window, type, state, - d1, d2, d3, d4); - else if (d3 != LONG_MIN) - arglist = Py_BuildValue("iliilll", action, window, type, state, - d1, d2, d3); - else if (d2 != LONG_MIN) - arglist = Py_BuildValue("iliill", action, window, type, state, d1, d2); - else if (d1 != LONG_MIN) - arglist = Py_BuildValue("iliil", action, window, type, state, d1); - else - arglist = Py_BuildValue("ilii", action, window, type, state); - - FunctionList::iterator it, end = callbacks[action].end(); - for (it = callbacks[action].begin(); it != end; ++it) { - // call the callback - result = PyEval_CallObject(*it, arglist); - if (result) { - Py_DECREF(result); - } else { - // an exception occured in the script, display it - PyErr_Print(); - } - } - - Py_DECREF(arglist); + Py_Finalize(); } - - - - - -bool python_bind_key(PyObject *keylist, PyObject *callback) +int python_exec(const std::string &path) { - if (!PyList_Check(keylist)) { - PyErr_SetString(PyExc_AssertionError, "Invalid keylist. Not a list."); - return false; - } - if (!PyCallable_Check(callback)) { - PyErr_SetString(PyExc_AssertionError, "Invalid callback function."); - return false; - } - - OBBindings::StringVect vectkeylist; - for (int i = 0, end = PyList_Size(keylist); i < end; ++i) { - PyObject *str = PyList_GetItem(keylist, i); - if (!PyString_Check(str)) { - PyErr_SetString(PyExc_AssertionError, - "Invalid keylist. It must contain only strings."); - return false; - } - vectkeylist.push_back(PyString_AsString(str)); - } + FILE *rcpyfd = fopen(path.c_str(), "r"); + if (!rcpyfd) { + fprintf(stderr, _("Unabled to open python file %s\n"), path.c_str()); + return 1; + } + + //PyRun_SimpleFile(rcpyfd, const_cast(path.c_str())); + + PyObject *module = PyImport_AddModule("__main__"); + assert(module); + PyObject *dict = PyModule_GetDict(module); + assert(dict); + PyObject *result = PyRun_File(rcpyfd, const_cast(path.c_str()), + Py_file_input, dict, dict); + int ret = result == NULL ? 2 : 0; + if (result == NULL) + PyErr_Print(); + + Py_XDECREF(result); + + Py_DECREF(dict); - // the id is what the binding class can call back with so it doesnt have to - // worry about the python function pointer - int id = keyfuncs.size(); - if (Openbox::instance->bindings()->add_key(vectkeylist, id)) { - Py_XINCREF(callback); // Add a reference to new callback - keyfuncs.push_back(callback); - return true; - } else { - PyErr_SetString(PyExc_AssertionError,"Unable to create binding. Invalid."); - return false; - } + fclose(rcpyfd); + return ret; } -bool python_unbind_key(PyObject *keylist) +bool python_get_long(const char *name, long *value) { - if (!PyList_Check(keylist)) { - PyErr_SetString(PyExc_AssertionError, "Invalid keylist. Not a list."); - return false; - } - - OBBindings::StringVect vectkeylist; - for (int i = 0, end = PyList_Size(keylist); i < end; ++i) { - PyObject *str = PyList_GetItem(keylist, i); - if (!PyString_Check(str)) { - PyErr_SetString(PyExc_AssertionError, - "Invalid keylist. It must contain only strings."); - return false; - } - vectkeylist.push_back(PyString_AsString(str)); - } - - int id; - if ((id = - Openbox::instance->bindings()->remove_key(vectkeylist)) >= 0) { - assert(keyfuncs[id]); // shouldn't be able to remove it twice - Py_XDECREF(keyfuncs[id]); // Dispose of previous callback - // important note: we don't erase the item from the list cuz that would - // ruin all the id's that are in use. simply nullify it. - keyfuncs[id] = 0; - return true; - } - 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_bind_mouse(const std::string &button, PyObject *callback) -{ - if (!PyCallable_Check(callback)) { - PyErr_SetString(PyExc_AssertionError, "Invalid callback function."); - return false; - } - - // the id is what the binding class can call back with so it doesnt have to - // worry about the python function pointer - int id = mousefuncs.size(); - if (Openbox::instance->bindings()->add_mouse(button, id)) { - Py_XINCREF(callback); // Add a reference to new callback - mousefuncs.push_back(callback); - return true; - } else { - PyErr_SetString(PyExc_AssertionError,"Unable to create binding. Invalid."); - return false; - } -} - -bool python_unbind_mouse(const std::string &button) +bool python_get_string(const char *name, otk::ustring *value) { - int id; - if ((id = - Openbox::instance->bindings()->remove_mouse(button)) >= 0) { - assert(mousefuncs[id]); // shouldn't be able to remove it twice - Py_XDECREF(mousefuncs[id]); // Dispose of previous callback - // important note: we don't erase the item from the list cuz that would - // ruin all the id's that are in use. simply nullify it. - mousefuncs[id] = 0; - return true; - } - 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_unbind_all() +bool python_get_stringlist(const char *name, std::vector *value) { - Openbox::instance->bindings()->remove_all(); - return true; + 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; } - }