X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d205df8517cabea52bb2a9c7c3a2d1f706e38553..ff3e20702fe0458bdefbb42f851ba29c64c6da69:/lib/service/listboxservice.cpp diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp index 9eafc853..0b7b7308 100644 --- a/lib/service/listboxservice.cpp +++ b/lib/service/listboxservice.cpp @@ -2,12 +2,30 @@ #include #include #include +#include +#include -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 lst; @@ -17,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) @@ -34,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) @@ -44,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 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(); @@ -101,10 +144,9 @@ 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(); m_element_position[celServiceInfo] = eRect(); m_element_font[celServiceInfo] = 0; } @@ -122,11 +164,17 @@ void eListboxServiceContent::setElementFont(int element, gFont *font) m_element_font[element] = font; } +void eListboxServiceContent::setPixmap(int type, ePtr &pic) +{ + if ((type >=0) && (type < picElements)) + m_pixmaps[type] = pic; +} + void eListboxServiceContent::sort() { ePtr 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(); @@ -138,7 +186,7 @@ void eListboxServiceContent::sort() DEFINE_REF(eListboxServiceContent); eListboxServiceContent::eListboxServiceContent() - :epgcache(eEPGCache::getInstance()), m_visual_mode(visModeSimple), m_size(0), m_current_marked(false), m_numberoffset(0) + :m_visual_mode(visModeSimple), m_size(0), m_current_marked(false), m_numberoffset(0) { cursorHome(); eServiceCenter::getInstance(m_service_center); @@ -148,6 +196,11 @@ void eListboxServiceContent::cursorHome() { 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); @@ -271,7 +324,6 @@ int eListboxServiceContent::cursorSet(int n) { cursorHome(); cursorMove(n); - return 0; } @@ -311,7 +363,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const if (m_current_marked && selected) style.setStyle(painter, eWindowStyle::styleListboxMarked); else if (cursorValid() && isMarked(*m_cursor)) - style.setStyle(painter, eWindowStyle::styleListboxMarked); + style.setStyle(painter, selected ? eWindowStyle::styleListboxMarkedAndSelected : eWindowStyle::styleListboxMarked); else style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); painter.clear(); @@ -321,81 +373,122 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const /* get service information */ ePtr service_info; m_service_center->info(*m_cursor, service_info); - - for (int e = 0; e < celElements; ++e) - { - if (!m_element_font[e]) - continue; - int flags=gPainter::RT_VALIGN_CENTER; - eRect area = m_element_position[e]; + if (m_is_playable_ignore.valid() && service_info && !service_info->isPlayable(*m_cursor, m_is_playable_ignore)) + painter.setForegroundColor(gRGB(0xbbbbbb)); - std::string text = ""; + int xoffset=0; // used as offset when painting the folder symbol - switch (e) - { - 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: + for (int e = 0; e < celElements; ++e) + { + if (m_element_font[e]) { - ePtr evt; - time_t t=-1; - if ( !epgcache->lookupEventTime(*m_cursor, t, evt) ) - text = '(' + evt->getEventName() + ')'; - else - continue; - break; - } - } + int flags=gPainter::RT_VALIGN_CENTER, + yoffs = 0, + xoffs = xoffset; + eRect &area = m_element_position[e]; + std::string text = ""; + xoffset=0; + + switch (e) + { + 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: + { + ePtr evt; + if ( !service_info->getEvent(*m_cursor, evt) ) + { + std::string name = evt->getEventName(); + if (!name.length()) + continue; + text = '(' + evt->getEventName() + ')'; + } + else + continue; + break; + } + } - eTextPara *para = new eTextPara(area); + eRect tmp = area; + tmp.setWidth(tmp.width()-xoffs); - para->setFont(m_element_font[e]); - para->renderString(text); + eTextPara *para = new eTextPara(tmp); + 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 (e == celServiceName) + { + eRect bbox = para->getBoundBox(); + int name_width = bbox.width()+8; + 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); + 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; + yoffs = vcentered_top - bbox.top(); + } - 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, offset+ePoint(xoffs, yoffs)); } + else if (e == celServiceTypePixmap || e == celFolderPixmap) + { + int orbpos = m_cursor->getUnsignedData(4) >> 16; + ePtr &pixmap = + (e == celFolderPixmap) ? m_pixmaps[picFolder] : + (orbpos == 0xFFFF) ? m_pixmaps[picDVB_C] : + (orbpos == 0xEEEE) ? m_pixmaps[picDVB_T] : m_pixmaps[picDVB_S]; + if (pixmap) + { + eSize pixmap_size = pixmap->size(); + eRect area = m_element_position[e == celFolderPixmap ? celServiceName : celServiceInfo]; + int correction = (area.height() - pixmap_size.height()) / 2; - painter.renderPara(para, offs); + if (m_cursor->flags & eServiceReference::flagDirectory) + { + if (e != celFolderPixmap) + continue; + xoffset = pixmap_size.width() + 8; + } + else + { + if (e != celServiceTypePixmap) + continue; + m_element_position[celServiceInfo] = area; + m_element_position[celServiceInfo].setLeft(area.left() + pixmap_size.width() + 8); + m_element_position[celServiceInfo].setWidth(area.width() - pixmap_size.width() - 8); + } + + area.moveBy(offset); + painter.clip(area); + painter.blit(pixmap, offset+ePoint(area.left(), correction), area, gPainter::BT_ALPHATEST); + painter.clippop(); + } + } } if (selected) @@ -405,3 +498,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const painter.clippop(); } +void eListboxServiceContent::setIgnoreService( const eServiceReference &service ) +{ + m_is_playable_ignore=service; +}