X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/76ab06c06bdf77f0b0cecd225367862ef0de0d2f..4dda70dcac6996c8b0a2016c49d6cfbab7128fee:/lib/gui/elistboxcontent.cpp

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index 585d6fec..69f72a41 100644
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -467,7 +467,8 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
 					/* type is borrowed */
 			} else
 				eWarning("eListboxPythonConfigContent: second value of tuple is not a tuple.");
-				/* value is borrowed */
+			if (value)
+				Py_DECREF(value);
 		}
 
 		if (selected && (!local_style || !local_style->m_selection))
@@ -622,10 +623,15 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 	painter.clip(itemregion);
 	clearRegion(painter, style, local_style, ePyObject(), ePyObject(), ePyObject(), ePyObject(), selected, itemregion, sel_clip);
 
-	ePyObject items;
+	ePyObject items, buildfunc_ret;
 
 	if (m_list && cursorValid())
 	{
+			/* 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)
@@ -633,7 +639,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 			if (PyCallable_Check(m_buildFunc))  // when we have a buildFunc then call it
 			{
 				if (PyTuple_Check(items))
-					items = PyObject_CallObject(m_buildFunc, items);
+					buildfunc_ret = items = PyObject_CallObject(m_buildFunc, items);
 				else
 					eDebug("items is no tuple");
 			}
@@ -647,14 +653,37 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 			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)
 		{
 			ePyObject item = PyList_GET_ITEM(items, i); // borrowed reference!
 
@@ -739,6 +768,9 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 						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) : "<not-a-string>";
 				int x = PyInt_AsLong(px) + offset.x();
 				int y = PyInt_AsLong(py) + offset.y();
@@ -847,6 +879,10 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 				int width = PyInt_AsLong(pwidth);
 				int height = PyInt_AsLong(pheight);
 				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 rect(x, y, width, height);
@@ -898,6 +934,9 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 					goto error_out;
 				}
 
+				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);
@@ -945,8 +984,8 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
 		style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
 
 error_out:
-	if (m_buildFunc && PyCallable_Check(m_buildFunc) && items)
-		Py_DECREF(items);
+	if (buildfunc_ret)
+		Py_DECREF(buildfunc_ret);
 
 	painter.clippop();
 }
@@ -977,7 +1016,11 @@ int eListboxPythonMultiContent::currentCursorSelectable()
 			{
 				ePyObject ret = PyObject_CallObject(m_selectableFunc, args);
 				if (ret)
-					return ret == Py_True;
+				{
+					bool retval = ret == Py_True;
+					Py_DECREF(ret);
+					return ret;
+				}
 				eDebug("call m_selectableFunc failed!!! assume not callable");
 			}
 			else
@@ -991,6 +1034,11 @@ int eListboxPythonMultiContent::currentCursorSelectable()
 				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;
@@ -1038,3 +1086,8 @@ void eListboxPythonMultiContent::entryRemoved(int idx)
 	if (m_listbox)
 		m_listbox->entryRemoved(idx);
 }
+
+void eListboxPythonMultiContent::setTemplate(ePyObject tmplate)
+{
+	m_template = tmplate;
+}