X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1ac36b6e99c0b4196f4e9358c2810b9aba6ced33..7dea67202a77e8de99af74142e3abeafa16f4c5c:/lib/gui/esubtitle.cpp

diff --git a/lib/gui/esubtitle.cpp b/lib/gui/esubtitle.cpp
index 729f6b4d..ca5c20d7 100644
--- a/lib/gui/esubtitle.cpp
+++ b/lib/gui/esubtitle.cpp
@@ -11,12 +11,13 @@
  	*/	
 
 eSubtitleWidget::eSubtitleWidget(eWidget *parent)
-	: eWidget(parent), m_hide_subtitles_timer(eApp)
+	: eWidget(parent), m_hide_subtitles_timer(eTimer::create(eApp))
 {
 	setBackgroundColor(gRGB(0,0,0,255));
 	m_page_ok = 0;
 	m_dvb_page_ok = 0;
-	CONNECT(m_hide_subtitles_timer.timeout, eSubtitleWidget::clearPage);
+	m_pango_page_ok = 0;
+	CONNECT(m_hide_subtitles_timer->timeout, eSubtitleWidget::clearPage);
 }
 
 #define startX 50
@@ -46,19 +47,54 @@ void eSubtitleWidget::setPage(const eDVBTeletextSubtitlePage &p)
 			m_visible_region.rects.push_back(area);
 		}
 	}
-	m_hide_subtitles_timer.start(7500, true);
+	m_hide_subtitles_timer->start(7500, true);
 	invalidate(m_visible_region);  // invalidate new regions
 }
 
 void eSubtitleWidget::setPage(const eDVBSubtitlePage &p)
 {
+	eDebug("setPage");
 	m_dvb_page = p;
 	invalidate(m_visible_region);  // invalidate old visible regions
 	m_visible_region.rects.clear();
 	for (std::list<eDVBSubtitleRegion>::iterator it(m_dvb_page.m_regions.begin()); it != m_dvb_page.m_regions.end(); ++it)
+	{
+		eDebug("add %d %d %d %d", it->m_position.x(), it->m_position.y(), it->m_pixmap->size().width(), it->m_pixmap->size().height());
 		m_visible_region.rects.push_back(eRect(it->m_position, it->m_pixmap->size()));
+	}
 	m_dvb_page_ok = 1;
-	m_hide_subtitles_timer.start(7500, true);
+	m_hide_subtitles_timer->start(7500, true);
+	invalidate(m_visible_region);  // invalidate new regions
+}
+
+void eSubtitleWidget::setPage(const ePangoSubtitlePage &p)
+{
+	m_pango_page = p;
+	m_pango_page_ok = 1;
+	invalidate(m_visible_region);  // invalidate old visible regions
+	m_visible_region.rects.clear();
+
+	int elements = m_pango_page.m_elements.size();
+	if (elements)
+	{
+		int startY = elements > 1
+			? size().height() / 2
+			: size().height() / 3 * 2;
+		int width = size().width() - startX * 2;
+		int height = size().height() - startY;
+		int size_per_element = height / (elements ? elements : 1);
+		for (int i=0; i<elements; ++i)
+		{
+			eRect &area = m_pango_page.m_elements[i].m_area;
+			area.setLeft(startX);
+			area.setTop(size_per_element * i + startY);
+			area.setWidth(width);
+			area.setHeight(size_per_element);
+			m_visible_region.rects.push_back(area);
+		}
+	}
+	int timeout_ms = m_pango_page.m_timeout;
+	m_hide_subtitles_timer->start(timeout_ms, true);
 	invalidate(m_visible_region);  // invalidate new regions
 }
 
@@ -67,10 +103,17 @@ void eSubtitleWidget::clearPage()
 	eDebug("subtitle timeout... hide");
 	m_page_ok = 0;
 	m_dvb_page_ok = 0;
+	m_pango_page_ok = 0;
 	invalidate(m_visible_region);
 	m_visible_region.rects.clear();
 }
 
+void eSubtitleWidget::setPixmap(ePtr<gPixmap> &pixmap, gRegion changed)
+{
+	m_pixmap = pixmap;
+	invalidate(changed);
+}
+
 int eSubtitleWidget::event(int event, void *data, void *data2)
 {
 	switch (event)
@@ -81,21 +124,60 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 		gPainter &painter = *(gPainter*)data2;
 
 		getStyle(style);
-		
 		eWidget::event(event, data, data2);
-		ePtr<gFont> font = new gFont("Regular", 38);
-		painter.setFont(font);
-		
-		if (m_page_ok)
+
+		if (m_pixmap)
+			painter.blit(m_pixmap, ePoint(0,0));
+		else if (m_page_ok)
 		{
 			int elements = m_page.m_elements.size();
+			ePtr<gFont> font = new gFont("Regular", 38);
+			painter.setFont(font);
 			for (int i=0; i<elements; ++i)
 			{
 				eDVBTeletextSubtitlePageElement &element = m_page.m_elements[i];
 				eRect &area = element.m_area;
 				eRect shadow = area;
 				shadow.moveBy(3,3);
-				std::string text = convertLatin1UTF8(element.m_text);
+				painter.setForegroundColor(gRGB(0,0,0));
+				painter.renderText(shadow, element.m_text, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
+				painter.setForegroundColor(element.m_color);
+				painter.renderText(area, element.m_text, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
+			}
+		}
+		else if (m_pango_page_ok)
+		{
+			int elements = m_pango_page.m_elements.size();
+			ePtr<gFont> font = new gFont("Regular", 38);
+			for (int i=0; i<elements; ++i)
+			{
+				ePangoSubtitlePageElement &element = m_pango_page.m_elements[i];
+				std::string text = element.m_pango_line;				
+				std::string::size_type loc = text.find("<", 0 );
+				if ( loc != std::string::npos )
+				{
+					switch (char(text.at(1)))
+					{
+					case 'i':
+						eDebug("found italic");
+						font = new gFont("LCD", 40);
+						break;
+					case 'b':
+						eDebug("found bold");
+						font = new gFont("Replacement", 40);
+						break;
+					default:
+						break;
+					}
+					text = text.substr(3, text.length()-7);
+				}
+				text = replace_all(text, "&apos;", "'");
+				text = replace_all(text, "&quot;", "\"");
+				text = replace_all(text, "&amp;", "&");
+				painter.setFont(font);		
+				eRect &area = element.m_area;
+				eRect shadow = area;
+				shadow.moveBy(3,3);
 				painter.setForegroundColor(gRGB(0,0,0));
 				painter.renderText(shadow, text, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
 				painter.setForegroundColor(element.m_color);