add missing import

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

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index c48fec701a8f512de891fc09d62b36be7004f578..afffbbe438a97c90b78015b79a31e6142fbb1ab9 100644 (file)
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -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)
+int iListboxContent::currentCursorSelectable()

 {
 {

-       m_size = size;
-}
-
-void eListboxTestContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
-{
-       ePtr<gFont> fnt = new gFont("Regular", 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("Regular", 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)
-{
-       m_list = list;
-       m_size = list.size();
-       cursorHome();
-       m_listbox->entryReset(false);
+       return 1;

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


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

+int eListboxPythonStringContent::currentCursorSelectable()
+{
+       if (m_list && cursorValid())
+       {
+               PyObject *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;


@@ -336,18 +144,31 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style,
 
        if (m_list && cursorValid())
        {
 
        if (m_list && cursorValid())
        {

+               int gray = 0;

                PyObject *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))
                PyObject *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))

+               {
+                       if (PyTuple_Size(item) == 1)
+                               gray = 1;

                        item = PyTuple_GET_ITEM(item, 0);
                        item = PyTuple_GET_ITEM(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));
-               
-               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);


@@ -374,10 +195,11 @@ void eListboxPythonStringContent::setList(PyObject *list)
 
 PyObject *eListboxPythonStringContent::getCurrentSelection()
 {
 
 PyObject *eListboxPythonStringContent::getCurrentSelection()
 {

-       if (!m_list)
-               return 0;
-       if (!cursorValid())
-               return 0;
+       if (!(m_list && cursorValid()))
+       {
+               Py_INCREF(Py_None);
+               return Py_None;
+       }

        PyObject *r = PyList_GET_ITEM(m_list, m_cursor);
        Py_XINCREF(r);
        return r;
        PyObject *r = PyList_GET_ITEM(m_list, m_cursor);
        Py_XINCREF(r);
        return r;


@@ -429,7 +251,11 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
                        eSize item_left = eSize(m_seperation, m_itemsize.height());
                        eSize item_right = eSize(m_itemsize.width() - m_seperation, m_itemsize.height());
                        painter.renderText(eRect(offset, item_left), string, gPainter::RT_HALIGN_LEFT);
                        eSize item_left = eSize(m_seperation, m_itemsize.height());
                        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);
+                       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*/
                        value = PyTuple_GET_ITEM(item, 1);
                        
                                /* now, handle the value. get 2nd part from tuple*/
                        value = PyTuple_GET_ITEM(item, 1);


@@ -462,18 +288,23 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
                                                PyObject *pvalue = PyTuple_GET_ITEM(value, 1);
                                                const char *value = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : "<not-a-string>";
                                                painter.setFont(fnt2);
                                                PyObject *pvalue = PyTuple_GET_ITEM(value, 1);
                                                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"))
                                        {
                                                PyObject *pvalue = PyTuple_GET_ITEM(value, 1);
 
                                                        /* pvalue is borrowed */
                                        } else if (!strcmp(atype, "slider"))
                                        {
                                                PyObject *pvalue = PyTuple_GET_ITEM(value, 1);

+                                               PyObject *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();
                                                
                                                                                                


@@ -487,11 +318,11 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
                                        {
                                                PyObject *pvalue = PyTuple_GET_ITEM(value, 1);
                                                const char *text = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : "<not-a-string>";
                                        {
                                                PyObject *pvalue = PyTuple_GET_ITEM(value, 1);
                                                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();
                                                
                                                PyObject *plist = 0;
                                                int glyphs = para->size();
                                                
                                                PyObject *plist = 0;


@@ -510,7 +341,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
                                                        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);


@@ -540,11 +371,27 @@ 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()
+       :m_buildFunc(0)
+{
+}
+
+eListboxPythonMultiContent::~eListboxPythonMultiContent()
+{
+       if (m_buildFunc)
+               Py_DECREF(m_buildFunc);
+}
+

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


@@ -552,10 +399,25 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
        style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
        painter.clear();
 
        style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
        painter.clear();
 

+       PyObject *items=0;
+

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

-               PyObject *items = PyList_GET_ITEM(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);


@@ -579,12 +441,12 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                goto error_out;
                        }
                        
                                goto error_out;
                        }
                        

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

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

-                               (0, 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 progress:
                                (1, x, y, width, height, filled_percent )


@@ -623,6 +485,8 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                        pflags = PyTuple_GET_ITEM(item, 6);
                                        pstring = PyTuple_GET_ITEM(item, 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)


@@ -631,7 +495,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                        {
                                if (!(px && py && pwidth && pheight && pfnt && pstring))
                                {
                        {
                                if (!(px && py && pwidth && pheight && pfnt && pstring))
                                {

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

                                        goto error_out;
                                }
                                
                                        goto error_out;
                                }
                                


@@ -643,6 +507,12 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                int flags = PyInt_AsLong(pflags);
                                int fnt = PyInt_AsLong(pfnt);
                                
                                int flags = PyInt_AsLong(pflags);
                                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);


@@ -706,6 +576,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 
                                break;
                        }
 
                                break;
                        }

+                       case TYPE_PIXMAP_ALPHATEST:

                        case TYPE_PIXMAP: // pixmap
                        {
                                if (!(px && py && pwidth && pheight && pfnt))
                        case TYPE_PIXMAP: // pixmap
                        {
                                if (!(px && py && pwidth && pheight && pfnt))


@@ -729,7 +600,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                r &= itemrect;
                                
                                painter.clip(r);
                                r &= itemrect;
                                
                                painter.clip(r);

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

                                painter.clippop();
 
                                break;
                                painter.clippop();
 
                                break;


@@ -738,6 +609,9 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                eWarning("eListboxPythonMultiContent received unknown type (%d)", type);
                                goto error_out;
                        }
                                eWarning("eListboxPythonMultiContent received unknown type (%d)", type);
                                goto error_out;
                        }

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

                }
        }
        
                }
        }
        


@@ -745,9 +619,40 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
 
 error_out:
                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(PyObject *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())
+       {
+               PyObject *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)