X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=a99416ae83899bc72ec3e4ec118321dbf9e18273;hb=df0447ce6d57c6ece97e69fc0874595e4ac0ae75;hp=9ea93b4d5b5c7d61d26fa4533c41ca9bc169edd6;hpb=b67f5e702e3cc12e4217dd31e2c522dde1ee19b0;p=chaz%2Fopenbox diff --git a/src/python.cc b/src/python.cc index 9ea93b4d..a99416ae 100644 --- a/src/python.cc +++ b/src/python.cc @@ -9,9 +9,8 @@ #include "otk/util.hh" extern "C" { -// The initializer in openbox_wrap.cc -extern void init_openbox(void); -// The initializer in otk_wrap.cc +// The initializer in openbox_wrap.cc / otk_wrap.cc +extern void init_ob(void); extern void init_otk(void); } @@ -21,41 +20,38 @@ 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_openbox(); + init_ob(); + // prepend the openbox directories for python scripts to the sys path PyRun_SimpleString("import sys"); - PyRun_SimpleString("sys.path.append('" SCRIPTDIR "')"); - PyRun_SimpleString(const_cast(((std::string)"sys.path.append('" + + PyRun_SimpleString("sys.path.insert(0, '" SCRIPTDIR "')"); + PyRun_SimpleString(const_cast(("sys.path.insert(0, '" + otk::expandTilde("~/.openbox/python") + "')").c_str())); -// PyRun_SimpleString("from _otk import *; from _openbox import *;"); - PyRun_SimpleString("from otk import *; from openbox import *;"); - PyRun_SimpleString("openbox = Openbox_instance()"); - PyRun_SimpleString("display = OBDisplay_display()"); - - /* XXX - sys.path.append('stuff') - install the .py wrappers, and include their path with this, then import em - and ~/.openbox/python/ !! - */ - + 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("__main__"); + PyObject *obmodule = PyImport_AddModule("config"); obdict = PyModule_GetDict(obmodule); } void python_destroy() { - Py_DECREF(obdict); + Py_Finalize(); } 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()); + printf("Failed to load python file %s\n", path.c_str()); return false; } PyRun_SimpleFile(rcpyfd, const_cast(path.c_str())); @@ -66,13 +62,13 @@ bool python_exec(const std::string &path) bool python_get_long(const char *name, long *value) { PyObject *val = PyDict_GetItemString(obdict, const_cast(name)); - if (!(val && PyLong_Check(val))) return false; + if (!(val && PyInt_Check(val))) return false; - *value = PyLong_AsLong(val); + *value = PyInt_AsLong(val); return true; } -bool python_get_string(const char *name, std::string *value) +bool python_get_string(const char *name, otk::ustring *value) { PyObject *val = PyDict_GetItemString(obdict, const_cast(name)); if (!(val && PyString_Check(val))) return false; @@ -81,7 +77,7 @@ bool python_get_string(const char *name, std::string *value) return true; } -bool python_get_stringlist(const char *name, std::vector *value) +bool python_get_stringlist(const char *name, std::vector *value) { PyObject *val = PyDict_GetItemString(obdict, const_cast(name)); if (!(val && PyList_Check(val))) return false; @@ -98,37 +94,80 @@ bool python_get_stringlist(const char *name, std::vector *value) // Stuff for calling from Python scripts // // ************************************* // -PyObject *mbind(const std::string &button, ob::MouseContext context, - ob::MouseAction action, PyObject *func) +PyObject *mbind(const std::string &button, ob::MouseContext::MC context, + ob::MouseAction::MA action, PyObject *func) { if (!PyCallable_Check(func)) { PyErr_SetString(PyExc_TypeError, "Invalid callback function."); return NULL; } + if(context < 0 || context >= MouseContext::NUM_MOUSE_CONTEXT) { + PyErr_SetString(PyExc_ValueError, "Invalid MouseContext"); + return NULL; + } + if(action < 0 || action >= MouseAction::NUM_MOUSE_ACTION) { + PyErr_SetString(PyExc_ValueError, "Invalid MouseAction"); + return NULL; + } - if (!ob::Openbox::instance->bindings()->addButton(button, context, - action, func)) { + if (!ob::openbox->bindings()->addButton(button, context, + action, func)) { PyErr_SetString(PyExc_RuntimeError,"Unable to add binding."); return NULL; } Py_INCREF(Py_None); return Py_None; } -PyObject *ebind(ob::EventAction action, PyObject *func) +PyObject *ebind(ob::EventAction::EA action, PyObject *func) { if (!PyCallable_Check(func)) { PyErr_SetString(PyExc_TypeError, "Invalid callback function."); return NULL; } - if (!ob::Openbox::instance->bindings()->addEvent(action, func)) { + 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 *kbind(PyObject *keylist, ob::KeyContext context, PyObject *func) +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; +} + +PyObject *kbind(PyObject *keylist, ob::KeyContext::KC context, PyObject *func) { if (!PyCallable_Check(func)) { PyErr_SetString(PyExc_TypeError, "Invalid callback function."); @@ -139,7 +178,7 @@ PyObject *kbind(PyObject *keylist, ob::KeyContext context, PyObject *func) return NULL; } - ob::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)) { @@ -151,13 +190,14 @@ PyObject *kbind(PyObject *keylist, ob::KeyContext context, PyObject *func) } (void)context; // XXX use this sometime! - if (!ob::Openbox::instance->bindings()->addKey(vectkeylist, func)) { + if (!ob::openbox->bindings()->addKey(vectkeylist, func)) { PyErr_SetString(PyExc_RuntimeError,"Unable to add binding."); return NULL; } Py_INCREF(Py_None); return Py_None; } +/* PyObject *kunbind(PyObject *keylist, PyObject *func) { if (!PyList_Check(keylist)) { @@ -169,7 +209,7 @@ PyObject *kunbind(PyObject *keylist, PyObject *func) return NULL; } - ob::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)) { @@ -180,38 +220,32 @@ PyObject *kunbind(PyObject *keylist, PyObject *func) vectkeylist.push_back(PyString_AsString(str)); } - if (!ob::Openbox::instance->bindings()->removeKey(vectkeylist, func)) { + if (!ob::openbox->bindings()->removeKey(vectkeylist, func)) { PyErr_SetString(PyExc_RuntimeError, "Could not remove callback."); return NULL; } Py_INCREF(Py_None); return Py_None; } +*/ void kunbind_all() { - ob::Openbox::instance->bindings()->removeAllKeys(); + ob::openbox->bindings()->removeAllKeys(); } void set_reset_key(const std::string &key) { - ob::Openbox::instance->bindings()->setResetKey(key); + ob::openbox->bindings()->setResetKey(key); } -PyObject *send_client_msg(Window target, int type, Window about, +PyObject *send_client_msg(Window target, Atom type, Window about, long data, long data1, long data2, long data3, long data4) { - if (type < 0 || type >= otk::OBProperty::NUM_ATOMS) { - PyErr_SetString(PyExc_TypeError, - "Invalid atom type. Must be from otk::OBProperty::Atoms"); - return NULL; - } - XEvent e; e.xclient.type = ClientMessage; e.xclient.format = 32; - e.xclient.message_type = - Openbox::instance->property()->atom((otk::OBProperty::Atoms)type); + e.xclient.message_type = type; e.xclient.window = about; e.xclient.data.l[0] = data; e.xclient.data.l[1] = data1; @@ -219,10 +253,17 @@ PyObject *send_client_msg(Window target, int type, Window about, e.xclient.data.l[3] = data3; e.xclient.data.l[4] = data4; - XSendEvent(otk::OBDisplay::display, target, false, + XSendEvent(**otk::display, target, false, SubstructureRedirectMask | SubstructureNotifyMask, &e); Py_INCREF(Py_None); return Py_None; } +void execute(const std::string &bin, int screen) +{ + if (screen >= ScreenCount(**otk::display)) + screen = 0; + otk::bexec(bin, otk::display->screenInfo(screen)->displayString()); +} + }