X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox_wrap.cc;h=4a66d956a5fb216d64e92e8eb8f0f48287594c22;hb=4c71c71d57e87c5273e09976fbac5b3a2f83bc52;hp=548cebbc95e552422b437ade24518a84bbc176b0;hpb=77ab46d1e35d48e73c201e6de88b26f48bb06425;p=chaz%2Fopenbox diff --git a/src/openbox_wrap.cc b/src/openbox_wrap.cc index 548cebbc..4a66d956 100644 --- a/src/openbox_wrap.cc +++ b/src/openbox_wrap.cc @@ -676,37 +676,38 @@ SWIG_InstallConstants(PyObject *d, swig_const_info constants[]) { #define SWIGTYPE_p_XConfigureEvent swig_types[28] #define SWIGTYPE_p_XCirculateEvent swig_types[29] #define SWIGTYPE_p_XRectangle swig_types[30] -#define SWIGTYPE_p_std__string swig_types[31] -#define SWIGTYPE_p_XCrossingEvent swig_types[32] -#define SWIGTYPE_p_Display swig_types[33] +#define SWIGTYPE_p_otk__ustring swig_types[31] +#define SWIGTYPE_p_std__string swig_types[32] +#define SWIGTYPE_p_XCrossingEvent swig_types[33] #define SWIGTYPE_p_otk__Display swig_types[34] -#define SWIGTYPE_p_XMappingEvent swig_types[35] -#define SWIGTYPE_p_otk__Style swig_types[36] -#define SWIGTYPE_p_otk__EventHandler swig_types[37] -#define SWIGTYPE_p_XReparentEvent swig_types[38] -#define SWIGTYPE_p_otk__EventDispatcher swig_types[39] -#define SWIGTYPE_p_otk__GCCache swig_types[40] -#define SWIGTYPE_p_ob__Bindings swig_types[41] -#define SWIGTYPE_p_ob__Openbox swig_types[42] -#define SWIGTYPE_p_ob__Actions swig_types[43] -#define SWIGTYPE_p_XEvent swig_types[44] -#define SWIGTYPE_p_otk__Property swig_types[45] -#define SWIGTYPE_p_PyObject swig_types[46] -#define SWIGTYPE_p_otk__ScreenInfo swig_types[47] -#define SWIGTYPE_p_ob__EventData swig_types[48] -#define SWIGTYPE_p_XCreateWindowEvent swig_types[49] -#define SWIGTYPE_p_XDestroyWindowEvent swig_types[50] -#define SWIGTYPE_p_otk__Property__StringVect swig_types[51] -#define SWIGTYPE_p_ob__WidgetBase swig_types[52] -#define SWIGTYPE_p_XKeyEvent swig_types[53] -#define SWIGTYPE_p_otk__Strut swig_types[54] -#define SWIGTYPE_p_unsigned_long swig_types[55] -#define SWIGTYPE_p_p_unsigned_long swig_types[56] -#define SWIGTYPE_p_XMotionEvent swig_types[57] -#define SWIGTYPE_p_XButtonEvent swig_types[58] -#define SWIGTYPE_p_XSelectionEvent swig_types[59] -#define SWIGTYPE_p_otk__TimerQueueManager swig_types[60] -static swig_type_info *swig_types[62]; +#define SWIGTYPE_p_Display swig_types[35] +#define SWIGTYPE_p_XMappingEvent swig_types[36] +#define SWIGTYPE_p_otk__Style swig_types[37] +#define SWIGTYPE_p_otk__EventHandler swig_types[38] +#define SWIGTYPE_p_XReparentEvent swig_types[39] +#define SWIGTYPE_p_otk__EventDispatcher swig_types[40] +#define SWIGTYPE_p_otk__GCCache swig_types[41] +#define SWIGTYPE_p_ob__Bindings swig_types[42] +#define SWIGTYPE_p_ob__Openbox swig_types[43] +#define SWIGTYPE_p_ob__Actions swig_types[44] +#define SWIGTYPE_p_XEvent swig_types[45] +#define SWIGTYPE_p_otk__Property swig_types[46] +#define SWIGTYPE_p_PyObject swig_types[47] +#define SWIGTYPE_p_otk__ScreenInfo swig_types[48] +#define SWIGTYPE_p_ob__EventData swig_types[49] +#define SWIGTYPE_p_XCreateWindowEvent swig_types[50] +#define SWIGTYPE_p_XDestroyWindowEvent swig_types[51] +#define SWIGTYPE_p_otk__Property__StringVect swig_types[52] +#define SWIGTYPE_p_ob__WidgetBase swig_types[53] +#define SWIGTYPE_p_XKeyEvent swig_types[54] +#define SWIGTYPE_p_otk__Strut swig_types[55] +#define SWIGTYPE_p_unsigned_long swig_types[56] +#define SWIGTYPE_p_p_unsigned_long swig_types[57] +#define SWIGTYPE_p_XMotionEvent swig_types[58] +#define SWIGTYPE_p_XButtonEvent swig_types[59] +#define SWIGTYPE_p_XSelectionEvent swig_types[60] +#define SWIGTYPE_p_otk__TimerQueueManager swig_types[61] +static swig_type_info *swig_types[63]; /* -------- TYPES TABLE (END) -------- */ @@ -812,7 +813,7 @@ std::string SwigString_AsString(PyObject* o) { #include - ob::Openbox *Openbox_instance() { return ob::Openbox::instance; } + ob::Openbox *Openbox_instance() { return ob::openbox; } namespace ob { @@ -882,10 +883,10 @@ void python_callback(PyObject *func, KeyData *data) #include - Display *Display_display() { return otk::Display::display; } +#include "ustring.hh" ob::Client *ob_Screen_client(ob::Screen *self,int i){ - if (i >= (int)self->clients.size()) + if (i < 0 || i >= (int)self->clients.size()) return NULL; ob::Client::List::iterator it = self->clients.begin(); std::advance(it,i); @@ -911,39 +912,28 @@ static PyObject *_wrap_Openbox_instance(PyObject *self, PyObject *args) { } -static PyObject *_wrap_Display_display(PyObject *self, PyObject *args) { +static PyObject *_wrap_new_Display(PyObject *self, PyObject *args) { PyObject *resultobj; - Display *result; - - if(!PyArg_ParseTuple(args,(char *)":Display_display")) goto fail; - result = (Display *)Display_display(); - - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_Display, 0); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_Display_initialize(PyObject *self, PyObject *args) { - PyObject *resultobj; - char *arg1 ; + otk::Display *result; - if(!PyArg_ParseTuple(args,(char *)"s:Display_initialize",&arg1)) goto fail; - otk::Display::initialize(arg1); + if(!PyArg_ParseTuple(args,(char *)":new_Display")) goto fail; + result = (otk::Display *)new otk::Display(); - Py_INCREF(Py_None); resultobj = Py_None; + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__Display, 1); return resultobj; fail: return NULL; } -static PyObject *_wrap_Display_destroy(PyObject *self, PyObject *args) { +static PyObject *_wrap_delete_Display(PyObject *self, PyObject *args) { PyObject *resultobj; + otk::Display *arg1 = (otk::Display *) 0 ; + PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)":Display_destroy")) goto fail; - otk::Display::destroy(); + if(!PyArg_ParseTuple(args,(char *)"O:delete_Display",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + delete arg1; Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -954,10 +944,13 @@ static PyObject *_wrap_Display_destroy(PyObject *self, PyObject *args) { static PyObject *_wrap_Display_gcCache(PyObject *self, PyObject *args) { PyObject *resultobj; + otk::Display *arg1 = (otk::Display *) 0 ; otk::GCCache *result; + PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)":Display_gcCache")) goto fail; - result = (otk::GCCache *)otk::Display::gcCache(); + if(!PyArg_ParseTuple(args,(char *)"O:Display_gcCache",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (otk::GCCache *)((otk::Display const *)arg1)->gcCache(); resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__GCCache, 0); return resultobj; @@ -968,11 +961,14 @@ static PyObject *_wrap_Display_gcCache(PyObject *self, PyObject *args) { static PyObject *_wrap_Display_screenInfo(PyObject *self, PyObject *args) { PyObject *resultobj; - int arg1 ; + otk::Display *arg1 = (otk::Display *) 0 ; + int arg2 ; otk::ScreenInfo *result; + PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"i:Display_screenInfo",&arg1)) goto fail; - result = (otk::ScreenInfo *)otk::Display::screenInfo(arg1); + if(!PyArg_ParseTuple(args,(char *)"Oi:Display_screenInfo",&obj0,&arg2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (otk::ScreenInfo *)(arg1)->screenInfo(arg2); resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__ScreenInfo, 0); return resultobj; @@ -983,14 +979,17 @@ static PyObject *_wrap_Display_screenInfo(PyObject *self, PyObject *args) { static PyObject *_wrap_Display_findScreen(PyObject *self, PyObject *args) { PyObject *resultobj; - Window arg1 ; + otk::Display *arg1 = (otk::Display *) 0 ; + Window arg2 ; otk::ScreenInfo *result; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:Display_findScreen",&obj0)) goto fail; - arg1 = (Window) PyInt_AsLong(obj0); + if(!PyArg_ParseTuple(args,(char *)"OO:Display_findScreen",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + arg2 = (Window) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; - result = (otk::ScreenInfo *)otk::Display::findScreen(arg1); + result = (otk::ScreenInfo *)(arg1)->findScreen(arg2); resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__ScreenInfo, 0); return resultobj; @@ -1001,10 +1000,13 @@ static PyObject *_wrap_Display_findScreen(PyObject *self, PyObject *args) { static PyObject *_wrap_Display_xkb(PyObject *self, PyObject *args) { PyObject *resultobj; + otk::Display *arg1 = (otk::Display *) 0 ; bool result; + PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)":Display_xkb")) goto fail; - result = (bool)otk::Display::xkb(); + if(!PyArg_ParseTuple(args,(char *)"O:Display_xkb",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (bool)((otk::Display const *)arg1)->xkb(); resultobj = PyInt_FromLong((long)result); return resultobj; @@ -1015,10 +1017,13 @@ static PyObject *_wrap_Display_xkb(PyObject *self, PyObject *args) { static PyObject *_wrap_Display_xkbEventBase(PyObject *self, PyObject *args) { PyObject *resultobj; + otk::Display *arg1 = (otk::Display *) 0 ; int result; + PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)":Display_xkbEventBase")) goto fail; - result = (int)otk::Display::xkbEventBase(); + if(!PyArg_ParseTuple(args,(char *)"O:Display_xkbEventBase",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (int)((otk::Display const *)arg1)->xkbEventBase(); resultobj = PyInt_FromLong((long)result); return resultobj; @@ -1029,10 +1034,13 @@ static PyObject *_wrap_Display_xkbEventBase(PyObject *self, PyObject *args) { static PyObject *_wrap_Display_shape(PyObject *self, PyObject *args) { PyObject *resultobj; + otk::Display *arg1 = (otk::Display *) 0 ; bool result; + PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)":Display_shape")) goto fail; - result = (bool)otk::Display::shape(); + if(!PyArg_ParseTuple(args,(char *)"O:Display_shape",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (bool)((otk::Display const *)arg1)->shape(); resultobj = PyInt_FromLong((long)result); return resultobj; @@ -1043,10 +1051,13 @@ static PyObject *_wrap_Display_shape(PyObject *self, PyObject *args) { static PyObject *_wrap_Display_shapeEventBase(PyObject *self, PyObject *args) { PyObject *resultobj; + otk::Display *arg1 = (otk::Display *) 0 ; int result; + PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)":Display_shapeEventBase")) goto fail; - result = (int)otk::Display::shapeEventBase(); + if(!PyArg_ParseTuple(args,(char *)"O:Display_shapeEventBase",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (int)((otk::Display const *)arg1)->shapeEventBase(); resultobj = PyInt_FromLong((long)result); return resultobj; @@ -1057,10 +1068,13 @@ static PyObject *_wrap_Display_shapeEventBase(PyObject *self, PyObject *args) { static PyObject *_wrap_Display_xinerama(PyObject *self, PyObject *args) { PyObject *resultobj; + otk::Display *arg1 = (otk::Display *) 0 ; bool result; + PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)":Display_xinerama")) goto fail; - result = (bool)otk::Display::xinerama(); + if(!PyArg_ParseTuple(args,(char *)"O:Display_xinerama",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (bool)((otk::Display const *)arg1)->xinerama(); resultobj = PyInt_FromLong((long)result); return resultobj; @@ -1071,10 +1085,13 @@ static PyObject *_wrap_Display_xinerama(PyObject *self, PyObject *args) { static PyObject *_wrap_Display_numLockMask(PyObject *self, PyObject *args) { PyObject *resultobj; + otk::Display *arg1 = (otk::Display *) 0 ; unsigned int result; + PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)":Display_numLockMask")) goto fail; - result = (unsigned int)otk::Display::numLockMask(); + if(!PyArg_ParseTuple(args,(char *)"O:Display_numLockMask",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (unsigned int)((otk::Display const *)arg1)->numLockMask(); resultobj = PyInt_FromLong((long)result); return resultobj; @@ -1085,10 +1102,13 @@ static PyObject *_wrap_Display_numLockMask(PyObject *self, PyObject *args) { static PyObject *_wrap_Display_scrollLockMask(PyObject *self, PyObject *args) { PyObject *resultobj; + otk::Display *arg1 = (otk::Display *) 0 ; unsigned int result; + PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)":Display_scrollLockMask")) goto fail; - result = (unsigned int)otk::Display::scrollLockMask(); + if(!PyArg_ParseTuple(args,(char *)"O:Display_scrollLockMask",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (unsigned int)((otk::Display const *)arg1)->scrollLockMask(); resultobj = PyInt_FromLong((long)result); return resultobj; @@ -1097,11 +1117,31 @@ static PyObject *_wrap_Display_scrollLockMask(PyObject *self, PyObject *args) { } +static PyObject *_wrap_Display___mul__(PyObject *self, PyObject *args) { + PyObject *resultobj; + otk::Display *arg1 = (otk::Display *) 0 ; + Display *result; + PyObject * obj0 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"O:Display___mul__",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + result = (Display *)((otk::Display const *)arg1)->operator *(); + + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_Display, 0); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Display_grab(PyObject *self, PyObject *args) { PyObject *resultobj; + otk::Display *arg1 = (otk::Display *) 0 ; + PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)":Display_grab")) goto fail; - otk::Display::grab(); + if(!PyArg_ParseTuple(args,(char *)"O:Display_grab",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + (arg1)->grab(); Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -1112,9 +1152,12 @@ static PyObject *_wrap_Display_grab(PyObject *self, PyObject *args) { static PyObject *_wrap_Display_ungrab(PyObject *self, PyObject *args) { PyObject *resultobj; + otk::Display *arg1 = (otk::Display *) 0 ; + PyObject * obj0 = 0 ; - if(!PyArg_ParseTuple(args,(char *)":Display_ungrab")) goto fail; - otk::Display::ungrab(); + if(!PyArg_ParseTuple(args,(char *)"O:Display_ungrab",&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + (arg1)->ungrab(); Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -1125,43 +1168,46 @@ static PyObject *_wrap_Display_ungrab(PyObject *self, PyObject *args) { static PyObject *_wrap_Display_grabButton(PyObject *self, PyObject *args) { PyObject *resultobj; - unsigned int arg1 ; + otk::Display *arg1 = (otk::Display *) 0 ; unsigned int arg2 ; - Window arg3 ; - bool arg4 ; - unsigned int arg5 ; - int arg6 ; + unsigned int arg3 ; + Window arg4 ; + bool arg5 ; + unsigned int arg6 ; int arg7 ; - Window arg8 ; - Cursor arg9 ; - bool arg10 ; + int arg8 ; + Window arg9 ; + Cursor arg10 ; + bool arg11 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; - PyObject * obj7 = 0 ; + PyObject * obj5 = 0 ; PyObject * obj8 = 0 ; PyObject * obj9 = 0 ; + PyObject * obj10 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOOOOiiOOO:Display_grabButton",&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&arg7,&obj7,&obj8,&obj9)) goto fail; - arg1 = (unsigned int) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOOOOOiiOOO:Display_grabButton",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&arg7,&arg8,&obj8,&obj9,&obj10)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (unsigned int) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (Window) PyInt_AsLong(obj2); + arg3 = (unsigned int) PyInt_AsLong(obj2); if (PyErr_Occurred()) SWIG_fail; - arg4 = (bool) PyInt_AsLong(obj3); + arg4 = (Window) PyInt_AsLong(obj3); if (PyErr_Occurred()) SWIG_fail; - arg5 = (unsigned int) PyInt_AsLong(obj4); + arg5 = (bool) PyInt_AsLong(obj4); if (PyErr_Occurred()) SWIG_fail; - arg8 = (Window) PyInt_AsLong(obj7); + arg6 = (unsigned int) PyInt_AsLong(obj5); if (PyErr_Occurred()) SWIG_fail; - arg9 = (Cursor) PyInt_AsLong(obj8); + arg9 = (Window) PyInt_AsLong(obj8); if (PyErr_Occurred()) SWIG_fail; - arg10 = (bool) PyInt_AsLong(obj9); + arg10 = (Cursor) PyInt_AsLong(obj9); if (PyErr_Occurred()) SWIG_fail; - otk::Display::grabButton(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10); + arg11 = (bool) PyInt_AsLong(obj10); + if (PyErr_Occurred()) SWIG_fail; + ((otk::Display const *)arg1)->grabButton(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11); Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -1172,21 +1218,24 @@ static PyObject *_wrap_Display_grabButton(PyObject *self, PyObject *args) { static PyObject *_wrap_Display_ungrabButton(PyObject *self, PyObject *args) { PyObject *resultobj; - unsigned int arg1 ; + otk::Display *arg1 = (otk::Display *) 0 ; unsigned int arg2 ; - Window arg3 ; + unsigned int arg3 ; + Window arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:Display_ungrabButton",&obj0,&obj1,&obj2)) goto fail; - arg1 = (unsigned int) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOOO:Display_ungrabButton",&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (unsigned int) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (Window) PyInt_AsLong(obj2); + arg3 = (unsigned int) PyInt_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (Window) PyInt_AsLong(obj3); if (PyErr_Occurred()) SWIG_fail; - otk::Display::ungrabButton(arg1,arg2,arg3); + ((otk::Display const *)arg1)->ungrabButton(arg2,arg3,arg4); Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -1197,31 +1246,34 @@ static PyObject *_wrap_Display_ungrabButton(PyObject *self, PyObject *args) { static PyObject *_wrap_Display_grabKey(PyObject *self, PyObject *args) { PyObject *resultobj; - unsigned int arg1 ; + otk::Display *arg1 = (otk::Display *) 0 ; unsigned int arg2 ; - Window arg3 ; - bool arg4 ; - int arg5 ; + unsigned int arg3 ; + Window arg4 ; + bool arg5 ; int arg6 ; - bool arg7 ; + int arg7 ; + bool arg8 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; - PyObject * obj6 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj7 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOOOiiO:Display_grabKey",&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6)) goto fail; - arg1 = (unsigned int) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOOOOiiO:Display_grabKey",&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&arg7,&obj7)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (unsigned int) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (Window) PyInt_AsLong(obj2); + arg3 = (unsigned int) PyInt_AsLong(obj2); + if (PyErr_Occurred()) SWIG_fail; + arg4 = (Window) PyInt_AsLong(obj3); if (PyErr_Occurred()) SWIG_fail; - arg4 = (bool) PyInt_AsLong(obj3); + arg5 = (bool) PyInt_AsLong(obj4); if (PyErr_Occurred()) SWIG_fail; - arg7 = (bool) PyInt_AsLong(obj6); + arg8 = (bool) PyInt_AsLong(obj7); if (PyErr_Occurred()) SWIG_fail; - otk::Display::grabKey(arg1,arg2,arg3,arg4,arg5,arg6,arg7); + ((otk::Display const *)arg1)->grabKey(arg2,arg3,arg4,arg5,arg6,arg7,arg8); Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -1232,21 +1284,24 @@ static PyObject *_wrap_Display_grabKey(PyObject *self, PyObject *args) { static PyObject *_wrap_Display_ungrabKey(PyObject *self, PyObject *args) { PyObject *resultobj; - unsigned int arg1 ; + otk::Display *arg1 = (otk::Display *) 0 ; unsigned int arg2 ; - Window arg3 ; + unsigned int arg3 ; + Window arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOO:Display_ungrabKey",&obj0,&obj1,&obj2)) goto fail; - arg1 = (unsigned int) PyInt_AsLong(obj0); - if (PyErr_Occurred()) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OOOO:Display_ungrabKey",&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Display,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (unsigned int) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; - arg3 = (Window) PyInt_AsLong(obj2); + arg3 = (unsigned int) PyInt_AsLong(obj2); if (PyErr_Occurred()) SWIG_fail; - otk::Display::ungrabKey(arg1,arg2,arg3); + arg4 = (Window) PyInt_AsLong(obj3); + if (PyErr_Occurred()) SWIG_fail; + ((otk::Display const *)arg1)->ungrabKey(arg2,arg3,arg4); Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -1505,8 +1560,8 @@ static PyObject *_wrap_Property_set__SWIG_2(PyObject *self, PyObject *args) { Window arg2 ; int arg3 ; int arg4 ; - std::string *arg5 = 0 ; - std::string temp5 ; + otk::ustring *arg5 = 0 ; + otk::ustring temp5 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj4 = 0 ; @@ -1517,13 +1572,13 @@ static PyObject *_wrap_Property_set__SWIG_2(PyObject *self, PyObject *args) { if (PyErr_Occurred()) SWIG_fail; { if (PyString_Check(obj4)) { - temp5 = std::string(PyString_AsString(obj4)); + temp5 = otk::ustring(PyString_AsString(obj4)); arg5 = &temp5; }else { - SWIG_exception(SWIG_TypeError, "string expected"); + SWIG_exception(SWIG_TypeError, "ustring expected"); } } - ((otk::Property const *)arg1)->set(arg2,(otk::Property::Atoms )arg3,(otk::Property::StringType )arg4,(std::string const &)*arg5); + ((otk::Property const *)arg1)->set(arg2,(otk::Property::Atoms )arg3,(otk::Property::StringType )arg4,(otk::ustring const &)*arg5); Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -1793,7 +1848,7 @@ static PyObject *_wrap_Property_get__SWIG_2(PyObject *self, PyObject *args) { Window arg2 ; int arg3 ; int arg4 ; - std::string *arg5 = (std::string *) 0 ; + otk::ustring *arg5 = (otk::ustring *) 0 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -1803,7 +1858,7 @@ static PyObject *_wrap_Property_get__SWIG_2(PyObject *self, PyObject *args) { if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__Property,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg2 = (Window) PyInt_AsLong(obj1); if (PyErr_Occurred()) SWIG_fail; - if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_std__string,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_otk__ustring,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; result = (bool)((otk::Property const *)arg1)->get(arg2,(otk::Property::Atoms )arg3,(otk::Property::StringType )arg4,arg5); resultobj = PyInt_FromLong((long)result); @@ -1918,7 +1973,7 @@ static PyObject *_wrap_Property_get(PyObject *self, PyObject *args) { if (_v) { { void *ptr; - if (SWIG_ConvertPtr(argv[4], (void **) &ptr, SWIGTYPE_p_std__string, 0) == -1) { + if (SWIG_ConvertPtr(argv[4], (void **) &ptr, SWIGTYPE_p_otk__ustring, 0) == -1) { _v = 0; PyErr_Clear(); }else { @@ -5594,8 +5649,8 @@ static PyObject *_wrap_Screen_setDesktopName(PyObject *self, PyObject *args) { PyObject *resultobj; ob::Screen *arg1 = (ob::Screen *) 0 ; long arg2 ; - std::string *arg3 = 0 ; - std::string temp3 ; + otk::ustring *arg3 = 0 ; + otk::ustring temp3 ; PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; @@ -5603,13 +5658,13 @@ static PyObject *_wrap_Screen_setDesktopName(PyObject *self, PyObject *args) { if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Screen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { if (PyString_Check(obj2)) { - temp3 = std::string(PyString_AsString(obj2)); + temp3 = otk::ustring(PyString_AsString(obj2)); arg3 = &temp3; }else { - SWIG_exception(SWIG_TypeError, "string expected"); + SWIG_exception(SWIG_TypeError, "ustring expected"); } } - (arg1)->setDesktopName(arg2,(std::string const &)*arg3); + (arg1)->setDesktopName(arg2,(otk::ustring const &)*arg3); Py_INCREF(Py_None); resultobj = Py_None; return resultobj; @@ -5967,14 +6022,14 @@ static PyObject *_wrap_Client_desktop(PyObject *self, PyObject *args) { static PyObject *_wrap_Client_title(PyObject *self, PyObject *args) { PyObject *resultobj; ob::Client *arg1 = (ob::Client *) 0 ; - std::string *result; + otk::ustring *result; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:Client_title",&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - std::string const &_result_ref = ((ob::Client const *)arg1)->title(); - result = (std::string *) &_result_ref; + otk::ustring const &_result_ref = ((ob::Client const *)arg1)->title(); + result = (otk::ustring *) &_result_ref; } { @@ -5989,14 +6044,14 @@ static PyObject *_wrap_Client_title(PyObject *self, PyObject *args) { static PyObject *_wrap_Client_iconTitle(PyObject *self, PyObject *args) { PyObject *resultobj; ob::Client *arg1 = (ob::Client *) 0 ; - std::string *result; + otk::ustring *result; PyObject * obj0 = 0 ; if(!PyArg_ParseTuple(args,(char *)"O:Client_iconTitle",&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_ob__Client,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { - std::string const &_result_ref = ((ob::Client const *)arg1)->iconTitle(); - result = (std::string *) &_result_ref; + otk::ustring const &_result_ref = ((ob::Client const *)arg1)->iconTitle(); + result = (otk::ustring *) &_result_ref; } { @@ -7898,9 +7953,8 @@ static PyObject *_wrap_send_client_msg(PyObject *self, PyObject *args) { static PyMethodDef SwigMethods[] = { { (char *)"Openbox_instance", _wrap_Openbox_instance, METH_VARARGS }, - { (char *)"Display_display", _wrap_Display_display, METH_VARARGS }, - { (char *)"Display_initialize", _wrap_Display_initialize, METH_VARARGS }, - { (char *)"Display_destroy", _wrap_Display_destroy, 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 }, { (char *)"Display_screenInfo", _wrap_Display_screenInfo, METH_VARARGS }, { (char *)"Display_findScreen", _wrap_Display_findScreen, METH_VARARGS }, @@ -7911,6 +7965,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Display_xinerama", _wrap_Display_xinerama, METH_VARARGS }, { (char *)"Display_numLockMask", _wrap_Display_numLockMask, METH_VARARGS }, { (char *)"Display_scrollLockMask", _wrap_Display_scrollLockMask, METH_VARARGS }, + { (char *)"Display___mul__", _wrap_Display___mul__, METH_VARARGS }, { (char *)"Display_grab", _wrap_Display_grab, METH_VARARGS }, { (char *)"Display_ungrab", _wrap_Display_ungrab, METH_VARARGS }, { (char *)"Display_grabButton", _wrap_Display_grabButton, METH_VARARGS }, @@ -8250,10 +8305,11 @@ static swig_type_info _swigt__p_ob__KeyData[] = {{"_p_ob__KeyData", 0, "ob::KeyD static swig_type_info _swigt__p_XConfigureEvent[] = {{"_p_XConfigureEvent", 0, "XConfigureEvent *", 0},{"_p_XConfigureEvent"},{0}}; static swig_type_info _swigt__p_XCirculateEvent[] = {{"_p_XCirculateEvent", 0, "XCirculateEvent *", 0},{"_p_XCirculateEvent"},{0}}; static swig_type_info _swigt__p_XRectangle[] = {{"_p_XRectangle", 0, "XRectangle *", 0},{"_p_XRectangle"},{0}}; +static swig_type_info _swigt__p_otk__ustring[] = {{"_p_otk__ustring", 0, "otk::ustring *", 0},{"_p_otk__ustring"},{0}}; static swig_type_info _swigt__p_std__string[] = {{"_p_std__string", 0, "std::string *", 0},{"_p_std__string"},{0}}; static swig_type_info _swigt__p_XCrossingEvent[] = {{"_p_XCrossingEvent", 0, "XCrossingEvent *", 0},{"_p_XCrossingEvent"},{0}}; -static swig_type_info _swigt__p_Display[] = {{"_p_Display", 0, "Display *", 0},{"_p_Display"},{0}}; static swig_type_info _swigt__p_otk__Display[] = {{"_p_otk__Display", 0, "otk::Display *", 0},{"_p_otk__Display"},{0}}; +static swig_type_info _swigt__p_Display[] = {{"_p_Display", 0, "Display *", 0},{"_p_Display"},{0}}; static swig_type_info _swigt__p_XMappingEvent[] = {{"_p_XMappingEvent", 0, "XMappingEvent *", 0},{"_p_XMappingEvent"},{0}}; static swig_type_info _swigt__p_otk__Style[] = {{"_p_otk__Style", 0, "otk::Style *", 0},{"_p_otk__Style"},{0}}; static swig_type_info _swigt__p_otk__EventHandler[] = {{"_p_otk__EventHandler", 0, "otk::EventHandler *", 0},{"_p_ob__Client", _p_ob__ClientTo_p_otk__EventHandler},{"_p_ob__Actions", _p_ob__ActionsTo_p_otk__EventHandler},{"_p_otk__EventHandler"},{"_p_ob__Openbox", _p_ob__OpenboxTo_p_otk__EventHandler},{"_p_ob__Screen", _p_ob__ScreenTo_p_otk__EventHandler},{0}}; @@ -8313,10 +8369,11 @@ _swigt__p_ob__KeyData, _swigt__p_XConfigureEvent, _swigt__p_XCirculateEvent, _swigt__p_XRectangle, +_swigt__p_otk__ustring, _swigt__p_std__string, _swigt__p_XCrossingEvent, -_swigt__p_Display, _swigt__p_otk__Display, +_swigt__p_Display, _swigt__p_XMappingEvent, _swigt__p_otk__Style, _swigt__p_otk__EventHandler,