X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=2c71b0182748aa4a44c7410bb97a4cd28eaf6d18;hb=bc88d310fea71823fb2c61d071ff499579bffaba;hp=21158dbea24166ce7d6b485eefd6eda83e00c01b;hpb=a6661d587cd043e1894418c091b8dbd4e18a7d55;p=chaz%2Fopenbox diff --git a/src/python.cc b/src/python.cc index 21158dbe..2c71b018 100644 --- a/src/python.cc +++ b/src/python.cc @@ -2,281 +2,232 @@ #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 +extern "C" { +// The initializer in openbox_wrap.cc +extern void init_openbox(void); +} namespace ob { -typedef std::vector FunctionList; +static PyObject *obdict = NULL; -static FunctionList callbacks[OBActions::NUM_ACTIONS]; -static FunctionList bindfuncs; +void python_init(char *argv0) +{ + std::string path; + + // start the python engine + //Py_SetProgramName(argv0); + //Py_Initialize(); + // initialize the C python module + //init_openbox(); + // include the openbox directories for python scripts in the sys path +// PyRun_SimpleString("import sys"); +printf("SCRIPTDIR=%s\n", SCRIPTDIR); +printf("1 getenv(DISPLAY)=%s\n", getenv("DISPLAY")); + path = "sys.path"; +printf("2 getenv(DISPLAY)=%s\n", getenv("DISPLAY")); + path = "sys.path.append('"; +printf("3 getenv(DISPLAY)=%s\n", getenv("DISPLAY")); + path += SCRIPTDIR; + path += "')"; + PyRun_SimpleString(const_cast(path.c_str())); + path = "sys.path.append('"; + path += otk::expandTilde("~/.openbox/python"); + path += "')"; + PyRun_SimpleString(const_cast(path.c_str())); + // import the otk and openbox modules into the main namespace + PyRun_SimpleString("from openbox import *;"); + // set up convenience global variables + PyRun_SimpleString("openbox = Openbox_instance()"); + + // set up access to the python global variables + PyObject *obmodule = PyImport_AddModule("__main__"); + obdict = PyModule_GetDict(obmodule); +} -bool python_register(int action, PyObject *callback) +void python_destroy() { - 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."); + Py_DECREF(obdict); +} + +bool 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; } + 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 && PyLong_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 = PyLong_AsLong(val); return true; } -bool python_preregister(int action, PyObject *callback) +bool python_get_string(const char *name, std::string *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 context, + ob::MouseAction 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::instance->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 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::instance->bindings()->addEvent(action, func)) { + PyErr_SetString(PyExc_RuntimeError,"Unable to add binding."); + return NULL; + } + Py_INCREF(Py_None); return Py_None; } - - - - - -bool python_bind_key(PyObject *keylist, PyObject *callback) +PyObject *kbind(PyObject *keylist, ob::KeyContext 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::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; + 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 = bindfuncs.size(); - if (Openbox::instance->bindings()->add_key(vectkeylist, id)) { - Py_XINCREF(callback); // Add a reference to new callback - bindfuncs.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::instance->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::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; + 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(bindfuncs[id]); // shouldn't be able to remove it twice - Py_XDECREF(bindfuncs[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. - bindfuncs[id] = 0; - return true; + if (!ob::Openbox::instance->bindings()->removeKey(vectkeylist, func)) { + PyErr_SetString(PyExc_RuntimeError, "Could not remove callback."); + return NULL; } - - return false; + Py_INCREF(Py_None); return Py_None; } -void python_set_reset_key(const std::string &key) +void kunbind_all() { - Openbox::instance->bindings()->setResetKey(key); + ob::Openbox::instance->bindings()->removeAllKeys(); } -bool python_bind_mouse(const std::string &button, PyObject *callback) +void set_reset_key(const std::string &key) { - 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 = bindfuncs.size(); - if (Openbox::instance->bindings()->add_mouse(button, id)) { - Py_XINCREF(callback); // Add a reference to new callback - bindfuncs.push_back(callback); - return true; - } else { - PyErr_SetString(PyExc_AssertionError,"Unable to create binding. Invalid."); - return false; - } + ob::Openbox::instance->bindings()->setResetKey(key); } -bool python_unbind_mouse(const std::string &button) +PyObject *send_client_msg(Window target, int type, Window about, + long data, long data1, long data2, + long data3, long data4) { - int id; - if ((id = - Openbox::instance->bindings()->remove_mouse(button)) >= 0) { - assert(bindfuncs[id]); // shouldn't be able to remove it twice - Py_XDECREF(bindfuncs[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. - bindfuncs[id] = 0; - return true; + if (type < 0 || type >= otk::OBProperty::NUM_ATOMS) { + PyErr_SetString(PyExc_TypeError, + "Invalid atom type. Must be from otk::OBProperty::Atoms"); + return NULL; } - return false; -} - -void python_unbind_all() -{ - Openbox::instance->bindings()->remove_all(); -} - - -void python_callback_binding(int id, OBActions::ActionType action, - Window window, unsigned int state, - unsigned int keybutton, Time time) -{ - assert(action >= 0 && action < OBActions::NUM_ACTIONS); - - if (!bindfuncs[id]) return; // the key was unbound - - PyObject *arglist; - PyObject *result; - - arglist = Py_BuildValue("ilisl", action, window, state, - XKeysymToString( - XKeycodeToKeysym(otk::OBDisplay::display, - keybutton, 0)), - time); - - // call the callback - result = PyEval_CallObject(bindfuncs[id], arglist); - if (result) { - Py_DECREF(result); - } else { - // an exception occured in the script, display it - PyErr_Print(); - } - - Py_DECREF(arglist); + XEvent e; + e.xclient.type = ClientMessage; + e.xclient.format = 32; + e.xclient.message_type = + Openbox::instance->property()->atom((otk::OBProperty::Atoms)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::OBDisplay::display, target, false, + SubstructureRedirectMask | SubstructureNotifyMask, + &e); + Py_INCREF(Py_None); return Py_None; } }