X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/91d875c1fe21ae2333475c74d46215b2ad3063cd..1f0cfd8eb9bbb24864bb2d9010f9c11286e9f845:/lib/gui/elistboxcontent.cpp diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index 362a3f84..8b0fe14d 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -110,7 +110,7 @@ void eListboxTestContent::setSize(const eSize &size) void eListboxTestContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) { - ePtr fnt = new gFont("Arial", 20); + ePtr fnt = new gFont("Regular", 20); painter.clip(eRect(offset, m_size)); style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); painter.clear(); @@ -219,7 +219,7 @@ void eListboxStringContent::setSize(const eSize &size) void eListboxStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) { - ePtr fnt = new gFont("Arial", 20); + ePtr fnt = new gFont("Regular", 20); painter.clip(eRect(offset, m_itemsize)); style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); painter.clear(); @@ -246,6 +246,7 @@ void eListboxStringContent::setList(std::list &list) m_list = list; m_size = list.size(); cursorHome(); + m_listbox->entryReset(false); } ////////////////////////////////////// @@ -259,6 +260,7 @@ eListboxPythonStringContent::eListboxPythonStringContent() eListboxPythonStringContent::~eListboxPythonStringContent() { + Py_XDECREF(m_list); } void eListboxPythonStringContent::cursorHome() @@ -327,19 +329,19 @@ void eListboxPythonStringContent::setSize(const eSize &size) void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) { - ePtr fnt = new gFont("Arial", 20); + ePtr fnt = new gFont("Regular", 20); painter.clip(eRect(offset, m_itemsize)); style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); painter.clear(); if (m_list && cursorValid()) { - PyObject *item = PyList_GetItem(m_list, m_cursor); // borrowed reference! + PyObject *item = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! painter.setFont(fnt); /* the user can supply tuples, in this case the first one will be displayed. */ if (PyTuple_Check(item)) - item = PyTuple_GetItem(item, 0); + item = PyTuple_GET_ITEM(item, 0); const char *string = PyString_Check(item) ? PyString_AsString(item) : ""; @@ -366,9 +368,8 @@ void eListboxPythonStringContent::setList(PyObject *list) Py_INCREF(m_list); } - //always invalidate when we get a new list if (m_listbox) - m_listbox->invalidate(); + m_listbox->entryReset(false); } PyObject *eListboxPythonStringContent::getCurrentSelection() @@ -377,7 +378,7 @@ PyObject *eListboxPythonStringContent::getCurrentSelection() return 0; if (!cursorValid()) return 0; - PyObject *r = PyList_GetItem(m_list, m_cursor); + PyObject *r = PyList_GET_ITEM(m_list, m_cursor); Py_XINCREF(r); return r; } @@ -398,16 +399,17 @@ void eListboxPythonStringContent::invalidate() void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) { - ePtr fnt = new gFont("Arial", 20); - ePtr fnt2 = new gFont("Arial", 16); - painter.clip(eRect(offset, m_itemsize)); + ePtr fnt = new gFont("Regular", 20); + ePtr fnt2 = new gFont("Regular", 16); + eRect itemrect(offset, m_itemsize); + painter.clip(itemrect); style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); painter.clear(); if (m_list && cursorValid()) { /* get current list item */ - PyObject *item = PyList_GetItem(m_list, m_cursor); // borrowed reference! + PyObject *item = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! PyObject *text = 0, *value = 0; painter.setFont(fnt); @@ -421,7 +423,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 = PyTuple_GET_ITEM(item, 0); 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()); @@ -430,11 +432,11 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, Py_XDECREF(text); /* now, handle the value. get 2nd part from tuple*/ - value = PyTuple_GetItem(item, 1); + value = PyTuple_GET_ITEM(item, 1); if (value) { PyObject *args = PyTuple_New(1); - PyTuple_SetItem(args, 0, PyInt_FromLong(selected)); + PyTuple_SET_ITEM(args, 0, PyInt_FromLong(selected)); /* CallObject will call __call__ which should return the value tuple */ value = PyObject_CallObject(value, args); @@ -450,14 +452,14 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, if (value && PyTuple_Check(value)) { /* convert type to string */ - PyObject *type = PyTuple_GetItem(value, 0); + PyObject *type = PyTuple_GET_ITEM(value, 0); const char *atype = (type && PyString_Check(type)) ? PyString_AsString(type) : 0; if (atype) { if (!strcmp(atype, "text")) { - PyObject *pvalue = PyTuple_GetItem(value, 1); + PyObject *pvalue = PyTuple_GET_ITEM(value, 1); const char *value = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : ""; painter.setFont(fnt2); painter.renderText(eRect(offset + eSize(m_seperation, 0), item_right), value, gPainter::RT_HALIGN_RIGHT); @@ -465,7 +467,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, /* pvalue is borrowed */ } else if (!strcmp(atype, "slider")) { - PyObject *pvalue = PyTuple_GetItem(value, 1); + PyObject *pvalue = PyTuple_GET_ITEM(value, 1); /* convert value to Long. fallback to -1 on error. */ int value = (pvalue && PyInt_Check(pvalue)) ? PyInt_AsLong(pvalue) : -1; @@ -483,19 +485,22 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, /* pvalue is borrowed */ } else if (!strcmp(atype, "mtext")) { - PyObject *pvalue = PyTuple_GetItem(value, 1); + PyObject *pvalue = PyTuple_GET_ITEM(value, 1); const char *text = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : ""; ePtr para = new eTextPara(eRect(offset + eSize(m_seperation, 0), item_right)); para->setFont(fnt2); para->renderString(text, 0); - para->realign(eTextPara::dirRight); + if (strlen(text) != 0) + para->realign(eTextPara::dirRight); + else + para->realign(eTextPara::dirLeft); int glyphs = para->size(); PyObject *plist = 0; if (PyTuple_Size(value) >= 3) - plist = PyTuple_GetItem(value, 2); + plist = PyTuple_GET_ITEM(value, 2); int entries = 0; @@ -504,7 +509,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, for (int i = 0; i < entries; ++i) { - PyObject *entry = PyList_GetItem(plist, i); + PyObject *entry = PyList_GET_ITEM(plist, i); int num = PyInt_Check(entry) ? PyInt_AsLong(entry) : -1; if ((num < 0) || (num >= glyphs)) @@ -545,147 +550,196 @@ RESULT SwigFromPython(ePtr &res, PyObject *obj); void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) { - painter.clip(eRect(offset, m_itemsize)); + eRect itemrect(offset, m_itemsize); + painter.clip(itemrect); style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); painter.clear(); if (m_list && cursorValid()) { - PyObject *items = PyList_GetItem(m_list, m_cursor); // borrowed reference! + PyObject *items = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! if (!items) { eDebug("eListboxPythonMultiContent: error getting item %d", m_cursor); - painter.clippop(); - return; + goto error_out; } if (!PyList_Check(items)) { eDebug("eListboxPythonMultiContent: list entry %d is not a list", m_cursor); - painter.clippop(); - return; + goto error_out; } int size = PyList_Size(items); for (int i = 1; i < size; ++i) { - PyObject *item = PyList_GetItem(items, i); // borrowed reference! + PyObject *item = PyList_GET_ITEM(items, i); // borrowed reference! if (!item) { eDebug("eListboxPythonMultiContent: ?"); - painter.clippop(); - return; + goto error_out; } - 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" ), - + (0, x, y, width, height, fnt, flags, "bla" ), + + or, for a progress: + (1, x, y, width, height, filled_percent ) + or, for a pixmap: - (x, y, width, height, pixmap ) + (2, x, y, width, height, pixmap ) */ if (!PyTuple_Check(item)) { eDebug("eListboxPythonMultiContent did not receive a tuple."); - painter.clippop(); - return; + goto error_out; } - + int size = PyTuple_Size(item); - - if (size >= 5) + + if (!size) { - 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); /* could also be an pixmap */ - if (size >= 7) - { - pflags = PyTuple_GetItem(item, 5); - pstring = PyTuple_GetItem(item, 6); - } + eDebug("eListboxPythonMultiContent receive empty tuple."); + goto error_out; } - - ePtr pixmap; - - /* decide what type */ - int type = -1; - if (pfnt) + + int type = PyInt_AsLong(PyTuple_GET_ITEM(item, 0)); + + if (size > 5) { - if (PyNumber_Check(pfnt)) /* font index */ - type = 0; - else if (!SwigFromPython(pixmap, pfnt)) - type = 1; + px = PyTuple_GET_ITEM(item, 1); + py = PyTuple_GET_ITEM(item, 2); + pwidth = PyTuple_GET_ITEM(item, 3); + pheight = PyTuple_GET_ITEM(item, 4); + pfnt = PyTuple_GET_ITEM(item, 5); /* could also be an pixmap or an int (progress filled percent) */ + if (size > 7) + { + pflags = PyTuple_GET_ITEM(item, 6); + pstring = PyTuple_GET_ITEM(item, 7); + } } switch (type) { - case 0: // text + case TYPE_TEXT: // 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; + eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_TEXT, x, y, width, height, fnt, flags, string[, ...])"); + goto error_out; } - - 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; + goto error_out; } + eRect r = eRect(x, y, width, height); r.moveBy(offset); - + r &= itemrect; + painter.setFont(m_font[fnt]); - + + painter.clip(r); painter.renderText(r, string, flags); + painter.clippop(); + break; + } + case TYPE_PROGRESS: // Progress + { + if (!(px && py && pwidth && pheight && pfnt)) + { + eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PROGRESS, x, y, width, height, filled percent))"); + goto error_out; + } + int x = PyInt_AsLong(px); + int y = PyInt_AsLong(py); + int width = PyInt_AsLong(pwidth); + int height = PyInt_AsLong(pheight); + int filled = PyInt_AsLong(pfnt); + + eRect r = eRect(x, y, width, height); + r.moveBy(offset); + r &= itemrect; + + painter.clip(r); + int bwidth=2; // borderwidth hardcoded yet + + // border + eRect rc = eRect(x, y, width, bwidth); + rc.moveBy(offset); + painter.fill(rc); + + rc = eRect(x, y+bwidth, bwidth, height-bwidth); + rc.moveBy(offset); + painter.fill(rc); + + rc = eRect(x+bwidth, y+height-bwidth, width-bwidth, bwidth); + rc.moveBy(offset); + painter.fill(rc); + + rc = eRect(x+width-bwidth, y+bwidth, bwidth, height-bwidth); + rc.moveBy(offset); + painter.fill(rc); + + // progress + rc = eRect(x+bwidth, y+bwidth, (width-bwidth*2) * filled / 100, height-bwidth*2); + rc.moveBy(offset); + painter.fill(rc); + + painter.clippop(); - Py_XDECREF(pstring); break; } - case 1: // pixmap + case TYPE_PIXMAP: // pixmap { + if (!(px && py && pwidth && pheight && pfnt)) + { + eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PIXMAP, x, y, width, height, pixmap))"); + goto error_out; + } int x = PyInt_AsLong(px); int y = PyInt_AsLong(py); int width = PyInt_AsLong(pwidth); int height = PyInt_AsLong(pheight); - + ePtr pixmap; + if (SwigFromPython(pixmap, pfnt)) + { + eDebug("eListboxPythonMultiContent (Pixmap) get pixmap failed"); + goto error_out; + } + eRect r = eRect(x, y, width, height); r.moveBy(offset); + r &= itemrect; + painter.clip(r); painter.blit(pixmap, r.topLeft(), r); + painter.clippop(); + break; } default: - eWarning("eListboxPythonMultiContent received neither text nor pixmap entry"); - painter.clippop(); - return; + eWarning("eListboxPythonMultiContent received unknown type (%d)", type); + goto error_out; } } } @@ -693,6 +747,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c if (selected) style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); +error_out: painter.clippop(); }