X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9f3ff2c642130e984c3df82fa6228da99b132f74..2d9f49283b5c45221f5cc81b5f95d744b24d6a09:/lib/gui/elistboxcontent.cpp diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index cc661d47..ff93eac2 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -110,7 +110,7 @@ void eListboxTestContent::setSize(const eSize &size) void eListboxTestContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) { - ePtr fnt = new gFont("Arial", 14); + ePtr fnt = new gFont("Regular", 20); painter.clip(eRect(offset, m_size)); style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); painter.clear(); @@ -219,7 +219,7 @@ void eListboxStringContent::setSize(const eSize &size) void eListboxStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) { - ePtr fnt = new gFont("Arial", 14); + ePtr fnt = new gFont("Regular", 20); painter.clip(eRect(offset, m_itemsize)); style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); painter.clear(); @@ -246,6 +246,7 @@ void eListboxStringContent::setList(std::list &list) m_list = list; m_size = list.size(); cursorHome(); + m_listbox->entryReset(false); } ////////////////////////////////////// @@ -259,6 +260,7 @@ eListboxPythonStringContent::eListboxPythonStringContent() eListboxPythonStringContent::~eListboxPythonStringContent() { + Py_XDECREF(m_list); } void eListboxPythonStringContent::cursorHome() @@ -327,19 +329,19 @@ void eListboxPythonStringContent::setSize(const eSize &size) void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) { - ePtr fnt = new gFont("Arial", 20); + ePtr fnt = new gFont("Regular", 20); painter.clip(eRect(offset, m_itemsize)); style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); painter.clear(); if (m_list && cursorValid()) { - PyObject *item = PyList_GetItem(m_list, m_cursor); // borrowed reference! + PyObject *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)) - item = PyTuple_GetItem(item, 0); + item = PyTuple_GET_ITEM(item, 0); const char *string = PyString_Check(item) ? PyString_AsString(item) : ""; @@ -365,6 +367,9 @@ void eListboxPythonStringContent::setList(PyObject *list) m_list = list; Py_INCREF(m_list); } + + if (m_listbox) + m_listbox->entryReset(false); } PyObject *eListboxPythonStringContent::getCurrentSelection() @@ -373,7 +378,7 @@ PyObject *eListboxPythonStringContent::getCurrentSelection() return 0; if (!cursorValid()) return 0; - PyObject *r = PyList_GetItem(m_list, m_cursor); + PyObject *r = PyList_GET_ITEM(m_list, m_cursor); Py_XINCREF(r); return r; } @@ -384,20 +389,27 @@ void eListboxPythonStringContent::invalidateEntry(int index) m_listbox->entryChanged(index); } +void eListboxPythonStringContent::invalidate() +{ + if (m_listbox) + m_listbox->invalidate(); +} + ////////////////////////////////////// void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) { - ePtr fnt = new gFont("Arial", 14); - ePtr fnt2 = new gFont("Arial", 16); - 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(); if (m_list && cursorValid()) { /* get current list item */ - PyObject *item = PyList_GetItem(m_list, m_cursor); // borrowed reference! + PyObject *item = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! PyObject *text = 0, *value = 0; painter.setFont(fnt); @@ -411,48 +423,58 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, { /* handle left part. get item from tuple, convert to string, display. */ - text = PyTuple_GetItem(item, 0); - text = PyObject_Str(text); + 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_GetItem(item, 1); + value = PyTuple_GET_ITEM(item, 1); if (value) { PyObject *args = PyTuple_New(1); - PyTuple_SetItem(args, 0, PyInt_FromLong(selected)); + 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 (PyTuple_Check(value)) + if (value && PyTuple_Check(value)) { /* convert type to string */ - PyObject *type = PyTuple_GetItem(value, 0); + PyObject *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_GetItem(value, 1); + PyObject *pvalue = PyTuple_GET_ITEM(value, 1); const char *value = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : ""; painter.setFont(fnt2); - painter.renderText(eRect(offset + eSize(m_seperation, 0), item_right), value, gPainter::RT_HALIGN_RIGHT); + 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")) { - PyObject *pvalue = PyTuple_GetItem(value, 1); + PyObject *pvalue = PyTuple_GET_ITEM(value, 1); /* convert value to Long. fallback to -1 on error. */ int value = (pvalue && PyInt_Check(pvalue)) ? PyInt_AsLong(pvalue) : -1; @@ -470,19 +492,19 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, /* pvalue is borrowed */ } else if (!strcmp(atype, "mtext")) { - PyObject *pvalue = PyTuple_GetItem(value, 1); + PyObject *pvalue = PyTuple_GET_ITEM(value, 1); const char *text = (pvalue && PyString_Check(pvalue)) ? PyString_AsString(pvalue) : ""; - - ePtr para = new eTextPara(eRect(offset + eSize(m_seperation, 0), item_right)); + 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(eTextPara::dirRight); + para->realign(value_alignment_left ? eTextPara::dirLeft : eTextPara::dirRight); int glyphs = para->size(); PyObject *plist = 0; if (PyTuple_Size(value) >= 3) - plist = PyTuple_GetItem(value, 2); + plist = PyTuple_GET_ITEM(value, 2); int entries = 0; @@ -491,11 +513,11 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, for (int i = 0; i < entries; ++i) { - PyObject *entry = PyList_GetItem(plist, i); + PyObject *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!"); + eWarning("glyph index %d in PythonConfigList out of bounds!", num); else { para->setGlyphFlag(num, GS_INVERT); @@ -512,8 +534,9 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, /* plist is 0 or borrowed */ } } - Py_XDECREF(type); - } + /* type is borrowed */ + } else + eWarning("eListboxPythonConfigContent: second value of tuple is not a tuple."); /* value is borrowed */ } @@ -526,108 +549,210 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style, ////////////////////////////////////// + /* todo: make a real infrastructure here! */ +RESULT SwigFromPython(ePtr &res, PyObject *obj); + void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected) { - painter.clip(eRect(offset, m_itemsize)); + eRect itemrect(offset, m_itemsize); + painter.clip(itemrect); style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal); painter.clear(); if (m_list && cursorValid()) { - PyObject *items = PyList_GetItem(m_list, m_cursor); // borrowed reference! + PyObject *items = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! if (!items) { eDebug("eListboxPythonMultiContent: error getting item %d", m_cursor); - painter.clippop(); - return; + goto error_out; } if (!PyList_Check(items)) { eDebug("eListboxPythonMultiContent: list entry %d is not a list", m_cursor); - painter.clippop(); - return; + goto error_out; } int size = PyList_Size(items); for (int i = 1; i < size; ++i) { - PyObject *item = PyList_GetItem(items, i); // borrowed reference! + PyObject *item = PyList_GET_ITEM(items, i); // borrowed reference! if (!item) { eDebug("eListboxPythonMultiContent: ?"); - painter.clippop(); - return; + goto error_out; } - - PyObject *px, *py, *pwidth, *pheight, *pfnt, *pstring, *pflags; + PyObject *px = 0, *py = 0, *pwidth = 0, *pheight = 0, *pfnt = 0, *pstring = 0, *pflags = 0; /* we have a list of tuples: - (x, y, width, height, fnt, flags, "bla" ), + (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."); - painter.clippop(); - return; + 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)); + + 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); + } } - - px = PyTuple_GetItem(item, 0); - py = PyTuple_GetItem(item, 1); - pwidth = PyTuple_GetItem(item, 2); - pheight = PyTuple_GetItem(item, 3); - pfnt = PyTuple_GetItem(item, 4); - pflags = PyTuple_GetItem(item, 5); - pstring = PyTuple_GetItem(item, 6); - if (!(px && py && pwidth && pheight && pfnt && pstring)) + switch (type) + { + case TYPE_TEXT: // text + { + if (!(px && py && pwidth && pheight && pfnt && pstring)) + { + eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_TEXT, x, y, width, height, fnt, flags, string[, ...])"); + goto error_out; + } + + const char *string = (PyString_Check(pstring)) ? PyString_AsString(pstring) : ""; + int x = PyInt_AsLong(px); + int y = PyInt_AsLong(py); + int width = PyInt_AsLong(pwidth); + int height = PyInt_AsLong(pheight); + int flags = PyInt_AsLong(pflags); + int fnt = PyInt_AsLong(pfnt); + + 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; + + painter.setFont(m_font[fnt]); + + painter.clip(r); + painter.renderText(r, string, flags); + painter.clippop(); + break; + } + case TYPE_PROGRESS: // Progress { - eDebug("eListboxPythonMultiContent received too small tuple (must be (x, y, width, height, fnt, flags, string[, ...])"); + if (!(px && py && pwidth && pheight && pfnt)) + { + eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PROGRESS, x, y, width, height, filled percent))"); + goto error_out; + } + int x = PyInt_AsLong(px); + int y = PyInt_AsLong(py); + int width = PyInt_AsLong(pwidth); + int height = PyInt_AsLong(pheight); + int filled = PyInt_AsLong(pfnt); + + eRect r = eRect(x, y, width, height); + r.moveBy(offset); + r &= itemrect; + + painter.clip(r); + int bwidth=2; // borderwidth hardcoded yet + + // border + eRect rc = eRect(x, y, width, bwidth); + rc.moveBy(offset); + painter.fill(rc); + + rc = eRect(x, y+bwidth, bwidth, height-bwidth); + rc.moveBy(offset); + painter.fill(rc); + + rc = eRect(x+bwidth, y+height-bwidth, width-bwidth, bwidth); + rc.moveBy(offset); + painter.fill(rc); + + rc = eRect(x+width-bwidth, y+bwidth, bwidth, height-bwidth); + rc.moveBy(offset); + painter.fill(rc); + + // progress + rc = eRect(x+bwidth, y+bwidth, (width-bwidth*2) * filled / 100, height-bwidth*2); + rc.moveBy(offset); + painter.fill(rc); + painter.clippop(); - return; + + break; } - - pstring = PyObject_Str(pstring); - - const char *string = (PyString_Check(pstring)) ? PyString_AsString(pstring) : ""; - - int x = PyInt_AsLong(px); - int y = PyInt_AsLong(py); - int width = PyInt_AsLong(pwidth); - int height = PyInt_AsLong(pheight); - int flags = PyInt_AsLong(pflags); - - int fnt = PyInt_AsLong(pfnt); - - if (m_font.find(fnt) == m_font.end()) + case TYPE_PIXMAP_ALPHATEST: + case TYPE_PIXMAP: // pixmap { - eDebug("eListboxPythonMultiContent: specified font %d was not found!", fnt); - Py_XDECREF(pstring); + if (!(px && py && pwidth && pheight && pfnt)) + { + eDebug("eListboxPythonMultiContent received too small tuple (must be (TYPE_PIXMAP, x, y, width, height, pixmap))"); + goto error_out; + } + int x = PyInt_AsLong(px); + int y = PyInt_AsLong(py); + int width = PyInt_AsLong(pwidth); + int height = PyInt_AsLong(pheight); + ePtr pixmap; + if (SwigFromPython(pixmap, pfnt)) + { + 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(); - return; + + break; + } + default: + eWarning("eListboxPythonMultiContent received unknown type (%d)", type); + goto error_out; } - - eRect r = eRect(x, y, width, height); - r.moveBy(offset); - - painter.setFont(m_font[fnt]); - - painter.renderText(r, string, flags); - - Py_XDECREF(pstring); - - if (selected) - style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); } } + if (selected) + style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry); + +error_out: painter.clippop(); }