X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cacb8d2623ed293ce8cb33b5993d5e6393709fca..5563110c9b66d46f0c47d599ed06dd65525cfecd:/lib/gui/elistboxcontent.cpp diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index 2278db16..69f72a41 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -262,7 +262,8 @@ void eListboxPythonStringContent::invalidate() int s = size(); if ( m_cursor >= s ) m_listbox->moveSelectionTo(s?s-1:0); - m_listbox->invalidate(); + else + m_listbox->invalidate(); } } @@ -430,6 +431,8 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, if (plist && PyList_Check(plist)) entries = PyList_Size(plist); + int left=0, right=0, last=-1; + eRect bbox; for (int i = 0; i < entries; ++i) { ePyObject entry = PyList_GET_ITEM(plist, i); @@ -439,15 +442,23 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, eWarning("glyph index %d in PythonConfigList out of bounds!", num); else { + if (last+1 != num && last != -1) { + bbox = eRect(left, offset.y(), right-left, m_itemsize.height()); + painter.fill(bbox); + } para->setGlyphFlag(num, GS_INVERT); - eRect bbox; bbox = para->getGlyphBBox(num); - bbox = eRect(bbox.left(), offset.y(), bbox.width(), m_itemsize.height()); - painter.fill(bbox); + if (last+1 != num || last == -1) + left = bbox.left(); + right = bbox.left() + bbox.width(); + last = num; } /* entry is borrowed */ } - + if (last != -1) { + bbox = eRect(left, offset.y(), right-left, m_itemsize.height()); + painter.fill(bbox); + } painter.renderPara(para, ePoint(0, 0)); /* pvalue is borrowed */ /* plist is 0 or borrowed */ @@ -456,7 +467,8 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, /* type is borrowed */ } else eWarning("eListboxPythonConfigContent: second value of tuple is not a tuple."); - /* value is borrowed */ + if (value) + Py_DECREF(value); } if (selected && (!local_style || !local_style->m_selection)) @@ -576,7 +588,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l { if (pforeColorSelected) { - int color = PyInt_AsLong(pforeColor); + int color = PyInt_AsLong(pforeColorSelected); painter.setForegroundColor(gRGB(color)); } /* if we have a local foreground color set, use that. */ @@ -611,10 +623,15 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c painter.clip(itemregion); clearRegion(painter, style, local_style, ePyObject(), ePyObject(), ePyObject(), ePyObject(), selected, itemregion, sel_clip); - ePyObject items; + ePyObject items, buildfunc_ret; if (m_list && cursorValid()) { + /* a multicontent list can be used in two ways: + either each item is a list of (TYPE,...)-tuples, + or there is a template defined, which is a list of (TYPE,...)-tuples, + and the list is an unformatted tuple. The template then references items from the list. + */ items = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! if (m_buildFunc) @@ -622,7 +639,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c if (PyCallable_Check(m_buildFunc)) // when we have a buildFunc then call it { if (PyTuple_Check(items)) - items = PyObject_CallObject(m_buildFunc, items); + buildfunc_ret = items = PyObject_CallObject(m_buildFunc, items); else eDebug("items is no tuple"); } @@ -636,14 +653,37 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c goto error_out; } - if (!PyList_Check(items)) + if (!m_template) { - eDebug("eListboxPythonMultiContent: list entry %d is not a list", m_cursor); - goto error_out; + if (!PyList_Check(items)) + { + eDebug("eListboxPythonMultiContent: list entry %d is not a list (non-templated)", m_cursor); + goto error_out; + } + } else + { + if (!PyTuple_Check(items)) + { + eDebug("eListboxPythonMultiContent: list entry %d is not a tuple (templated)", m_cursor); + goto error_out; + } + } + + ePyObject data; + + /* if we have a template, use the template for the actual formatting. + we will later detect that "data" is present, and refer to that, instead + of the immediate value. */ + int start = 1; + if (m_template) + { + data = items; + items = m_template; + start = 0; } int size = PyList_Size(items); - for (int i = 1; i < size; ++i) + for (int i = start; i < size; ++i) { ePyObject item = PyList_GET_ITEM(items, i); // borrowed reference! @@ -728,6 +768,9 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c pborderColor=ePyObject(); } + if (PyInt_Check(pstring) && data) /* if the string is in fact a number, it refers to the 'data' list. */ + pstring = PyTuple_GetItem(data, PyInt_AsLong(pstring)); + const char *string = (PyString_Check(pstring)) ? PyString_AsString(pstring) : ""; int x = PyInt_AsLong(px) + offset.x(); int y = PyInt_AsLong(py) + offset.y(); @@ -765,8 +808,6 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c int color = PyInt_AsLong(pborderColor); painter.setForegroundColor(gRGB(color)); } - else if (pforeColor) // reset to normal color - style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); rect.setRect(x, y, width, bwidth); painter.fill(rect); @@ -838,6 +879,10 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c int width = PyInt_AsLong(pwidth); int height = PyInt_AsLong(pheight); int filled = PyInt_AsLong(pfilled_perc); + + if ((filled < 0) && data) /* if the string is in a negative number, it refers to the 'data' list. */ + filled = PyInt_AsLong(PyTuple_GetItem(data, -filled)); + int bwidth = pborderWidth ? PyInt_AsLong(pborderWidth) : 2; eRect rect(x, y, width, height); @@ -889,6 +934,9 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c goto error_out; } + if (PyInt_Check(ppixmap) && data) /* if the pixemap is in fact a number, it refers to the 'data' list. */ + ppixmap = PyTuple_GetItem(data, PyInt_AsLong(ppixmap)); + int x = PyInt_AsLong(px) + offset.x(); int y = PyInt_AsLong(py) + offset.y(); int width = PyInt_AsLong(pwidth); @@ -936,8 +984,8 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); error_out: - if (m_buildFunc && PyCallable_Check(m_buildFunc) && items) - Py_DECREF(items); + if (buildfunc_ret) + Py_DECREF(buildfunc_ret); painter.clippop(); } @@ -968,7 +1016,11 @@ int eListboxPythonMultiContent::currentCursorSelectable() { ePyObject ret = PyObject_CallObject(m_selectableFunc, args); if (ret) - return ret == Py_True; + { + bool retval = ret == Py_True; + Py_DECREF(ret); + return ret; + } eDebug("call m_selectableFunc failed!!! assume not callable"); } else @@ -982,6 +1034,11 @@ int eListboxPythonMultiContent::currentCursorSelectable() item = PyList_GET_ITEM(item, 0); if (item != Py_None) return 1; + } else if (PyTuple_Check(item)) + { + item = PyTuple_GET_ITEM(item, 0); + if (item != Py_None) + return 1; } else if (m_buildFunc && PyCallable_Check(m_buildFunc)) return 1; @@ -1023,3 +1080,14 @@ void eListboxPythonMultiContent::updateClip(gRegion &clip) else m_old_clip = m_clip = gRegion::invalidRegion(); } + +void eListboxPythonMultiContent::entryRemoved(int idx) +{ + if (m_listbox) + m_listbox->entryRemoved(idx); +} + +void eListboxPythonMultiContent::setTemplate(ePyObject tmplate) +{ + m_template = tmplate; +}