fix RT_VALIGN_CENTER in painter.setText

[enigma2.git] / lib / gdi / grc.cpp

diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp
index 9cb1a0720f9f8044fd40e77d7a9ba3ae7663a892..e00bd540d57df2b64671ee3554ffb89078380cfe 100644 (file)
--- 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,29 +10,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 +56,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 +138,11 @@ void *gRC::thread()
        return 0;
 }
 
+void gRC::recv_notify(const int &i)
+{
+       notify();
+}
+
 gRC *gRC::getInstance()
 {
        return instance;
@@ -211,6 +280,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 +289,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);
 }
 
@@ -240,6 +311,12 @@ void gPainter::setPalette(gRGB *colors, int start, int len)
        m_rc->submit(o);
 }
 
+void gPainter::setPalette(gPixmap *source)
+{
+       ASSERT(source);
+       setPalette(source->surface->clut.data, source->surface->clut.start, source->surface->clut.colors);
+}
+
 void gPainter::mergePalette(gPixmap *target)
 {
        gOpcode o;
@@ -331,8 +408,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()
@@ -392,7 +497,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;
@@ -494,6 +601,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:
@@ -516,4 +627,3 @@ gRGB gDC::getRGB(gColor col)
 DEFINE_REF(gDC);
 
 eAutoInitPtr<gRC> init_grc(eAutoInitNumbers::graphic, "gRC");
-