X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8ade23537a682d4b0c9709d533b25702bde2ee23..ad83142d636daacda163509898f0afeacf95fdd8:/lib/gui/elistbox.cpp diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp index c2af3d32..e2f1c26f 100644 --- a/lib/gui/elistbox.cpp +++ b/lib/gui/elistbox.cpp @@ -1,163 +1,41 @@ #include +#include +#include -/* - The basic idea is to have an interface which gives all relevant list - processing functions, and can be used by the listbox to browse trough - the list. - - The listbox directly uses the implemented cursor. It tries hard to avoid - iterating trough the (possibly very large) list, so it should be O(1), - i.e. the performance should not be influenced by the size of the list. - - The list interface knows how to draw the current entry to a specified - offset. Different interfaces can be used to adapt different lists, - pre-filter lists on the fly etc. - - cursorSave/Restore is used to avoid re-iterating the list on redraw. - The current selection is always selected as cursor position, the - cursor is then positioned to the start, and then iterated. This gives - at most 2x m_items_per_page cursor movements per redraw, indepenent - of the size of the list. - - Although cursorSet is provided, it should be only used when there is no - other way, as it involves iterating trough the list. - */ - -class eListboxTestContent: public virtual iListboxContent -{ - DECLARE_REF; -public: - void cursorHome(); - void cursorEnd(); - int cursorMove(int count=1); - int cursorValid(); - int cursorSet(int n); - int cursorGet(); - - void cursorSave(); - void cursorRestore(); - int size(); - - RESULT connectItemChanged(const Slot0 &itemChanged, ePtr &connection); - - // void setOutputDevice ? (for allocating colors, ...) .. requires some work, though - void setSize(const eSize &size); - - /* the following functions always refer to the selected item */ - void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected); -private: - int m_cursor, m_saved_cursor; - eSize m_size; -}; - -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() +eListbox::eListbox(eWidget *parent): eWidget(parent) { - m_cursor = m_saved_cursor; -} + setContent(new eListboxStringContent()); -int eListboxTestContent::size() -{ - return 10; -} + ePtr ptr; + eActionMap::getInstance(ptr); -RESULT eListboxTestContent::connectItemChanged(const Slot0 &itemChanged, ePtr &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 fnt = new gFont("Arial", 14); - 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); - } + m_itemheight = 25; + m_selection_enabled = 1; - painter.clippop(); + ptr->bindAction("ListboxActions", 0, 0, this); } -eListbox::eListbox(eWidget *parent): eWidget(parent) +eListbox::~eListbox() { - setContent(new eListboxTestContent()); - m_content->cursorHome(); - m_top = 0; - m_selected = 0; + ePtr ptr; + eActionMap::getInstance(ptr); + ptr->unbindAction(this, 0); } void eListbox::setContent(iListboxContent *content) { m_content = content; + if (content) + m_content->setListbox(this); + entryReset(); } void eListbox::moveSelection(int dir) { + /* refuse to do anything without a valid list. */ + if (!m_content) + return; + /* we need the old top/sel to see what we have to redraw */ int oldtop = m_top; int oldsel = m_selected; @@ -174,17 +52,41 @@ void eListbox::moveSelection(int dir) if (!m_content->cursorValid()) m_content->cursorMove(-1); break; + case pageUp: + if (m_content->cursorGet() >= m_items_per_page) + { + m_content->cursorMove(-m_items_per_page); + m_top -= m_items_per_page; + if (m_top < 0) + m_top = 0; + } else + { + m_top = 0; + m_content->cursorHome(); + } + break; case moveTop: m_content->cursorHome(); m_top = 0; /* align with top, speeds up process */ break; + + case pageDown: + m_content->cursorMove(m_items_per_page); + if (m_content->cursorValid()) + break; + /* fall through */ case moveEnd: /* move to last existing one ("end" is already invalid) */ m_content->cursorEnd(); m_content->cursorMove(-1); - - m_top = m_content->cursorGet() - m_items_per_page + 1; - if (m_top < 0) - m_top = 0; + /* current selection invisible? */ + if (m_top + m_items_per_page <= m_content->cursorGet()) + { + m_top = m_content->cursorGet() - m_items_per_page + 1; + if (m_top < 0) + m_top = 0; + } + break; + case justCheck: break; } @@ -194,21 +96,22 @@ void eListbox::moveSelection(int dir) /* now, look wether the current selection is out of screen */ m_selected = m_content->cursorGet(); - if (m_selected < m_top) + + while (m_selected < m_top) { m_top -= m_items_per_page; if (m_top < 0) m_top = 0; - } else if (m_selected >= m_top + m_items_per_page) - { - /* m_top should be always valid here as it's selected */ - m_top += m_items_per_page; } - + while (m_selected >= m_top + m_items_per_page) + /* m_top should be always valid here as it's selected */ + m_top += m_items_per_page; + if (m_top != oldtop) invalidate(); - else + else if (m_selected != oldsel) { + /* redraw the old and newly selected */ gRegion inv = eRect(0, m_itemheight * (m_selected-m_top), size().width(), m_itemheight); inv |= eRect(0, m_itemheight * (oldsel-m_top), size().width(), m_itemheight); @@ -217,6 +120,14 @@ void eListbox::moveSelection(int dir) } } +void eListbox::moveSelectionTo(int index) +{ + printf("Moving to listbox-entry with index %d\n", index); + m_content->cursorHome(); + m_content->cursorMove(index); + moveSelection(justCheck); +} + int eListbox::event(int event, void *data, void *data2) { switch (event) @@ -225,8 +136,9 @@ int eListbox::event(int event, void *data, void *data2) { ePtr style; + if (!m_content) + return eWidget::event(event, data, data2); assert(m_content); - recalcSize(); // move to event getStyle(style); @@ -238,9 +150,9 @@ int eListbox::event(int event, void *data, void *data2) m_content->cursorSave(); m_content->cursorMove(m_top - m_selected); - for (int y = 0, i = 0; i < m_items_per_page; y += m_itemheight, ++i) + for (int y = 0, i = 0; i <= m_items_per_page; y += m_itemheight, ++i) { - m_content->paint(painter, *style, ePoint(0, y), m_selected == m_content->cursorGet()); + m_content->paint(painter, *style, ePoint(0, y), m_selected == m_content->cursorGet() && m_content->size() && m_selection_enabled); m_content->cursorMove(+1); } @@ -248,6 +160,17 @@ int eListbox::event(int event, void *data, void *data2) return 0; } + case evtChangedSize: + recalcSize(); + return eWidget::event(event, data, data2); + + case evtAction: + if (isVisible()) + { + moveSelection((int)data2); + return 1; + } + return 0; default: return eWidget::event(event, data, data2); } @@ -255,7 +178,77 @@ int eListbox::event(int event, void *data, void *data2) void eListbox::recalcSize() { - m_itemheight = 20; m_content->setSize(eSize(size().width(), m_itemheight)); m_items_per_page = size().height() / m_itemheight; } + +void eListbox::setItemHeight(int h) +{ + if (h) + m_itemheight = h; + else + m_itemheight = 20; + recalcSize(); +} + +void eListbox::setSelectionEnable(int en) +{ + if (m_selection_enabled == en) + return; + m_selection_enabled = en; + entryChanged(m_selected); /* redraw current entry */ +} + +void eListbox::entryAdded(int index) +{ + /* manage our local pointers. when the entry was added before the current position, we have to advance. */ + + /* we need to check <= - when the new entry has the (old) index of the cursor, the cursor was just moved down. */ + if (index <= m_selected) + ++m_selected; + if (index <= m_top) + ++m_top; + + /* we have to check wether our current cursor is gone out of the screen. */ + /* moveSelection will check for this case */ + moveSelection(justCheck); + + /* now, check if the new index is visible. */ + if ((m_top <= index) && (index < (m_top + m_items_per_page))) + { + /* todo, calc exact invalidation... */ + invalidate(); + } +} + +void eListbox::entryRemoved(int index) +{ + if (index == m_selected) + m_selected = m_content->cursorGet(); + + moveSelection(justCheck); + + if ((m_top <= index) && (index < (m_top + m_items_per_page))) + { + /* todo, calc exact invalidation... */ + invalidate(); + } +} + +void eListbox::entryChanged(int index) +{ + if ((m_top <= index) && (index < (m_top + m_items_per_page))) + { + gRegion inv = eRect(0, m_itemheight * (index-m_top), size().width(), m_itemheight); + invalidate(inv); + } +} + +void eListbox::entryReset() +{ + if (m_content) + m_content->cursorHome(); + m_top = 0; + m_selected = 0; + invalidate(); +}