do unlock thread before send signal

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

diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp
index 46181d3256daf9a393072ff6a2151ff75151dbb5..de6761e810d4f0f335a4f338c95489c6e9339e53 100644 (file)
--- a/lib/gdi/grc.cpp
+++ b/lib/gdi/grc.cpp
@@ -1,5 +1,5 @@
 // for debugging use:
 // for debugging use:

- #define SYNC_PAINT
+// #define SYNC_PAINT

 #include <unistd.h>
 #ifndef SYNC_PAINT
 #include <pthread.h>
 #include <unistd.h>
 #ifndef SYNC_PAINT
 #include <pthread.h>


@@ -10,29 +10,33 @@
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 

-#define MAXSIZE 1024
-

 #ifndef SYNC_PAINT
 void *gRC::thread_wrapper(void *ptr)
 {
 #ifndef SYNC_PAINT
 void *gRC::thread_wrapper(void *ptr)
 {

-       nice(3);

        return ((gRC*)ptr)->thread();
 }
 #endif
 
 gRC *gRC::instance=0;
 
        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;
 {
        ASSERT(!instance);
        instance=this;

-       queuelock.lock(MAXSIZE);
+       CONNECT(m_notify_pump.recv_msg, gRC::recv_notify);

 #ifndef SYNC_PAINT
 #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
        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
 }
 
 #endif
 }
 


@@ -45,26 +49,87 @@ gRC::~gRC()
        gOpcode o;
        o.opcode=gOpcode::shutdown;
        submit(o);
        gOpcode o;
        o.opcode=gOpcode::shutdown;
        submit(o);

+#ifndef SYNC_PAINT

        eDebug("waiting for gRC thread shutdown");
        pthread_join(the_thread, 0);
        eDebug("gRC thread has finished");
        eDebug("waiting for gRC thread shutdown");
        pthread_join(the_thread, 0);
        eDebug("gRC thread has finished");

+#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()
 {
 }
 
 void *gRC::thread()
 {

+       int need_notify = 0;

 #ifndef SYNC_PAINT
        while (1)
 #ifndef SYNC_PAINT
        while (1)

+       {

 #else
 #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
+               pthread_mutex_lock(&mutex);
+               if ( rp != wp )
+               {
+                       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);
        }
 #ifndef SYNC_PAINT
        pthread_exit(0);


@@ -72,6 +137,11 @@ void *gRC::thread()
        return 0;
 }
 
        return 0;
 }
 

+void gRC::recv_notify(const int &i)
+{
+       notify();
+}
+

 gRC *gRC::getInstance()
 {
        return instance;
 gRC *gRC::getInstance()
 {
        return instance;


@@ -94,40 +164,74 @@ gPainter::~gPainter()
 
 void gPainter::setBackgroundColor(const gColor &color)
 {
 
 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;
        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)
 {
        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;
        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)
 {
        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;
        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)
 {
        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();
        gOpcode o;
        o.opcode=gOpcode::renderText;
        o.dc = m_dc.grabRef();


@@ -140,6 +244,8 @@ void gPainter::renderText(const eRect &pos, const std::string &string, int flags
 
 void gPainter::renderPara(eTextPara *para, ePoint offset)
 {
 
 void gPainter::renderPara(eTextPara *para, ePoint offset)
 {

+       if ( m_dc->islocked() )
+               return;

        gOpcode o;
        o.opcode=gOpcode::renderPara;
        o.dc = m_dc.grabRef();
        gOpcode o;
        o.opcode=gOpcode::renderPara;
        o.dc = m_dc.grabRef();


@@ -153,6 +259,8 @@ void gPainter::renderPara(eTextPara *para, ePoint offset)
 
 void gPainter::fill(const eRect &area)
 {
 
 void gPainter::fill(const eRect &area)
 {

+       if ( m_dc->islocked() )
+               return;

        gOpcode o;
        o.opcode=gOpcode::fill;
 
        gOpcode o;
        o.opcode=gOpcode::fill;
 


@@ -162,8 +270,23 @@ void gPainter::fill(const eRect &area)
        m_rc->submit(o);
 }
 
        m_rc->submit(o);
 }
 

+void gPainter::fill(const gRegion &region)
+{
+       if ( m_dc->islocked() )
+               return;
+       gOpcode o;
+       o.opcode=gOpcode::fillRegion;
+
+       o.dc = m_dc.grabRef();
+       o.parm.fillRegion = new gOpcode::para::pfillRegion;
+       o.parm.fillRegion->region = region;
+       m_rc->submit(o);
+}
+

 void gPainter::clear()
 {
 void gPainter::clear()
 {

+       if ( m_dc->islocked() )
+               return;

        gOpcode o;
        o.opcode=gOpcode::clear;
        o.dc = m_dc.grabRef();
        gOpcode o;
        o.opcode=gOpcode::clear;
        o.dc = m_dc.grabRef();


@@ -174,8 +297,12 @@ void gPainter::clear()
 
 void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags)
 {
 
 void gPainter::blit(gPixmap *pixmap, ePoint pos, const eRect &clip, int flags)
 {

+       if ( m_dc->islocked() )
+               return;

        gOpcode o;
 
        gOpcode o;
 

+       ASSERT(pixmap);
+

        o.opcode=gOpcode::blit;
        o.dc = m_dc.grabRef();
        pixmap->AddRef();
        o.opcode=gOpcode::blit;
        o.dc = m_dc.grabRef();
        pixmap->AddRef();


@@ -183,21 +310,23 @@ 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.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);
 }
 
 
 void gPainter::setPalette(gRGB *colors, int start, int len)
 {
        m_rc->submit(o);
 }
 
 
 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;
        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];
        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;
        memcpy(p->data, colors, len*sizeof(gRGB));
        p->start=start;
        p->colors=len;


@@ -205,18 +334,29 @@ void gPainter::setPalette(gRGB *colors, int start, int len)
        m_rc->submit(o);
 }
 
        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)
 {
 void gPainter::mergePalette(gPixmap *target)
 {

+       if ( m_dc->islocked() )
+               return;

        gOpcode o;
        gOpcode o;

-       o.opcode=gOpcode::mergePalette;
+       o.opcode = gOpcode::mergePalette;

        o.dc = m_dc.grabRef();
        target->AddRef();
        o.dc = m_dc.grabRef();
        target->AddRef();

+       o.parm.mergePalette = new gOpcode::para::pmergePalette;

        o.parm.mergePalette->target = target;
        m_rc->submit(o);
 }
 
 void gPainter::line(ePoint start, ePoint end)
 {
        o.parm.mergePalette->target = target;
        m_rc->submit(o);
 }
 
 void gPainter::line(ePoint start, ePoint end)
 {

+       if ( m_dc->islocked() )
+               return;

        gOpcode o;
        o.opcode=gOpcode::line;
        o.dc = m_dc.grabRef();
        gOpcode o;
        o.opcode=gOpcode::line;
        o.dc = m_dc.grabRef();


@@ -228,6 +368,8 @@ void gPainter::line(ePoint start, ePoint end)
 
 void gPainter::setOffset(ePoint val)
 {
 
 void gPainter::setOffset(ePoint val)
 {

+       if ( m_dc->islocked() )
+               return;

        gOpcode o;
        o.opcode=gOpcode::setOffset;
        o.dc = m_dc.grabRef();
        gOpcode o;
        o.opcode=gOpcode::setOffset;
        o.dc = m_dc.grabRef();


@@ -239,6 +381,8 @@ void gPainter::setOffset(ePoint val)
 
 void gPainter::moveOffset(ePoint rel)
 {
 
 void gPainter::moveOffset(ePoint rel)
 {

+       if ( m_dc->islocked() )
+               return;

        gOpcode o;
        o.opcode=gOpcode::setOffset;
        o.dc = m_dc.grabRef();
        gOpcode o;
        o.opcode=gOpcode::setOffset;
        o.dc = m_dc.grabRef();


@@ -250,16 +394,21 @@ void gPainter::moveOffset(ePoint rel)
 
 void gPainter::resetOffset()
 {
 
 void gPainter::resetOffset()
 {

+       if ( m_dc->islocked() )
+               return;

        gOpcode o;
        o.opcode=gOpcode::setOffset;
        o.dc = m_dc.grabRef();
        o.parm.setOffset = new gOpcode::para::psetOffset;
        gOpcode o;
        o.opcode=gOpcode::setOffset;
        o.dc = m_dc.grabRef();
        o.parm.setOffset = new gOpcode::para::psetOffset;

+       o.parm.setOffset->rel = 0;

        o.parm.setOffset->value = ePoint(0, 0);
        m_rc->submit(o);
 }
 
 void gPainter::resetClip(const gRegion &region)
 {
        o.parm.setOffset->value = ePoint(0, 0);
        m_rc->submit(o);
 }
 
 void gPainter::resetClip(const gRegion &region)
 {

+       if ( m_dc->islocked() )
+               return;

        gOpcode o;
        o.opcode = gOpcode::setClip;
        o.dc = m_dc.grabRef();
        gOpcode o;
        o.opcode = gOpcode::setClip;
        o.dc = m_dc.grabRef();


@@ -270,6 +419,8 @@ void gPainter::resetClip(const gRegion &region)
 
 void gPainter::clip(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();
        gOpcode o;
        o.opcode = gOpcode::addClip;
        o.dc = m_dc.grabRef();


@@ -280,6 +431,8 @@ void gPainter::clip(const gRegion &region)
 
 void gPainter::clippop()
 {
 
 void gPainter::clippop()
 {

+       if ( m_dc->islocked() )
+               return;

        gOpcode o;
        o.opcode = gOpcode::popClip;
        o.dc = m_dc.grabRef();
        gOpcode o;
        o.opcode = gOpcode::popClip;
        o.dc = m_dc.grabRef();


@@ -288,10 +441,52 @@ void gPainter::clippop()
 
 void gPainter::flush()
 {
 
 void gPainter::flush()
 {

+       if ( m_dc->islocked() )
+               return;
+       gOpcode o;
+       o.opcode = gOpcode::flush;
+       o.dc = m_dc.grabRef();
+       m_rc->submit(o);
+}
+
+void gPainter::waitVSync()
+{
+       if ( m_dc->islocked() )
+               return;
+       gOpcode o;
+       o.opcode = gOpcode::waitVSync;
+       o.dc = m_dc.grabRef();
+       m_rc->submit(o);
+}
+
+void gPainter::flip()
+{
+       if ( m_dc->islocked() )
+               return;
+       gOpcode o;
+       o.opcode = gOpcode::flip;
+       o.dc = m_dc.grabRef();
+       m_rc->submit(o);
+}
+
+void gPainter::notify()
+{
+       if ( m_dc->islocked() )
+               return;
+       gOpcode o;
+       o.opcode = gOpcode::notify;
+       o.dc = m_dc.grabRef();
+       m_rc->submit(o);

 }
 
 void gPainter::end()
 {
 }
 
 void gPainter::end()
 {

+       if ( m_dc->islocked() )
+               return;
+       gOpcode o;
+       o.opcode = gOpcode::flush;
+       o.dc = m_dc.grabRef();
+       m_rc->submit(o);

 }
 
 gDC::gDC()
 }
 
 gDC::gDC()


@@ -318,6 +513,14 @@ void gDC::exec(gOpcode *o)
                m_foreground_color = o->parm.setColor->color;
                delete o->parm.setColor;
                break;
                m_foreground_color = o->parm.setColor->color;
                delete o->parm.setColor;
                break;

+       case gOpcode::setBackgroundColorRGB:
+               m_background_color = m_pixmap->surface->clut.findColor(o->parm.setColorRGB->color);
+               delete o->parm.setColorRGB;
+               break;
+       case gOpcode::setForegroundColorRGB:
+               m_foreground_color = m_pixmap->surface->clut.findColor(o->parm.setColorRGB->color);
+               delete o->parm.setColorRGB;
+               break;

        case gOpcode::setFont:
                m_current_font = o->parm.setFont->font;
                o->parm.setFont->font->Release();
        case gOpcode::setFont:
                m_current_font = o->parm.setFont->font;
                o->parm.setFont->font->Release();


@@ -326,15 +529,34 @@ void gDC::exec(gOpcode *o)
        case gOpcode::renderText:
        {
                ePtr<eTextPara> para = new eTextPara(o->parm.renderText->area);
        case gOpcode::renderText:
        {
                ePtr<eTextPara> para = new eTextPara(o->parm.renderText->area);

+               int flags = o->parm.renderText->flags;
+               assert(m_current_font);

                para->setFont(m_current_font);
                para->setFont(m_current_font);

-               para->renderString(o->parm.renderText->text, o->parm.renderText->flags);
-               para->blit(*this, ePoint(0, 0), getRGB(m_foreground_color), getRGB(m_background_color));
+               para->renderString(o->parm.renderText->text, (flags & gPainter::RT_WRAP) ? RS_WRAP : 0);
+               
+               if (flags & gPainter::RT_HALIGN_RIGHT)
+                       para->realign(eTextPara::dirRight);
+               else if (flags & gPainter::RT_HALIGN_CENTER)
+                       para->realign(eTextPara::dirCenter);
+               else if (flags & gPainter::RT_HALIGN_BLOCK)
+                       para->realign(eTextPara::dirBlock);
+               
+               ePoint offset = m_current_offset;
+               
+               if (o->parm.renderText->flags & gPainter::RT_VALIGN_CENTER)
+               {
+                       eRect bbox = para->getBoundBox();
+                       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;
                break;
        }
        case gOpcode::renderPara:
        {
                delete o->parm.renderText;
                break;
        }
        case gOpcode::renderPara:
        {

-               o->parm.renderPara->textpara->blit(*this, o->parm.renderPara->offset, getRGB(m_foreground_color), getRGB(m_background_color));
+               o->parm.renderPara->textpara->blit(*this, o->parm.renderPara->offset + m_current_offset, getRGB(m_background_color), getRGB(m_foreground_color));

                o->parm.renderPara->textpara->Release();
                delete o->parm.renderPara;
                break;
                o->parm.renderPara->textpara->Release();
                delete o->parm.renderPara;
                break;


@@ -348,6 +570,14 @@ void gDC::exec(gOpcode *o)
                delete o->parm.fill;
                break;
        }
                delete o->parm.fill;
                break;
        }

+       case gOpcode::fillRegion:
+       {
+               o->parm.fillRegion->region.moveBy(m_current_offset);
+               gRegion clip = m_current_clip & o->parm.fillRegion->region;
+               m_pixmap->fill(clip, m_foreground_color);
+               delete o->parm.fillRegion;
+               break;
+       }

        case gOpcode::clear:
                m_pixmap->fill(m_current_clip, m_background_color);
                delete o->parm.fill;
        case gOpcode::clear:
                m_pixmap->fill(m_current_clip, m_background_color);
                delete o->parm.fill;


@@ -355,11 +585,17 @@ void gDC::exec(gOpcode *o)
        case gOpcode::blit:
        {
                gRegion clip;
        case gOpcode::blit:
        {
                gRegion clip;

-               if (!o->parm.blit->clip.isValid())
+                               // this code should be checked again but i'm too tired now
+               
+               o->parm.blit->position += m_current_offset;
+               
+               if (o->parm.blit->clip.valid())

                {
                {

-                       clip.intersect(gRegion(o->parm.blit->clip), clip);
+                       o->parm.blit->clip.moveBy(m_current_offset);
+                       clip.intersect(gRegion(o->parm.blit->clip), m_current_clip);

                } else
                        clip = m_current_clip;
                } else
                        clip = m_current_clip;

+               

                m_pixmap->blit(*o->parm.blit->pixmap, o->parm.blit->position, clip, o->parm.blit->flags);
                o->parm.blit->pixmap->Release();
                delete o->parm.blit;
                m_pixmap->blit(*o->parm.blit->pixmap, o->parm.blit->position, clip, o->parm.blit->flags);
                o->parm.blit->pixmap->Release();
                delete o->parm.blit;


@@ -378,12 +614,10 @@ void gDC::exec(gOpcode *o)
                delete o->parm.setPalette;
                break;
        case gOpcode::mergePalette:
                delete o->parm.setPalette;
                break;
        case gOpcode::mergePalette:

-#if 0
-               pixmap->mergePalette(*o->parm.blit->pixmap);
-               o->parm.blit->pixmap->unlock();
-               delete o->parm.blit;
-#endif
-               break;
+               m_pixmap->mergePalette(*o->parm.mergePalette->target);
+               o->parm.mergePalette->target->Release();
+               delete o->parm.mergePalette;
+               break; 

        case gOpcode::line:
        {
                ePoint start = o->parm.line->start + m_current_offset, end = o->parm.line->end + m_current_offset;
        case gOpcode::line:
        {
                ePoint start = o->parm.line->start + m_current_offset, end = o->parm.line->end + m_current_offset;


@@ -399,7 +633,7 @@ void gDC::exec(gOpcode *o)
                break;
        case gOpcode::setClip:
                o->parm.clip->region.moveBy(m_current_offset);
                break;
        case gOpcode::setClip:
                o->parm.clip->region.moveBy(m_current_offset);

-               m_current_clip = o->parm.clip->region & eRect(ePoint(0, 0), m_pixmap->getSize());
+               m_current_clip = o->parm.clip->region & eRect(ePoint(0, 0), m_pixmap->size());

                delete o->parm.clip;
                break;
        case gOpcode::popClip:
                delete o->parm.clip;
                break;
        case gOpcode::popClip:


@@ -416,6 +650,12 @@ void gDC::exec(gOpcode *o)
                        m_current_offset  = o->parm.setOffset->value;
                delete o->parm.setOffset;
                break;
                        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:
                eFatal("illegal opcode %d. expect memory leak!", o->opcode);
        }
        default:
                eFatal("illegal opcode %d. expect memory leak!", o->opcode);
        }


@@ -436,4 +676,3 @@ gRGB gDC::getRGB(gColor col)
 DEFINE_REF(gDC);
 
 eAutoInitPtr<gRC> init_grc(eAutoInitNumbers::graphic, "gRC");
 DEFINE_REF(gDC);
 
 eAutoInitPtr<gRC> init_grc(eAutoInitNumbers::graphic, "gRC");

-