summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/openbox.i3
-rw-r--r--src/openbox.py2
-rw-r--r--src/openbox_wrap.cc18
3 files changed, 23 insertions, 0 deletions
diff --git a/src/openbox.i b/src/openbox.i
index ef86b9bc..657e31b7 100644
--- a/src/openbox.i
+++ b/src/openbox.i
@@ -110,6 +110,9 @@ void python_callback(PyObject *func, KeyData *data)
};
%ignore otk::display;
+%inline %{
+ otk::Display *Display_instance() { return otk::display; }
+%};
%include "../otk/ustring.i"
diff --git a/src/openbox.py b/src/openbox.py
index 1f263d30..1d7e4104 100644
--- a/src/openbox.py
+++ b/src/openbox.py
@@ -29,6 +29,8 @@ except AttributeError:
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)
diff --git a/src/openbox_wrap.cc b/src/openbox_wrap.cc
index 4a66d956..4d1136cd 100644
--- a/src/openbox_wrap.cc
+++ b/src/openbox_wrap.cc
@@ -883,6 +883,9 @@ void python_callback(PyObject *func, KeyData *data)
#include <iterator>
+ otk::Display *Display_instance() { return otk::display; }
+
+
#include "ustring.hh"
ob::Client *ob_Screen_client(ob::Screen *self,int i){
@@ -912,6 +915,20 @@ static PyObject *_wrap_Openbox_instance(PyObject *self, PyObject *args) {
}
+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;
+}
+
+
static PyObject *_wrap_new_Display(PyObject *self, PyObject *args) {
PyObject *resultobj;
otk::Display *result;
@@ -7953,6 +7970,7 @@ static PyObject *_wrap_send_client_msg(PyObject *self, PyObject *args) {
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 },