X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.cc;h=040d70206d44f26c49103ae7f2c571ed3420d373;hb=0b12453cf633b914f6712315dfc2c0171d2bb574;hp=edadbc259fd2475961db2c1563e8869cb3c1127a;hpb=b35dae95a5cdb902f1661b9572af47c3f55c975c;p=chaz%2Fopenbox diff --git a/src/python.cc b/src/python.cc index edadbc25..040d7020 100644 --- a/src/python.cc +++ b/src/python.cc @@ -6,221 +6,38 @@ #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 { static PyObject *obdict = NULL; -// ************************************************************* // -// Define some custom types which are passed to python callbacks // -// ************************************************************* // - -typedef struct { - PyObject_HEAD; - MouseAction action; - Window window; - MouseContext context; - unsigned int state; - unsigned int button; - int xroot; - int yroot; - Time time; -} ActionData; - -typedef struct { - PyObject_HEAD; - Window window; - unsigned int state; - unsigned int key; - Time time; -} BindingData; - -static void ActionDataDealloc(ActionData *self) -{ - PyObject_Del((PyObject*)self); -} - -static void BindingDataDealloc(BindingData *self) -{ - PyObject_Del((PyObject*)self); -} - -PyObject *ActionData_action(ActionData *self, PyObject *args) -{ - if(!PyArg_ParseTuple(args,":action")) return NULL; - return PyLong_FromLong((int)self->action); -} - -PyObject *ActionData_window(ActionData *self, PyObject *args) -{ - if(!PyArg_ParseTuple(args,":window")) return NULL; - return PyLong_FromLong(self->window); -} - -PyObject *ActionData_context(ActionData *self, PyObject *args) -{ - if(!PyArg_ParseTuple(args,":context")) return NULL; - return PyLong_FromLong((int)self->context); -} - -PyObject *ActionData_modifiers(ActionData *self, PyObject *args) -{ - if(!PyArg_ParseTuple(args,":modifiers")) return NULL; - return PyLong_FromUnsignedLong(self->state); -} - -PyObject *ActionData_button(ActionData *self, PyObject *args) -{ - if(!PyArg_ParseTuple(args,":button")) return NULL; - int b = 0; - switch (self->button) { - case Button5: b++; - case Button4: b++; - case Button3: b++; - case Button2: b++; - case Button1: b++; - default: ; - } - return PyLong_FromLong(b); -} - -PyObject *ActionData_xroot(ActionData *self, PyObject *args) -{ - if(!PyArg_ParseTuple(args,":xroot")) return NULL; - return PyLong_FromLong(self->xroot); -} - -PyObject *ActionData_yroot(ActionData *self, PyObject *args) -{ - if(!PyArg_ParseTuple(args,":yroot")) return NULL; - return PyLong_FromLong(self->yroot); -} - -PyObject *ActionData_time(ActionData *self, PyObject *args) -{ - if(!PyArg_ParseTuple(args,":time")) return NULL; - return PyLong_FromLong(self->time); -} - -static PyMethodDef ActionData_methods[] = { - {"action", (PyCFunction)ActionData_action, METH_VARARGS, - "Return the action being executed."}, - {"window", (PyCFunction)ActionData_window, METH_VARARGS, - "Return the client window id."}, - {"context", (PyCFunction)ActionData_context, METH_VARARGS, - "Return the context that the action is occuring in."}, - {"modifiers", (PyCFunction)ActionData_modifiers, METH_VARARGS, - "Return the modifier keys state."}, - {"button", (PyCFunction)ActionData_button, METH_VARARGS, - "Return the number of the pressed button (1-5)."}, - {"xroot", (PyCFunction)ActionData_xroot, METH_VARARGS, - "Return the X-position of the mouse cursor on the root window."}, - {"yroot", (PyCFunction)ActionData_yroot, METH_VARARGS, - "Return the Y-position of the mouse cursor on the root window."}, - {"time", (PyCFunction)ActionData_time, METH_VARARGS, - "Return the time at which the event occured."}, - {NULL, NULL, 0, NULL} -}; - -PyObject *BindingData_window(BindingData *self, PyObject *args) -{ - if(!PyArg_ParseTuple(args,":window")) return NULL; - return PyLong_FromLong(self->window); -} - -PyObject *BindingData_modifiers(BindingData *self, PyObject *args) -{ - if(!PyArg_ParseTuple(args,":modifiers")) return NULL; - return PyLong_FromUnsignedLong(self->state); -} - -PyObject *BindingData_key(BindingData *self, PyObject *args) -{ - if(!PyArg_ParseTuple(args,":key")) return NULL; - return PyString_FromString( - XKeysymToString(XKeycodeToKeysym(otk::OBDisplay::display, self->key, 0))); - -} - -PyObject *BindingData_time(BindingData *self, PyObject *args) -{ - if(!PyArg_ParseTuple(args,":time")) return NULL; - return PyLong_FromLong(self->time); -} - -static PyMethodDef BindingData_methods[] = { - {"window", (PyCFunction)BindingData_window, METH_VARARGS, - "Return the client window id."}, - {"modifiers", (PyCFunction)BindingData_modifiers, METH_VARARGS, - "Return the modifier keys state."}, - {"key", (PyCFunction)BindingData_key, METH_VARARGS, - "Return the name of the pressed key."}, - {"time", (PyCFunction)BindingData_time, METH_VARARGS, - "Return the time at which the event occured."}, - {NULL, NULL, 0, NULL} -}; - -static PyObject *ActionDataGetAttr(PyObject *obj, char *name) -{ - return Py_FindMethod(ActionData_methods, obj, name); -} - -static PyObject *BindingDataGetAttr(PyObject *obj, char *name) -{ - return Py_FindMethod(BindingData_methods, obj, name); -} - -static PyTypeObject ActionData_Type = { - PyObject_HEAD_INIT(NULL) - 0, - "ActionData", - sizeof(ActionData), - 0, - (destructor)ActionDataDealloc, - 0, - (getattrfunc)ActionDataGetAttr, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -}; - -static PyTypeObject BindingData_Type = { - PyObject_HEAD_INIT(NULL) - 0, - "BindingData", - sizeof(BindingData), - 0, - (destructor)BindingDataDealloc, - 0, - (getattrfunc)BindingDataGetAttr, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -}; - -// **************** // -// End custom types // -// **************** // - 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(((std::string)"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()"); // set up access to the python global variables PyObject *obmodule = PyImport_AddModule("__main__"); obdict = PyModule_GetDict(obmodule); - - // set up the custom types - ActionData_Type.ob_type = &PyType_Type; - BindingData_Type.ob_type = &PyType_Type; } void python_destroy() @@ -240,58 +57,13 @@ bool python_exec(const std::string &path) return true; } -static void call(PyObject *func, PyObject *data) +bool python_get_long(const char *name, long *value) { - PyObject *arglist; - PyObject *result; - - arglist = Py_BuildValue("(O)", data); - - // call the callback - result = PyEval_CallObject(func, arglist); - if (!result) { - // an exception occured in the script, display it - PyErr_Print(); - } - - Py_XDECREF(result); - Py_DECREF(arglist); -} - -void python_callback(PyObject *func, MouseAction action, - Window window, MouseContext context, - unsigned int state, unsigned int button, - int xroot, int yroot, Time time) -{ - assert(func); + PyObject *val = PyDict_GetItemString(obdict, const_cast(name)); + if (!(val && PyLong_Check(val))) return false; - ActionData *data = PyObject_New(ActionData, &ActionData_Type); - data->action = action; - data->window = window; - data->context= context; - data->state = state; - data->button = button; - data->xroot = xroot; - data->yroot = yroot; - data->time = time; - - call(func, (PyObject*)data); - Py_DECREF(data); -} - -void python_callback(PyObject *func, Window window, unsigned int state, - unsigned int key, Time time) -{ - if (!func) return; - - BindingData *data = PyObject_New(BindingData, &BindingData_Type); - data->window = window; - data->state = state; - data->key = key; - data->time = time; - - call(func, (PyObject*)data); - Py_DECREF(data); + *value = PyLong_AsLong(val); + return true; } bool python_get_string(const char *name, std::string *value) @@ -320,65 +92,37 @@ bool python_get_stringlist(const char *name, std::vector *value) // Stuff for calling from Python scripts // // ************************************* // -/* -PyObject * python_register(int action, PyObject *func, bool infront = false) -{ - if (!PyCallable_Check(func)) { - PyErr_SetString(PyExc_TypeError, "Invalid callback function."); - return NULL; - } - - if (!ob::Openbox::instance->actions()->registerCallback( - (ob::OBActions::ActionType)action, func, infront)) { - PyErr_SetString(PyExc_RuntimeError, "Unable to register action callback."); - return NULL; - } - Py_INCREF(Py_None); return Py_None; -} - -PyObject *unregister(int action, PyObject *func) +PyObject *mbind(const std::string &button, ob::MouseContext context, + ob::MouseAction action, PyObject *func) { if (!PyCallable_Check(func)) { PyErr_SetString(PyExc_TypeError, "Invalid callback function."); return NULL; } - - if (!ob::Openbox::instance->actions()->unregisterCallback( - (ob::OBActions::ActionType)action, func)) { - PyErr_SetString(PyExc_RuntimeError, "Unable to unregister action callback."); + + if (!ob::Openbox::instance->bindings()->addButton(button, context, + action, func)) { + PyErr_SetString(PyExc_RuntimeError,"Unable to add binding."); return NULL; } Py_INCREF(Py_None); return Py_None; } -PyObject *unregister_all(int action) -{ - if (!ob::Openbox::instance->actions()->unregisterAllCallbacks( - (ob::OBActions::ActionType)action)) { - PyErr_SetString(PyExc_RuntimeError, - "Unable to unregister action callbacks."); - return NULL; - } - Py_INCREF(Py_None); return Py_None; -} -*/ -PyObject * mbind(const std::string &button, ob::MouseContext context, - ob::MouseAction action, PyObject *func) +PyObject *ebind(ob::EventAction action, PyObject *func) { if (!PyCallable_Check(func)) { PyErr_SetString(PyExc_TypeError, "Invalid callback function."); return NULL; } - if (!ob::Openbox::instance->bindings()->addButton(button, context, - action, func)) { + 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; } -PyObject * kbind(PyObject *keylist, ob::KeyContext context, PyObject *func) +PyObject *kbind(PyObject *keylist, ob::KeyContext context, PyObject *func) { if (!PyCallable_Check(func)) { PyErr_SetString(PyExc_TypeError, "Invalid callback function."); @@ -400,20 +144,25 @@ PyObject * kbind(PyObject *keylist, ob::KeyContext context, PyObject *func) vectkeylist.push_back(PyString_AsString(str)); } - if (!ob::Openbox::instance->bindings()->add(vectkeylist, func)) { + (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; } -PyObject * kunbind(PyObject *keylist) +PyObject *kunbind(PyObject *keylist, PyObject *func) { if (!PyList_Check(keylist)) { PyErr_SetString(PyExc_TypeError, "Invalid keylist. Not a list."); return NULL; } - + 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); @@ -425,17 +174,49 @@ PyObject * kunbind(PyObject *keylist) vectkeylist.push_back(PyString_AsString(str)); } - ob::Openbox::instance->bindings()->remove(vectkeylist); + if (!ob::Openbox::instance->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()->removeAll(); + ob::Openbox::instance->bindings()->removeAllKeys(); } void set_reset_key(const std::string &key) { ob::Openbox::instance->bindings()->setResetKey(key); } + +PyObject *send_client_msg(Window target, int 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.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; +} + }