ePtr<gFont> 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 we have a local background color set, use that. */
+ if (local_style && local_style->m_background_color_set)
+ painter.setBackgroundColor(local_style->m_background_color);
+
+ /* same for foreground */
+ if (local_style && local_style->m_foreground_color_set)
+ painter.setBackgroundColor(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 && local_style->m_background)
+ painter.blit(local_style->m_background, offset, eRect(), gPainter::BT_ALPHATEST);
+ }
if (m_list && cursorValid())
{
gray = 1;
item = PyTuple_GET_ITEM(item, 0);
}
-
+
+ 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
{
painter.setForegroundColor(gRGB(0x808080));
painter.renderText(eRect(text_offset, m_itemsize), string);
}
-
- if (selected)
+
+ if (selected && (!local_style || !local_style->m_selection))
style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
}
-
+
painter.clippop();
}
eListboxPythonMultiContent::~eListboxPythonMultiContent()
{
- if (m_buildFunc)
- Py_DECREF(m_buildFunc);
+ Py_XDECREF(m_buildFunc);
+ Py_XDECREF(m_selectableFunc);
}
void eListboxPythonMultiContent::setSelectionClip(eRect &rect, bool update)
m_selection_clip = rect;
}
+static void clearRegion(gPainter &painter, eWindowStyle &style, ePyObject pforeColor, ePyObject pbackColor, ePyObject pbackColorSelected, int selected, gRegion &rc, eRect &sel_clip)
+{
+ 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));
+ }
+}
+
void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
{
gRegion itemregion(eRect(offset, m_itemsize));
painter.clip(itemregion);
+ clearRegion(painter, style, ePyObject(), ePyObject(), ePyObject(), selected, itemregion, sel_clip);
+
ePyObject items;
if (m_list && cursorValid())
for (int i = 1; i < size; ++i)
{
ePyObject item = PyList_GET_ITEM(items, i); // borrowed reference!
+ bool reset_colors=false;
if (!item)
{
case TYPE_TEXT: // text
{
/*
- (0, x, y, width, height, fnt, flags, "bla" [, color] )
+ (0, x, y, width, height, fnt, flags, "bla" [, color, backColor, backColorSelected, borderWidth, borderColor] )
*/
ePyObject px = PyTuple_GET_ITEM(item, 1),
py = PyTuple_GET_ITEM(item, 2),
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, ]...])");
+ 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;
}
}
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)
+ painter.clip(rect);
+ if (pbackColor || pbackColorSelected || pforeColor)
{
- int color = PyInt_AsLong(pforeColor);
- painter.setForegroundColor(gRGB(color));
+ gRegion rc(rect);
+ clearRegion(painter, style, pforeColor, pbackColor, pbackColorSelected, selected, rc, sel_clip);
+ reset_colors=true;
}
painter.setFont(m_font[fnt]);
if (bwidth)
{
eRect rect(eRect(x, y, width, height));
- gRegion rc(rect);
- rc &= itemregion;
- painter.clip(rc);
- itemregion -= rc;
+ painter.clip(rect);
if (pborderColor)
{
int color = PyInt_AsLong(pborderColor);
case TYPE_PROGRESS: // Progress
{
/*
- (1, x, y, width, height, filled_percent )
+ (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);
+ pfilled_perc = PyTuple_GET_ITEM(item, 5),
+ pborderWidth, pforeColor, 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;
}
+ if (size > 6)
+ pborderWidth = PyTuple_GET_ITEM(item, 6);
+ if (size > 7)
+ pforeColor = PyTuple_GET_ITEM(item, 7);
+ if (size > 8)
+ {
+ pbackColor = PyTuple_GET_ITEM(item, 8);
+ if (pbackColor == Py_None)
+ pbackColor=ePyObject();
+ }
+ if (size > 9)
+ {
+ pbackColorSelected = PyTuple_GET_ITEM(item, 9);
+ 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(pfilled_perc);
+ int bwidth = pborderWidth ? PyInt_AsLong(pborderWidth) : 2;
eRect rect(x, y, width, height);
- gRegion rc(rect);
- rc &= itemregion;
- painter.clip(rc);
- itemregion -= rc;
- if (selected && sel_clip.valid())
+ painter.clip(rect);
+ if (pbackColor || pbackColorSelected || pforeColor)
{
- 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();
+ gRegion rc(rect);
+ clearRegion(painter, style, pforeColor, pbackColor, pbackColorSelected, selected, rc, sel_clip);
+ reset_colors=true;
}
- int bwidth=2; // borderwidth hardcoded yet
-
// border
rect.setRect(x, y, width, bwidth);
painter.fill(rect);
case TYPE_PIXMAP: // pixmap
{
/*
- (2, x, y, width, height, pixmap )
+ (2, x, y, width, height, pixmap [, 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),
- ppixmap = PyTuple_GET_ITEM(item, 5);
+ 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;
}
goto error_out;
}
- eRect rect(x, y, width, height);
- gRegion rc(rect);
- rc &= itemregion;
- painter.clip(rc);
- itemregion -= rc;
-
- if (selected && sel_clip.valid())
+ if (size > 6)
{
- 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();
+ pbackColor = PyTuple_GET_ITEM(item, 6);
+ if (pbackColor == Py_None)
+ pbackColor=ePyObject();
}
- else
+ if (size > 7)
{
- style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
- painter.clear();
+ pbackColorSelected = PyTuple_GET_ITEM(item, 7);
+ if (pbackColorSelected == Py_None)
+ pbackColorSelected=ePyObject();
}
+ eRect rect(x, y, width, height);
+ painter.clip(rect);
+ if (pbackColor || pbackColorSelected)
+ {
+ gRegion rc(rect);
+ clearRegion(painter, style, ePyObject(), pbackColor, pbackColorSelected, selected, rc, sel_clip);
+ reset_colors=true;
+ }
+
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;
}
+ if (reset_colors)
+ style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
}
}
- 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);
void eListboxPythonMultiContent::setBuildFunc(ePyObject cb)
{
- if (m_buildFunc)
- Py_DECREF(m_buildFunc);
+ Py_XDECREF(m_buildFunc);
m_buildFunc=cb;
- if (cb)
- Py_INCREF(m_buildFunc);
+ 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())
{
- ePyObject item = PyList_GET_ITEM(m_list, m_cursor);
- if (PyList_Check(item))
+ if (m_selectableFunc && PyCallable_Check(m_selectableFunc))
{
- item = PyList_GET_ITEM(item, 0);
- if (item != Py_None)
+ 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 (m_buildFunc && PyCallable_Check(m_buildFunc))
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;
}
git.cweiske.de / enigma2.git / blobdiff