all repos — openbox @ 63a74632ac39d445cb15cda510c8267da9ff6bbb

openbox fork - make it a bit more like ryudo

add the global display variable
Dana Jansens danakj@orodu.net
commit

63a74632ac39d445cb15cda510c8267da9ff6bbb

parent

3d012bcb47eda9210fa49df28efa8b59c2949c05

3 files changed, 23 insertions(+), 0 deletions(-)

jump to
M src/openbox.isrc/openbox.i

@@ -110,6 +110,9 @@ }

}; %ignore otk::display; +%inline %{ + otk::Display *Display_instance() { return otk::display; } +%}; %include "../otk/ustring.i"
M src/openbox.pysrc/openbox.py

@@ -29,6 +29,8 @@

Openbox_instance = _openbox.Openbox_instance +Display_instance = _openbox.Display_instance + class Display(_object): __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, Display, name, value)
M src/openbox_wrap.ccsrc/openbox_wrap.cc

@@ -883,6 +883,9 @@

#include <iterator> + otk::Display *Display_instance() { return otk::display; } + + #include "ustring.hh" ob::Client *ob_Screen_client(ob::Screen *self,int i){

@@ -906,6 +909,20 @@ if(!PyArg_ParseTuple(args,(char *)":Openbox_instance")) goto fail;

result = (ob::Openbox *)Openbox_instance(); resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ob__Openbox, 0); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_Display_instance(PyObject *self, PyObject *args) { + PyObject *resultobj; + otk::Display *result; + + if(!PyArg_ParseTuple(args,(char *)":Display_instance")) goto fail; + result = (otk::Display *)Display_instance(); + + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__Display, 0); return resultobj; fail: return NULL;

@@ -7953,6 +7970,7 @@

static PyMethodDef SwigMethods[] = { { (char *)"Openbox_instance", _wrap_Openbox_instance, METH_VARARGS }, + { (char *)"Display_instance", _wrap_Display_instance, METH_VARARGS }, { (char *)"new_Display", _wrap_new_Display, METH_VARARGS }, { (char *)"delete_Display", _wrap_delete_Display, METH_VARARGS }, { (char *)"Display_gcCache", _wrap_Display_gcCache, METH_VARARGS },