X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9b6b96172d1d20d9daf3c11bc5f0222f487d53d7..d67129171c8d25ff62382e9c84b90c9102a30dcd:/lib/gui/elistboxcontent.cpp diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index f5ae2b38..beb12044 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include /* The basic idea is to have an interface which gives all relevant list @@ -37,225 +37,20 @@ iListboxContent::iListboxContent(): m_listbox(0) void iListboxContent::setListbox(eListbox *lb) { m_listbox = lb; + m_listbox->setItemHeight(getItemHeight()); } -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() -{ - m_cursor = m_saved_cursor; -} - -int eListboxTestContent::size() -{ - return 10; -} - -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("Regular", 20); - 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); - } - - 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) -{ - if (count > 0) - { - while (count && (m_cursor != m_list.end())) - { - ++m_cursor; - ++m_cursor_number; - --count; - } - } else if (count < 0) - { - while (count && (m_cursor != m_list.begin())) - { - --m_cursor; - --m_cursor_number; - ++count; - } - } - - return 0; -} - -int eListboxStringContent::cursorValid() -{ - return m_cursor != m_list.end(); -} - -int eListboxStringContent::cursorSet(int n) -{ - cursorHome(); - cursorMove(n); - - return 0; -} - -int eListboxStringContent::cursorGet() +int iListboxContent::currentCursorSelectable() { - return m_cursor_number; -} - -void eListboxStringContent::cursorSave() -{ - m_saved_cursor = m_cursor; - m_saved_cursor_number = m_cursor_number; -} - -void eListboxStringContent::cursorRestore() -{ - m_cursor = m_saved_cursor; - m_cursor_number = m_saved_cursor_number; -} - -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) -{ - ePtr fnt = new gFont("Regular", 20); - painter.clip(eRect(offset, m_itemsize)); - style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); - painter.clear(); - - eDebug("item %d", m_cursor_number); - if (cursorValid()) - { - eDebug("is valid.."); - painter.setFont(fnt); - - ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1)); - - painter.renderText(eRect(text_offset, m_itemsize), *m_cursor); - - if (selected) - style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); - } - - painter.clippop(); -} - -void eListboxStringContent::setList(std::list &list) -{ - m_list = list; - m_size = list.size(); - cursorHome(); - m_listbox->entryReset(false); + return 1; } ////////////////////////////////////// DEFINE_REF(eListboxPythonStringContent); -eListboxPythonStringContent::eListboxPythonStringContent() +eListboxPythonStringContent::eListboxPythonStringContent(): m_itemheight(25) { - m_list = 0; } eListboxPythonStringContent::~eListboxPythonStringContent() @@ -305,6 +100,19 @@ int eListboxPythonStringContent::cursorGet() return m_cursor; } +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; @@ -332,36 +140,95 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style, ePtr fnt = new gFont("Regular", 20); painter.clip(eRect(offset, m_itemsize)); style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); - painter.clear(); + + eListboxStyle *local_style = 0; + + /* get local listbox style, if present */ + if (m_listbox) + local_style = m_listbox->getLocalStyle(); + + if (local_style) + { + if (selected) + { + /* if we have a local background color set, use that. */ + if (local_style->m_background_color_selected_set) + painter.setBackgroundColor(local_style->m_background_color_selected); + /* same for foreground */ + if (local_style->m_foreground_color_selected_set) + painter.setForegroundColor(local_style->m_foreground_color_selected); + } + else + { + /* if we have a local background color set, use that. */ + if (local_style->m_background_color_set) + painter.setBackgroundColor(local_style->m_background_color); + /* same for foreground */ + if (local_style->m_foreground_color_set) + painter.setForegroundColor(local_style->m_foreground_color); + } + } + + /* if we have no transparent background */ + if (!local_style || !local_style->m_transparent_background) + { + /* blit background picture, if available (otherwise, clear only) */ + if (local_style && local_style->m_background) + painter.blit(local_style->m_background, offset, eRect(), 0); + else + painter.clear(); + } else + { + if (local_style->m_background) + painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST); + else if (selected && !local_style->m_selection) + painter.clear(); + } if (m_list && cursorValid()) { - PyObject *item = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! + int gray = 0; + ePyObject item = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! painter.setFont(fnt); /* 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); - - 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) + } + + if (selected && local_style && local_style->m_selection) + painter.blit(local_style->m_selection, offset, eRect(), gPainter::BT_ALPHATEST); + + if (item == Py_None) + { + /* seperator */ + 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 && (!local_style || !local_style->m_selection)) style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); } - + painter.clippop(); } -void eListboxPythonStringContent::setList(PyObject *list) +void eListboxPythonStringContent::setList(ePyObject list) { Py_XDECREF(m_list); if (!PyList_Check(list)) { - m_list = 0; + m_list = ePyObject(); } else { m_list = list; @@ -375,11 +242,9 @@ void eListboxPythonStringContent::setList(PyObject *list) PyObject *eListboxPythonStringContent::getCurrentSelection() { if (!(m_list && cursorValid())) - { - Py_INCREF(Py_None); - return Py_None; - } - PyObject *r = PyList_GET_ITEM(m_list, m_cursor); + Py_RETURN_NONE; + + ePyObject r = PyList_GET_ITEM(m_list, m_cursor); Py_XINCREF(r); return r; } @@ -393,7 +258,13 @@ void eListboxPythonStringContent::invalidateEntry(int index) void eListboxPythonStringContent::invalidate() { if (m_listbox) - m_listbox->invalidate(); + { + int s = size(); + if ( m_cursor >= s ) + m_listbox->moveSelectionTo(s?s-1:0); + else + m_listbox->invalidate(); + } } ////////////////////////////////////// @@ -403,17 +274,63 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, ePtr fnt = new gFont("Regular", 20); ePtr fnt2 = new gFont("Regular", 16); eRect itemrect(offset, m_itemsize); + eListboxStyle *local_style = 0; + painter.clip(itemrect); style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); - painter.clear(); + + /* get local listbox style, if present */ + if (m_listbox) + local_style = m_listbox->getLocalStyle(); + + if (local_style) + { + if (selected) + { + /* if we have a local background color set, use that. */ + if (local_style->m_background_color_selected_set) + painter.setBackgroundColor(local_style->m_background_color_selected); + /* same for foreground */ + if (local_style->m_foreground_color_selected_set) + painter.setForegroundColor(local_style->m_foreground_color_selected); + } + else + { + /* if we have a local background color set, use that. */ + if (local_style->m_background_color_set) + painter.setBackgroundColor(local_style->m_background_color); + /* same for foreground */ + if (local_style->m_foreground_color_set) + painter.setForegroundColor(local_style->m_foreground_color); + } + } + + if (!local_style || !local_style->m_transparent_background) + /* if we have no transparent background */ + { + /* blit background picture, if available (otherwise, clear only) */ + if (local_style && local_style->m_background) + painter.blit(local_style->m_background, offset, eRect(), 0); + else + painter.clear(); + } else + { + if (local_style->m_background) + painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST); + else if (selected && !local_style->m_selection) + painter.clear(); + } if (m_list && cursorValid()) { /* get current list item */ - PyObject *item = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! - PyObject *text = 0, *value = 0; + ePyObject item = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! + ePyObject text, value; painter.setFont(fnt); + if (selected && local_style && local_style->m_selection) + painter.blit(local_style->m_selection, offset, eRect(), gPainter::BT_ALPHATEST); + /* the first tuple element is a string for the left side. the second one will be called, and the result shall be an tuple. @@ -440,7 +357,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, value = PyTuple_GET_ITEM(item, 1); if (value) { - PyObject *args = PyTuple_New(1); + ePyObject args = PyTuple_New(1); PyTuple_SET_ITEM(args, 0, PyInt_FromLong(selected)); /* CallObject will call __call__ which should return the value tuple */ @@ -457,14 +374,14 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, if (value && PyTuple_Check(value)) { /* convert type to string */ - PyObject *type = PyTuple_GET_ITEM(value, 0); + ePyObject type = PyTuple_GET_ITEM(value, 0); const char *atype = (type && PyString_Check(type)) ? PyString_AsString(type) : 0; if (atype) { if (!strcmp(atype, "text")) { - PyObject *pvalue = PyTuple_GET_ITEM(value, 1); + ePyObject pvalue = PyTuple_GET_ITEM(value, 1); const char *value = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : ""; painter.setFont(fnt2); if (value_alignment_left) @@ -475,8 +392,8 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, /* pvalue is borrowed */ } else if (!strcmp(atype, "slider")) { - PyObject *pvalue = PyTuple_GET_ITEM(value, 1); - PyObject *psize = PyTuple_GET_ITEM(value, 2); + 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; @@ -495,7 +412,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, /* pvalue is borrowed */ } else if (!strcmp(atype, "mtext")) { - PyObject *pvalue = PyTuple_GET_ITEM(value, 1); + 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)); @@ -504,7 +421,7 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, para->realign(value_alignment_left ? eTextPara::dirLeft : eTextPara::dirRight); int glyphs = para->size(); - PyObject *plist = 0; + ePyObject plist; if (PyTuple_Size(value) >= 3) plist = PyTuple_GET_ITEM(value, 2); @@ -514,24 +431,34 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, if (plist && PyList_Check(plist)) entries = PyList_Size(plist); + int left=0, right=0, last=-1; + eRect bbox; for (int i = 0; i < entries; ++i) { - PyObject *entry = PyList_GET_ITEM(plist, 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 { + if (last+1 != num && last != -1) { + bbox = eRect(left, offset.y(), right-left, m_itemsize.height()); + painter.fill(bbox); + } 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); + if (last+1 != num || last == -1) + left = bbox.left(); + right = bbox.left() + bbox.width(); + last = num; } /* entry is borrowed */ } - + if (last != -1) { + bbox = eRect(left, offset.y(), right-left, m_itemsize.height()); + painter.fill(bbox); + } painter.renderPara(para, ePoint(0, 0)); /* pvalue is borrowed */ /* plist is 0 or borrowed */ @@ -543,68 +470,228 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, /* value is borrowed */ } - if (selected) + if (selected && (!local_style || !local_style->m_selection)) style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); } painter.clippop(); } +int eListboxPythonConfigContent::currentCursorSelectable() +{ + return eListboxPythonStringContent::currentCursorSelectable(); +} + ////////////////////////////////////// /* todo: make a real infrastructure here! */ RESULT SwigFromPython(ePtr &res, PyObject *obj); +eListboxPythonMultiContent::eListboxPythonMultiContent() + :m_clip(gRegion::invalidRegion()), m_old_clip(gRegion::invalidRegion()) +{ +} + +eListboxPythonMultiContent::~eListboxPythonMultiContent() +{ + Py_XDECREF(m_buildFunc); + Py_XDECREF(m_selectableFunc); +} + +void eListboxPythonMultiContent::setSelectionClip(eRect &rect, bool update) +{ + m_selection_clip = rect; + if (m_listbox) + rect.moveBy(ePoint(0, m_listbox->getEntryTop())); + if (m_clip.valid()) + m_clip |= rect; + else + m_clip = rect; + if (update && m_listbox) + m_listbox->entryChanged(m_cursor); +} + +static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *local_style, ePyObject pforeColor, ePyObject pforeColorSelected, ePyObject pbackColor, ePyObject pbackColorSelected, int selected, gRegion &rc, eRect &sel_clip) +{ + if (selected && sel_clip.valid()) + { + gRegion part = rc - sel_clip; + if (!part.empty()) + { + painter.clip(part); + style.setStyle(painter, eWindowStyle::styleListboxNormal); + if (pbackColor) + { + int color = PyInt_AsLong(pbackColor); + painter.setBackgroundColor(gRGB(color)); + } // transparent background? + // if we have a local background color set, use that. + else if (local_style && local_style->m_background_color_set) + painter.setBackgroundColor(local_style->m_background_color); + if (!pbackColor && local_style && local_style->m_transparent_background) + ; + else + painter.clear(); + painter.clippop(); + selected = 0; + } + part = rc & sel_clip; + if (!part.empty()) + { + painter.clip(part); + style.setStyle(painter, eWindowStyle::styleListboxSelected); + if (pbackColorSelected) + { + int color = PyInt_AsLong(pbackColorSelected); + painter.setBackgroundColor(gRGB(color)); + } + else if (local_style && local_style->m_background_color_selected_set) + painter.setBackgroundColor(local_style->m_background_color_selected); + painter.clear(); + painter.clippop(); + selected = 1; + } + } + else + { + if (selected) + { + style.setStyle(painter, eWindowStyle::styleListboxSelected); + if (pbackColorSelected) + { + int color = PyInt_AsLong(pbackColorSelected); + painter.setBackgroundColor(gRGB(color)); + } + else if (local_style && local_style->m_background_color_selected_set) + painter.setBackgroundColor(local_style->m_background_color_selected); + painter.clear(); + } + else + { + style.setStyle(painter, eWindowStyle::styleListboxNormal); + if (pbackColor) + { + int color = PyInt_AsLong(pbackColor); + painter.setBackgroundColor(gRGB(color)); + }/* if we have a local background color set, use that. */ + else if (local_style && local_style->m_background_color_set) + painter.setBackgroundColor(local_style->m_background_color); + /* if we have no transparent background */ + if (!pbackColor && local_style && local_style->m_transparent_background) + ; + else + painter.clear(); + } + } + if (selected) + { + if (pforeColorSelected) + { + int color = PyInt_AsLong(pforeColorSelected); + painter.setForegroundColor(gRGB(color)); + } + /* if we have a local foreground color set, use that. */ + else if (local_style && local_style->m_foreground_color_selected_set) + painter.setForegroundColor(local_style->m_foreground_color_selected); + } + else + { + if (pforeColor) + { + int color = PyInt_AsLong(pforeColor); + painter.setForegroundColor(gRGB(color)); + } + /* if we have a local foreground color set, use that. */ + else if (local_style && local_style->m_foreground_color_set) + painter.setForegroundColor(local_style->m_foreground_color); + } +} + void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) { - eRect itemrect(offset, m_itemsize); - painter.clip(itemrect); - style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); - painter.clear(); + gRegion itemregion(eRect(offset, m_itemsize)); + eListboxStyle *local_style = 0; + eRect sel_clip(m_selection_clip); + if (sel_clip.valid()) + sel_clip.moveBy(offset); + + /* get local listbox style, if present */ + if (m_listbox) + local_style = m_listbox->getLocalStyle(); + + painter.clip(itemregion); + clearRegion(painter, style, local_style, ePyObject(), ePyObject(), ePyObject(), ePyObject(), selected, itemregion, sel_clip); + + ePyObject items; if (m_list && cursorValid()) { - PyObject *items = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! - + /* a multicontent list can be used in two ways: + either each item is a list of (TYPE,...)-tuples, + or there is a template defined, which is a list of (TYPE,...)-tuples, + and the list is an unformatted tuple. The template then references items from the list. + */ + items = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! + + 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"); + } + if (!items) { eDebug("eListboxPythonMultiContent: error getting item %d", m_cursor); goto error_out; } - - if (!PyList_Check(items)) + + if (!m_template) { - eDebug("eListboxPythonMultiContent: list entry %d is not a list", m_cursor); - goto error_out; + if (!PyList_Check(items)) + { + eDebug("eListboxPythonMultiContent: list entry %d is not a list (non-templated)", m_cursor); + goto error_out; + } + } else + { + if (!PyTuple_Check(items)) + { + eDebug("eListboxPythonMultiContent: list entry %d is not a tuple (templated)", m_cursor); + goto error_out; + } } - + + ePyObject data; + + /* if we have a template, use the template for the actual formatting. + we will later detect that "data" is present, and refer to that, instead + of the immediate value. */ + int start = 1; + if (m_template) + { + data = items; + items = m_template; + start = 0; + } + int size = PyList_Size(items); - for (int i = 1; i < size; ++i) + for (int i = start; i < size; ++i) { - PyObject *item = PyList_GET_ITEM(items, i); // borrowed reference! - + ePyObject item = PyList_GET_ITEM(items, i); // borrowed reference! + if (!item) { eDebug("eListboxPythonMultiContent: ?"); goto error_out; } - - PyObject *px = 0, *py = 0, *pwidth = 0, *pheight = 0, *pfnt = 0, *pstring = 0, *pflags = 0; - - /* - we have a list of tuples: - - (0, x, y, width, height, fnt, flags, "bla" ), - - or, for a progress: - (1, x, y, width, height, filled_percent ) - or, for a pixmap: - - (2, x, y, width, height, pixmap ) - - */ - if (!PyTuple_Check(item)) { eDebug("eListboxPythonMultiContent did not receive a tuple."); @@ -621,96 +708,206 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c int type = PyInt_AsLong(PyTuple_GET_ITEM(item, 0)); - if (size > 5) - { - 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); /* could also be an pixmap or an int (progress filled percent) */ - if (size > 7) - { - pflags = PyTuple_GET_ITEM(item, 6); - pstring = PyTuple_GET_ITEM(item, 7); - } - } - switch (type) { case TYPE_TEXT: // text { - if (!(px && py && pwidth && pheight && pfnt && pstring)) + /* + (0, x, y, width, height, fnt, flags, "bla" [, color, colorSelected, backColor, backColorSelected, borderWidth, borderColor] ) + */ + 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, pforeColorSelected, 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[, ...])"); + eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_TEXT, x, y, width, height, fnt, flags, string [, color, backColor, backColorSelected, borderWidth, borderColor])"); goto error_out; } - + + if (size > 8) + { + pforeColor = PyTuple_GET_ITEM(item, 8); + if (pforeColor == Py_None) + pforeColor=ePyObject(); + } + if (size > 9) + { + pforeColorSelected = PyTuple_GET_ITEM(item, 9); + if (pforeColorSelected == Py_None) + pforeColorSelected=ePyObject(); + } + if (size > 10) + { + pbackColor = PyTuple_GET_ITEM(item, 10); + if (pbackColor == Py_None) + pbackColor=ePyObject(); + } + if (size > 11) + { + pbackColorSelected = PyTuple_GET_ITEM(item, 11); + if (pbackColorSelected == Py_None) + pbackColorSelected=ePyObject(); + } + if (size > 12) + { + pborderWidth = PyTuple_GET_ITEM(item, 12); + if (pborderWidth == Py_None) + pborderWidth=ePyObject(); + } + if (size > 13) + { + pborderColor = PyTuple_GET_ITEM(item, 13); + if (pborderColor == Py_None) + pborderColor=ePyObject(); + } + + if (PyInt_Check(pstring) && data) /* if the string is in fact a number, it refers to the 'data' list. */ + pstring = PyTuple_GetItem(data, PyInt_AsLong(pstring)); + const char *string = (PyString_Check(pstring)) ? PyString_AsString(pstring) : ""; - int x = PyInt_AsLong(px); - int y = PyInt_AsLong(py); + 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 r = eRect(x, y, width, height); - r.moveBy(offset); - r &= itemrect; - + + eRect rect(x+bwidth, y+bwidth, width-bwidth*2, height-bwidth*2); + painter.clip(rect); + + { + gRegion rc(rect); + clearRegion(painter, style, local_style, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected, selected, rc, sel_clip); + } + painter.setFont(m_font[fnt]); - - painter.clip(r); - painter.renderText(r, string, flags); + painter.renderText(rect, string, flags); painter.clippop(); + + // draw border + if (bwidth) + { + eRect rect(eRect(x, y, width, height)); + painter.clip(rect); + if (pborderColor) + { + int color = PyInt_AsLong(pborderColor); + painter.setForegroundColor(gRGB(color)); + } + + 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 { - if (!(px && py && pwidth && pheight && pfnt)) + /* + (1, x, y, width, height, filled_percent [, borderWidth, foreColor, backColor, backColorSelected] ) + */ + 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), + pborderWidth, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected; + + if (!(px && py && pwidth && pheight && pfilled_perc)) { - eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PROGRESS, x, y, width, height, filled percent))"); + eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PROGRESS, x, y, width, height, filled percent [,border width, foreColor, backColor, backColorSelected]))"); goto error_out; } - int x = PyInt_AsLong(px); - int y = PyInt_AsLong(py); + + if (size > 6) + { + pborderWidth = PyTuple_GET_ITEM(item, 6); + if (pborderWidth == Py_None) + pborderWidth = ePyObject(); + } + if (size > 7) + { + pforeColor = PyTuple_GET_ITEM(item, 7); + if (pforeColor == Py_None) + pforeColor = ePyObject(); + } + if (size > 8) + { + pforeColorSelected = PyTuple_GET_ITEM(item, 8); + if (pforeColorSelected == Py_None) + pforeColorSelected=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(); + } + + 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(pfnt); + int filled = PyInt_AsLong(pfilled_perc); + + if ((filled < 0) && data) /* if the string is in a negative number, it refers to the 'data' list. */ + filled = PyInt_AsLong(PyTuple_GetItem(data, -filled)); + + int bwidth = pborderWidth ? PyInt_AsLong(pborderWidth) : 2; - eRect r = eRect(x, y, width, height); - r.moveBy(offset); - r &= itemrect; + eRect rect(x, y, width, height); + painter.clip(rect); - painter.clip(r); - int bwidth=2; // borderwidth hardcoded yet + { + gRegion rc(rect); + clearRegion(painter, style, local_style, pforeColor, pforeColorSelected, pbackColor, pbackColorSelected, selected, rc, sel_clip); + } // border - eRect rc = eRect(x, y, width, bwidth); - rc.moveBy(offset); - painter.fill(rc); + rect.setRect(x, y, width, bwidth); + painter.fill(rect); - rc = eRect(x, y+bwidth, bwidth, height-bwidth); - rc.moveBy(offset); - painter.fill(rc); + rect.setRect(x, y+bwidth, bwidth, height-bwidth); + painter.fill(rect); - rc = eRect(x+bwidth, y+height-bwidth, width-bwidth, bwidth); - rc.moveBy(offset); - painter.fill(rc); + rect.setRect(x+bwidth, y+height-bwidth, width-bwidth, bwidth); + painter.fill(rect); - rc = eRect(x+width-bwidth, y+bwidth, bwidth, height-bwidth); - rc.moveBy(offset); - painter.fill(rc); + rect.setRect(x+width-bwidth, y+bwidth, bwidth, height-bwidth); + painter.fill(rect); // progress - rc = eRect(x+bwidth, y+bwidth, (width-bwidth*2) * filled / 100, height-bwidth*2); - rc.moveBy(offset); - painter.fill(rc); + rect.setRect(x+bwidth, y+bwidth, (width-bwidth*2) * filled / 100, height-bwidth*2); + painter.fill(rect); painter.clippop(); @@ -719,30 +916,60 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c case TYPE_PIXMAP_ALPHATEST: case TYPE_PIXMAP: // pixmap { - if (!(px && py && pwidth && pheight && pfnt)) + /* + (2, x, y, width, height, pixmap [, backColor, backColorSelected] ) + */ + + 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), + pbackColor, pbackColorSelected; + + if (!(px && py && pwidth && pheight && ppixmap)) { - eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PIXMAP, x, y, width, height, pixmap))"); + eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PIXMAP, x, y, width, height, pixmap [, backColor, backColorSelected] ))"); goto error_out; } - int x = PyInt_AsLong(px); - int y = PyInt_AsLong(py); + + if (PyInt_Check(ppixmap) && data) /* if the pixemap is in fact a number, it refers to the 'data' list. */ + ppixmap = PyTuple_GetItem(data, PyInt_AsLong(ppixmap)); + + 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, pfnt)) + if (SwigFromPython(pixmap, ppixmap)) { eDebug("eListboxPythonMultiContent (Pixmap) get pixmap failed"); goto error_out; } - eRect r = eRect(x, y, width, height); - r.moveBy(offset); - r &= itemrect; - - painter.clip(r); - painter.blit(pixmap, r.topLeft(), r, (type == TYPE_PIXMAP_ALPHATEST) ? gPainter::BT_ALPHATEST : 0); - painter.clippop(); + if (size > 6) + { + pbackColor = PyTuple_GET_ITEM(item, 6); + if (pbackColor == Py_None) + pbackColor=ePyObject(); + } + if (size > 7) + { + pbackColorSelected = PyTuple_GET_ITEM(item, 7); + if (pbackColorSelected == Py_None) + pbackColorSelected=ePyObject(); + } + + eRect rect(x, y, width, height); + painter.clip(rect); + { + gRegion rc(rect); + clearRegion(painter, style, local_style, ePyObject(), ePyObject(), pbackColor, pbackColorSelected, selected, rc, sel_clip); + } + + painter.blit(pixmap, rect.topLeft(), rect, (type == TYPE_PIXMAP_ALPHATEST) ? gPainter::BT_ALPHATEST : 0); + painter.clippop(); break; } default: @@ -751,14 +978,70 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c } } } - + 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 eListboxPythonMultiContent::setBuildFunc(ePyObject cb) +{ + Py_XDECREF(m_buildFunc); + m_buildFunc=cb; + Py_XINCREF(m_buildFunc); +} + +void eListboxPythonMultiContent::setSelectableFunc(ePyObject cb) +{ + Py_XDECREF(m_selectableFunc); + m_selectableFunc=cb; + Py_XINCREF(m_selectableFunc); +} + +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()) + { + if (m_selectableFunc && PyCallable_Check(m_selectableFunc)) + { + ePyObject args = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! + if (PyTuple_Check(args)) + { + ePyObject ret = PyObject_CallObject(m_selectableFunc, args); + if (ret) + return ret == Py_True; + eDebug("call m_selectableFunc failed!!! assume not callable"); + } + else + eDebug("m_list[m_cursor] is not a tuple!!! assume not callable"); + } + else + { + 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 (PyTuple_Check(item)) + { + item = PyTuple_GET_ITEM(item, 0); + if (item != Py_None) + return 1; + } + else if (m_buildFunc && PyCallable_Check(m_buildFunc)) + return 1; + } + } + return 0; +} + void eListboxPythonMultiContent::setFont(int fnt, gFont *font) { if (font) @@ -766,3 +1049,40 @@ void eListboxPythonMultiContent::setFont(int fnt, gFont *font) else m_font.erase(fnt); } + +void eListboxPythonMultiContent::setItemHeight(int height) +{ + m_itemheight = height; + if (m_listbox) + m_listbox->setItemHeight(height); +} + +void eListboxPythonMultiContent::setList(ePyObject list) +{ + m_old_clip = m_clip = gRegion::invalidRegion(); + eListboxPythonStringContent::setList(list); +} + +void eListboxPythonMultiContent::updateClip(gRegion &clip) +{ + if (m_clip.valid()) + { + clip &= m_clip; + if (m_old_clip.valid() && !(m_clip-m_old_clip).empty()) + m_clip -= m_old_clip; + m_old_clip = m_clip; + } + else + m_old_clip = m_clip = gRegion::invalidRegion(); +} + +void eListboxPythonMultiContent::entryRemoved(int idx) +{ + if (m_listbox) + m_listbox->entryRemoved(idx); +} + +void eListboxPythonMultiContent::setTemplate(ePyObject tmplate) +{ + m_template = tmplate; +}