X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fgui%2Felistboxcontent.cpp;h=1d0323cf9b1d2db5aeab9a4a8daca5914d470564;hp=c309216062a973d3fa63a63d03b4c4eea7c3112b;hb=3b29e9279367292962046494cf0da1b24827c269;hpb=d9bb0d90e2a5fc8c275c79e981d36c03b1687785 diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index c309216..1d0323c 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -49,7 +49,8 @@ int iListboxContent::currentCursorSelectable() DEFINE_REF(eListboxPythonStringContent); -eListboxPythonStringContent::eListboxPythonStringContent(): m_itemheight(25) +eListboxPythonStringContent::eListboxPythonStringContent() + :m_cursor(0), m_itemheight(25) { } @@ -140,26 +141,73 @@ 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(); - if (m_list && cursorValid()) + eListboxStyle *local_style = 0; + bool cursorValid = this->cursorValid(); + + /* get local listbox style, if present */ + if (m_listbox) + local_style = m_listbox->getLocalStyle(); + + if (local_style) + { + if (selected) + { + /* if we have a local background color set, use that. */ + if (local_style->m_background_color_selected_set) + painter.setBackgroundColor(local_style->m_background_color_selected); + /* same for foreground */ + if (local_style->m_foreground_color_selected_set) + painter.setForegroundColor(local_style->m_foreground_color_selected); + } + else + { + /* if we have a local background color set, use that. */ + if (local_style->m_background_color_set) + painter.setBackgroundColor(local_style->m_background_color); + /* same for foreground */ + if (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 && cursorValid) + painter.blit(local_style->m_background, offset, eRect(), 0); + else + painter.clear(); + } else + { + if (local_style->m_background && cursorValid) + painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST); + else if (selected && !local_style->m_selection) + painter.clear(); + } + + if (m_list && cursorValid) { int gray = 0; ePyObject 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. */ + /* the user can supply tuples, in this case the first one will be displayed. */ if (PyTuple_Check(item)) { if (PyTuple_Size(item) == 1) 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 +217,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(); } @@ -216,7 +264,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(); } } @@ -227,27 +276,73 @@ 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; + bool cursorValid = this->cursorValid(); + painter.clip(itemrect); style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); - painter.clear(); - if (m_list && cursorValid()) + /* get local listbox style, if present */ + if (m_listbox) + local_style = m_listbox->getLocalStyle(); + + if (local_style) + { + if (selected) + { + /* if we have a local background color set, use that. */ + if (local_style->m_background_color_selected_set) + painter.setBackgroundColor(local_style->m_background_color_selected); + /* same for foreground */ + if (local_style->m_foreground_color_selected_set) + painter.setForegroundColor(local_style->m_foreground_color_selected); + } + else + { + /* if we have a local background color set, use that. */ + if (local_style->m_background_color_set) + painter.setBackgroundColor(local_style->m_background_color); + /* same for foreground */ + if (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 && cursorValid) + painter.blit(local_style->m_background, offset, eRect(), 0); + else + painter.clear(); + } else + { + if (local_style->m_background && cursorValid) + painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST); + else if (selected && !local_style->m_selection) + painter.clear(); + } + + if (m_list && cursorValid) { /* get current list item */ ePyObject item = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! 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. - + of this tuple, the first one is the type (string). the second one is the value. */ if (PyTuple_Check(item)) { /* handle left part. get item from tuple, convert to string, display. */ - 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) : ""; @@ -255,35 +350,37 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, eSize item_right = eSize(m_itemsize.width() - m_seperation, m_itemsize.height()); painter.renderText(eRect(offset, item_left), string, gPainter::RT_HALIGN_LEFT); Py_XDECREF(text); - - /* when we have no label, align value to the left. (FIXME: + + /* when we have no label, align value to the left. (FIXME: don't we want to specifiy this individually?) */ int value_alignment_left = !*string; - + /* now, handle the value. get 2nd part from tuple*/ - value = PyTuple_GET_ITEM(item, 1); + if (PyTuple_Size(item) >= 2) // when no 2nd entry is in tuple this is a non selectable entry without config part + value = PyTuple_GET_ITEM(item, 1); + if (value) { ePyObject args = PyTuple_New(1); PyTuple_SET_ITEM(args, 0, PyInt_FromLong(selected)); - + /* CallObject will call __call__ which should return the value tuple */ value = PyObject_CallObject(value, args); - + if (PyErr_Occurred()) PyErr_Print(); Py_DECREF(args); /* the PyInt was stolen. */ } - + /* check if this is really a tuple */ if (value && PyTuple_Check(value)) { /* convert type to string */ ePyObject type = PyTuple_GET_ITEM(value, 0); const char *atype = (type && PyString_Check(type)) ? PyString_AsString(type) : 0; - + if (atype) { if (!strcmp(atype, "text")) @@ -301,21 +398,21 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, { ePyObject pvalue = PyTuple_GET_ITEM(value, 1); ePyObject psize = PyTuple_GET_ITEM(value, 2); - + /* convert value to Long. fallback to -1 on error. */ int value = (pvalue && PyInt_Check(pvalue)) ? PyInt_AsLong(pvalue) : -1; int size = (pvalue && PyInt_Check(psize)) ? PyInt_AsLong(psize) : 100; - + /* calc. slider length */ int width = item_right.width() * value / size; int height = item_right.height(); - - + + /* draw slider */ //painter.fill(eRect(offset.x() + m_seperation, offset.y(), width, height)); //hack - make it customizable painter.fill(eRect(offset.x() + m_seperation, offset.y() + 5, width, height-10)); - + /* pvalue is borrowed */ } else if (!strcmp(atype, "mtext")) { @@ -327,50 +424,61 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, para->renderString(text, 0); para->realign(value_alignment_left ? eTextPara::dirLeft : eTextPara::dirRight); int glyphs = para->size(); - + ePyObject plist; - + if (PyTuple_Size(value) >= 3) plist = PyTuple_GET_ITEM(value, 2); - + int entries = 0; 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); int num = PyInt_Check(entry) ? PyInt_AsLong(entry) : -1; - + if ((num < 0) || (num >= glyphs)) 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 */ } } /* type is borrowed */ - } else + } else if (value) eWarning("eListboxPythonConfigContent: second value of tuple is not a tuple."); - /* value is borrowed */ + if (value) + Py_DECREF(value); } - if (selected) + if (selected && (!local_style || !local_style->m_selection)) style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); } - + painter.clippop(); } @@ -385,51 +493,186 @@ 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 clearRegionHelper(gPainter &painter, eListboxStyle *local_style, const ePoint &offset, ePyObject &pbackColor, bool cursorValid) +{ + if (pbackColor) + { + unsigned int color = PyInt_AsUnsignedLongMask(pbackColor); + painter.setBackgroundColor(gRGB(color)); + } + else if (local_style) + { + if (local_style && local_style->m_background_color_set) + painter.setBackgroundColor(local_style->m_background_color); + if (local_style->m_background && cursorValid) + { + if (local_style->m_transparent_background) + painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST); + else + painter.blit(local_style->m_background, offset, eRect(), 0); + return; + } + else if (local_style->m_transparent_background) + return; + } + painter.clear(); +} + +static void clearRegionSelectedHelper(gPainter &painter, eListboxStyle *local_style, const ePoint &offset, ePyObject &pbackColorSelected, bool cursorValid) +{ + if (pbackColorSelected) + { + unsigned int color = PyInt_AsUnsignedLongMask(pbackColorSelected); + painter.setBackgroundColor(gRGB(color)); + } + else if (local_style) + { + if (local_style && local_style->m_background_color_selected_set) + painter.setBackgroundColor(local_style->m_background_color_selected); + if (local_style->m_background && cursorValid) + { + if (local_style->m_transparent_background) + painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST); + else + painter.blit(local_style->m_background, offset, eRect(), 0); + return; + } + } + painter.clear(); +} + +static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *local_style, ePyObject pforeColor, ePyObject pforeColorSelected, ePyObject pbackColor, ePyObject pbackColorSelected, int selected, gRegion &rc, eRect &sel_clip, const ePoint &offset, bool cursorValid) +{ + 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); + gRegion part = rc - sel_clip; + if (!part.empty()) + { + painter.clip(part); + style.setStyle(painter, eWindowStyle::styleListboxNormal); + clearRegionHelper(painter, local_style, offset, pbackColor, cursorValid); + painter.clippop(); + selected = 0; + } + part = rc & sel_clip; + if (!part.empty()) + { + painter.clip(part); + style.setStyle(painter, eWindowStyle::styleListboxSelected); + clearRegionSelectedHelper(painter, local_style, offset, pbackColorSelected, cursorValid); + painter.clippop(); + selected = 1; + } + } + else if (selected) + { + style.setStyle(painter, eWindowStyle::styleListboxSelected); + clearRegionSelectedHelper(painter, local_style, offset, pbackColorSelected, cursorValid); + if (local_style && local_style->m_selection) + painter.blit(local_style->m_selection, offset, eRect(), gPainter::BT_ALPHATEST); } else - m_selection_clip = rect; + { + style.setStyle(painter, eWindowStyle::styleListboxNormal); + clearRegionHelper(painter, local_style, offset, pbackColor, cursorValid); + } + + if (selected) + { + if (pforeColorSelected) + { + unsigned int color = PyInt_AsUnsignedLongMask(pforeColorSelected); + painter.setForegroundColor(gRGB(color)); + } + /* if we have a local foreground color set, use that. */ + else if (local_style && local_style->m_foreground_color_selected_set) + painter.setForegroundColor(local_style->m_foreground_color_selected); + } + else + { + if (pforeColor) + { + unsigned int color = PyInt_AsUnsignedLongMask(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); + } +} + +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)); - + eListboxStyle *local_style = 0; eRect sel_clip(m_selection_clip); + bool cursorValid = this->cursorValid(); 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(), ePyObject(), selected, itemregion, sel_clip, offset, cursorValid); - ePyObject items; + ePyObject items, buildfunc_ret; - if (m_list && cursorValid()) + 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) @@ -437,7 +680,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"); } @@ -451,14 +694,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! @@ -489,7 +755,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, colorSelected, backColor, backColorSelected, borderWidth, borderColor] ) */ ePyObject px = PyTuple_GET_ITEM(item, 1), py = PyTuple_GET_ITEM(item, 2), @@ -498,36 +764,41 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c pfnt = PyTuple_GET_ITEM(item, 5), pflags = PyTuple_GET_ITEM(item, 6), pstring = PyTuple_GET_ITEM(item, 7), - pforeColor, pbackColor, pbackColorSelected, pborderWidth, pborderColor; + pforeColor, pforeColorSelected, 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(); - } + pforeColor = lookupColor(PyTuple_GET_ITEM(item, 8), data); + if (size > 9) - { - pbackColor = PyTuple_GET_ITEM(item, 9); - if (pbackColor == Py_None) - pbackColor=ePyObject(); - } + pforeColorSelected = lookupColor(PyTuple_GET_ITEM(item, 9), data); + if (size > 10) - { - pbackColorSelected = PyTuple_GET_ITEM(item, 10); - if (pbackColorSelected == Py_None) - pbackColorSelected=ePyObject(); - } + pbackColor = lookupColor(PyTuple_GET_ITEM(item, 10), data); + if (size > 11) - pborderWidth = PyTuple_GET_ITEM(item, 11); + pbackColorSelected = lookupColor(PyTuple_GET_ITEM(item, 11), data); + if (size > 12) - pborderColor = PyTuple_GET_ITEM(item, 12); + { + pborderWidth = PyTuple_GET_ITEM(item, 12); + if (pborderWidth == Py_None) + pborderWidth=ePyObject(); + } + if (size > 13) + 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)); + + /* don't do anything if we have 'None' as string */ + if (pstring == Py_None) + continue; const char *string = (PyString_Check(pstring)) ? PyString_AsString(pstring) : ""; int x = PyInt_AsLong(px) + offset.x(); @@ -545,59 +816,11 @@ 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(); - } + painter.clip(rect); - if (pforeColor) { - int color = PyInt_AsLong(pforeColor); - painter.setForegroundColor(gRGB(color)); + gRegion rc(rect); + clearRegion(painter, style, local_style, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected, selected, rc, sel_clip, offset, cursorValid); } painter.setFont(m_font[fnt]); @@ -608,17 +831,12 @@ 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); + unsigned int color = PyInt_AsUnsignedLongMask(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); @@ -639,50 +857,75 @@ 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, pforeColorSelected, 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 (pborderWidth == Py_None) + pborderWidth = ePyObject(); + } + if (size > 7) + { + pforeColor = PyTuple_GET_ITEM(item, 7); + if (pforeColor == Py_None) + pforeColor = ePyObject(); + } + if (size > 8) + { + pforeColorSelected = PyTuple_GET_ITEM(item, 8); + if (pforeColorSelected == Py_None) + pforeColorSelected=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(); + } + 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); + 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)); + + /* don't do anything if percent out of range */ + if ((filled < 0) || (filled > 100)) + continue; + + 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); + { - style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); - painter.clear(); + gRegion rc(rect); + clearRegion(painter, style, local_style, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected, selected, rc, sel_clip, offset, cursorValid); } - int bwidth=2; // borderwidth hardcoded yet - // border rect.setRect(x, y, width, bwidth); painter.fill(rect); @@ -704,25 +947,34 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c break; } + case TYPE_PIXMAP_ALPHABLEND: case TYPE_PIXMAP_ALPHATEST: 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; } + 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)); + + /* don't do anything if we have 'None' as pixmap */ + if (ppixmap == Py_None) + continue; + int x = PyInt_AsLong(px) + offset.x(); int y = PyInt_AsLong(py) + offset.y(); int width = PyInt_AsLong(pwidth); @@ -734,32 +986,22 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c goto error_out; } + if (size > 6) + pbackColor = lookupColor(PyTuple_GET_ITEM(item, 6), data); + + if (size > 7) + pbackColorSelected = lookupColor(PyTuple_GET_ITEM(item, 7), data); + eRect rect(x, y, width, height); - gRegion rc(rect); - rc &= itemregion; - painter.clip(rc); - itemregion -= rc; + painter.clip(rect); - 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 - { - style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); - painter.clear(); + gRegion rc(rect); + clearRegion(painter, style, local_style, ePyObject(), ePyObject(), pbackColor, pbackColorSelected, selected, rc, sel_clip, offset, cursorValid); } - painter.blit(pixmap, rect.topLeft(), rect, (type == TYPE_PIXMAP_ALPHATEST) ? gPainter::BT_ALPHATEST : 0); + painter.blit(pixmap, rect.topLeft(), rect, (type == TYPE_PIXMAP_ALPHATEST) ? gPainter::BT_ALPHATEST : (type == TYPE_PIXMAP_ALPHABLEND) ? gPainter::BT_ALPHABLEND : 0); painter.clippop(); - break; } default: @@ -769,43 +1011,28 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c } } - 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) + if (selected && !sel_clip.valid() && (!local_style || !local_style->m_selection)) 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(); } 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 +1040,40 @@ 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) + { + bool retval = ret == Py_True; + Py_DECREF(ret); + return retval; + } + 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 (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; } - 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 +1092,33 @@ 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(); +} + +void eListboxPythonMultiContent::entryRemoved(int idx) +{ + if (m_listbox) + m_listbox->entryRemoved(idx); +} + +void eListboxPythonMultiContent::setTemplate(ePyObject tmplate) +{ + m_template = tmplate; +}