X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d9ee52e4f0fbe9a1ae00d0e66f9e6f0a07fa319f..d9bb0d90e2a5fc8c275c79e981d36c03b1687785:/lib/gui/elistboxcontent.cpp diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index 0a10b27a..c3092160 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -1,6 +1,7 @@ #include #include -#include +#include +#include /* The basic idea is to have an interface which gives all relevant list @@ -29,24 +30,45 @@ iListboxContent::~iListboxContent() { } +iListboxContent::iListboxContent(): m_listbox(0) +{ +} + void iListboxContent::setListbox(eListbox *lb) { m_listbox = lb; + m_listbox->setItemHeight(getItemHeight()); +} + +int iListboxContent::currentCursorSelectable() +{ + return 1; +} + +////////////////////////////////////// + +DEFINE_REF(eListboxPythonStringContent); + +eListboxPythonStringContent::eListboxPythonStringContent(): m_itemheight(25) +{ } -DEFINE_REF(eListboxTestContent); +eListboxPythonStringContent::~eListboxPythonStringContent() +{ + Py_XDECREF(m_list); +} -void eListboxTestContent::cursorHome() +void eListboxPythonStringContent::cursorHome() { m_cursor = 0; } -void eListboxTestContent::cursorEnd() +void eListboxPythonStringContent::cursorEnd() { m_cursor = size(); } -int eListboxTestContent::cursorMove(int count) +int eListboxPythonStringContent::cursorMove(int count) { m_cursor += count; @@ -57,12 +79,12 @@ int eListboxTestContent::cursorMove(int count) return 0; } -int eListboxTestContent::cursorValid() +int eListboxPythonStringContent::cursorValid() { return m_cursor < size(); } -int eListboxTestContent::cursorSet(int n) +int eListboxPythonStringContent::cursorSet(int n) { m_cursor = n; @@ -73,162 +95,278 @@ int eListboxTestContent::cursorSet(int n) return 0; } -int eListboxTestContent::cursorGet() +int eListboxPythonStringContent::cursorGet() { return m_cursor; } -void eListboxTestContent::cursorSave() +int eListboxPythonStringContent::currentCursorSelectable() +{ + if (m_list && cursorValid()) + { + ePyObject 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 eListboxTestContent::cursorRestore() +void eListboxPythonStringContent::cursorRestore() { m_cursor = m_saved_cursor; } -int eListboxTestContent::size() +int eListboxPythonStringContent::size() { - return 10; + if (!m_list) + return 0; + return PyList_Size(m_list); } -RESULT eListboxTestContent::connectItemChanged(const Slot0 &itemChanged, ePtr &connection) -{ - return 0; -} - -void eListboxTestContent::setSize(const eSize &size) +void eListboxPythonStringContent::setSize(const eSize &size) { - m_size = size; + m_itemsize = size; } -void eListboxTestContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) +void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) { - ePtr fnt = new gFont("Arial", 14); - painter.clip(eRect(offset, m_size)); + ePtr fnt = new gFont("Regular", 20); + painter.clip(eRect(offset, m_itemsize)); style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); painter.clear(); - if (cursorValid()) + if (m_list && cursorValid()) { + int gray = 0; + ePyObject item = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! painter.setFont(fnt); - char string[10]; - sprintf(string, "%d.)", m_cursor); - - ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1)); + + /* 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); + } - painter.renderText(eRect(text_offset, m_size), 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) : ""; + 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_size), eWindowStyle::frameListboxEntry); + style.drawFrame(painter, eRect(offset, m_itemsize), 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) +void eListboxPythonStringContent::setList(ePyObject list) { - if (count > 0) + Py_XDECREF(m_list); + if (!PyList_Check(list)) { - while (count && (m_cursor != m_list.end())) - { - ++m_cursor; - ++m_cursor_number; - --count; - } - } else if (count < 0) + m_list = ePyObject(); + } else { - while (count && (m_cursor != m_list.begin())) - { - --m_cursor; - --m_cursor_number; - ++count; - } + m_list = list; + Py_INCREF(m_list); } - - return 0; -} -int eListboxStringContent::cursorValid() -{ - return m_cursor != m_list.end(); + if (m_listbox) + m_listbox->entryReset(false); } -int eListboxStringContent::cursorSet(int n) +PyObject *eListboxPythonStringContent::getCurrentSelection() { - cursorHome(); - cursorMove(n); - - return 0; -} + if (!(m_list && cursorValid())) + Py_RETURN_NONE; -int eListboxStringContent::cursorGet() -{ - return m_cursor_number; + ePyObject r = PyList_GET_ITEM(m_list, m_cursor); + Py_XINCREF(r); + return r; } -void eListboxStringContent::cursorSave() +void eListboxPythonStringContent::invalidateEntry(int index) { - m_saved_cursor = m_cursor; - m_saved_cursor_number = m_cursor_number; + if (m_listbox) + m_listbox->entryChanged(index); } -void eListboxStringContent::cursorRestore() +void eListboxPythonStringContent::invalidate() { - m_cursor = m_saved_cursor; - m_cursor_number = m_saved_cursor_number; + if (m_listbox) + { + int s = size(); + if ( m_cursor >= s ) + m_listbox->moveSelectionTo(s?s-1:0); + m_listbox->invalidate(); + } } -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) +void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) { - ePtr fnt = new gFont("Arial", 14); - painter.clip(eRect(offset, m_itemsize)); + ePtr fnt = new gFont("Regular", 20); + ePtr fnt2 = new gFont("Regular", 16); + eRect itemrect(offset, m_itemsize); + painter.clip(itemrect); style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); painter.clear(); - - eDebug("item %d", m_cursor_number); - if (cursorValid()) + + if (m_list && cursorValid()) { - eDebug("is valid.."); + /* get current list item */ + ePyObject item = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! + ePyObject text, value; painter.setFont(fnt); - - ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1)); - - painter.renderText(eRect(text_offset, m_itemsize), *m_cursor); - + + /* the first tuple element is a string for the left side. + the second one will be called, and the result shall be an tuple. + + of this tuple, + the first one is the type (string). + the second one is the value. */ + if (PyTuple_Check(item)) + { + /* handle left part. get item from tuple, convert to string, display. */ + + text = PyTuple_GET_ITEM(item, 0); + text = PyObject_Str(text); /* creates a new object - old object was borrowed! */ + const char *string = (text && PyString_Check(text)) ? PyString_AsString(text) : ""; + 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); + + /* 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); + if (value) + { + ePyObject args = PyTuple_New(1); + PyTuple_SET_ITEM(args, 0, PyInt_FromLong(selected)); + + /* CallObject will call __call__ which should return the value tuple */ + value = PyObject_CallObject(value, args); + + if (PyErr_Occurred()) + PyErr_Print(); + + Py_DECREF(args); + /* the PyInt was stolen. */ + } + + /* check if this is really a tuple */ + if (value && PyTuple_Check(value)) + { + /* convert type to string */ + ePyObject type = PyTuple_GET_ITEM(value, 0); + const char *atype = (type && PyString_Check(type)) ? PyString_AsString(type) : 0; + + if (atype) + { + if (!strcmp(atype, "text")) + { + ePyObject pvalue = PyTuple_GET_ITEM(value, 1); + const char *value = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : ""; + painter.setFont(fnt2); + 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")) + { + ePyObject pvalue = PyTuple_GET_ITEM(value, 1); + ePyObject 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; + int size = (pvalue && PyInt_Check(psize)) ? PyInt_AsLong(psize) : 100; + + /* calc. slider length */ + int width = item_right.width() * value / size; + int height = item_right.height(); + + + /* draw slider */ + //painter.fill(eRect(offset.x() + m_seperation, offset.y(), width, height)); + //hack - make it customizable + painter.fill(eRect(offset.x() + m_seperation, offset.y() + 5, width, height-10)); + + /* pvalue is borrowed */ + } else if (!strcmp(atype, "mtext")) + { + ePyObject pvalue = PyTuple_GET_ITEM(value, 1); + const char *text = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : ""; + int xoffs = value_alignment_left ? 0 : m_seperation; + ePtr para = new eTextPara(eRect(offset + eSize(xoffs, 0), item_right)); + para->setFont(fnt2); + para->renderString(text, 0); + para->realign(value_alignment_left ? eTextPara::dirLeft : eTextPara::dirRight); + int glyphs = para->size(); + + ePyObject plist; + + if (PyTuple_Size(value) >= 3) + plist = PyTuple_GET_ITEM(value, 2); + + int entries = 0; + + if (plist && PyList_Check(plist)) + entries = PyList_Size(plist); + + for (int i = 0; i < entries; ++i) + { + ePyObject entry = PyList_GET_ITEM(plist, i); + int num = PyInt_Check(entry) ? PyInt_AsLong(entry) : -1; + + if ((num < 0) || (num >= glyphs)) + eWarning("glyph index %d in PythonConfigList out of bounds!", num); + else + { + para->setGlyphFlag(num, GS_INVERT); + eRect bbox; + bbox = para->getGlyphBBox(num); + bbox = eRect(bbox.left(), offset.y(), bbox.width(), m_itemsize.height()); + painter.fill(bbox); + } + /* entry is borrowed */ + } + + painter.renderPara(para, ePoint(0, 0)); + /* pvalue is borrowed */ + /* plist is 0 or borrowed */ + } + } + /* type is borrowed */ + } else + eWarning("eListboxPythonConfigContent: second value of tuple is not a tuple."); + /* value is borrowed */ + } + if (selected) style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); } @@ -236,141 +374,470 @@ void eListboxStringContent::paint(gPainter &painter, eWindowStyle &style, const painter.clippop(); } -void eListboxStringContent::setList(std::list &list) +int eListboxPythonConfigContent::currentCursorSelectable() { - m_list = list; - m_size = list.size(); - cursorHome(); + return eListboxPythonStringContent::currentCursorSelectable(); } ////////////////////////////////////// -DEFINE_REF(eListboxPythonStringContent); + /* todo: make a real infrastructure here! */ +RESULT SwigFromPython(ePtr &res, PyObject *obj); -eListboxPythonStringContent::eListboxPythonStringContent() +eListboxPythonMultiContent::eListboxPythonMultiContent() + :m_temp_clip(gRegion::invalidRegion()) { - m_list = 0; } -eListboxPythonStringContent::~eListboxPythonStringContent() +eListboxPythonMultiContent::~eListboxPythonMultiContent() { + if (m_buildFunc) + Py_DECREF(m_buildFunc); } -void eListboxPythonStringContent::cursorHome() +void eListboxPythonMultiContent::setSelectionClip(eRect &rect, bool update) { - m_cursor = 0; + if (update && m_selection_clip.valid()) + { + m_temp_clip = m_selection_clip; + m_temp_clip |= rect; + m_selection_clip = rect; + if (m_listbox) + m_listbox->entryChanged(m_cursor); + } + else + m_selection_clip = rect; } -void eListboxPythonStringContent::cursorEnd() +void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) { - m_cursor = size(); -} + gRegion itemregion(eRect(offset, m_itemsize)); -int eListboxPythonStringContent::cursorMove(int count) -{ - m_cursor += count; - - if (m_cursor < 0) - cursorHome(); - else if (m_cursor > size()) - cursorEnd(); - return 0; -} + eRect sel_clip(m_selection_clip); + if (sel_clip.valid()) + sel_clip.moveBy(offset); -int eListboxPythonStringContent::cursorValid() -{ - return m_cursor < size(); -} + if (m_temp_clip.valid()) + { + m_temp_clip.moveBy(offset); + itemregion &= m_temp_clip; + m_temp_clip = eRect(); + } -int eListboxPythonStringContent::cursorSet(int n) -{ - m_cursor = n; - - if (m_cursor < 0) - cursorHome(); - else if (m_cursor > size()) - cursorEnd(); - return 0; -} + painter.clip(itemregion); -int eListboxPythonStringContent::cursorGet() -{ - return m_cursor; -} + ePyObject items; -void eListboxPythonStringContent::cursorSave() -{ - m_saved_cursor = m_cursor; -} + if (m_list && cursorValid()) + { + items = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! -void eListboxPythonStringContent::cursorRestore() -{ - m_cursor = m_saved_cursor; -} + 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"); + } -int eListboxPythonStringContent::size() -{ - if (!m_list) - return 0; - return PyList_Size(m_list); -} - -void eListboxPythonStringContent::setSize(const eSize &size) -{ - m_itemsize = size; -} + if (!items) + { + eDebug("eListboxPythonMultiContent: error getting item %d", m_cursor); + goto error_out; + } -void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) -{ - ePtr fnt = new gFont("Arial", 14); - painter.clip(eRect(offset, m_itemsize)); - style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); - painter.clear(); + if (!PyList_Check(items)) + { + eDebug("eListboxPythonMultiContent: list entry %d is not a list", m_cursor); + goto error_out; + } - if (m_list && cursorValid()) - { - PyObject *item = PyList_GetItem(m_list, m_cursor); // borrowed reference! - painter.setFont(fnt); + int size = PyList_Size(items); + for (int i = 1; i < size; ++i) + { + ePyObject item = PyList_GET_ITEM(items, i); // borrowed reference! + + if (!item) + { + eDebug("eListboxPythonMultiContent: ?"); + goto error_out; + } + + if (!PyTuple_Check(item)) + { + eDebug("eListboxPythonMultiContent did not receive a tuple."); + goto error_out; + } + + int size = PyTuple_Size(item); + + if (!size) + { + eDebug("eListboxPythonMultiContent receive empty tuple."); + goto error_out; + } + + int type = PyInt_AsLong(PyTuple_GET_ITEM(item, 0)); + + switch (type) + { + case TYPE_TEXT: // text + { + /* + (0, x, y, width, height, fnt, flags, "bla" [, color] ) + */ + ePyObject px = PyTuple_GET_ITEM(item, 1), + py = PyTuple_GET_ITEM(item, 2), + pwidth = PyTuple_GET_ITEM(item, 3), + pheight = PyTuple_GET_ITEM(item, 4), + pfnt = PyTuple_GET_ITEM(item, 5), + pflags = PyTuple_GET_ITEM(item, 6), + pstring = PyTuple_GET_ITEM(item, 7), + pforeColor, pbackColor, pbackColorSelected, pborderWidth, pborderColor; + + if (!(px && py && pwidth && pheight && pfnt && pflags && pstring)) + { + eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_TEXT, x, y, width, height, fnt, flags, string, [color, ]...])"); + goto error_out; + } + + if (size > 8) + { + pforeColor = PyTuple_GET_ITEM(item, 8); + if (pforeColor == Py_None) + pforeColor=ePyObject(); + } + if (size > 9) + { + pbackColor = PyTuple_GET_ITEM(item, 9); + if (pbackColor == Py_None) + pbackColor=ePyObject(); + } + if (size > 10) + { + pbackColorSelected = PyTuple_GET_ITEM(item, 10); + if (pbackColorSelected == Py_None) + pbackColorSelected=ePyObject(); + } + if (size > 11) + pborderWidth = PyTuple_GET_ITEM(item, 11); + if (size > 12) + pborderColor = PyTuple_GET_ITEM(item, 12); + + const char *string = (PyString_Check(pstring)) ? PyString_AsString(pstring) : ""; + int x = PyInt_AsLong(px) + offset.x(); + int y = PyInt_AsLong(py) + offset.y(); + int width = PyInt_AsLong(pwidth); + int height = PyInt_AsLong(pheight); + int flags = PyInt_AsLong(pflags); + int fnt = PyInt_AsLong(pfnt); + int bwidth = pborderWidth ? PyInt_AsLong(pborderWidth) : 0; + + if (m_font.find(fnt) == m_font.end()) + { + eDebug("eListboxPythonMultiContent: specified font %d was not found!", fnt); + goto error_out; + } + + eRect rect(x+bwidth, y+bwidth, width-bwidth*2, height-bwidth*2); + gRegion rc(rect); + rc &= itemregion; + painter.clip(rc); + itemregion -= rc; + if (selected && sel_clip.valid()) + { + painter.clip(rc-sel_clip); + if (pbackColor) + { + int color = PyInt_AsLong(pbackColor); + painter.setBackgroundColor(gRGB(color)); + } + else + style.setStyle(painter, eWindowStyle::styleListboxNormal); + painter.clear(); + painter.clippop(); + painter.clip(rc&sel_clip); + style.setStyle(painter, eWindowStyle::styleListboxSelected); + if (pbackColorSelected) + { + int color = PyInt_AsLong(pbackColorSelected); + painter.setBackgroundColor(gRGB(color)); + } + painter.clear(); + painter.clippop(); + } + else + { + if (selected) + { + style.setStyle(painter, eWindowStyle::styleListboxSelected); + if (pbackColorSelected) + { + int color = PyInt_AsLong(pbackColorSelected); + painter.setBackgroundColor(gRGB(color)); + } + } + else + { + style.setStyle(painter, eWindowStyle::styleListboxNormal); + if (pbackColor) + { + int color = PyInt_AsLong(pbackColor); + painter.setBackgroundColor(gRGB(color)); + } + } + painter.clear(); + } + + if (pforeColor) + { + int color = PyInt_AsLong(pforeColor); + painter.setForegroundColor(gRGB(color)); + } + + painter.setFont(m_font[fnt]); + painter.renderText(rect, string, flags); + painter.clippop(); + + // draw border + if (bwidth) + { + eRect rect(eRect(x, y, width, height)); + gRegion rc(rect); + rc &= itemregion; + painter.clip(rc); + itemregion -= rc; + if (pborderColor) + { + int color = PyInt_AsLong(pborderColor); + painter.setForegroundColor(gRGB(color)); + } + else if (pforeColor) // reset to normal color + style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); + + rect.setRect(x, y, width, bwidth); + painter.fill(rect); + + rect.setRect(x, y+bwidth, bwidth, height-bwidth); + painter.fill(rect); + + rect.setRect(x+bwidth, y+height-bwidth, width-bwidth, bwidth); + painter.fill(rect); + + rect.setRect(x+width-bwidth, y+bwidth, bwidth, height-bwidth); + painter.fill(rect); + + painter.clippop(); + } + break; + } + case TYPE_PROGRESS: // Progress + { + /* + (1, x, y, width, height, filled_percent ) + */ + ePyObject px = PyTuple_GET_ITEM(item, 1), + py = PyTuple_GET_ITEM(item, 2), + pwidth = PyTuple_GET_ITEM(item, 3), + pheight = PyTuple_GET_ITEM(item, 4), + pfilled_perc = PyTuple_GET_ITEM(item, 5); + + if (!(px && py && pwidth && pheight && pfilled_perc)) + { + eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PROGRESS, x, y, width, height, filled percent))"); + goto error_out; + } + + int x = PyInt_AsLong(px) + offset.x(); + int y = PyInt_AsLong(py) + offset.y(); + int width = PyInt_AsLong(pwidth); + int height = PyInt_AsLong(pheight); + int filled = PyInt_AsLong(pfilled_perc); + + eRect rect(x, y, width, height); + gRegion rc(rect); + rc &= itemregion; + painter.clip(rc); + itemregion -= rc; + if (selected && sel_clip.valid()) + { + painter.clip(rc-sel_clip); + style.setStyle(painter, eWindowStyle::styleListboxNormal); + painter.clear(); + painter.clippop(); + painter.clip(rc&sel_clip); + style.setStyle(painter, eWindowStyle::styleListboxSelected); + painter.clear(); + painter.clippop(); + } + else + { + style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); + painter.clear(); + } + + int bwidth=2; // borderwidth hardcoded yet + + // border + rect.setRect(x, y, width, bwidth); + painter.fill(rect); + + rect.setRect(x, y+bwidth, bwidth, height-bwidth); + painter.fill(rect); + + rect.setRect(x+bwidth, y+height-bwidth, width-bwidth, bwidth); + painter.fill(rect); + + rect.setRect(x+width-bwidth, y+bwidth, bwidth, height-bwidth); + painter.fill(rect); + + // progress + rect.setRect(x+bwidth, y+bwidth, (width-bwidth*2) * filled / 100, height-bwidth*2); + painter.fill(rect); + + painter.clippop(); + + break; + } + case TYPE_PIXMAP_ALPHATEST: + case TYPE_PIXMAP: // pixmap + { + /* + (2, x, y, width, height, pixmap ) + */ + + ePyObject px = PyTuple_GET_ITEM(item, 1), + py = PyTuple_GET_ITEM(item, 2), + pwidth = PyTuple_GET_ITEM(item, 3), + pheight = PyTuple_GET_ITEM(item, 4), + ppixmap = PyTuple_GET_ITEM(item, 5); + + if (!(px && py && pwidth && pheight && ppixmap)) + { + eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PIXMAP, x, y, width, height, pixmap))"); + goto error_out; + } + + int x = PyInt_AsLong(px) + offset.x(); + int y = PyInt_AsLong(py) + offset.y(); + int width = PyInt_AsLong(pwidth); + int height = PyInt_AsLong(pheight); + ePtr pixmap; + if (SwigFromPython(pixmap, ppixmap)) + { + eDebug("eListboxPythonMultiContent (Pixmap) get pixmap failed"); + goto error_out; + } + + eRect rect(x, y, width, height); + gRegion rc(rect); + rc &= itemregion; + painter.clip(rc); + itemregion -= rc; + + if (selected && sel_clip.valid()) + { + painter.clip(rc-sel_clip); + style.setStyle(painter, eWindowStyle::styleListboxNormal); + painter.clear(); + painter.clippop(); + painter.clip(rc&sel_clip); + style.setStyle(painter, eWindowStyle::styleListboxSelected); + painter.clear(); + painter.clippop(); + } + else + { + style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); + painter.clear(); + } + + painter.blit(pixmap, rect.topLeft(), rect, (type == TYPE_PIXMAP_ALPHATEST) ? gPainter::BT_ALPHATEST : 0); + painter.clippop(); + + break; + } + default: + eWarning("eListboxPythonMultiContent received unknown type (%d)", type); + goto error_out; + } + } + } - /* the user can supply tuples, in this case the first one will be displayed. */ - if (PyTuple_Check(item)) - item = PyTuple_GetItem(item, 0); - - const char *string = PyString_Check(item) ? PyString_AsString(item) : ""; - - ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1)); - - painter.renderText(eRect(text_offset, m_itemsize), string); - - if (selected) - style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); + if (selected && sel_clip.valid()) + { + painter.clip(itemregion-sel_clip); + style.setStyle(painter, eWindowStyle::styleListboxNormal); + painter.clear(); + painter.clippop(); + itemregion &= sel_clip; + painter.clip(itemregion); + style.setStyle(painter, eWindowStyle::styleListboxSelected); + painter.clear(); + painter.clippop(); } - + else + { + painter.clip(itemregion); + style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); + painter.clear(); + painter.clippop(); + } + + if (selected) + style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); + +error_out: + if (m_buildFunc && PyCallable_Check(m_buildFunc) && items) + Py_DECREF(items); + painter.clippop(); } -void eListboxPythonStringContent::setList(PyObject *list) +void eListboxPythonMultiContent::setBuildFunc(ePyObject cb) { - Py_XDECREF(m_list); - if (!PyList_Check(list)) - { - m_list = 0; - } else + 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()) { - m_list = list; - Py_INCREF(m_list); + ePyObject 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; } -PyObject *eListboxPythonStringContent::getCurrentSelection() +void eListboxPythonMultiContent::setFont(int fnt, gFont *font) { - if (!m_list) - return 0; - if (!cursorValid()) - return 0; - PyObject *r = PyList_GetItem(m_list, m_cursor); - Py_XINCREF(r); - return r; + if (font) + m_font[fnt] = font; + else + m_font.erase(fnt); } -////////////////////////////////////// +void eListboxPythonMultiContent::setItemHeight(int height) +{ + m_itemheight = height; + if (m_listbox) + m_listbox->setItemHeight(height); +}