X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3d5abd63531d388ad02bfb454decadad18b32fb0..91d875c1fe21ae2333475c74d46215b2ad3063cd:/lib/gui/elistboxcontent.cpp diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index f94765ef..362a3f84 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -365,6 +365,10 @@ void eListboxPythonStringContent::setList(PyObject *list) m_list = list; Py_INCREF(m_list); } + + //always invalidate when we get a new list + if (m_listbox) + m_listbox->invalidate(); } PyObject *eListboxPythonStringContent::getCurrentSelection() @@ -384,6 +388,12 @@ void eListboxPythonStringContent::invalidateEntry(int index) m_listbox->entryChanged(index); } +void eListboxPythonStringContent::invalidate() +{ + if (m_listbox) + m_listbox->invalidate(); +} + ////////////////////////////////////// void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) @@ -412,7 +422,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, /* handle left part. get item from tuple, convert to string, display. */ text = PyTuple_GetItem(item, 0); - text = PyObject_Str(text); + text = PyObject_Str(text); /* creates a new object - old object was borrowed! */ const char *string = (text && PyString_Check(text)) ? PyString_AsString(text) : ""; eSize item_left = eSize(m_seperation, m_itemsize.height()); eSize item_right = eSize(m_itemsize.width() - m_seperation, m_itemsize.height()); @@ -515,7 +525,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, /* plist is 0 or borrowed */ } } - Py_XDECREF(type); + /* type is borrowed */ } else eWarning("eListboxPythonConfigContent: second value of tuple is not a tuple."); /* value is borrowed */ @@ -530,6 +540,9 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, ////////////////////////////////////// + /* todo: make a real infrastructure here! */ +RESULT SwigFromPython(ePtr &res, PyObject *obj); + void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) { painter.clip(eRect(offset, m_itemsize)); @@ -567,13 +580,17 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c } - PyObject *px, *py, *pwidth, *pheight, *pfnt, *pstring, *pflags; + PyObject *px = 0, *py = 0, *pwidth = 0, *pheight = 0, *pfnt = 0, *pstring = 0, *pflags = 0; /* we have a list of tuples: (x, y, width, height, fnt, flags, "bla" ), + or, for a pixmap: + + (x, y, width, height, pixmap ) + */ if (!PyTuple_Check(item)) @@ -582,56 +599,100 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c painter.clippop(); return; } - - px = PyTuple_GetItem(item, 0); - py = PyTuple_GetItem(item, 1); - pwidth = PyTuple_GetItem(item, 2); - pheight = PyTuple_GetItem(item, 3); - pfnt = PyTuple_GetItem(item, 4); - pflags = PyTuple_GetItem(item, 5); - pstring = PyTuple_GetItem(item, 6); - if (!(px && py && pwidth && pheight && pfnt && pstring)) + int size = PyTuple_Size(item); + + if (size >= 5) { - eDebug("eListboxPythonMultiContent received too small tuple (must be (x, y, width, height, fnt, flags, string[, ...])"); - painter.clippop(); - return; - } - - pstring = PyObject_Str(pstring); + px = PyTuple_GetItem(item, 0); + py = PyTuple_GetItem(item, 1); + pwidth = PyTuple_GetItem(item, 2); + pheight = PyTuple_GetItem(item, 3); - const char *string = (PyString_Check(pstring)) ? PyString_AsString(pstring) : ""; + pfnt = PyTuple_GetItem(item, 4); /* could also be an pixmap */ + if (size >= 7) + { + pflags = PyTuple_GetItem(item, 5); + pstring = PyTuple_GetItem(item, 6); + } + } - int x = PyInt_AsLong(px); - int y = PyInt_AsLong(py); - int width = PyInt_AsLong(pwidth); - int height = PyInt_AsLong(pheight); - int flags = PyInt_AsLong(pflags); + ePtr pixmap; - int fnt = PyInt_AsLong(pfnt); + /* decide what type */ + int type = -1; + if (pfnt) + { + if (PyNumber_Check(pfnt)) /* font index */ + type = 0; + else if (!SwigFromPython(pixmap, pfnt)) + type = 1; + } - if (m_font.find(fnt) == m_font.end()) + switch (type) { - eDebug("eListboxPythonMultiContent: specified font %d was not found!", fnt); + case 0: // text + { + if (!(px && py && pwidth && pheight && pfnt && pstring)) + { + eDebug("eListboxPythonMultiContent received too small tuple (must be (x, y, width, height, fnt, flags, string[, ...])"); + painter.clippop(); + return; + } + + pstring = PyObject_Str(pstring); + + const char *string = (PyString_Check(pstring)) ? PyString_AsString(pstring) : ""; + + int x = PyInt_AsLong(px); + int y = PyInt_AsLong(py); + int width = PyInt_AsLong(pwidth); + int height = PyInt_AsLong(pheight); + int flags = PyInt_AsLong(pflags); + + int fnt = PyInt_AsLong(pfnt); + + if (m_font.find(fnt) == m_font.end()) + { + eDebug("eListboxPythonMultiContent: specified font %d was not found!", fnt); + Py_XDECREF(pstring); + painter.clippop(); + return; + } + eRect r = eRect(x, y, width, height); + r.moveBy(offset); + + painter.setFont(m_font[fnt]); + + painter.renderText(r, string, flags); + Py_XDECREF(pstring); + break; + } + case 1: // pixmap + { + int x = PyInt_AsLong(px); + int y = PyInt_AsLong(py); + int width = PyInt_AsLong(pwidth); + int height = PyInt_AsLong(pheight); + + eRect r = eRect(x, y, width, height); + r.moveBy(offset); + + painter.blit(pixmap, r.topLeft(), r); + break; + } + default: + eWarning("eListboxPythonMultiContent received neither text nor pixmap entry"); painter.clippop(); return; } - - eRect r = eRect(x, y, width, height); - r.moveBy(offset); - - painter.setFont(m_font[fnt]); - - painter.renderText(r, string, flags); - - Py_XDECREF(pstring); - - if (selected) - style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); } } + if (selected) + style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); + painter.clippop(); }