add 'templates' in listboxcontent, to split the layout from actual data content
[enigma2.git] / lib / gui / elistboxcontent.cpp
index fbbbb6ff2b7070480cdbace34895d5a0d0b38b9c..beb120445729bff9ab425f40c014e041f1ff0047 100644 (file)
@@ -140,7 +140,50 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style,
        ePtr<gFont> 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 (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)
+                       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 +198,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 +215,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 +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();
        }
 }
 
@@ -227,9 +274,52 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
        ePtr<gFont> fnt = new gFont("Regular", 20);
        ePtr<gFont> 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 (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)
+                       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 +328,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.
                           
@@ -338,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);
@@ -347,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 */
@@ -367,7 +470,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,53 +488,69 @@ int eListboxPythonConfigContent::currentCursorSelectable()
 RESULT SwigFromPython(ePtr<gPixmap> &res, PyObject *obj);
 
 eListboxPythonMultiContent::eListboxPythonMultiContent()
-       :m_temp_clip(gRegion::invalidRegion())
+       :m_clip(gRegion::invalidRegion()), m_old_clip(gRegion::invalidRegion())
 {
 }
 
 eListboxPythonMultiContent::~eListboxPythonMultiContent()
 {
        Py_XDECREF(m_buildFunc);
-       Py_XDECREF(m_callableFunc);
+       Py_XDECREF(m_selectableFunc);
 }
 
 void eListboxPythonMultiContent::setSelectionClip(eRect &rect, bool update)
 {
-       if (update && m_selection_clip.valid())
-       {
-               m_temp_clip = m_selection_clip;
-               m_temp_clip |= rect;
-               m_selection_clip = rect;
-               if (m_listbox)
-                       m_listbox->entryChanged(m_cursor);
-       }
+       m_selection_clip = rect;
+       if (m_listbox)
+               rect.moveBy(ePoint(0, m_listbox->getEntryTop()));
+       if (m_clip.valid())
+               m_clip |= rect;
        else
-               m_selection_clip = rect;
+               m_clip = rect;
+       if (update && m_listbox)
+               m_listbox->entryChanged(m_cursor);
 }
 
-static void clearRegion(gPainter &painter, eWindowStyle &style, ePyObject pforeColor, ePyObject pbackColor, ePyObject pbackColorSelected, int selected, gRegion &rc, eRect &sel_clip)
+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)
 {
        if (selected && sel_clip.valid())
        {
-               painter.clip(rc-sel_clip);
-               if (pbackColor)
+               gRegion part = rc - sel_clip;
+               if (!part.empty())
                {
-                       int color = PyInt_AsLong(pbackColor);
-                       painter.setBackgroundColor(gRGB(color));
-               }
-               else
+                       painter.clip(part);
                        style.setStyle(painter, eWindowStyle::styleListboxNormal);
-               painter.clear();
-               painter.clippop();
-               painter.clip(rc&sel_clip);
-               style.setStyle(painter, eWindowStyle::styleListboxSelected);
-               if (pbackColorSelected)
+                       if (pbackColor)
+                       {
+                               int color = PyInt_AsLong(pbackColor);
+                               painter.setBackgroundColor(gRGB(color));
+                       } // transparent background?
+                       // 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);
+                       if (!pbackColor && local_style && local_style->m_transparent_background)
+                               ;
+                       else
+                               painter.clear();
+                       painter.clippop();
+                       selected = 0;
+               }
+               part = rc & sel_clip;
+               if (!part.empty())
                {
-                       int color = PyInt_AsLong(pbackColorSelected);
-                       painter.setBackgroundColor(gRGB(color));
+                       painter.clip(part);
+                       style.setStyle(painter, eWindowStyle::styleListboxSelected);
+                       if (pbackColorSelected)
+                       {
+                               int color = PyInt_AsLong(pbackColorSelected);
+                               painter.setBackgroundColor(gRGB(color));
+                       }
+                       else if (local_style && local_style->m_background_color_selected_set)
+                               painter.setBackgroundColor(local_style->m_background_color_selected);
+                       painter.clear();
+                       painter.clippop();
+                       selected = 1;
                }
-               painter.clear();
-               painter.clippop();
        }
        else
        {
@@ -443,6 +562,9 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, ePyObject pforeC
                                int color = PyInt_AsLong(pbackColorSelected);
                                painter.setBackgroundColor(gRGB(color));
                        }
+                       else if (local_style && local_style->m_background_color_selected_set)
+                               painter.setBackgroundColor(local_style->m_background_color_selected);
+                       painter.clear();
                }
                else
                {
@@ -451,40 +573,64 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, ePyObject pforeC
                        {
                                int color = PyInt_AsLong(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)
+                               painter.setBackgroundColor(local_style->m_background_color);
+                       /* if we have no transparent background */
+                       if (!pbackColor && local_style && local_style->m_transparent_background)
+                               ;
+                       else
+                               painter.clear();
                }
-               painter.clear();
        }
-       if (pforeColor)
+       if (selected)
        {
-               int color = PyInt_AsLong(pforeColor);
-               painter.setForegroundColor(gRGB(color));
+               if (pforeColorSelected)
+               {
+                       int color = PyInt_AsLong(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)
+               {
+                       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, ePyObject(), ePyObject(), ePyObject(), selected, itemregion, sel_clip);
+       clearRegion(painter, style, local_style, ePyObject(), ePyObject(), ePyObject(), ePyObject(), selected, itemregion, sel_clip);
 
        ePyObject items;
 
        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)
@@ -506,17 +652,39 @@ 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!
-                       bool reset_colors=false;
 
                        if (!item)
                        {
@@ -545,7 +713,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                        case TYPE_TEXT: // text
                        {
                        /*
-                               (0, x, y, width, height, fnt, flags, "bla" [, color, backColor, backColorSelected, borderWidth, borderColor] )
+                               (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),
@@ -554,7 +722,7 @@ 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))
                                {
@@ -570,20 +738,37 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                }
                                if (size > 9)
                                {
-                                       pbackColor = PyTuple_GET_ITEM(item, 9);
+                                       pforeColorSelected = PyTuple_GET_ITEM(item, 9);
+                                       if (pforeColorSelected == Py_None)
+                                               pforeColorSelected=ePyObject();
+                               }
+                               if (size > 10)
+                               {
+                                       pbackColor = PyTuple_GET_ITEM(item, 10);
                                        if (pbackColor == Py_None)
                                                pbackColor=ePyObject();
                                }
-                               if (size > 10)
+                               if (size > 11)
                                {
-                                       pbackColorSelected = PyTuple_GET_ITEM(item, 10);
+                                       pbackColorSelected = PyTuple_GET_ITEM(item, 11);
                                        if (pbackColorSelected == Py_None)
                                                pbackColorSelected=ePyObject();
                                }
-                               if (size > 11)
-                                       pborderWidth = PyTuple_GET_ITEM(item, 11);
                                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 = PyTuple_GET_ITEM(item, 13);
+                                       if (pborderColor == Py_None)
+                                               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) : "<not-a-string>";
                                int x = PyInt_AsLong(px) + offset.x();
@@ -602,11 +787,10 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 
                                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, pforeColor, pbackColor, pbackColorSelected, selected, rc, sel_clip);
-                                       reset_colors=true;
+                                       clearRegion(painter, style, local_style, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected, selected, rc, sel_clip);
                                }
 
                                painter.setFont(m_font[fnt]);
@@ -623,8 +807,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);
@@ -652,7 +834,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                                        pwidth = PyTuple_GET_ITEM(item, 3),
                                                        pheight = PyTuple_GET_ITEM(item, 4),
                                                        pfilled_perc = PyTuple_GET_ITEM(item, 5),
-                                                       pborderWidth, pforeColor, pbackColor, pbackColorSelected;
+                                                       pborderWidth, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected;
 
                                if (!(px && py && pwidth && pheight && pfilled_perc))
                                {
@@ -661,18 +843,32 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                }
 
                                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)
                                {
-                                       pbackColor = PyTuple_GET_ITEM(item, 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 > 9)
+                               if (size > 10)
                                {
-                                       pbackColorSelected = PyTuple_GET_ITEM(item, 9);
+                                       pbackColorSelected = PyTuple_GET_ITEM(item, 10);
                                        if (pbackColorSelected == Py_None)
                                                pbackColorSelected=ePyObject();
                                }
@@ -682,15 +878,18 @@ 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);
                                painter.clip(rect);
-                               if (pbackColor || pbackColorSelected || pforeColor)
+
                                {
                                        gRegion rc(rect);
-                                       clearRegion(painter, style, pforeColor, pbackColor, pbackColorSelected, selected, rc, sel_clip);
-                                       reset_colors=true;
+                                       clearRegion(painter, style, local_style, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected, selected, rc, sel_clip);
                                }
 
                                // border
@@ -718,7 +917,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                        case TYPE_PIXMAP: // pixmap
                        {
                        /*
-                               (2, x, y, width, height, pixmap [, foreColor, backColor, backColorSelected] )
+                               (2, x, y, width, height, pixmap [, backColor, backColorSelected] )
                        */
 
                                ePyObject px = PyTuple_GET_ITEM(item, 1),
@@ -726,14 +925,17 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                                        pwidth = PyTuple_GET_ITEM(item, 3),
                                                        pheight = PyTuple_GET_ITEM(item, 4),
                                                        ppixmap = PyTuple_GET_ITEM(item, 5),
-                                                       pforeColor, pbackColor, pbackColorSelected;
+                                                       pbackColor, pbackColorSelected;
 
                                if (!(px && py && pwidth && pheight && ppixmap))
                                {
-                                       eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PIXMAP, x, y, width, height, pixmap [, foreColor, backColor, backColorSelected] ))");
+                                       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));
+
                                int x = PyInt_AsLong(px) + offset.x();
                                int y = PyInt_AsLong(py) + offset.y();
                                int width = PyInt_AsLong(pwidth);
@@ -747,32 +949,25 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 
                                if (size > 6)
                                {
-                                       pforeColor = PyTuple_GET_ITEM(item, 6);
-                                       if (pforeColor == Py_None)
-                                               pforeColor=ePyObject();
-                               }
-                               if (size > 7)
-                               {
-                                       pbackColor = PyTuple_GET_ITEM(item, 7);
+                                       pbackColor = PyTuple_GET_ITEM(item, 6);
                                        if (pbackColor == Py_None)
                                                pbackColor=ePyObject();
                                }
-                               if (size > 8)
+                               if (size > 7)
                                {
-                                       pbackColorSelected = PyTuple_GET_ITEM(item, 8);
+                                       pbackColorSelected = PyTuple_GET_ITEM(item, 7);
                                        if (pbackColorSelected == Py_None)
                                                pbackColorSelected=ePyObject();
                                }
 
                                eRect rect(x, y, width, height);
                                painter.clip(rect);
-                               if (pbackColor || pbackColorSelected || pforeColor)
+
                                {
                                        gRegion rc(rect);
-                                       clearRegion(painter, style, pforeColor, pbackColor, pbackColorSelected, selected, rc, sel_clip);
-                                       reset_colors=true;
+                                       clearRegion(painter, style, local_style, ePyObject(), ePyObject(), pbackColor, pbackColorSelected, selected, rc, sel_clip);
                                }
-                               
+
                                painter.blit(pixmap, rect.topLeft(), rect, (type == TYPE_PIXMAP_ALPHATEST) ? gPainter::BT_ALPHATEST : 0);
                                painter.clippop();
                                break;
@@ -781,8 +976,6 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                eWarning("eListboxPythonMultiContent received unknown type (%d)", type);
                                goto error_out;
                        }
-                       if (reset_colors)
-                               style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
                }
        }
 
@@ -803,11 +996,11 @@ void eListboxPythonMultiContent::setBuildFunc(ePyObject cb)
        Py_XINCREF(m_buildFunc);
 }
 
-void eListboxPythonMultiContent::setCallableFunc(ePyObject cb)
+void eListboxPythonMultiContent::setSelectableFunc(ePyObject cb)
 {
-       Py_XDECREF(m_callableFunc);
-       m_callableFunc=cb;
-       Py_XINCREF(m_callableFunc);
+       Py_XDECREF(m_selectableFunc);
+       m_selectableFunc=cb;
+       Py_XINCREF(m_selectableFunc);
 }
 
 int eListboxPythonMultiContent::currentCursorSelectable()
@@ -815,15 +1008,15 @@ 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())
        {
-               if (m_callableFunc && PyCallable_Check(m_callableFunc))
+               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_callableFunc, args);
+                               ePyObject ret = PyObject_CallObject(m_selectableFunc, args);
                                if (ret)
                                        return ret == Py_True;
-                               eDebug("call m_callableFunc failed!!! assume not callable");
+                               eDebug("call m_selectableFunc failed!!! assume not callable");
                        }
                        else
                                eDebug("m_list[m_cursor] is not a tuple!!! assume not callable");
@@ -836,6 +1029,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;
@@ -858,3 +1056,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;
+}