color and gccache etc are like, half done
Dana Jansens danakj@orodu.net
4 files changed,
14 insertions(+),
6 deletions(-)
M
otk_c/Makefile
→
otk_c/Makefile
@@ -3,8 +3,8 @@ exec_prefix=$(prefix)
libdir=$(exec_prefix)/lib targets = libotk.so libotk.a -sources = display.c screeninfo.c rect.c -headers = display.h screeninfo.h rect.h +sources = display.c screeninfo.c rect.c gccache.c +headers = display.h screeninfo.h rect.h gccache.h CFLAGS+=-I/usr/gwar/include/python2.2
M
otk_c/display.c
→
otk_c/display.c
@@ -143,6 +143,11 @@ if (self->grab_count == 0)
XUngrabServer(self->display); } +OtkScreenInfo *OtkDisplay_ScreenInfo(OtkDisplay *self, int num) +{ + PyObject *py = PyList_GetItem(self->screenInfoList, num); + return (OtkScreenInfo*) py; +} static PyObject *otkdisplay_grab(OtkDisplay* self, PyObject* args)@@ -174,7 +179,7 @@
static void otkdisplay_dealloc(PyObject* self) { XCloseDisplay(((OtkDisplay*) self)->display); - PyObject_Del(((OtkDisplay*) self)->screenInfoList); + Py_DECREF(((OtkDisplay*) self)->screenInfoList); PyObject_Del(self); }
M
otk_c/display.h
→
otk_c/display.h
@@ -61,4 +61,7 @@
//! Ungrabs the display void OtkDisplay_Ungrab(OtkDisplay *self); +//! Get the screen info for a specific screen +struct OtkScreenInfo *OtkDisplay_ScreenInfo(OtkDisplay *self, int num); + #endif // __display_h
M
otk_c/screeninfo.c
→
otk_c/screeninfo.c
@@ -162,10 +162,10 @@
static void otkscreeninfo_dealloc(PyObject* self) { - PyObject_Del(((OtkScreenInfo*) self)->display_string); - PyObject_Del(((OtkScreenInfo*) self)->rect); + Py_DECREF(((OtkScreenInfo*) self)->display_string); + Py_DECREF(((OtkScreenInfo*) self)->rect); #ifdef XINERAMA - PyObject_Del(((OtkScreenInfo*) self)->xinerama_areas); + Py_DECREF(((OtkScreenInfo*) self)->xinerama_areas); #endif PyObject_Del(self); }