X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ba1d94b0fcdf6a9766160794a6d8605ee359529a..9511adb1e0b28923cd05f5bcb74575d49e57f650:/lib/service/listboxservice.cpp diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp index f413f2e2..abb5e77b 100644 --- a/lib/service/listboxservice.cpp +++ b/lib/service/listboxservice.cpp @@ -1,25 +1,79 @@ #include #include +#include +#include +#include +#include -void eListboxServiceContent::setRoot(const eServiceReference &root) +void eListboxServiceContent::addService(const eServiceReference &service, bool beforeCurrent) +{ + if (beforeCurrent && m_size) + { + m_list.insert(m_cursor, service); + ++m_size; + --m_cursor; + } + else + m_list.push_back(service); +} + +void eListboxServiceContent::removeCurrent() +{ + if (m_size && m_listbox) + { + if (m_cursor_number == m_size-1) + { + m_list.erase(m_cursor--); + --m_cursor_number; + } + else + m_list.erase(m_cursor++); + --m_size; + m_listbox->entryRemoved(m_cursor_number); + } +} + +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) + { + m_lst=0; + return; + } assert(m_service_center); - ePtr lst; - if (m_service_center->list(m_root, lst)) + if (m_service_center->list(m_root, m_lst)) eDebug("no list available!"); - else - if (lst->getContent(m_list)) - eDebug("getContent failed"); + else if (m_lst->getContent(m_list)) + eDebug("getContent failed"); - m_size = m_list.size(); - cursorHome(); - + FillFinished(); +} + +void eListboxServiceContent::setCurrent(const eServiceReference &ref) +{ + int index=0; + for (list::iterator i(m_list.begin()); i != m_list.end(); ++i, ++index) + if ( *i == ref ) + { + m_cursor = i; + m_cursor_number = index; + break; + } if (m_listbox) - m_listbox->entryReset(); + m_listbox->moveSelectionTo(index); } void eListboxServiceContent::getCurrent(eServiceReference &ref) @@ -30,6 +84,65 @@ 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; +} + +int eListboxServiceContent::getPrevMarkerPos() +{ + if (!m_listbox) + return 0; + list::iterator i(m_cursor); + int index = m_cursor_number; + while (index) + { + --i; + --index; + if (i->flags & eServiceReference::isMarker) + break; + } + return index; +} + +int eListboxServiceContent::getNextMarkerPos() +{ + if (!m_listbox) + return 0; + list::iterator i(m_cursor); + int index = m_cursor_number; + while (index < (m_size-1)) + { + ++i; + ++index; + if (i->flags & eServiceReference::isMarker) + break; + } + return index; +} + void eListboxServiceContent::initMarked() { m_marked.clear(); @@ -87,10 +200,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; } @@ -108,12 +220,19 @@ 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)) - { - m_list.sort(iListableServiceCompare(lst)); + if (!m_lst) + m_service_center->list(m_root, m_lst); + if (m_lst) + { + m_list.sort(iListableServiceCompare(m_lst)); /* FIXME: is this really required or can we somehow keep the current entry? */ cursorHome(); if (m_listbox) @@ -124,7 +243,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_visual_mode(visModeSimple), m_size(0), m_current_marked(false), m_numberoffset(0) { cursorHome(); eServiceCenter::getInstance(m_service_center); @@ -132,21 +251,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) @@ -155,46 +302,74 @@ int eListboxServiceContent::setCurrentMarked(bool state) m_current_marked = state; if (state != prev && m_listbox) + { m_listbox->entryChanged(m_cursor_number); + if (!state) + { + if (!m_lst) + m_service_center->list(m_root, m_lst); + if (m_lst) + { + ePtr list; + if (m_lst->startEdit(list)) + eDebug("no editable list"); + else + { + eServiceReference ref; + getCurrent(ref); + if(!ref) + eDebug("no valid service selected"); + else + { + int pos = cursorGet(); + eDebugNoNewLine("move %s to %d ", ref.toString().c_str(), pos); + if (list->moveService(ref, cursorGet())) + eDebug("failed"); + else + eDebug("ok"); + } + } + } + else + eDebug("no list available!"); + } + } return 0; } 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; } @@ -207,7 +382,6 @@ int eListboxServiceContent::cursorSet(int n) { cursorHome(); cursorMove(n); - return 0; } @@ -247,7 +421,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(); @@ -257,43 +431,146 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const /* get service information */ ePtr service_info; m_service_center->info(*m_cursor, service_info); - + + if (m_is_playable_ignore.valid() && service_info && !service_info->isPlayable(*m_cursor, m_is_playable_ignore)) + painter.setForegroundColor(gRGB(0xbbbbbb)); + + int xoffset=0; // used as offset when painting the folder/marker symbol + for (int e = 0; e < celElements; ++e) { - if (!m_element_font[e]) - continue; - painter.setFont(m_element_font[e]); - - std::string text = ""; - - switch (e) + if (m_element_font[e]) { - case celServiceName: - { - if (service_info) - service_info->getName(*m_cursor, text); - 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: + { + if (m_cursor->flags & eServiceReference::isMarker) + continue; + char bla[10]; + /* how we can do this better? :) */ + int markers_before=0; + { + list::iterator tmp=m_cursor; + while(tmp != m_list.begin()) + { + --tmp; + if (tmp->flags & eServiceReference::isMarker) + ++markers_before; + } + } + sprintf(bla, "%d", m_numberoffset + m_cursor_number + 1 - markers_before); + 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; + } + } + + eRect tmp = area; + tmp.setWidth(tmp.width()-xoffs); + + eTextPara *para = new eTextPara(tmp); + para->setFont(m_element_font[e]); + para->renderString(text.c_str()); + + 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_VALIGN_CENTER) + { + eRect bbox = para->getBoundBox(); + int vcentered_top = (area.height() - bbox.height()) / 2; + yoffs = vcentered_top - bbox.top(); + } + + painter.renderPara(para, offset+ePoint(xoffs, yoffs)); } - case celServiceNumber: + else if (e == celServiceTypePixmap || e == celFolderPixmap || e == celMarkerPixmap) { - char bla[10]; - sprintf(bla, "%d", m_cursor_number + 1); - text = bla; - break; - } - case celServiceInfo: - { - text = "now&next"; - break; + int orbpos = m_cursor->getUnsignedData(4) >> 16; + ePtr &pixmap = + (e == celFolderPixmap) ? m_pixmaps[picFolder] : + (e == celMarkerPixmap) ? m_pixmaps[picMarker] : + (orbpos == 0xFFFF) ? m_pixmaps[picDVB_C] : + (orbpos == 0xEEEE) ? m_pixmaps[picDVB_T] : m_pixmaps[picDVB_S]; + if (pixmap) + { + eSize pixmap_size = pixmap->size(); + int p = celServiceInfo; + if (e == celFolderPixmap) + p = celServiceName; + else if (e == celMarkerPixmap) + p = celServiceNumber; + eRect area = m_element_position[p]; + int correction = (area.height() - pixmap_size.height()) / 2; + + if (m_cursor->flags & eServiceReference::flagDirectory) + { + if (e != celFolderPixmap) + continue; + xoffset = pixmap_size.width() + 8; + } + else if (m_cursor->flags & eServiceReference::isMarker) + { + if (e != celMarkerPixmap) + continue; + } + 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(); + } } - case celIcon: - continue; - } - - eRect area = m_element_position[e]; - area.moveBy(offset.x(), offset.y()); - - painter.renderText(area, text); } if (selected) @@ -303,3 +580,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const painter.clippop(); } +void eListboxServiceContent::setIgnoreService( const eServiceReference &service ) +{ + m_is_playable_ignore=service; +}