X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=08f8f506139cf2398f8ce25c511500789c0cb82f;hb=7fe3301e7ea905a8a76d54c22751f3d8a346e28b;hp=a9b94811cccb18e04e5ce3503ae09fac84d9d44b;hpb=d7a30f93b517ac76816d0acea92e9c56ad5d6594;p=chaz%2Fopenbox diff --git a/src/python.cc b/src/python.cc index a9b94811..08f8f506 100644 --- a/src/python.cc +++ b/src/python.cc @@ -2,280 +2,46 @@ #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; - -bool python_register(int action, PyObject *callback) -{ - if (action < 0 || action >= OBActions::NUM_ACTIONS || - action == OBActions::Action_KeyPress) { - 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 || - action == OBActions::Action_KeyPress) { - 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; -} - -bool python_unregister(int action, PyObject *callback) -{ - if (action < 0 || action >= OBActions::NUM_ACTIONS || - action == OBActions::Action_KeyPress) { - 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()) { // its been registered before - Py_XDECREF(*it); // Dispose of previous callback - callbacks[action].erase(it); - } - return true; -} - -bool python_unregister_all(int action) -{ - if (action < 0 || action >= OBActions::NUM_ACTIONS) { - PyErr_SetString(PyExc_AssertionError, "Invalid action type."); - return false; - } - - 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) -{ - 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); +extern "C" { +#include } +namespace ob { - - - - -bool python_bind_key(PyObject *keylist, PyObject *callback) +void python_init(char *argv0) { - 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)); - } - - // 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; - } + // 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())); } -bool python_unbind_key(PyObject *keylist) +void python_destroy() { - 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; + Py_Finalize(); } -bool python_bind_mouse(const std::string &button, PyObject *callback) +bool python_exec(const std::string &path) { - 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."); + FILE *rcpyfd = fopen(path.c_str(), "r"); + if (!rcpyfd) { + printf("Failed to load python file %s\n", path.c_str()); return false; } -} - -bool python_unbind_mouse(const std::string &button) -{ - 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; -} - -bool python_unbind_all() -{ - Openbox::instance->bindings()->remove_all(); + PyRun_SimpleFile(rcpyfd, const_cast(path.c_str())); + fclose(rcpyfd); return true; } - -void python_callback_binding(int id, OBActions::ActionType action, - Window window, unsigned int state, - unsigned int keybutton, Time time) -{ - PyObject *func; - - assert(action >= 0 && action < OBActions::NUM_ACTIONS); - - if (action == OBActions::Action_KeyPress) - func = keyfuncs[id]; - else - func = mousefuncs[id]; - - if (!func) return; - - PyObject *arglist; - PyObject *result; - - arglist = Py_BuildValue("iliil", action, window, state, keybutton, time); - - // call the callback - result = PyEval_CallObject(func, arglist); - if (result) { - Py_DECREF(result); - } else { - // an exception occured in the script, display it - PyErr_Print(); - } - - Py_DECREF(arglist); -} - }