X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=9905dec59b2dd93211793b9b451c6bec3d773d3b;hb=ab2968b3a5d61e2dc6b0a64153a7abb0078ee442;hp=2e490d314e34d74e7e891001431b40819fbb40e1;hpb=345d957e1ea577480f807b892b73c3f52fe913d2;p=chaz%2Fopenbox diff --git a/src/python.cc b/src/python.cc index 2e490d31..9905dec5 100644 --- a/src/python.cc +++ b/src/python.cc @@ -6,12 +6,11 @@ #include "python.hh" #include "bindings.hh" #include "otk/display.hh" +#include "otk/util.hh" extern "C" { // The initializer in openbox_wrap.cc extern void init_openbox(void); -// The initializer in otk_wrap.cc -extern void init_otk(void); } namespace ob { @@ -20,20 +19,23 @@ static PyObject *obdict = NULL; void python_init(char *argv0) { + // start the python engine Py_SetProgramName(argv0); Py_Initialize(); - init_otk(); + // initialize the C python module init_openbox(); - PyRun_SimpleString("from _otk import *; from _openbox import *;"); + // include the openbox directories for python scripts in the sys path + PyRun_SimpleString("import sys"); + PyRun_SimpleString("sys.path.append('" SCRIPTDIR "')"); + PyRun_SimpleString(const_cast(("sys.path.append('" + + otk::expandTilde("~/.openbox/python") + + "')").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()"); - PyRun_SimpleString("display = OBDisplay_display()"); + PyRun_SimpleString("display = Display_instance()"); - /* XXX - sys.path.append('stuff') - install the .py wrappers, and include their path with this, then import em - and ~/.openbox/python/ !! - */ - // set up access to the python global variables PyObject *obmodule = PyImport_AddModule("__main__"); obdict = PyModule_GetDict(obmodule); @@ -59,13 +61,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; @@ -74,7 +76,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; @@ -99,7 +101,7 @@ PyObject *mbind(const std::string &button, ob::MouseContext context, return NULL; } - if (!ob::Openbox::instance->bindings()->addButton(button, context, + if (!ob::openbox->bindings()->addButton(button, context, action, func)) { PyErr_SetString(PyExc_RuntimeError,"Unable to add binding."); return NULL; @@ -114,7 +116,7 @@ PyObject *ebind(ob::EventAction action, PyObject *func) 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; } @@ -132,7 +134,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)) { @@ -143,7 +145,8 @@ PyObject *kbind(PyObject *keylist, ob::KeyContext context, PyObject *func) vectkeylist.push_back(PyString_AsString(str)); } - if (!ob::Openbox::instance->bindings()->addKey(vectkeylist, func)) { + (void)context; // XXX use this sometime! + if (!ob::openbox->bindings()->addKey(vectkeylist, func)) { PyErr_SetString(PyExc_RuntimeError,"Unable to add binding."); return NULL; } @@ -161,7 +164,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)) { @@ -172,7 +175,7 @@ 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; } @@ -181,29 +184,22 @@ PyObject *kunbind(PyObject *keylist, PyObject *func) 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; @@ -211,7 +207,7 @@ 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;