X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a9f8b624a019abc105b248885c98a71d37803e88..c668e555f7f57a878b8295abfeeb87d0f4550fbd:/lib/gui/elistboxcontent.cpp diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index fd7341a9..44973af7 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)) @@ -511,7 +523,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l style.setStyle(painter, eWindowStyle::styleListboxNormal); if (pbackColor) { - int color = PyInt_AsLong(pbackColor); + unsigned int color = PyInt_AsUnsignedLongMask(pbackColor); painter.setBackgroundColor(gRGB(color)); } // transparent background? // if we have a local background color set, use that. @@ -531,7 +543,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l style.setStyle(painter, eWindowStyle::styleListboxSelected); if (pbackColorSelected) { - int color = PyInt_AsLong(pbackColorSelected); + unsigned int color = PyInt_AsUnsignedLongMask(pbackColorSelected); painter.setBackgroundColor(gRGB(color)); } else if (local_style && local_style->m_background_color_selected_set) @@ -548,7 +560,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l style.setStyle(painter, eWindowStyle::styleListboxSelected); if (pbackColorSelected) { - int color = PyInt_AsLong(pbackColorSelected); + unsigned int color = PyInt_AsUnsignedLongMask(pbackColorSelected); painter.setBackgroundColor(gRGB(color)); } else if (local_style && local_style->m_background_color_selected_set) @@ -560,7 +572,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l style.setStyle(painter, eWindowStyle::styleListboxNormal); if (pbackColor) { - int color = PyInt_AsLong(pbackColor); + unsigned int color = PyInt_AsUnsignedLongMask(pbackColor); painter.setBackgroundColor(gRGB(color)); }/* if we have a local background color set, use that. */ else if (local_style && local_style->m_background_color_set) @@ -576,7 +588,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l { if (pforeColorSelected) { - int color = PyInt_AsLong(pforeColorSelected); + unsigned int color = PyInt_AsUnsignedLongMask(pforeColorSelected); painter.setForegroundColor(gRGB(color)); } /* if we have a local foreground color set, use that. */ @@ -587,7 +599,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l { if (pforeColor) { - int color = PyInt_AsLong(pforeColor); + unsigned int color = PyInt_AsUnsignedLongMask(pforeColor); painter.setForegroundColor(gRGB(color)); } /* if we have a local foreground color set, use that. */ @@ -596,6 +608,30 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l } } +static ePyObject lookupColor(ePyObject color, ePyObject data) +{ + if (color == Py_None) + return ePyObject(); + + if ((!color) && (!data)) + return color; + + unsigned int icolor = PyInt_AsUnsignedLongMask(color); + + /* check if we have the "magic" template color */ + if ((icolor & 0xFF000000) == 0xFF000000) + { + int index = icolor & 0xFFFFFF; + eDebug("[eListboxPythonMultiContent] template color index: %d", index); + return PyTuple_GetItem(data, index); + } + + if (color == Py_None) + return ePyObject(); + + return color; +} + void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) { gRegion itemregion(eRect(offset, m_itemsize)); @@ -611,10 +647,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 +663,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 +677,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! @@ -692,29 +756,17 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c } if (size > 8) - { - pforeColor = PyTuple_GET_ITEM(item, 8); - if (pforeColor == Py_None) - pforeColor=ePyObject(); - } + pforeColor = lookupColor(PyTuple_GET_ITEM(item, 8), data); + if (size > 9) - { - pforeColorSelected = PyTuple_GET_ITEM(item, 9); - if (pforeColorSelected == Py_None) - pforeColorSelected=ePyObject(); - } + pforeColorSelected = lookupColor(PyTuple_GET_ITEM(item, 9), data); + if (size > 10) - { - pbackColor = PyTuple_GET_ITEM(item, 10); - if (pbackColor == Py_None) - pbackColor=ePyObject(); - } + pbackColor = lookupColor(PyTuple_GET_ITEM(item, 10), data); + if (size > 11) - { - pbackColorSelected = PyTuple_GET_ITEM(item, 11); - if (pbackColorSelected == Py_None) - pbackColorSelected=ePyObject(); - } + pbackColorSelected = lookupColor(PyTuple_GET_ITEM(item, 11), data); + if (size > 12) { pborderWidth = PyTuple_GET_ITEM(item, 12); @@ -722,11 +774,10 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c pborderWidth=ePyObject(); } if (size > 13) - { - pborderColor = PyTuple_GET_ITEM(item, 13); - if (pborderColor == Py_None) - pborderColor=ePyObject(); - } + pborderColor = lookupColor(PyTuple_GET_ITEM(item, 13), data); + + 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(); @@ -762,7 +813,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c painter.clip(rect); if (pborderColor) { - int color = PyInt_AsLong(pborderColor); + unsigned int color = PyInt_AsUnsignedLongMask(pborderColor); painter.setForegroundColor(gRGB(color)); } @@ -836,6 +887,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); @@ -887,6 +942,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); @@ -899,17 +957,10 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c } if (size > 6) - { - pbackColor = PyTuple_GET_ITEM(item, 6); - if (pbackColor == Py_None) - pbackColor=ePyObject(); - } + pbackColor = lookupColor(PyTuple_GET_ITEM(item, 6), data); + if (size > 7) - { - pbackColorSelected = PyTuple_GET_ITEM(item, 7); - if (pbackColorSelected == Py_None) - pbackColorSelected=ePyObject(); - } + pbackColorSelected = lookupColor(PyTuple_GET_ITEM(item, 7), data); eRect rect(x, y, width, height); painter.clip(rect); @@ -934,8 +985,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(); } @@ -966,7 +1017,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 @@ -980,6 +1035,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; @@ -1021,3 +1081,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; +}