X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d9bb0d90e2a5fc8c275c79e981d36c03b1687785..b3faf74faa0d7539fb0b61e2ab35512c7286d23e:/lib/gui/elistboxcontent.cpp diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index c3092160..8331ca11 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -140,7 +140,36 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style, ePtr fnt = new gFont("Regular", 20); painter.clip(eRect(offset, m_itemsize)); style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); - painter.clear(); + + eListboxStyle *local_style = 0; + + /* get local listbox style, if present */ + if (m_listbox) + local_style = m_listbox->getLocalStyle(); + + /* if we have a local background color set, use that. */ + if (local_style && local_style->m_background_color_set) + painter.setBackgroundColor(local_style->m_background_color); + + /* same for foreground */ + if (local_style && local_style->m_foreground_color_set) + painter.setForegroundColor(local_style->m_foreground_color); + + /* if we have no transparent background */ + if (!local_style || !local_style->m_transparent_background) + { + /* blit background picture, if available (otherwise, clear only) */ + if (local_style && local_style->m_background) + painter.blit(local_style->m_background, offset, eRect(), 0); + else + painter.clear(); + } else + { + if (local_style->m_background) + painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST); + else if (selected && !local_style->m_selection) + painter.clear(); + } if (m_list && cursorValid()) { @@ -155,11 +184,14 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style, gray = 1; item = PyTuple_GET_ITEM(item, 0); } - + + if (selected && local_style && local_style->m_selection) + painter.blit(local_style->m_selection, offset, eRect(), gPainter::BT_ALPHATEST); + if (item == Py_None) { + /* seperator */ int half_height = m_itemsize.height() / 2; - painter.fill(eRect(offset.x() + half_height, offset.y() + half_height - 2, m_itemsize.width() - m_itemsize.height(), 4)); } else { @@ -169,11 +201,11 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style, painter.setForegroundColor(gRGB(0x808080)); painter.renderText(eRect(text_offset, m_itemsize), string); } - - if (selected) + + if (selected && (!local_style || !local_style->m_selection)) style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); } - + painter.clippop(); } @@ -227,9 +259,38 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, ePtr fnt = new gFont("Regular", 20); ePtr fnt2 = new gFont("Regular", 16); eRect itemrect(offset, m_itemsize); + eListboxStyle *local_style = 0; + painter.clip(itemrect); style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); - painter.clear(); + + /* get local listbox style, if present */ + if (m_listbox) + local_style = m_listbox->getLocalStyle(); + + /* if we have a local background color set, use that. */ + if (local_style && local_style->m_background_color_set) + painter.setBackgroundColor(local_style->m_background_color); + + /* same for foreground */ + if (local_style && local_style->m_foreground_color_set) + painter.setForegroundColor(local_style->m_foreground_color); + + if (!local_style || !local_style->m_transparent_background) + /* if we have no transparent background */ + { + /* blit background picture, if available (otherwise, clear only) */ + if (local_style && local_style->m_background) + painter.blit(local_style->m_background, offset, eRect(), 0); + else + painter.clear(); + } else + { + if (local_style->m_background) + painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST); + else if (selected && !local_style->m_selection) + painter.clear(); + } if (m_list && cursorValid()) { @@ -238,6 +299,9 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, ePyObject text, value; painter.setFont(fnt); + if (selected && local_style && local_style->m_selection) + painter.blit(local_style->m_selection, offset, eRect(), gPainter::BT_ALPHATEST); + /* the first tuple element is a string for the left side. the second one will be called, and the result shall be an tuple. @@ -367,7 +431,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, /* value is borrowed */ } - if (selected) + if (selected && (!local_style || !local_style->m_selection)) style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); } @@ -385,47 +449,118 @@ int eListboxPythonConfigContent::currentCursorSelectable() RESULT SwigFromPython(ePtr &res, PyObject *obj); eListboxPythonMultiContent::eListboxPythonMultiContent() - :m_temp_clip(gRegion::invalidRegion()) + :m_clip(gRegion::invalidRegion()), m_old_clip(gRegion::invalidRegion()) { } eListboxPythonMultiContent::~eListboxPythonMultiContent() { - if (m_buildFunc) - Py_DECREF(m_buildFunc); + Py_XDECREF(m_buildFunc); + Py_XDECREF(m_selectableFunc); } void eListboxPythonMultiContent::setSelectionClip(eRect &rect, bool update) { - if (update && m_selection_clip.valid()) + m_selection_clip = rect; + if (m_listbox) + rect.moveBy(ePoint(0, m_listbox->getEntryTop())); + if (m_clip.valid()) + m_clip |= rect; + else + m_clip = rect; + if (update && m_listbox) + m_listbox->entryChanged(m_cursor); +} + +static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *local_style, ePyObject pforeColor, ePyObject pbackColor, ePyObject pbackColorSelected, int selected, gRegion &rc, eRect &sel_clip) +{ + if (selected && sel_clip.valid()) { - m_temp_clip = m_selection_clip; - m_temp_clip |= rect; - m_selection_clip = rect; - if (m_listbox) - m_listbox->entryChanged(m_cursor); + bool clear=true; + painter.clip(rc-sel_clip); + if (pbackColor) + { + int color = PyInt_AsLong(pbackColor); + painter.setBackgroundColor(gRGB(color)); + } // transparent background? + else if (local_style && local_style->m_transparent_background) + clear=false; + // if we have a local background color set, use that. + else if (local_style && local_style->m_background_color_set) + painter.setBackgroundColor(local_style->m_background_color); + else + style.setStyle(painter, eWindowStyle::styleListboxNormal); + if (clear) + painter.clear(); + painter.clippop(); + painter.clip(rc&sel_clip); + style.setStyle(painter, eWindowStyle::styleListboxSelected); + if (pbackColorSelected) + { + int color = PyInt_AsLong(pbackColorSelected); + painter.setBackgroundColor(gRGB(color)); + } + painter.clear(); + painter.clippop(); } else - m_selection_clip = rect; + { + if (selected) + { + style.setStyle(painter, eWindowStyle::styleListboxSelected); + if (pbackColorSelected) + { + int color = PyInt_AsLong(pbackColorSelected); + painter.setBackgroundColor(gRGB(color)); + } + painter.clear(); + } + else + { + bool clear=true; + style.setStyle(painter, eWindowStyle::styleListboxNormal); + if (pbackColor) + { + int color = PyInt_AsLong(pbackColor); + painter.setBackgroundColor(gRGB(color)); + }/* if we have a local background color set, use that. */ + else if (local_style) + { + if (local_style->m_transparent_background) + clear=false; + else if (local_style->m_background_color_set) + painter.setBackgroundColor(local_style->m_background_color); + } + /* if we have no transparent background */ + if (clear) + painter.clear(); + } + } + if (pforeColor) + { + int color = PyInt_AsLong(pforeColor); + painter.setForegroundColor(gRGB(color)); + }/* if we have a local foreground color set, use that. */ + else if (local_style && local_style->m_foreground_color_set) + painter.setForegroundColor(local_style->m_foreground_color); } void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) { gRegion itemregion(eRect(offset, m_itemsize)); - + eListboxStyle *local_style = 0; eRect sel_clip(m_selection_clip); if (sel_clip.valid()) sel_clip.moveBy(offset); - if (m_temp_clip.valid()) - { - m_temp_clip.moveBy(offset); - itemregion &= m_temp_clip; - m_temp_clip = eRect(); - } + /* get local listbox style, if present */ + if (m_listbox) + local_style = m_listbox->getLocalStyle(); painter.clip(itemregion); + clearRegion(painter, style, local_style, ePyObject(), ePyObject(), ePyObject(), selected, itemregion, sel_clip); + ePyObject items; if (m_list && cursorValid()) @@ -461,6 +596,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c for (int i = 1; i < size; ++i) { ePyObject item = PyList_GET_ITEM(items, i); // borrowed reference! + bool reset_colors=false; if (!item) { @@ -489,7 +625,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c case TYPE_TEXT: // text { /* - (0, x, y, width, height, fnt, flags, "bla" [, color] ) + (0, x, y, width, height, fnt, flags, "bla" [, color, backColor, backColorSelected, borderWidth, borderColor] ) */ ePyObject px = PyTuple_GET_ITEM(item, 1), py = PyTuple_GET_ITEM(item, 2), @@ -502,7 +638,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c if (!(px && py && pwidth && pheight && pfnt && pflags && pstring)) { - eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_TEXT, x, y, width, height, fnt, flags, string, [color, ]...])"); + eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_TEXT, x, y, width, height, fnt, flags, string [, color, backColor, backColorSelected, borderWidth, borderColor])"); goto error_out; } @@ -545,59 +681,12 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c } eRect rect(x+bwidth, y+bwidth, width-bwidth*2, height-bwidth*2); - gRegion rc(rect); - rc &= itemregion; - painter.clip(rc); - itemregion -= rc; - if (selected && sel_clip.valid()) - { - painter.clip(rc-sel_clip); - if (pbackColor) - { - int color = PyInt_AsLong(pbackColor); - painter.setBackgroundColor(gRGB(color)); - } - else - style.setStyle(painter, eWindowStyle::styleListboxNormal); - painter.clear(); - painter.clippop(); - painter.clip(rc&sel_clip); - style.setStyle(painter, eWindowStyle::styleListboxSelected); - if (pbackColorSelected) - { - int color = PyInt_AsLong(pbackColorSelected); - painter.setBackgroundColor(gRGB(color)); - } - painter.clear(); - painter.clippop(); - } - else - { - if (selected) - { - style.setStyle(painter, eWindowStyle::styleListboxSelected); - if (pbackColorSelected) - { - int color = PyInt_AsLong(pbackColorSelected); - painter.setBackgroundColor(gRGB(color)); - } - } - else - { - style.setStyle(painter, eWindowStyle::styleListboxNormal); - if (pbackColor) - { - int color = PyInt_AsLong(pbackColor); - painter.setBackgroundColor(gRGB(color)); - } - } - painter.clear(); - } - - if (pforeColor) + painter.clip(rect); + if (pbackColor || pbackColorSelected || pforeColor) { - int color = PyInt_AsLong(pforeColor); - painter.setForegroundColor(gRGB(color)); + gRegion rc(rect); + clearRegion(painter, style, local_style, pforeColor, pbackColor, pbackColorSelected, selected, rc, sel_clip); + reset_colors=true; } painter.setFont(m_font[fnt]); @@ -608,10 +697,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c if (bwidth) { eRect rect(eRect(x, y, width, height)); - gRegion rc(rect); - rc &= itemregion; - painter.clip(rc); - itemregion -= rc; + painter.clip(rect); if (pborderColor) { int color = PyInt_AsLong(pborderColor); @@ -639,50 +725,54 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c case TYPE_PROGRESS: // Progress { /* - (1, x, y, width, height, filled_percent ) + (1, x, y, width, height, filled_percent [, borderWidth, foreColor, backColor, backColorSelected] ) */ ePyObject px = PyTuple_GET_ITEM(item, 1), py = PyTuple_GET_ITEM(item, 2), pwidth = PyTuple_GET_ITEM(item, 3), pheight = PyTuple_GET_ITEM(item, 4), - pfilled_perc = PyTuple_GET_ITEM(item, 5); + pfilled_perc = PyTuple_GET_ITEM(item, 5), + pborderWidth, pforeColor, pbackColor, pbackColorSelected; if (!(px && py && pwidth && pheight && pfilled_perc)) { - eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PROGRESS, x, y, width, height, filled percent))"); + eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PROGRESS, x, y, width, height, filled percent [,border width, foreColor, backColor, backColorSelected]))"); goto error_out; } + if (size > 6) + pborderWidth = PyTuple_GET_ITEM(item, 6); + if (size > 7) + pforeColor = PyTuple_GET_ITEM(item, 7); + if (size > 8) + { + pbackColor = PyTuple_GET_ITEM(item, 8); + if (pbackColor == Py_None) + pbackColor=ePyObject(); + } + if (size > 9) + { + pbackColorSelected = PyTuple_GET_ITEM(item, 9); + if (pbackColorSelected == Py_None) + pbackColorSelected=ePyObject(); + } + int x = PyInt_AsLong(px) + offset.x(); int y = PyInt_AsLong(py) + offset.y(); int width = PyInt_AsLong(pwidth); int height = PyInt_AsLong(pheight); int filled = PyInt_AsLong(pfilled_perc); + int bwidth = pborderWidth ? PyInt_AsLong(pborderWidth) : 2; eRect rect(x, y, width, height); - gRegion rc(rect); - rc &= itemregion; - painter.clip(rc); - itemregion -= rc; - if (selected && sel_clip.valid()) - { - painter.clip(rc-sel_clip); - style.setStyle(painter, eWindowStyle::styleListboxNormal); - painter.clear(); - painter.clippop(); - painter.clip(rc&sel_clip); - style.setStyle(painter, eWindowStyle::styleListboxSelected); - painter.clear(); - painter.clippop(); - } - else + painter.clip(rect); + if (pbackColor || pbackColorSelected || pforeColor) { - style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); - painter.clear(); + gRegion rc(rect); + clearRegion(painter, style, local_style, pforeColor, pbackColor, pbackColorSelected, selected, rc, sel_clip); + reset_colors=true; } - int bwidth=2; // borderwidth hardcoded yet - // border rect.setRect(x, y, width, bwidth); painter.fill(rect); @@ -708,18 +798,19 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c case TYPE_PIXMAP: // pixmap { /* - (2, x, y, width, height, pixmap ) + (2, x, y, width, height, pixmap [, backColor, backColorSelected] ) */ ePyObject px = PyTuple_GET_ITEM(item, 1), py = PyTuple_GET_ITEM(item, 2), pwidth = PyTuple_GET_ITEM(item, 3), pheight = PyTuple_GET_ITEM(item, 4), - ppixmap = PyTuple_GET_ITEM(item, 5); + ppixmap = PyTuple_GET_ITEM(item, 5), + pbackColor, pbackColorSelected; if (!(px && py && pwidth && pheight && ppixmap)) { - eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PIXMAP, x, y, width, height, pixmap))"); + eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PIXMAP, x, y, width, height, pixmap [, backColor, backColorSelected] ))"); goto error_out; } @@ -734,61 +825,41 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c goto error_out; } - eRect rect(x, y, width, height); - gRegion rc(rect); - rc &= itemregion; - painter.clip(rc); - itemregion -= rc; - - if (selected && sel_clip.valid()) + if (size > 6) { - painter.clip(rc-sel_clip); - style.setStyle(painter, eWindowStyle::styleListboxNormal); - painter.clear(); - painter.clippop(); - painter.clip(rc&sel_clip); - style.setStyle(painter, eWindowStyle::styleListboxSelected); - painter.clear(); - painter.clippop(); + pbackColor = PyTuple_GET_ITEM(item, 6); + if (pbackColor == Py_None) + pbackColor=ePyObject(); } - else + if (size > 7) { - style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); - painter.clear(); + pbackColorSelected = PyTuple_GET_ITEM(item, 7); + if (pbackColorSelected == Py_None) + pbackColorSelected=ePyObject(); } + eRect rect(x, y, width, height); + painter.clip(rect); + if (pbackColor || pbackColorSelected) + { + gRegion rc(rect); + clearRegion(painter, style, local_style, ePyObject(), pbackColor, pbackColorSelected, selected, rc, sel_clip); + reset_colors=true; + } + painter.blit(pixmap, rect.topLeft(), rect, (type == TYPE_PIXMAP_ALPHATEST) ? gPainter::BT_ALPHATEST : 0); painter.clippop(); - break; } default: eWarning("eListboxPythonMultiContent received unknown type (%d)", type); goto error_out; } + if (reset_colors) + style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); } } - if (selected && sel_clip.valid()) - { - painter.clip(itemregion-sel_clip); - style.setStyle(painter, eWindowStyle::styleListboxNormal); - painter.clear(); - painter.clippop(); - itemregion &= sel_clip; - painter.clip(itemregion); - style.setStyle(painter, eWindowStyle::styleListboxSelected); - painter.clear(); - painter.clippop(); - } - else - { - painter.clip(itemregion); - style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); - painter.clear(); - painter.clippop(); - } - if (selected) style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); @@ -801,11 +872,16 @@ error_out: void eListboxPythonMultiContent::setBuildFunc(ePyObject cb) { - if (m_buildFunc) - Py_DECREF(m_buildFunc); + Py_XDECREF(m_buildFunc); m_buildFunc=cb; - if (cb) - Py_INCREF(m_buildFunc); + Py_XINCREF(m_buildFunc); +} + +void eListboxPythonMultiContent::setSelectableFunc(ePyObject cb) +{ + Py_XDECREF(m_selectableFunc); + m_selectableFunc=cb; + Py_XINCREF(m_selectableFunc); } int eListboxPythonMultiContent::currentCursorSelectable() @@ -813,16 +889,31 @@ int eListboxPythonMultiContent::currentCursorSelectable() /* each list-entry is a list of tuples. if the first of these is none, it's not selectable */ if (m_list && cursorValid()) { - ePyObject item = PyList_GET_ITEM(m_list, m_cursor); - if (PyList_Check(item)) + if (m_selectableFunc && PyCallable_Check(m_selectableFunc)) { - item = PyList_GET_ITEM(item, 0); - if (item != Py_None) + ePyObject args = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! + if (PyTuple_Check(args)) + { + ePyObject ret = PyObject_CallObject(m_selectableFunc, args); + if (ret) + return ret == Py_True; + eDebug("call m_selectableFunc failed!!! assume not callable"); + } + else + eDebug("m_list[m_cursor] is not a tuple!!! assume not callable"); + } + else + { + ePyObject item = PyList_GET_ITEM(m_list, m_cursor); + if (PyList_Check(item)) + { + item = PyList_GET_ITEM(item, 0); + if (item != Py_None) + return 1; + } + else if (m_buildFunc && PyCallable_Check(m_buildFunc)) return 1; } - else if (m_buildFunc && PyCallable_Check(m_buildFunc)) - // FIXME .. how we can detect non selectable entrys when we have a buildFunc callback - return 1; } return 0; } @@ -841,3 +932,22 @@ void eListboxPythonMultiContent::setItemHeight(int height) if (m_listbox) m_listbox->setItemHeight(height); } + +void eListboxPythonMultiContent::setList(ePyObject list) +{ + m_old_clip = m_clip = gRegion::invalidRegion(); + eListboxPythonStringContent::setList(list); +} + +void eListboxPythonMultiContent::updateClip(gRegion &clip) +{ + if (m_clip.valid()) + { + clip &= m_clip; + if (m_old_clip.valid() && !(m_clip-m_old_clip).empty()) + m_clip -= m_old_clip; + m_old_clip = m_clip; + } + else + m_old_clip = m_clip = gRegion::invalidRegion(); +}