X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/23375d83d2c191d85e65580d6307c0949b5007e5..b3faf74faa0d7539fb0b61e2ab35512c7286d23e:/lib/gui/elistboxcontent.cpp diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index 4fa5a65e..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,21 +449,117 @@ int eListboxPythonConfigContent::currentCursorSelectable() RESULT SwigFromPython(ePtr &res, PyObject *obj); eListboxPythonMultiContent::eListboxPythonMultiContent() + :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) +{ + 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()) + { + 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 + { + 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) { - eRect itemrect(offset, m_itemsize); - painter.clip(itemrect); - style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); - painter.clear(); + gRegion itemregion(eRect(offset, m_itemsize)); + eListboxStyle *local_style = 0; + eRect sel_clip(m_selection_clip); + if (sel_clip.valid()) + sel_clip.moveBy(offset); + + /* 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; @@ -425,40 +585,25 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c eDebug("eListboxPythonMultiContent: error getting item %d", m_cursor); goto error_out; } - + if (!PyList_Check(items)) { eDebug("eListboxPythonMultiContent: list entry %d is not a list", m_cursor); goto error_out; } - + int size = PyList_Size(items); for (int i = 1; i < size; ++i) { ePyObject item = PyList_GET_ITEM(items, i); // borrowed reference! - + bool reset_colors=false; + if (!item) { eDebug("eListboxPythonMultiContent: ?"); goto error_out; } - - ePyObject px, py, pwidth, pheight, pfnt, pstring, pflags, pcolor; - - /* - we have a list of tuples: - - (0, x, y, width, height, fnt, flags, "bla"[, color] ), - or, for a progress: - (1, x, y, width, height, filled_percent ) - - or, for a pixmap: - - (2, x, y, width, height, pixmap ) - - */ - if (!PyTuple_Check(item)) { eDebug("eListboxPythonMultiContent did not receive a tuple."); @@ -475,104 +620,175 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c int type = PyInt_AsLong(PyTuple_GET_ITEM(item, 0)); - if (size > 5) - { - 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); - } - if (size > 8) - pcolor = PyTuple_GET_ITEM(item, 8); - } - switch (type) { case TYPE_TEXT: // text { - if (!(px && py && pwidth && pheight && pfnt && pstring)) + /* + (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), + pwidth = PyTuple_GET_ITEM(item, 3), + pheight = PyTuple_GET_ITEM(item, 4), + pfnt = PyTuple_GET_ITEM(item, 5), + pflags = PyTuple_GET_ITEM(item, 6), + pstring = PyTuple_GET_ITEM(item, 7), + pforeColor, pbackColor, pbackColorSelected, pborderWidth, pborderColor; + + 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; } - + + if (size > 8) + { + pforeColor = PyTuple_GET_ITEM(item, 8); + if (pforeColor == Py_None) + pforeColor=ePyObject(); + } + if (size > 9) + { + pbackColor = PyTuple_GET_ITEM(item, 9); + if (pbackColor == Py_None) + pbackColor=ePyObject(); + } + if (size > 10) + { + pbackColorSelected = PyTuple_GET_ITEM(item, 10); + if (pbackColorSelected == Py_None) + pbackColorSelected=ePyObject(); + } + if (size > 11) + pborderWidth = PyTuple_GET_ITEM(item, 11); + if (size > 12) + pborderColor = PyTuple_GET_ITEM(item, 12); + const char *string = (PyString_Check(pstring)) ? PyString_AsString(pstring) : ""; - int x = PyInt_AsLong(px); - int y = PyInt_AsLong(py); + 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 flags = PyInt_AsLong(pflags); int fnt = PyInt_AsLong(pfnt); - - if (pcolor) - { - int color = PyInt_AsLong(pcolor); - painter.setForegroundColor(gRGB(color)); - } - + int bwidth = pborderWidth ? PyInt_AsLong(pborderWidth) : 0; + if (m_font.find(fnt) == m_font.end()) { eDebug("eListboxPythonMultiContent: specified font %d was not found!", fnt); goto error_out; } - - eRect r = eRect(x, y, width, height); - r.moveBy(offset); - r &= itemrect; - + + eRect rect(x+bwidth, y+bwidth, width-bwidth*2, height-bwidth*2); + painter.clip(rect); + if (pbackColor || pbackColorSelected || pforeColor) + { + gRegion rc(rect); + clearRegion(painter, style, local_style, pforeColor, pbackColor, pbackColorSelected, selected, rc, sel_clip); + reset_colors=true; + } + painter.setFont(m_font[fnt]); - - painter.clip(r); - painter.renderText(r, string, flags); + painter.renderText(rect, string, flags); painter.clippop(); + + // draw border + if (bwidth) + { + eRect rect(eRect(x, y, width, height)); + painter.clip(rect); + if (pborderColor) + { + 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); + + rect.setRect(x, y+bwidth, bwidth, height-bwidth); + painter.fill(rect); + + rect.setRect(x+bwidth, y+height-bwidth, width-bwidth, bwidth); + painter.fill(rect); + + rect.setRect(x+width-bwidth, y+bwidth, bwidth, height-bwidth); + painter.fill(rect); + + painter.clippop(); + } break; } case TYPE_PROGRESS: // Progress { - if (!(px && py && pwidth && pheight && pfnt)) + /* + (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), + 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; } - int x = PyInt_AsLong(px); - int y = PyInt_AsLong(py); + + 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(pfnt); + int filled = PyInt_AsLong(pfilled_perc); + int bwidth = pborderWidth ? PyInt_AsLong(pborderWidth) : 2; - eRect r = eRect(x, y, width, height); - r.moveBy(offset); - r &= itemrect; - - painter.clip(r); - int bwidth=2; // borderwidth hardcoded yet + eRect rect(x, y, width, height); + painter.clip(rect); + if (pbackColor || pbackColorSelected || pforeColor) + { + gRegion rc(rect); + clearRegion(painter, style, local_style, pforeColor, pbackColor, pbackColorSelected, selected, rc, sel_clip); + reset_colors=true; + } // border - eRect rc = eRect(x, y, width, bwidth); - rc.moveBy(offset); - painter.fill(rc); + rect.setRect(x, y, width, bwidth); + painter.fill(rect); - rc = eRect(x, y+bwidth, bwidth, height-bwidth); - rc.moveBy(offset); - painter.fill(rc); + rect.setRect(x, y+bwidth, bwidth, height-bwidth); + painter.fill(rect); - rc = eRect(x+bwidth, y+height-bwidth, width-bwidth, bwidth); - rc.moveBy(offset); - painter.fill(rc); + rect.setRect(x+bwidth, y+height-bwidth, width-bwidth, bwidth); + painter.fill(rect); - rc = eRect(x+width-bwidth, y+bwidth, bwidth, height-bwidth); - rc.moveBy(offset); - painter.fill(rc); + rect.setRect(x+width-bwidth, y+bwidth, bwidth, height-bwidth); + painter.fill(rect); // progress - rc = eRect(x+bwidth, y+bwidth, (width-bwidth*2) * filled / 100, height-bwidth*2); - rc.moveBy(offset); - painter.fill(rc); + rect.setRect(x+bwidth, y+bwidth, (width-bwidth*2) * filled / 100, height-bwidth*2); + painter.fill(rect); painter.clippop(); @@ -581,42 +797,69 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c case TYPE_PIXMAP_ALPHATEST: case TYPE_PIXMAP: // pixmap { - if (!(px && py && pwidth && pheight && pfnt)) + /* + (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), + 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; } - int x = PyInt_AsLong(px); - int y = PyInt_AsLong(py); + + int x = PyInt_AsLong(px) + offset.x(); + int y = PyInt_AsLong(py) + offset.y(); int width = PyInt_AsLong(pwidth); int height = PyInt_AsLong(pheight); ePtr pixmap; - if (SwigFromPython(pixmap, pfnt)) + if (SwigFromPython(pixmap, ppixmap)) { eDebug("eListboxPythonMultiContent (Pixmap) get pixmap failed"); goto error_out; } - eRect r = eRect(x, y, width, height); - r.moveBy(offset); - r &= itemrect; + if (size > 6) + { + pbackColor = PyTuple_GET_ITEM(item, 6); + if (pbackColor == Py_None) + pbackColor=ePyObject(); + } + if (size > 7) + { + 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.clip(r); - painter.blit(pixmap, r.topLeft(), r, (type == TYPE_PIXMAP_ALPHATEST) ? gPainter::BT_ALPHATEST : 0); + 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 (pcolor) + if (reset_colors) style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); } } - + if (selected) style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); @@ -629,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() @@ -641,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)) + { + 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 { - item = PyList_GET_ITEM(item, 0); - if (item != Py_None) + 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; } @@ -669,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(); +}