add some more hacks

[enigma2.git] / lib / gui / elistboxcontent.cpp

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index dea72a6c98bc9721a79623caacbd6a4bf0ce6c1d..621fa5cc907b0a33549d414c7891a9ede769f084 100644 (file)
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -1,7 +1,7 @@
 #include <lib/gui/elistbox.h>
 #include <lib/gui/elistboxcontent.h>
 #include <lib/gdi/font.h>
 #include <lib/gui/elistbox.h>
 #include <lib/gui/elistboxcontent.h>
 #include <lib/gdi/font.h>

-#include <Python.h>
+#include <lib/python/python.h>

 
 /*
     The basic idea is to have an interface which gives all relevant list
 
 /*
     The basic idea is to have an interface which gives all relevant list


@@ -39,214 +39,9 @@ void iListboxContent::setListbox(eListbox *lb)
        m_listbox = lb;
 }
 
        m_listbox = lb;
 }
 

-DEFINE_REF(eListboxTestContent);
-
-void eListboxTestContent::cursorHome()
-{
-       m_cursor = 0;
-}
-
-void eListboxTestContent::cursorEnd()
-{
-       m_cursor = size();
-}
-
-int eListboxTestContent::cursorMove(int count)
-{
-       m_cursor += count;
-       
-       if (m_cursor < 0)
-               cursorHome();
-       else if (m_cursor > size())
-               cursorEnd();
-       return 0;
-}
-
-int eListboxTestContent::cursorValid()
-{
-       return m_cursor < size();
-}
-
-int eListboxTestContent::cursorSet(int n)
-{
-       m_cursor = n;
-       
-       if (m_cursor < 0)
-               cursorHome();
-       else if (m_cursor > size())
-               cursorEnd();
-       return 0;
-}
-
-int eListboxTestContent::cursorGet()
-{
-       return m_cursor;
-}
-
-void eListboxTestContent::cursorSave()
-{
-       m_saved_cursor = m_cursor;
-}
-
-void eListboxTestContent::cursorRestore()
-{
-       m_cursor = m_saved_cursor;
-}
-
-int eListboxTestContent::size()
-{
-       return 10;
-}
-       
-RESULT eListboxTestContent::connectItemChanged(const Slot0<void> &itemChanged, ePtr<eConnection> &connection)
-{
-       return 0;
-}
-
-void eListboxTestContent::setSize(const eSize &size)
-{
-       m_size = size;
-}
-
-void eListboxTestContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
-{
-       ePtr<gFont> fnt = new gFont("Arial", 20);
-       painter.clip(eRect(offset, m_size));
-       style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
-       painter.clear();
-
-       if (cursorValid())
-       {
-               painter.setFont(fnt);
-               char string[10];
-               sprintf(string, "%d.)", m_cursor);
-               
-               ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1));
-               
-               painter.renderText(eRect(text_offset, m_size), string);
-               
-               if (selected)
-                       style.drawFrame(painter, eRect(offset, m_size), eWindowStyle::frameListboxEntry);
-       }
-       
-       painter.clippop();
-}
-
-//////////////////////////////////////
-
-DEFINE_REF(eListboxStringContent);
-
-eListboxStringContent::eListboxStringContent()
-{
-       m_size = 0;
-       cursorHome();
-}
-
-void eListboxStringContent::cursorHome()
-{
-       m_cursor = m_list.begin();
-       m_cursor_number = 0;
-}
-
-void eListboxStringContent::cursorEnd()
-{
-       m_cursor = m_list.end();
-       m_cursor_number = m_size;
-}
-
-int eListboxStringContent::cursorMove(int count)
-{
-       if (count > 0)
-       {
-               while (count && (m_cursor != m_list.end()))
-               {
-                       ++m_cursor;
-                       ++m_cursor_number;
-                       --count;
-               }
-       } else if (count < 0)
-       {
-               while (count && (m_cursor != m_list.begin()))
-               {
-                       --m_cursor;
-                       --m_cursor_number;
-                       ++count;
-               }
-       }
-       
-       return 0;
-}
-
-int eListboxStringContent::cursorValid()
-{
-       return m_cursor != m_list.end();
-}
-
-int eListboxStringContent::cursorSet(int n)
-{
-       cursorHome();
-       cursorMove(n);
-       
-       return 0;
-}
-
-int eListboxStringContent::cursorGet()
-{
-       return m_cursor_number;
-}
-
-void eListboxStringContent::cursorSave()
-{
-       m_saved_cursor = m_cursor;
-       m_saved_cursor_number = m_cursor_number;
-}
-
-void eListboxStringContent::cursorRestore()
-{
-       m_cursor = m_saved_cursor;
-       m_cursor_number = m_saved_cursor_number;
-}
-
-int eListboxStringContent::size()
-{
-       return m_size;
-}
-       
-void eListboxStringContent::setSize(const eSize &size)
-{
-       m_itemsize = size;
-}
-
-void eListboxStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
-{
-       ePtr<gFont> fnt = new gFont("Arial", 20);
-       painter.clip(eRect(offset, m_itemsize));
-       style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
-       painter.clear();
-       
-       eDebug("item %d", m_cursor_number);
-       if (cursorValid())
-       {
-               eDebug("is valid..");
-               painter.setFont(fnt);
-               
-               ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1));
-               
-               painter.renderText(eRect(text_offset, m_itemsize), *m_cursor);
-               
-               if (selected)
-                       style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
-       }
-       
-       painter.clippop();
-}
-
-void eListboxStringContent::setList(std::list<std::string> &list)
+int iListboxContent::currentCursorSelectable()

 {
 {

-       m_list = list;
-       m_size = list.size();
-       cursorHome();
-       m_listbox->entryReset();
+       return 1;

 }
 
 //////////////////////////////////////
 }
 
 //////////////////////////////////////


@@ -255,11 +50,11 @@ DEFINE_REF(eListboxPythonStringContent);
 
 eListboxPythonStringContent::eListboxPythonStringContent()
 {
 
 eListboxPythonStringContent::eListboxPythonStringContent()
 {

-       m_list = 0;

 }
 
 eListboxPythonStringContent::~eListboxPythonStringContent()
 {
 }
 
 eListboxPythonStringContent::~eListboxPythonStringContent()
 {

+       Py_XDECREF(m_list);

 }
 
 void eListboxPythonStringContent::cursorHome()
 }
 
 void eListboxPythonStringContent::cursorHome()


@@ -304,6 +99,19 @@ int eListboxPythonStringContent::cursorGet()
        return m_cursor;
 }
 
        return m_cursor;
 }
 

+int eListboxPythonStringContent::currentCursorSelectable()
+{
+       if (m_list && cursorValid())
+       {
+               ePyObject item = PyList_GET_ITEM(m_list, m_cursor);
+               if (!PyTuple_Check(item))
+                       return 1;
+               if (PyTuple_Size(item) >= 2)
+                       return 1;
+       }
+       return 0;
+}
+

 void eListboxPythonStringContent::cursorSave()
 {
        m_saved_cursor = m_cursor;
 void eListboxPythonStringContent::cursorSave()
 {
        m_saved_cursor = m_cursor;


@@ -328,25 +136,38 @@ void eListboxPythonStringContent::setSize(const eSize &size)
 
 void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
 
 void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {

-       ePtr<gFont> fnt = new gFont("Arial", 20);
+       ePtr<gFont> 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())
        {
        painter.clip(eRect(offset, m_itemsize));
        style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
        painter.clear();
 
        if (m_list && cursorValid())
        {

-               PyObject *item = PyList_GetItem(m_list, m_cursor); // borrowed reference!
+               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. */         
                if (PyTuple_Check(item))
                painter.setFont(fnt);
 
                        /* the user can supply tuples, in this case the first one will be displayed. */         
                if (PyTuple_Check(item))

-                       item = PyTuple_GetItem(item, 0);
-               
-               const char *string = PyString_Check(item) ? PyString_AsString(item) : "<not-a-string>";
-               
-               ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1));
+               {
+                       if (PyTuple_Size(item) == 1)
+                               gray = 1;
+                       item = PyTuple_GET_ITEM(item, 0);
+               }

                
                

-               painter.renderText(eRect(text_offset, m_itemsize), string);
+               if (item == Py_None)
+               {
+                       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
+               {
+                       const char *string = PyString_Check(item) ? PyString_AsString(item) : "<not-a-string>";
+                       ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1));
+                       if (gray)
+                               painter.setForegroundColor(gRGB(0x808080));
+                       painter.renderText(eRect(text_offset, m_itemsize), string);
+               }

                
                if (selected)
                        style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
                
                if (selected)
                        style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);


@@ -355,12 +176,12 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style,
        painter.clippop();
 }
 
        painter.clippop();
 }
 

-void eListboxPythonStringContent::setList(PyObject *list)
+void eListboxPythonStringContent::setList(ePyObject list)

 {
        Py_XDECREF(m_list);
        if (!PyList_Check(list))
        {
 {
        Py_XDECREF(m_list);
        if (!PyList_Check(list))
        {

-               m_list = 0;
+               m_list = ePyObject();

        } else
        {
                m_list = list;
        } else
        {
                m_list = list;


@@ -368,16 +189,15 @@ void eListboxPythonStringContent::setList(PyObject *list)
        }
 
        if (m_listbox)
        }
 
        if (m_listbox)

-               m_listbox->entryReset();
+               m_listbox->entryReset(false);

 }
 
 PyObject *eListboxPythonStringContent::getCurrentSelection()
 {
 }
 
 PyObject *eListboxPythonStringContent::getCurrentSelection()
 {

-       if (!m_list)
-               return 0;
-       if (!cursorValid())
-               return 0;
-       PyObject *r = PyList_GetItem(m_list, m_cursor);
+       if (!(m_list && cursorValid()))
+               Py_RETURN_NONE;
+
+       ePyObject r = PyList_GET_ITEM(m_list, m_cursor);

        Py_XINCREF(r);
        return r;
 }
        Py_XINCREF(r);
        return r;
 }


@@ -391,24 +211,30 @@ void eListboxPythonStringContent::invalidateEntry(int index)
 void eListboxPythonStringContent::invalidate()
 {
        if (m_listbox)
 void eListboxPythonStringContent::invalidate()
 {
        if (m_listbox)

+       {
+               int s = size();
+               if ( m_cursor >= s )
+                       m_listbox->moveSelectionTo(s?s-1:0);

                m_listbox->invalidate();
                m_listbox->invalidate();

+       }

 }
 
 //////////////////////////////////////
 
 void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
 }
 
 //////////////////////////////////////
 
 void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {

-       ePtr<gFont> fnt = new gFont("Arial", 20);
-       ePtr<gFont> fnt2 = new gFont("Arial", 16);
-       painter.clip(eRect(offset, m_itemsize));
+       ePtr<gFont> fnt = new gFont("Regular", 20);
+       ePtr<gFont> fnt2 = new gFont("Regular", 16);
+       eRect itemrect(offset, m_itemsize);
+       painter.clip(itemrect);

        style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
        painter.clear();
 
        if (m_list && cursorValid())
        {
                        /* get current list item */
        style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
        painter.clear();
 
        if (m_list && cursorValid())
        {
                        /* get current list item */

-               PyObject *item = PyList_GetItem(m_list, m_cursor); // borrowed reference!
-               PyObject *text = 0, *value = 0;
+               ePyObject item = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference!
+               ePyObject text, value;

                painter.setFont(fnt);
 
                        /* the first tuple element is a string for the left side.
                painter.setFont(fnt);
 
                        /* the first tuple element is a string for the left side.


@@ -421,7 +247,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
                {
                                /* handle left part. get item from tuple, convert to string, display. */
                                
                {
                                /* handle left part. get item from tuple, convert to string, display. */
                                

-                       text = PyTuple_GetItem(item, 0);
+                       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) : "<not-a-string>";
                        eSize item_left = eSize(m_seperation, m_itemsize.height());
                        text = PyObject_Str(text); /* creates a new object - old object was borrowed! */
                        const char *string = (text && PyString_Check(text)) ? PyString_AsString(text) : "<not-a-string>";
                        eSize item_left = eSize(m_seperation, m_itemsize.height());


@@ -429,12 +255,16 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
                        painter.renderText(eRect(offset, item_left), string, gPainter::RT_HALIGN_LEFT);
                        Py_XDECREF(text);
                        
                        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: 
+                                  don't we want to specifiy this individually?) */
+                       int value_alignment_left = !*string;
+                       

                                /* now, handle the value. get 2nd part from tuple*/
                                /* now, handle the value. get 2nd part from tuple*/

-                       value = PyTuple_GetItem(item, 1);
+                       value = PyTuple_GET_ITEM(item, 1);

                        if (value)
                        {
                        if (value)
                        {

-                               PyObject *args = PyTuple_New(1);
-                               PyTuple_SetItem(args, 0, PyInt_FromLong(selected));
+                               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);
                                
                                        /* CallObject will call __call__ which should return the value tuple */
                                value = PyObject_CallObject(value, args);


@@ -450,28 +280,33 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
                        if (value && PyTuple_Check(value))
                        {
                                        /* convert type to string */
                        if (value && PyTuple_Check(value))
                        {
                                        /* convert type to string */

-                               PyObject *type = PyTuple_GetItem(value, 0);
+                               ePyObject type = PyTuple_GET_ITEM(value, 0);

                                const char *atype = (type && PyString_Check(type)) ? PyString_AsString(type) : 0;
                                
                                if (atype)
                                {
                                        if (!strcmp(atype, "text"))
                                        {
                                const char *atype = (type && PyString_Check(type)) ? PyString_AsString(type) : 0;
                                
                                if (atype)
                                {
                                        if (!strcmp(atype, "text"))
                                        {

-                                               PyObject *pvalue = PyTuple_GetItem(value, 1);
+                                               ePyObject pvalue = PyTuple_GET_ITEM(value, 1);

                                                const char *value = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : "<not-a-string>";
                                                painter.setFont(fnt2);
                                                const char *value = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : "<not-a-string>";
                                                painter.setFont(fnt2);

-                                               painter.renderText(eRect(offset + eSize(m_seperation, 0), item_right), value, gPainter::RT_HALIGN_RIGHT);
+                                               if (value_alignment_left)
+                                                       painter.renderText(eRect(offset, item_right), value, gPainter::RT_HALIGN_LEFT);
+                                               else
+                                                       painter.renderText(eRect(offset + eSize(m_seperation, 0), item_right), value, gPainter::RT_HALIGN_RIGHT);

 
                                                        /* pvalue is borrowed */
                                        } else if (!strcmp(atype, "slider"))
                                        {
 
                                                        /* pvalue is borrowed */
                                        } else if (!strcmp(atype, "slider"))
                                        {

-                                               PyObject *pvalue = PyTuple_GetItem(value, 1);
+                                               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;
                                                
                                                        /* 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 */
                                                
                                                        /* calc. slider length */

-                                               int width = item_right.width() * value / 100;
+                                               int width = item_right.width() * value / size;

                                                int height = item_right.height();
                                                
                                                                                                
                                                int height = item_right.height();
                                                
                                                                                                


@@ -483,19 +318,19 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
                                                        /* pvalue is borrowed */
                                        } else if (!strcmp(atype, "mtext"))
                                        {
                                                        /* pvalue is borrowed */
                                        } else if (!strcmp(atype, "mtext"))
                                        {

-                                               PyObject *pvalue = PyTuple_GetItem(value, 1);
+                                               ePyObject pvalue = PyTuple_GET_ITEM(value, 1);

                                                const char *text = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : "<not-a-string>";
                                                const char *text = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : "<not-a-string>";

-                                               
-                                               ePtr<eTextPara> para = new eTextPara(eRect(offset + eSize(m_seperation, 0), item_right));
+                                               int xoffs = value_alignment_left ? 0 : m_seperation;
+                                               ePtr<eTextPara> para = new eTextPara(eRect(offset + eSize(xoffs, 0), item_right));

                                                para->setFont(fnt2);
                                                para->renderString(text, 0);
                                                para->setFont(fnt2);
                                                para->renderString(text, 0);

-                                               para->realign(eTextPara::dirRight);
+                                               para->realign(value_alignment_left ? eTextPara::dirLeft : eTextPara::dirRight);

                                                int glyphs = para->size();
                                                
                                                int glyphs = para->size();
                                                

-                                               PyObject *plist = 0;
+                                               ePyObject plist;

                                                
                                                if (PyTuple_Size(value) >= 3)
                                                
                                                if (PyTuple_Size(value) >= 3)

-                                                       plist = PyTuple_GetItem(value, 2);
+                                                       plist = PyTuple_GET_ITEM(value, 2);

                                                
                                                int entries = 0;
 
                                                
                                                int entries = 0;
 


@@ -504,11 +339,11 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
                                                
                                                for (int i = 0; i < entries; ++i)
                                                {
                                                
                                                for (int i = 0; i < entries; ++i)
                                                {

-                                                       PyObject *entry = PyList_GetItem(plist, i);
+                                                       ePyObject entry = PyList_GET_ITEM(plist, i);

                                                        int num = PyInt_Check(entry) ? PyInt_AsLong(entry) : -1;
                                                        
                                                        if ((num < 0) || (num >= glyphs))
                                                        int num = PyInt_Check(entry) ? PyInt_AsLong(entry) : -1;
                                                        
                                                        if ((num < 0) || (num >= glyphs))

-                                                               eWarning("glyph index %d in PythonConfigList out of bounds!");
+                                                               eWarning("glyph index %d in PythonConfigList out of bounds!", num);

                                                        else
                                                        {
                                                                para->setGlyphFlag(num, GS_INVERT);
                                                        else
                                                        {
                                                                para->setGlyphFlag(num, GS_INVERT);


@@ -538,164 +373,287 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
        painter.clippop();
 }
 
        painter.clippop();
 }
 

+int eListboxPythonConfigContent::currentCursorSelectable()
+{
+       return eListboxPythonStringContent::currentCursorSelectable();
+}
+

 //////////////////////////////////////
 
        /* todo: make a real infrastructure here! */
 RESULT SwigFromPython(ePtr<gPixmap> &res, PyObject *obj);
 
 //////////////////////////////////////
 
        /* todo: make a real infrastructure here! */
 RESULT SwigFromPython(ePtr<gPixmap> &res, PyObject *obj);
 

+eListboxPythonMultiContent::eListboxPythonMultiContent()
+{
+}
+
+eListboxPythonMultiContent::~eListboxPythonMultiContent()
+{
+       if (m_buildFunc)
+               Py_DECREF(m_buildFunc);
+}
+

 void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {
 void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
 {

-       painter.clip(eRect(offset, m_itemsize));
+       eRect itemrect(offset, m_itemsize);
+       painter.clip(itemrect);

        style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
        painter.clear();
 
        style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
        painter.clear();
 

+       ePyObject items;
+

        if (m_list && cursorValid())
        {
        if (m_list && cursorValid())
        {

-               PyObject *items = PyList_GetItem(m_list, m_cursor); // borrowed reference!
-               
+               items = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference!
+
+               if (m_buildFunc)
+               {
+                       if (PyCallable_Check(m_buildFunc))  // when we have a buildFunc then call it
+                       {
+                               if (PyTuple_Check(items))
+                                       items = PyObject_CallObject(m_buildFunc, items);
+                               else
+                                       eDebug("items is no tuple");
+                       }
+                       else
+                               eDebug("buildfunc is not callable");
+               }
+

                if (!items)
                {
                        eDebug("eListboxPythonMultiContent: error getting item %d", m_cursor);
                if (!items)
                {
                        eDebug("eListboxPythonMultiContent: error getting item %d", m_cursor);

-                       painter.clippop();
-                       return;
+                       goto error_out;

                }
                
                if (!PyList_Check(items))
                {
                        eDebug("eListboxPythonMultiContent: list entry %d is not a list", m_cursor);
                }
                
                if (!PyList_Check(items))
                {
                        eDebug("eListboxPythonMultiContent: list entry %d is not a list", m_cursor);

-                       painter.clippop();
-                       return;
+                       goto error_out;

                }
                
                int size = PyList_Size(items);
                for (int i = 1; i < size; ++i)
                {
                }
                
                int size = PyList_Size(items);
                for (int i = 1; i < size; ++i)
                {

-                       PyObject *item = PyList_GetItem(items, i); // borrowed reference!
+                       ePyObject item = PyList_GET_ITEM(items, i); // borrowed reference!

                        
                        if (!item)
                        {
                                eDebug("eListboxPythonMultiContent: ?");
                        
                        if (!item)
                        {
                                eDebug("eListboxPythonMultiContent: ?");

-                               painter.clippop();
-                               return;
+                               goto error_out;

                        }
                        
                        }
                        

-                       
-                       PyObject *px = 0, *py = 0, *pwidth = 0, *pheight = 0, *pfnt = 0, *pstring = 0, *pflags = 0;
+                       ePyObject px, py, pwidth, pheight, pfnt, pstring, pflags, pcolor;

                
                        /*
                                we have a list of tuples:
                                
                
                        /*
                                we have a list of tuples:
                                

-                               (x, y, width, height, fnt, flags, "bla" ),
-                               
+                               (0, x, y, width, height, fnt, flags, "bla"[, color] ),
+
+                               or, for a progress:
+                               (1, x, y, width, height, filled_percent )
+

                                or, for a pixmap:
                                
                                or, for a pixmap:
                                

-                               (x, y, width, height, pixmap )
+                               (2, x, y, width, height, pixmap )

                                
                         */
                        
                        if (!PyTuple_Check(item))
                        {
                                eDebug("eListboxPythonMultiContent did not receive a tuple.");
                                
                         */
                        
                        if (!PyTuple_Check(item))
                        {
                                eDebug("eListboxPythonMultiContent did not receive a tuple.");

-                               painter.clippop();
-                               return;
+                               goto error_out;

                        }
                        }

-                       
+

                        int size = PyTuple_Size(item);
                        int size = PyTuple_Size(item);

-                       
-                       if (size >= 5)
+
+                       if (!size)

                        {
                        {

-                               px = PyTuple_GetItem(item, 0);
-                               py = PyTuple_GetItem(item, 1);
-                               pwidth = PyTuple_GetItem(item, 2);
-                               pheight = PyTuple_GetItem(item, 3);
-                       
-                               pfnt = PyTuple_GetItem(item, 4); /* could also be an pixmap */
-                               if (size >= 7)
-                               {
-                                       pflags = PyTuple_GetItem(item, 5);
-                                       pstring = PyTuple_GetItem(item, 6);
-                               }
+                               eDebug("eListboxPythonMultiContent receive empty tuple.");
+                               goto error_out;

                        }
                        }

-                       
-                       ePtr<gPixmap> pixmap;
-                       
-                               /* decide what type */
-                       int type = -1;
-                       if (pfnt)
+
+                       int type = PyInt_AsLong(PyTuple_GET_ITEM(item, 0));
+
+                       if (size > 5)

                        {
                        {

-                               if (PyNumber_Check(pfnt)) /* font index */
-                                       type = 0;
-                               else if (!SwigFromPython(pixmap, pfnt))
-                                       type = 1;
+                               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)
                        {
                        }
                        
                        switch (type)
                        {

-                       case 0: // text
+                       case TYPE_TEXT: // text

                        {
                                if (!(px && py && pwidth && pheight && pfnt && pstring))
                                {
                        {
                                if (!(px && py && pwidth && pheight && pfnt && pstring))
                                {

-                                       eDebug("eListboxPythonMultiContent received too small tuple (must be (x, y, width, height, fnt, flags, string[, ...])");
-                                       painter.clippop();
-                                       return;
+                                       eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_TEXT, x, y, width, height, fnt, flags, string, [color, ]...])");
+                                       goto error_out;

                                }
                                }

-       
-                               pstring = PyObject_Str(pstring);
-                       
+                               

                                const char *string = (PyString_Check(pstring)) ? PyString_AsString(pstring) : "<not-a-string>";
                                const char *string = (PyString_Check(pstring)) ? PyString_AsString(pstring) : "<not-a-string>";

-                       

                                int x = PyInt_AsLong(px);
                                int y = PyInt_AsLong(py);
                                int width = PyInt_AsLong(pwidth);
                                int height = PyInt_AsLong(pheight);
                                int flags = PyInt_AsLong(pflags);
                                int x = PyInt_AsLong(px);
                                int y = PyInt_AsLong(py);
                                int width = PyInt_AsLong(pwidth);
                                int height = PyInt_AsLong(pheight);
                                int flags = PyInt_AsLong(pflags);

-

                                int fnt = PyInt_AsLong(pfnt);
                                int fnt = PyInt_AsLong(pfnt);

-
+                               
+                               if (pcolor)
+                               {
+                                       int color = PyInt_AsLong(pcolor);
+                                       painter.setForegroundColor(gRGB(color));
+                               }
+                               

                                if (m_font.find(fnt) == m_font.end())
                                {
                                        eDebug("eListboxPythonMultiContent: specified font %d was not found!", fnt);
                                if (m_font.find(fnt) == m_font.end())
                                {
                                        eDebug("eListboxPythonMultiContent: specified font %d was not found!", fnt);

-                                       Py_XDECREF(pstring);
-                                       painter.clippop();
-                                       return;
+                                       goto error_out;

                                }
                                }

+                               

                                eRect r = eRect(x, y, width, height);
                                r.moveBy(offset);
                                eRect r = eRect(x, y, width, height);
                                r.moveBy(offset);

-
+                               r &= itemrect;
+                               

                                painter.setFont(m_font[fnt]);
                                painter.setFont(m_font[fnt]);

-
+                               
+                               painter.clip(r);

                                painter.renderText(r, string, flags);
                                painter.renderText(r, string, flags);

+                               painter.clippop();
+                               break;
+                       }
+                       case TYPE_PROGRESS: // Progress
+                       {
+                               if (!(px && py && pwidth && pheight && pfnt))
+                               {
+                                       eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PROGRESS, x, y, width, height, filled percent))");
+                                       goto error_out;
+                               }
+                               int x = PyInt_AsLong(px);
+                               int y = PyInt_AsLong(py);
+                               int width = PyInt_AsLong(pwidth);
+                               int height = PyInt_AsLong(pheight);
+                               int filled = PyInt_AsLong(pfnt);
+
+                               eRect r = eRect(x, y, width, height);
+                               r.moveBy(offset);
+                               r &= itemrect;
+
+                               painter.clip(r);
+                               int bwidth=2;  // borderwidth hardcoded yet
+
+                               // border
+                               eRect rc = eRect(x, y, width, bwidth);
+                               rc.moveBy(offset);
+                               painter.fill(rc);
+
+                               rc = eRect(x, y+bwidth, bwidth, height-bwidth);
+                               rc.moveBy(offset);
+                               painter.fill(rc);
+
+                               rc = eRect(x+bwidth, y+height-bwidth, width-bwidth, bwidth);
+                               rc.moveBy(offset);
+                               painter.fill(rc);
+
+                               rc = eRect(x+width-bwidth, y+bwidth, bwidth, height-bwidth);
+                               rc.moveBy(offset);
+                               painter.fill(rc);
+
+                               // progress
+                               rc = eRect(x+bwidth, y+bwidth, (width-bwidth*2) * filled / 100, height-bwidth*2);
+                               rc.moveBy(offset);
+                               painter.fill(rc);
+
+                               painter.clippop();

 
 

-                               Py_XDECREF(pstring);

                                break;
                        }
                                break;
                        }

-                       case 1: // pixmap
+                       case TYPE_PIXMAP_ALPHATEST:
+                       case TYPE_PIXMAP: // pixmap

                        {
                        {

+                               if (!(px && py && pwidth && pheight && pfnt))
+                               {
+                                       eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PIXMAP, x, y, width, height, pixmap))");
+                                       goto error_out;
+                               }

                                int x = PyInt_AsLong(px);
                                int y = PyInt_AsLong(py);
                                int width = PyInt_AsLong(pwidth);
                                int height = PyInt_AsLong(pheight);
                                int x = PyInt_AsLong(px);
                                int y = PyInt_AsLong(py);
                                int width = PyInt_AsLong(pwidth);
                                int height = PyInt_AsLong(pheight);

-                               
+                               ePtr<gPixmap> pixmap;
+                               if (SwigFromPython(pixmap, pfnt))
+                               {
+                                       eDebug("eListboxPythonMultiContent (Pixmap) get pixmap failed");
+                                       goto error_out;
+                               }
+

                                eRect r = eRect(x, y, width, height);
                                r.moveBy(offset);
                                eRect r = eRect(x, y, width, height);
                                r.moveBy(offset);

+                               r &= itemrect;

                                
                                

-                               painter.blit(pixmap, r.topLeft(), r);
+                               painter.clip(r);
+                               painter.blit(pixmap, r.topLeft(), r, (type == TYPE_PIXMAP_ALPHATEST) ? gPainter::BT_ALPHATEST : 0);
+                               painter.clippop();
+

                                break;
                        }
                        default:
                                break;
                        }
                        default:

-                               eWarning("eListboxPythonMultiContent received neither text nor pixmap entry");
-                               painter.clippop();
-                               return;
+                               eWarning("eListboxPythonMultiContent received unknown type (%d)", type);
+                               goto error_out;

                        }
                        }

+                       
+                       if (pcolor)
+                               style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);

                }
        }
        
        if (selected)
                style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
 
                }
        }
        
        if (selected)
                style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
 

+error_out:
+       if (m_buildFunc && PyCallable_Check(m_buildFunc) && items)
+               Py_DECREF(items);
+

        painter.clippop();
 }
 
        painter.clippop();
 }
 

+void eListboxPythonMultiContent::setBuildFunc(ePyObject cb)
+{
+       if (m_buildFunc)
+               Py_DECREF(m_buildFunc);
+       m_buildFunc=cb;
+       if (cb)
+               Py_INCREF(m_buildFunc);
+}
+
+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))
+               {
+                       item = PyList_GET_ITEM(item, 0);
+                       if (item != Py_None)
+                               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;
+}
+

 void eListboxPythonMultiContent::setFont(int fnt, gFont *font)
 {
        if (font)
 void eListboxPythonMultiContent::setFont(int fnt, gFont *font)
 {
        if (font)