fix wrap around with enabled movemode
[enigma2.git] / lib / service / listboxservice.cpp
index 938b179..13538e9 100644 (file)
@@ -1,11 +1,31 @@
 #include <lib/service/listboxservice.h>
 #include <lib/service/service.h>
+#include <lib/gdi/font.h>
+#include <lib/dvb/epgcache.h>
+#include <lib/dvb/pmt.h>
+#include <lib/python/connections.h>
 
-void eListboxServiceContent::setRoot(const eServiceReference &root)
+void eListboxServiceContent::addService(const eServiceReference &service)
+{
+       m_list.push_back(service);
+}
+
+void eListboxServiceContent::FillFinished()
+{
+       m_size = m_list.size();
+       cursorHome();
+
+       if (m_listbox)
+               m_listbox->entryReset();
+}
+
+void eListboxServiceContent::setRoot(const eServiceReference &root, bool justSet)
 {
        m_list.clear();
        m_root = root;
-       
+
+       if (justSet)
+               return;
        assert(m_service_center);
        
        ePtr<iListableService> lst;
@@ -15,11 +35,7 @@ void eListboxServiceContent::setRoot(const eServiceReference &root)
                if (lst->getContent(m_list))
                        eDebug("getContent failed");
 
-       m_size = m_list.size();
-       cursorHome();
-       
-       if (m_listbox)
-               m_listbox->entryReset();
+       FillFinished();
 }
 
 void eListboxServiceContent::setCurrent(const eServiceReference &ref)
@@ -32,6 +48,8 @@ void eListboxServiceContent::setCurrent(const eServiceReference &ref)
                        m_cursor_number = index;
                        break;
                }
+       if (m_listbox)
+               m_listbox->moveSelectionTo(index);
 }
 
 void eListboxServiceContent::getCurrent(eServiceReference &ref)
@@ -42,6 +60,33 @@ void eListboxServiceContent::getCurrent(eServiceReference &ref)
                ref = eServiceReference();
 }
 
+int eListboxServiceContent::getNextBeginningWithChar(char c)
+{
+//     printf("Char: %c\n", c);
+       int index=0;
+       for (list::iterator i(m_list.begin()); i != m_list.end(); ++i, ++index)
+       {
+               std::string text;
+               ePtr<iStaticServiceInformation> service_info;
+               m_service_center->info(*i, service_info);
+               service_info->getName(*i, text);
+//             printf("%c\n", text.c_str()[0]);
+               int idx=0;
+               int len=text.length();
+               while ( idx <= len )
+               {
+                       char cc = text[idx++];
+                       if ( cc >= 33 && cc < 127)
+                       {
+                               if (cc == c)
+                                       return index;
+                               break;
+                       }
+               }
+       }
+       return 0;
+}
+
 void eListboxServiceContent::initMarked()
 {
        m_marked.clear();
@@ -99,7 +144,7 @@ void eListboxServiceContent::setVisualMode(int mode)
        if (m_visual_mode == visModeSimple)
        {
                m_element_position[celServiceName] = eRect(ePoint(0, 0), m_itemsize);
-               m_element_font[celServiceName] = new gFont("Arial", 23);
+               m_element_font[celServiceName] = new gFont("Regular", 23);
                m_element_position[celServiceNumber] = eRect();
                m_element_font[celServiceNumber] = 0;
                m_element_position[celIcon] = eRect();
@@ -123,8 +168,8 @@ void eListboxServiceContent::setElementFont(int element, gFont *font)
 void eListboxServiceContent::sort()
 {
        ePtr<iListableService> lst;
-  if (!m_service_center->list(m_root, lst))
-  {
+       if (!m_service_center->list(m_root, lst))
+       {
                m_list.sort(iListableServiceCompare(lst));
                        /* FIXME: is this really required or can we somehow keep the current entry? */
                cursorHome();
@@ -136,7 +181,7 @@ void eListboxServiceContent::sort()
 DEFINE_REF(eListboxServiceContent);
 
 eListboxServiceContent::eListboxServiceContent()
-       :m_visual_mode(visModeSimple), m_size(0), m_current_marked(false), m_swap(m_list.end()), m_numberoffset(0)
+       :m_visual_mode(visModeSimple), m_size(0), m_current_marked(false), m_numberoffset(0)
 {
        cursorHome();
        eServiceCenter::getInstance(m_service_center);
@@ -144,21 +189,49 @@ eListboxServiceContent::eListboxServiceContent()
 
 void eListboxServiceContent::cursorHome()
 {
-       list::iterator old = m_cursor;
-
-       m_cursor = m_list.begin();
-       m_cursor_number = 0;
-
-       if ( m_current_marked && m_saved_cursor == m_list.end() )
-               std::iter_swap( old, m_cursor );
+       if (m_current_marked && m_saved_cursor == m_list.end())
+       {
+               if (m_cursor_number >= m_size)
+               {
+                       m_cursor_number = m_size-1;
+                       --m_cursor;
+               }
+               while (m_cursor_number)
+               {
+                       std::iter_swap(m_cursor--, m_cursor);
+                       --m_cursor_number;
+                       if (m_listbox && m_cursor_number)
+                               m_listbox->entryChanged(m_cursor_number);
+               }
+       }
+       else
+       {
+               m_cursor = m_list.begin();
+               m_cursor_number = 0;
+       }
 }
 
 void eListboxServiceContent::cursorEnd()
 {
-       if ( m_current_marked && m_saved_cursor == m_list.end() && m_cursor != m_list.end() )
-               m_swap = m_cursor;
-       m_cursor = m_list.end();
-       m_cursor_number = m_size;
+       if (m_current_marked && m_saved_cursor == m_list.end())
+       {
+               while (m_cursor != m_list.end())
+               {
+                       list::iterator prev = m_cursor++;
+                       ++m_cursor_number;
+                       if ( prev != m_list.end() && m_cursor != m_list.end() )
+                       {
+                               std::iter_swap(m_cursor, prev);
+                               if ( m_listbox )
+                                       m_listbox->entryChanged(m_cursor_number);
+                       }
+               }
+       }
+       else
+       {
+               m_cursor = m_list.end();
+               m_cursor_number = m_size;
+       }
 }
 
 int eListboxServiceContent::setCurrentMarked(bool state)
@@ -204,39 +277,36 @@ int eListboxServiceContent::setCurrentMarked(bool state)
 
 int eListboxServiceContent::cursorMove(int count)
 {
-       list::iterator old = m_cursor;
-
+       int prev = m_cursor_number, last = m_cursor_number + count;
        if (count > 0)
        {
-               while(count && (m_cursor != m_list.end()))
+               while(count && m_cursor != m_list.end())
                {
-                       ++m_cursor;
+                       list::iterator prev_it = m_cursor++;
+                       if ( m_current_marked && m_cursor != m_list.end() && m_saved_cursor == m_list.end() )
+                       {
+                               std::iter_swap(prev_it, m_cursor);
+                               if ( m_listbox && prev != m_cursor_number && last != m_cursor_number )
+                                       m_listbox->entryChanged(m_cursor_number);
+                       }
                        ++m_cursor_number;
                        --count;
-               }
+       }
        } else if (count < 0)
        {
-               while (count && (m_cursor != m_list.begin()))
+               while (count && m_cursor != m_list.begin())
                {
-                       --m_cursor;
+                       list::iterator prev_it = m_cursor--;
+                       if ( m_current_marked && m_cursor != m_list.end() && prev_it != m_list.end() && m_saved_cursor == m_list.end() )
+                       {
+                               std::iter_swap(prev_it, m_cursor);
+                               if ( m_listbox && prev != m_cursor_number && last != m_cursor_number )
+                                       m_listbox->entryChanged(m_cursor_number);
+                       }
                        --m_cursor_number;
                        ++count;
                }
        }
-
-       if ( m_current_marked && m_saved_cursor == m_list.end() )
-       {
-               if ( m_cursor == m_list.end() )
-                       m_swap = old;
-               else if ( old == m_list.end() )
-               {
-                       std::iter_swap( m_swap, m_cursor );
-                       m_swap = m_list.end();
-               }
-               else
-                       std::iter_swap( old, m_cursor );
-       }
-
        return 0;
 }
 
@@ -249,7 +319,6 @@ int eListboxServiceContent::cursorSet(int n)
 {
        cursorHome();
        cursorMove(n);
-       
        return 0;
 }
 
@@ -299,43 +368,83 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
                        /* get service information */
                ePtr<iStaticServiceInformation> service_info;
                m_service_center->info(*m_cursor, service_info);
-               
+
+               if (m_is_playable_ignore.valid() && !service_info->isPlayable(*m_cursor, m_is_playable_ignore))
+                       painter.setForegroundColor(gRGB(0xbbbbbb));
+
                for (int e = 0; e < celElements; ++e)
                {
                        if (!m_element_font[e])
                                continue;
-                       painter.setFont(m_element_font[e]);
-                       
+                       int flags=gPainter::RT_VALIGN_CENTER;
+
+                       eRect area = m_element_position[e];
+
                        std::string text = "<n/a>";
-                       
+
                        switch (e)
                        {
-                       case celServiceName:
-                       {
-                               if (service_info)
-                                       service_info->getName(*m_cursor, text);
-                               break;
-                       }
+                       case celIcon:
+                               // render icon here...
+                               continue;
                        case celServiceNumber:
                        {
                                char bla[10];
                                sprintf(bla, "%d", m_numberoffset + m_cursor_number + 1);
                                text = bla;
+                               flags|=gPainter::RT_HALIGN_RIGHT;
+                               break;
+                       }
+                       case celServiceName:
+                       {
+                               if (service_info)
+                                       service_info->getName(*m_cursor, text);
                                break;
                        }
                        case celServiceInfo:
                        {
-                               text = "now&next";
+                               ePtr<eServiceEvent> evt;
+                               if ( !service_info->getEvent(*m_cursor, evt) )
+                                       text = '(' + evt->getEventName() + ')';
+                               else
+                                       continue;
                                break;
                        }
-                       case celIcon:
-                               continue;
                        }
-                       
-                       eRect area = m_element_position[e];
-                       area.moveBy(offset.x(), offset.y());
-                       
-                       painter.renderText(area, text);
+
+                       eTextPara *para = new eTextPara(area);
+
+                       para->setFont(m_element_font[e]);
+                       para->renderString(text);
+
+                       if (e == celServiceName)
+                       {
+                               eRect bbox = para->getBoundBox();
+                               int name_width = bbox.width()+10;
+                               m_element_position[celServiceInfo].setLeft(area.left()+name_width);
+                               m_element_position[celServiceInfo].setTop(area.top());
+                               m_element_position[celServiceInfo].setWidth(area.width()-name_width);
+                               m_element_position[celServiceInfo].setHeight(area.height());
+                       }
+
+                       if (flags & gPainter::RT_HALIGN_RIGHT)
+                               para->realign(eTextPara::dirRight);
+                       else if (flags & gPainter::RT_HALIGN_CENTER)
+                               para->realign(eTextPara::dirCenter);
+                       else if (flags & gPainter::RT_HALIGN_BLOCK)
+                               para->realign(eTextPara::dirBlock);
+
+                       ePoint offs = offset;
+
+                       if (flags & gPainter::RT_VALIGN_CENTER)
+                       {
+                               eRect bbox = para->getBoundBox();
+                               int vcentered_top = (area.height() - bbox.height()) / 2;
+                               int correction = vcentered_top - bbox.top();
+                               offs += ePoint(0, correction);
+                       }
+
+                       painter.renderPara(para, offs);
                }
                
                if (selected)
@@ -345,3 +454,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
        painter.clippop();
 }
 
+void eListboxServiceContent::setIgnoreService( const eServiceReference &service )
+{
+       m_is_playable_ignore=service;
+}