-// -*- mode: C; indent-tabs-mode: nil; -*-
+// -*- mode: C; indent-tabs-mode: nil; c-basic-offset: 2; -*-
#include "../config.h"
#include "screeninfo.h"
self->screen = num;
self->root_window = RootWindow(OBDisplay->display, self->screen);
- self->rect = OtkRect_New(0, 0,
- WidthOfScreen(ScreenOfDisplay(OBDisplay->display,
- self->screen)),
- HeightOfScreen(ScreenOfDisplay(OBDisplay->display,
- self->screen)));
+ self->rect = (OtkRect*)
+ OtkRect_New(0, 0, WidthOfScreen(ScreenOfDisplay(OBDisplay->display,
+ self->screen)),
+ HeightOfScreen(ScreenOfDisplay(OBDisplay->display,
+ self->screen)));
/*
If the default depth is at least 8 we will use that,
}
// get the default display string and strip the screen number
- self->display_string =
+ self->display_string = (PyStringObject*)
PyString_FromFormat("DISPLAY=%s",DisplayString(OBDisplay->display));
- dstr = PyString_AsString(self->display_string);
+ dstr = PyString_AsString((PyObject*)self->display_string);
dstr2 = strrchr(dstr, '.');
if (dstr2) {
PyObject *str;
- PyString_Resize(self->display_string, dstr2 - dstr);
+ _PyString_Resize((PyObject**)&self->display_string, dstr2 - dstr);
str = PyString_FromFormat(".%d", self->screen);
- PyString_Concat(&self->display_string, str);
+ PyString_Concat((PyObject**)&self->display_string, str);
}
#ifdef XINERAMA
return PyInt_FromLong(self->screen);
}
-static PyObject *otkscreeninfo_getrect(OtkScreenInfo* self, PyObject* args)
+static OtkRect *otkscreeninfo_getrect(OtkScreenInfo* self, PyObject* args)
{
if (!PyArg_ParseTuple(args, ":getRect"))
return NULL;
-static void otkscreeninfo_dealloc(PyObject* self)
+static void otkscreeninfo_dealloc(OtkScreenInfo* self)
{
- Py_DECREF(((OtkScreenInfo*) self)->display_string);
- Py_DECREF(((OtkScreenInfo*) self)->rect);
+ Py_DECREF(self->display_string);
+ Py_DECREF(self->rect);
#ifdef XINERAMA
- Py_DECREF(((OtkScreenInfo*) self)->xinerama_areas);
+ Py_DECREF(self->xinerama_areas);
#endif
- PyObject_Del(self);
+ PyObject_Del((PyObject*)self);
}
static PyObject *otkscreeninfo_getattr(PyObject *obj, char *name)
"OtkScreenInfo",
sizeof(OtkScreenInfo),
0,
- otkscreeninfo_dealloc, /*tp_dealloc*/
+ (destructor)otkscreeninfo_dealloc, /*tp_dealloc*/
0, /*tp_print*/
otkscreeninfo_getattr, /*tp_getattr*/
0, /*tp_setattr*/