add the global display variable

diff --git a/src/openbox.i b/src/openbox.i
index ef86b9bcceb725fc3bae125ae83f08551f6745bd..657e31b741e2640a4e6c70a74ee67b5b626f73dd 100644 (file)
--- 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 1f263d30dd27036816f81f90fb3b773281267fc8..1d7e4104520a4d0b76d9a572639fbb0d656f1469 100644 (file)
--- 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 4a66d956a5fb216d64e92e8eb8f0f48287594c22..4d1136cd5eab791091ca9e6c2cc63e47c7ce09a5 100644 (file)
--- 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 },