#include <lib/gui/elistbox.h>
#include <lib/gui/elistboxcontent.h>
#include <lib/gdi/font.h>
-#include <Python.h>
+#include <lib/python/python.h>
/*
The basic idea is to have an interface which gives all relevant list
void iListboxContent::setListbox(eListbox *lb)
{
m_listbox = lb;
+ m_listbox->setItemHeight(getItemHeight());
}
int iListboxContent::currentCursorSelectable()
DEFINE_REF(eListboxPythonStringContent);
-eListboxPythonStringContent::eListboxPythonStringContent()
+eListboxPythonStringContent::eListboxPythonStringContent(): m_itemheight(25)
{
- m_list = 0;
}
eListboxPythonStringContent::~eListboxPythonStringContent()
{
if (m_list && cursorValid())
{
- PyObject *item = PyList_GET_ITEM(m_list, m_cursor);
- if (PyTuple_Check(item))
- item = PyTuple_GET_ITEM(item, 0);
-
- if (item != Py_None)
+ ePyObject item = PyList_GET_ITEM(m_list, m_cursor);
+ if (!PyTuple_Check(item))
+ return 1;
+ if (PyTuple_Size(item) >= 2)
return 1;
}
return 0;
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);
+ }
if (item == Py_None)
{
{
const char *string = PyString_Check(item) ? PyString_AsString(item) : "<not-a-string>";
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);
}
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;
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;
}
void eListboxPythonStringContent::invalidate()
{
if (m_listbox)
+ {
+ int s = size();
+ if ( m_cursor >= s )
+ m_listbox->moveSelectionTo(s?s-1:0);
m_listbox->invalidate();
+ }
}
//////////////////////////////////////
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);
/* the first tuple element is a string for the left side.
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 */
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) : "<not-a-string>";
painter.setFont(fnt2);
if (value_alignment_left)
/* 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;
/* 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) : "<not-a-string>";
int xoffs = value_alignment_left ? 0 : m_seperation;
ePtr<eTextPara> para = new eTextPara(eRect(offset + eSize(xoffs, 0), item_right));
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);
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))
/* todo: make a real infrastructure here! */
RESULT SwigFromPython(ePtr<gPixmap> &res, PyObject *obj);
+eListboxPythonMultiContent::eListboxPythonMultiContent()
+ :m_temp_clip(gRegion::invalidRegion())
+{
+}
+
+eListboxPythonMultiContent::~eListboxPythonMultiContent()
+{
+ if (m_buildFunc)
+ Py_DECREF(m_buildFunc);
+}
+
+void eListboxPythonMultiContent::setSelectionClip(eRect &rect, bool update)
+{
+ 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 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));
+
+ eRect sel_clip(m_selection_clip);
+ if (sel_clip.valid())
+ sel_clip.moveBy(offset);
+
+ if (m_temp_clip.valid())
+ {
+ m_temp_clip.moveBy(offset);
+ itemregion &= m_temp_clip;
+ m_temp_clip = eRect();
+ }
+
+ painter.clip(itemregion);
+
+ ePyObject items;
if (m_list && cursorValid())
{
- PyObject *items = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference!
-
+ 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))
{
eDebug("eListboxPythonMultiContent: list entry %d is not a list", m_cursor);
goto error_out;
}
-
+
int size = PyList_Size(items);
for (int i = 1; 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.");
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] )
+ */
+ 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[, ...])");
+ 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) : "<not-a-string>";
- 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);
+ 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.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));
+ 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
{
- if (!(px && py && pwidth && pheight && pfnt))
+ /*
+ (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);
- 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 filled = PyInt_AsLong(pfnt);
-
- eRect r = eRect(x, y, width, height);
- r.moveBy(offset);
- r &= itemrect;
+ 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();
+ }
- painter.clip(r);
int bwidth=2; // borderwidth hardcoded yet
// 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();
case TYPE_PIXMAP_ALPHATEST:
case TYPE_PIXMAP: // pixmap
{
- if (!(px && py && pwidth && pheight && pfnt))
+ /*
+ (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);
- 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);
ePtr<gPixmap> 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);
+ 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;
}
}
}
-
+
+ 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 eListboxPythonMultiContent::setBuildFunc(ePyObject cb)
+{
+ if (m_buildFunc)
+ Py_DECREF(m_buildFunc);
+ m_buildFunc=cb;
+ if (cb)
+ Py_INCREF(m_buildFunc);
+}
+
int eListboxPythonMultiContent::currentCursorSelectable()
{
- return eListboxPythonStringContent::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))
+ {
+ 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;
}
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);
+}
git.cweiske.de / enigma2.git / blobdiff