X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b8e9b51fb1a75b1805cf3108ffdc22aff9f75cf2..3d9a041b1ae9244499a5fd54a62d5c6d755d98b7:/lib/gdi/grc.cpp

diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp
index 05aaa6ff..de6761e8 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>
@@ -10,25 +10,28 @@
 #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), m_notify_pump(eApp, 0), 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");
@@ -53,25 +56,80 @@ gRC::~gRC()
 #endif
 }
 
+void gRC::submit(const gOpcode &o)
+{
+	while(1)
+	{
+#ifndef SYNC_PAINT
+		pthread_mutex_lock(&mutex);
+#endif
+		int tmp=wp+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;
+		pthread_mutex_unlock(&mutex);
+		if (o.opcode==gOpcode::flush||o.opcode==gOpcode::shutdown||o.opcode==gOpcode::notify)
+#ifndef SYNC_PAINT
+			pthread_cond_signal(&cond);  // wakeup gdi thread
+#else
+			thread(); // paint
+#endif
+		break;
+	}
+}
+
 void *gRC::thread()
 {
+	int need_notify = 0;
 #ifndef SYNC_PAINT
 	while (1)
+	{
 #else
-	while (queue.size())
-#endif
+	while (rp != wp)
 	{
-		queuelock.lock(1);
-		gOpcode& o(queue.current());
-		if (o.opcode==gOpcode::shutdown)
-			break;
-		if (o.opcode==gOpcode::notify)
+#endif
+		pthread_mutex_lock(&mutex);
+		if ( rp != wp )
 		{
-			m_notify_pump.send(1);
-		} else
-			o.dc->exec(&o);
-		o.dc->Release();
-		queue.dequeue();
+			gOpcode o(queue[rp++]);
+			if ( rp == MAXSIZE )
+				rp=0;
+			pthread_mutex_unlock(&mutex);
+			if (o.opcode==gOpcode::shutdown)
+				break;
+			else if (o.opcode==gOpcode::notify)
+				need_notify = 1;
+			else
+				o.dc->exec(&o);
+		}
+		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);
@@ -106,62 +164,74 @@ gPainter::~gPainter()
 
 void gPainter::setBackgroundColor(const gColor &color)
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode = gOpcode::setBackgroundColor;
 	o.dc = m_dc.grabRef();
 	o.parm.setColor = new gOpcode::para::psetColor;
 	o.parm.setColor->color = color;
-	
+
 	m_rc->submit(o);
 }
 
 void gPainter::setForegroundColor(const gColor &color)
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode = gOpcode::setForegroundColor;
 	o.dc = m_dc.grabRef();
 	o.parm.setColor = new gOpcode::para::psetColor;
 	o.parm.setColor->color = color;
-	
+
 	m_rc->submit(o);
 }
 
 void gPainter::setBackgroundColor(const gRGB &color)
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode = gOpcode::setBackgroundColorRGB;
 	o.dc = m_dc.grabRef();
 	o.parm.setColorRGB = new gOpcode::para::psetColorRGB;
 	o.parm.setColorRGB->color = color;
-	
+
 	m_rc->submit(o);
 }
 
 void gPainter::setForegroundColor(const gRGB &color)
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode = gOpcode::setForegroundColorRGB;
 	o.dc = m_dc.grabRef();
 	o.parm.setColorRGB = new gOpcode::para::psetColorRGB;
 	o.parm.setColorRGB->color = color;
-	
+
 	m_rc->submit(o);
 }
 
 void gPainter::setFont(gFont *font)
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode = gOpcode::setFont;
 	o.dc = m_dc.grabRef();
 	font->AddRef();
 	o.parm.setFont = new gOpcode::para::psetFont;
 	o.parm.setFont->font = font;
-	
+
 	m_rc->submit(o);
 }
 
 void gPainter::renderText(const eRect &pos, const std::string &string, int flags)
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode=gOpcode::renderText;
 	o.dc = m_dc.grabRef();
@@ -174,6 +244,8 @@ void gPainter::renderText(const eRect &pos, const std::string &string, int flags
 
 void gPainter::renderPara(eTextPara *para, ePoint offset)
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode=gOpcode::renderPara;
 	o.dc = m_dc.grabRef();
@@ -187,6 +259,8 @@ void gPainter::renderPara(eTextPara *para, ePoint offset)
 
 void gPainter::fill(const eRect &area)
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode=gOpcode::fill;
 
@@ -198,6 +272,8 @@ void gPainter::fill(const eRect &area)
 
 void gPainter::fill(const gRegion &region)
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode=gOpcode::fillRegion;
 
@@ -209,6 +285,8 @@ void gPainter::fill(const gRegion &region)
 
 void gPainter::clear()
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode=gOpcode::clear;
 	o.dc = m_dc.grabRef();
@@ -219,8 +297,12 @@ void gPainter::clear()
 
 void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags)
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
-	
+
+	ASSERT(pixmap);
+
 	o.opcode=gOpcode::blit;
 	o.dc = m_dc.grabRef();
 	pixmap->AddRef();
@@ -235,14 +317,16 @@ void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags)
 
 void gPainter::setPalette(gRGB *colors, int start, int len)
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode=gOpcode::setPalette;
 	o.dc = m_dc.grabRef();
 	gPalette *p=new gPalette;
-	
+
 	o.parm.setPalette = new gOpcode::para::psetPalette;
 	p->data=new gRGB[len];
-	
+
 	memcpy(p->data, colors, len*sizeof(gRGB));
 	p->start=start;
 	p->colors=len;
@@ -258,6 +342,8 @@ void gPainter::setPalette(gPixmap *source)
 
 void gPainter::mergePalette(gPixmap *target)
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode = gOpcode::mergePalette;
 	o.dc = m_dc.grabRef();
@@ -269,6 +355,8 @@ void gPainter::mergePalette(gPixmap *target)
 
 void gPainter::line(ePoint start, ePoint end)
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode=gOpcode::line;
 	o.dc = m_dc.grabRef();
@@ -280,6 +368,8 @@ void gPainter::line(ePoint start, ePoint end)
 
 void gPainter::setOffset(ePoint val)
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode=gOpcode::setOffset;
 	o.dc = m_dc.grabRef();
@@ -291,6 +381,8 @@ void gPainter::setOffset(ePoint val)
 
 void gPainter::moveOffset(ePoint rel)
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode=gOpcode::setOffset;
 	o.dc = m_dc.grabRef();
@@ -302,6 +394,8 @@ void gPainter::moveOffset(ePoint rel)
 
 void gPainter::resetOffset()
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode=gOpcode::setOffset;
 	o.dc = m_dc.grabRef();
@@ -313,6 +407,8 @@ void gPainter::resetOffset()
 
 void gPainter::resetClip(const gRegion &region)
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode = gOpcode::setClip;
 	o.dc = m_dc.grabRef();
@@ -323,6 +419,8 @@ void gPainter::resetClip(const gRegion &region)
 
 void gPainter::clip(const gRegion &region)
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode = gOpcode::addClip;
 	o.dc = m_dc.grabRef();
@@ -333,6 +431,8 @@ void gPainter::clip(const gRegion &region)
 
 void gPainter::clippop()
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode = gOpcode::popClip;
 	o.dc = m_dc.grabRef();
@@ -341,6 +441,8 @@ void gPainter::clippop()
 
 void gPainter::flush()
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode = gOpcode::flush;
 	o.dc = m_dc.grabRef();
@@ -349,6 +451,8 @@ void gPainter::flush()
 
 void gPainter::waitVSync()
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode = gOpcode::waitVSync;
 	o.dc = m_dc.grabRef();
@@ -357,6 +461,8 @@ void gPainter::waitVSync()
 
 void gPainter::flip()
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode = gOpcode::flip;
 	o.dc = m_dc.grabRef();
@@ -365,6 +471,8 @@ void gPainter::flip()
 
 void gPainter::notify()
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode = gOpcode::notify;
 	o.dc = m_dc.grabRef();
@@ -373,6 +481,8 @@ void gPainter::notify()
 
 void gPainter::end()
 {
+	if ( m_dc->islocked() )
+		return;
 	gOpcode o;
 	o.opcode = gOpcode::flush;
 	o.dc = m_dc.grabRef();
@@ -436,7 +546,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.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;