X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fgdi%2Fgrc.cpp;h=f54f1604ca1d5b352f8ebe05c2abd208737bcda4;hp=756ed9b7e724e1a3e2eb50d1905dc0f539f28673;hb=02226aee689caad4d05e65448ec7640d33e8f659;hpb=78c828aae07db0b15a66577d9230cb848fe536fa

diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp
index 756ed9b..f54f160 100644
--- a/lib/gdi/grc.cpp
+++ b/lib/gdi/grc.cpp
@@ -1,5 +1,5 @@
 // for debugging use:
-#define SYNC_PAINT
+ #define SYNC_PAINT
 #include <unistd.h>
 #ifndef SYNC_PAINT
 #include <pthread.h>
@@ -22,17 +22,18 @@ void *gRC::thread_wrapper(void *ptr)
 
 gRC *gRC::instance=0;
 
-gRC::gRC(): queue(2048), queuelock(MAXSIZE)
+gRC::gRC(): queue(2048), m_notify_pump(eApp, 0), queuelock(MAXSIZE)
 {
 	ASSERT(!instance);
 	instance=this;
 	queuelock.lock(MAXSIZE);
+	CONNECT(m_notify_pump.recv_msg, gRC::recv_notify);
 #ifndef SYNC_PAINT
 	int res = pthread_create(&the_thread, 0, thread_wrapper, this);
 	if (res)
 		eFatal("RC thread couldn't be created");
 	else
-		eDebug("RC thread createted successfully");
+		eDebug("RC thread created successfully");
 #endif
 }
 
@@ -54,6 +55,7 @@ gRC::~gRC()
 
 void *gRC::thread()
 {
+	int need_notify = 0;
 #ifndef SYNC_PAINT
 	while (1)
 #else
@@ -64,9 +66,18 @@ void *gRC::thread()
 		gOpcode& o(queue.current());
 		if (o.opcode==gOpcode::shutdown)
 			break;
-		o.dc->exec(&o);
+		if (o.opcode==gOpcode::notify)
+			need_notify = 1;
+		else
+			o.dc->exec(&o);
 		o.dc->Release();
 		queue.dequeue();
+
+		if ((!queue.size()) && need_notify)
+		{
+			need_notify = 0;
+			m_notify_pump.send(1);
+		}
 	}
 #ifndef SYNC_PAINT
 	pthread_exit(0);
@@ -74,6 +85,11 @@ void *gRC::thread()
 	return 0;
 }
 
+void gRC::recv_notify(const int &i)
+{
+	notify();
+}
+
 gRC *gRC::getInstance()
 {
 	return instance;
@@ -211,6 +227,8 @@ void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags)
 {
 	gOpcode o;
 	
+	ASSERT(pixmap);
+	
 	o.opcode=gOpcode::blit;
 	o.dc = m_dc.grabRef();
 	pixmap->AddRef();
@@ -218,7 +236,7 @@ void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags)
 	o.parm.blit->pixmap = pixmap;
 	o.parm.blit->position = pos;
 	o.parm.blit->clip = clip;
-	o.flags=flags;
+	o.parm.blit->flags=flags;
 	m_rc->submit(o);
 }
 
@@ -337,8 +355,36 @@ void gPainter::flush()
 	m_rc->submit(o);
 }
 
+void gPainter::waitVSync()
+{
+	gOpcode o;
+	o.opcode = gOpcode::waitVSync;
+	o.dc = m_dc.grabRef();
+	m_rc->submit(o);
+}
+
+void gPainter::flip()
+{
+	gOpcode o;
+	o.opcode = gOpcode::flip;
+	o.dc = m_dc.grabRef();
+	m_rc->submit(o);
+}
+
+void gPainter::notify()
+{
+	gOpcode o;
+	o.opcode = gOpcode::notify;
+	o.dc = m_dc.grabRef();
+	m_rc->submit(o);
+}
+
 void gPainter::end()
 {
+	gOpcode o;
+	o.opcode = gOpcode::flush;
+	o.dc = m_dc.grabRef();
+	m_rc->submit(o);
 }
 
 gDC::gDC()
@@ -398,7 +444,9 @@ void gDC::exec(gOpcode *o)
 		if (o->parm.renderText->flags & gPainter::RT_VALIGN_CENTER)
 		{
 			eRect bbox = para->getBoundBox();
-			offset += ePoint(0, (o->parm.renderText->area.height() - bbox.height()) / 2);
+			int vcentered_top = (o->parm.renderText->area.height() - bbox.height()) / 2;
+			int correction = vcentered_top - bbox.top();
+			offset += ePoint(0, correction);
 		}
 		para->blit(*this, offset, getRGB(m_background_color), getRGB(m_foreground_color));
 		delete o->parm.renderText;
@@ -500,6 +548,10 @@ void gDC::exec(gOpcode *o)
 			m_current_offset  = o->parm.setOffset->value;
 		delete o->parm.setOffset;
 		break;
+	case gOpcode::waitVSync:
+		break;
+	case gOpcode::flip:
+		break;
 	case gOpcode::flush:
 		break;
 	default:
@@ -522,4 +574,3 @@ gRGB gDC::getRGB(gColor col)
 DEFINE_REF(gDC);
 
 eAutoInitPtr<gRC> init_grc(eAutoInitNumbers::graphic, "gRC");
-