X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8ecfc549ce93bc353d6a64f43a0c25dcd65f860e..aec06d4c574979c24e7ef10c352f7a2d22e79177:/lib/gdi/grc.cpp

diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp
index c8af2457..dff6b059 100644
--- a/lib/gdi/grc.cpp
+++ b/lib/gdi/grc.cpp
@@ -119,7 +119,11 @@ void *gRC::thread()
 				break;
 			else if (o.opcode==gOpcode::notify)
 				need_notify = 1;
-			else if(o.dc)
+			else if (o.opcode==gOpcode::setCompositing)
+			{
+				m_compositing = o.parm.setCompositing;
+				m_compositing->Release();
+			} else if(o.dc)
 			{
 				o.dc->exec(&o);
 				// o.dc is a gDC* filled with grabref... so we must release it here
@@ -160,7 +164,13 @@ void *gRC::thread()
 				if (pthread_cond_timedwait(&cond, &mutex, &timeout) == ETIMEDOUT)
 				{
 					if (eApp && !eApp->isIdle())
-						idle = 0;
+					{
+						int idle_count = eApp->idleCount();
+						if (idle_count == m_prev_idle_count)
+							idle = 0;
+						else
+							m_prev_idle_count = idle_count;
+					}
 				}
 
 				if (!idle)
@@ -326,6 +336,7 @@ void gPainter::renderPara(eTextPara *para, ePoint offset)
 {
 	if ( m_dc->islocked() )
 		return;
+	ASSERT(para);
 	gOpcode o;
 	o.opcode=gOpcode::renderPara;
 	o.dc = m_dc.grabRef();
@@ -377,6 +388,13 @@ void gPainter::clear()
 
 void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags)
 {
+	blitScale(pixmap, eRect(pos, eSize()), clip, flags, 0);
+}
+
+void gPainter::blitScale(gPixmap *pixmap, const eRect &position, const eRect &clip, int flags, int aflags)
+{
+	flags |= aflags;
+
 	if ( m_dc->islocked() )
 		return;
 	gOpcode o;
@@ -388,17 +406,17 @@ void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags)
 	pixmap->AddRef();
 	o.parm.blit  = new gOpcode::para::pblit;
 	o.parm.blit->pixmap = pixmap;
-	o.parm.blit->position = pos;
 	o.parm.blit->clip = clip;
-	o.parm.blit->flags=flags;
+	o.parm.blit->flags = flags;
+	o.parm.blit->position = position;
 	m_rc->submit(o);
 }
 
-
 void gPainter::setPalette(gRGB *colors, int start, int len)
 {
 	if ( m_dc->islocked() )
 		return;
+	ASSERT(colors);
 	gOpcode o;
 	o.opcode=gOpcode::setPalette;
 	o.dc = m_dc.grabRef();
@@ -424,6 +442,7 @@ void gPainter::mergePalette(gPixmap *target)
 {
 	if ( m_dc->islocked() )
 		return;
+	ASSERT(target);
 	gOpcode o;
 	o.opcode = gOpcode::mergePalette;
 	o.dc = m_dc.grabRef();
@@ -549,7 +568,17 @@ void gPainter::notify()
 	m_rc->submit(o);
 }
 
-void gPainter::end()
+void gPainter::setCompositing(gCompositingData *comp)
+{
+	gOpcode o;
+	o.opcode = gOpcode::setCompositing;
+	o.dc = 0;
+	o.parm.setCompositing = comp;
+	comp->AddRef(); /* will be freed in ::thread */
+	m_rc->submit(o);
+}
+
+void gPainter::flush()
 {
 	if ( m_dc->islocked() )
 		return;
@@ -559,6 +588,12 @@ void gPainter::end()
 	m_rc->submit(o);
 }
 
+void gPainter::end()
+{
+	if ( m_dc->islocked() )
+		return;
+}
+
 gDC::gDC()
 {
 	m_spinner_pic = 0;
@@ -609,7 +644,7 @@ void gDC::exec(gOpcode *o)
 	{
 		ePtr<eTextPara> para = new eTextPara(o->parm.renderText->area);
 		int flags = o->parm.renderText->flags;
-		assert(m_current_font);
+		ASSERT(m_current_font);
 		para->setFont(m_current_font);
 		para->renderString(o->parm.renderText->text, (flags & gPainter::RT_WRAP) ? RS_WRAP : 0);
 		if (o->parm.renderText->text)
@@ -677,7 +712,7 @@ void gDC::exec(gOpcode *o)
 		gRegion clip;
 				// this code should be checked again but i'm too tired now
 		
-		o->parm.blit->position += m_current_offset;
+		o->parm.blit->position.moveBy(m_current_offset);
 		
 		if (o->parm.blit->clip.valid())
 		{
@@ -777,7 +812,7 @@ void gDC::enableSpinner()
 	ASSERT(m_spinner_saved);
 	
 		/* save the background to restore it later. We need to negative position because we want to blit from the middle of the screen. */
-	m_spinner_saved->blit(*m_pixmap, -m_spinner_pos.topLeft(), gRegion(eRect(ePoint(0, 0), m_spinner_saved->size())), 0);
+	m_spinner_saved->blit(*m_pixmap, eRect(-m_spinner_pos.topLeft(), eSize()), gRegion(eRect(ePoint(0, 0), m_spinner_saved->size())), 0);
 	
 	incrementSpinner();
 }
@@ -787,7 +822,7 @@ void gDC::disableSpinner()
 	ASSERT(m_spinner_saved);
 
 		/* restore background */
-	m_pixmap->blit(*m_spinner_saved, m_spinner_pos.topLeft(), gRegion(m_spinner_pos), 0);
+	m_pixmap->blit(*m_spinner_saved, eRect(m_spinner_pos.topLeft(), eSize()), gRegion(m_spinner_pos), 0);
 }
 
 void gDC::incrementSpinner()
@@ -811,12 +846,12 @@ void gDC::incrementSpinner()
 	}
 #endif
 
-	m_spinner_temp->blit(*m_spinner_saved, ePoint(0, 0), eRect(ePoint(0, 0), m_spinner_pos.size()));
+	m_spinner_temp->blit(*m_spinner_saved, eRect(0, 0, 0, 0), eRect(ePoint(0, 0), m_spinner_pos.size()));
 
 	if (m_spinner_pic[m_spinner_i])
-		m_spinner_temp->blit(*m_spinner_pic[m_spinner_i], ePoint(0, 0), eRect(ePoint(0, 0), m_spinner_pos.size()), gPixmap::blitAlphaTest);
+		m_spinner_temp->blit(*m_spinner_pic[m_spinner_i], eRect(0, 0, 0, 0), eRect(ePoint(0, 0), m_spinner_pos.size()), gPixmap::blitAlphaTest);
 
-	m_pixmap->blit(*m_spinner_temp, m_spinner_pos.topLeft(), gRegion(m_spinner_pos), 0);
+	m_pixmap->blit(*m_spinner_temp, eRect(m_spinner_pos.topLeft(), eSize()), gRegion(m_spinner_pos), 0);
 	m_spinner_i++;
 	m_spinner_i %= m_spinner_num;
 }