X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/78c828aae07db0b15a66577d9230cb848fe536fa..c70d4282351bbe4cd09f07a246221e22652783a2:/lib/gdi/grc.cpp

diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp
index 756ed9b7..1f5cdfb1 100644
--- a/lib/gdi/grc.cpp
+++ b/lib/gdi/grc.cpp
@@ -1,5 +1,4 @@
 // for debugging use:
-#define SYNC_PAINT
 #include <unistd.h>
 #ifndef SYNC_PAINT
 #include <pthread.h>
@@ -10,29 +9,33 @@
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 
-#define MAXSIZE 1024
-
 #ifndef SYNC_PAINT
 void *gRC::thread_wrapper(void *ptr)
 {
-	nice(3);
 	return ((gRC*)ptr)->thread();
 }
 #endif
 
 gRC *gRC::instance=0;
 
-gRC::gRC(): queue(2048), queuelock(MAXSIZE)
+gRC::gRC(): rp(0), wp(0)
+#ifdef SYNC_PAINT
+,m_notify_pump(eApp, 0)
+#else
+,m_notify_pump(eApp, 1)
+#endif
 {
 	ASSERT(!instance);
 	instance=this;
-	queuelock.lock(MAXSIZE);
+	CONNECT(m_notify_pump.recv_msg, gRC::recv_notify);
 #ifndef SYNC_PAINT
+	pthread_mutex_init(&mutex, 0);
+	pthread_cond_init(&cond, 0);
 	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
 }
 
@@ -52,21 +55,81 @@ gRC::~gRC()
 #endif
 }
 
+void gRC::submit(const gOpcode &o)
+{
+	while(1)
+	{
+#ifndef SYNC_PAINT
+		pthread_mutex_lock(&mutex);
+#endif
+		int tmp=wp;
+		tmp+=1;
+		if ( tmp == MAXSIZE )
+			tmp=0;
+		if ( tmp == rp )
+		{
+#ifndef SYNC_PAINT
+			pthread_mutex_unlock(&mutex);
+#else
+			thread();
+#endif
+			//printf("render buffer full...\n");
+			//fflush(stdout);
+			usleep(1000);  // wait 1 msec
+			continue;
+		}
+		int free=rp-wp;
+		if ( free <= 0 )
+			free+=MAXSIZE;
+		queue[wp++]=o;
+		if ( wp == MAXSIZE )
+			wp = 0;
+		if (o.opcode==gOpcode::flush||o.opcode==gOpcode::shutdown||o.opcode==gOpcode::notify)
+#ifndef SYNC_PAINT
+			pthread_cond_signal(&cond);  // wakeup gdi thread
+		pthread_mutex_unlock(&mutex);
+#else
+			thread(); // paint
+#endif
+		break;
+	}
+}
+
 void *gRC::thread()
 {
+	int need_notify = 0;
 #ifndef SYNC_PAINT
 	while (1)
+	{
+		singleLock s(mutex);
 #else
-	while (queue.size())
-#endif
+	while (rp != wp)
 	{
-		queuelock.lock(1);
-		gOpcode& o(queue.current());
-		if (o.opcode==gOpcode::shutdown)
-			break;
-		o.dc->exec(&o);
-		o.dc->Release();
-		queue.dequeue();
+#endif
+		if ( rp != wp )
+		{
+			gOpcode& o(queue[rp]);
+			if (o.opcode==gOpcode::shutdown)
+				break;
+			else if (o.opcode==gOpcode::notify)
+				need_notify = 1;
+			else
+				o.dc->exec(&o);
+			rp++;
+			if ( rp == MAXSIZE )
+				rp=0;
+		}
+		else
+		{
+			if (need_notify)
+			{
+				need_notify = 0;
+				m_notify_pump.send(1);
+			}
+#ifndef SYNC_PAINT
+			pthread_cond_wait(&cond, &mutex);
+#endif
+		}
 	}
 #ifndef SYNC_PAINT
 	pthread_exit(0);
@@ -74,6 +137,11 @@ void *gRC::thread()
 	return 0;
 }
 
+void gRC::recv_notify(const int &i)
+{
+	notify();
+}
+
 gRC *gRC::getInstance()
 {
 	return instance;
@@ -211,6 +279,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 +288,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 +407,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 +496,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 +600,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 +626,3 @@ gRGB gDC::getRGB(gColor col)
 DEFINE_REF(gDC);
 
 eAutoInitPtr<gRC> init_grc(eAutoInitNumbers::graphic, "gRC");
-