X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=84cfff291a7abb5ca8e310678ad47332cbb2bc77;hb=1da8531a7b4eea22592b6d0760352d2a34e9b6b0;hp=a9b94811cccb18e04e5ce3503ae09fac84d9d44b;hpb=d7a30f93b517ac76816d0acea92e9c56ad5d6594;p=chaz%2Fopenbox diff --git a/src/python.cc b/src/python.cc index a9b94811..84cfff29 100644 --- a/src/python.cc +++ b/src/python.cc @@ -2,280 +2,260 @@ #include "python.hh" #include "openbox.hh" - -#include -#include +#include "actions.hh" +#include "python.hh" +#include "bindings.hh" +#include "otk/display.hh" +#include "otk/util.hh" + +extern "C" { +// The initializer in openbox_wrap.cc / otk_wrap.cc +extern void init_ob(void); +extern void init_otk(void); +} namespace ob { -typedef std::vector FunctionList; +static PyObject *obdict = NULL; + +void python_init(char *argv0) +{ + // start the python engine + Py_SetProgramName(argv0); + Py_Initialize(); + // initialize the C python module + init_otk(); + init_ob(); + // 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())); + PyRun_SimpleString("import ob; import otk; 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); +} -static FunctionList callbacks[OBActions::NUM_ACTIONS]; -static FunctionList keyfuncs; -static FunctionList mousefuncs; +void python_destroy() +{ + Py_Finalize(); +} -bool python_register(int action, PyObject *callback) +bool python_exec(const std::string &path) { - 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."); + FILE *rcpyfd = fopen(path.c_str(), "r"); + if (!rcpyfd) { + printf("Failed to load python file %s\n", path.c_str()); return false; } + PyRun_SimpleFile(rcpyfd, const_cast(path.c_str())); + fclose(rcpyfd); + return true; +} + +bool python_get_long(const char *name, long *value) +{ + PyObject *val = PyDict_GetItemString(obdict, const_cast(name)); + if (!(val && PyInt_Check(val))) 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); - } + *value = PyInt_AsLong(val); return true; } -bool python_preregister(int action, PyObject *callback) +bool python_get_string(const char *name, otk::ustring *value) { - 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; - } + PyObject *val = PyDict_GetItemString(obdict, const_cast(name)); + if (!(val && PyString_Check(val))) 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); - } + *value = PyString_AsString(val); return true; } -bool python_unregister(int action, PyObject *callback) +bool python_get_stringlist(const char *name, std::vector *value) { - 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; - } + PyObject *val = PyDict_GetItemString(obdict, const_cast(name)); + if (!(val && PyList_Check(val))) 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); + 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; } -bool python_unregister_all(int action) +// ************************************* // +// Stuff for calling from Python scripts // +// ************************************* // + +PyObject *mbind(const std::string &button, ob::MouseContext::MC context, + ob::MouseAction::MA action, PyObject *func) { - if (action < 0 || action >= OBActions::NUM_ACTIONS) { - PyErr_SetString(PyExc_AssertionError, "Invalid action type."); - return false; + if (!PyCallable_Check(func)) { + PyErr_SetString(PyExc_TypeError, "Invalid callback function."); + return NULL; } - - while (!callbacks[action].empty()) { - Py_XDECREF(callbacks[action].back()); - callbacks[action].pop_back(); + + if (!ob::openbox->bindings()->addButton(button, context, + action, func)) { + PyErr_SetString(PyExc_RuntimeError,"Unable to add binding."); + return NULL; } - return true; + Py_INCREF(Py_None); return Py_None; } -void python_callback(OBActions::ActionType action, Window window, - OBWidget::WidgetType type, unsigned int state, - long d1, long d2, long d3, long d4) +PyObject *ebind(ob::EventAction::EA action, PyObject *func) { - 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(); - } + if (!PyCallable_Check(func)) { + PyErr_SetString(PyExc_TypeError, "Invalid callback function."); + return NULL; } - - Py_DECREF(arglist); + + if (!ob::openbox->bindings()->addEvent(action, func)) { + PyErr_SetString(PyExc_RuntimeError,"Unable to add binding."); + return NULL; + } + Py_INCREF(Py_None); return Py_None; } +PyObject *kgrab(int screen, PyObject *func) +{ + if (!PyCallable_Check(func)) { + PyErr_SetString(PyExc_TypeError, "Invalid callback function."); + return NULL; + } + if (!ob::openbox->bindings()->grabKeyboard(screen, func)) { + PyErr_SetString(PyExc_RuntimeError,"Unable to grab keybaord."); + return NULL; + } + Py_INCREF(Py_None); return Py_None; +} +PyObject *kungrab() +{ + ob::openbox->bindings()->ungrabKeyboard(); + Py_INCREF(Py_None); return Py_None; +} +PyObject *mgrab(int screen) +{ + if (!ob::openbox->bindings()->grabPointer(screen)) { + PyErr_SetString(PyExc_RuntimeError,"Unable to grab pointer."); + return NULL; + } + Py_INCREF(Py_None); return Py_None; +} +PyObject *mungrab() +{ + ob::openbox->bindings()->ungrabPointer(); + Py_INCREF(Py_None); return Py_None; +} -bool python_bind_key(PyObject *keylist, PyObject *callback) +PyObject *kbind(PyObject *keylist, ob::KeyContext::KC context, PyObject *func) { - if (!PyList_Check(keylist)) { - PyErr_SetString(PyExc_AssertionError, "Invalid keylist. Not a list."); - return false; + if (!PyCallable_Check(func)) { + PyErr_SetString(PyExc_TypeError, "Invalid callback function."); + return NULL; } - if (!PyCallable_Check(callback)) { - PyErr_SetString(PyExc_AssertionError, "Invalid callback function."); - return false; + if (!PyList_Check(keylist)) { + PyErr_SetString(PyExc_TypeError, "Invalid keylist. Not a list."); + return NULL; } - OBBindings::StringVect vectkeylist; + ob::Bindings::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; + PyErr_SetString(PyExc_TypeError, + "Invalid keylist. It must contain only strings."); + return NULL; } 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; + (void)context; // XXX use this sometime! + if (!ob::openbox->bindings()->addKey(vectkeylist, func)) { + PyErr_SetString(PyExc_RuntimeError,"Unable to add binding."); + return NULL; } + Py_INCREF(Py_None); return Py_None; } -bool python_unbind_key(PyObject *keylist) +/* +PyObject *kunbind(PyObject *keylist, PyObject *func) { if (!PyList_Check(keylist)) { - PyErr_SetString(PyExc_AssertionError, "Invalid keylist. Not a list."); - return false; + PyErr_SetString(PyExc_TypeError, "Invalid keylist. Not a list."); + return NULL; } - - OBBindings::StringVect vectkeylist; + if (!PyCallable_Check(func)) { + PyErr_SetString(PyExc_TypeError, "Invalid callback function."); + return NULL; + } + + ob::Bindings::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; + PyErr_SetString(PyExc_TypeError, + "Invalid keylist. It must contain only strings."); + return NULL; } 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; + if (!ob::openbox->bindings()->removeKey(vectkeylist, func)) { + PyErr_SetString(PyExc_RuntimeError, "Could not remove callback."); + return NULL; } - - return false; + Py_INCREF(Py_None); return Py_None; } +*/ -bool python_bind_mouse(const std::string &button, PyObject *callback) +void kunbind_all() { - 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; - } + ob::openbox->bindings()->removeAllKeys(); } -bool python_unbind_mouse(const std::string &button) +void set_reset_key(const std::string &key) { - 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; + ob::openbox->bindings()->setResetKey(key); } -bool python_unbind_all() +PyObject *send_client_msg(Window target, Atom type, Window about, + long data, long data1, long data2, + long data3, long data4) { - Openbox::instance->bindings()->remove_all(); - return true; + XEvent e; + e.xclient.type = ClientMessage; + e.xclient.format = 32; + e.xclient.message_type = type; + e.xclient.window = about; + e.xclient.data.l[0] = data; + e.xclient.data.l[1] = data1; + e.xclient.data.l[2] = data2; + e.xclient.data.l[3] = data3; + e.xclient.data.l[4] = data4; + + XSendEvent(**otk::display, target, false, + SubstructureRedirectMask | SubstructureNotifyMask, + &e); + Py_INCREF(Py_None); return Py_None; } - -void python_callback_binding(int id, OBActions::ActionType action, - Window window, unsigned int state, - unsigned int keybutton, Time time) +void execute(const std::string &bin, int screen) { - 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); + if (screen >= ScreenCount(**otk::display)) + screen = 0; + otk::bexec(bin, otk::display->screenInfo(screen)->displayString()); } }