small fix

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

diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp
index e4e4a8615c5149933d063b954be6fb76225a8412..274d221bee72db9a5c82875eeddeab6f98fff719 100644 (file)
--- a/lib/gdi/grc.cpp
+++ b/lib/gdi/grc.cpp
@@ -1,10 +1,4 @@
-// for debugging use:
-// #define SYNC_PAINT
 #include <unistd.h>
-#ifndef SYNC_PAINT
-#include <pthread.h>
-#endif
-
 #include <lib/gdi/grc.h>
 #include <lib/gdi/font.h>
 #include <lib/base/init.h>
@@ -63,8 +57,7 @@ void gRC::submit(const gOpcode &o)
 #ifndef SYNC_PAINT
                pthread_mutex_lock(&mutex);
 #endif
-               int tmp=wp;
-               tmp+=1;
+               int tmp=wp+1;
                if ( tmp == MAXSIZE )
                        tmp=0;
                if ( tmp == rp )
@@ -106,14 +99,17 @@ void *gRC::thread()
        while (rp != wp)
        {
 #endif
+#ifndef SYNC_PAINT
                pthread_mutex_lock(&mutex);
+#endif
                if ( rp != wp )
                {
-                       gOpcode o(queue[rp]);
-                       rp++;
+                       gOpcode o(queue[rp++]);
                        if ( rp == MAXSIZE )
                                rp=0;
+#ifndef SYNC_PAINT
                        pthread_mutex_unlock(&mutex);
+#endif
                        if (o.opcode==gOpcode::shutdown)
                                break;
                        else if (o.opcode==gOpcode::notify)
@@ -129,9 +125,10 @@ void *gRC::thread()
                                m_notify_pump.send(1);
                        }
 #ifndef SYNC_PAINT
-                       pthread_cond_wait(&cond, &mutex);
-#endif
+                       while(rp == wp)
+                               pthread_cond_wait(&cond, &mutex);
                        pthread_mutex_unlock(&mutex);
+#endif
                }
        }
 #ifndef SYNC_PAINT
@@ -510,18 +507,24 @@ void gDC::exec(gOpcode *o)
        {
        case gOpcode::setBackgroundColor:
                m_background_color = o->parm.setColor->color;
+               m_background_color_rgb = getRGB(m_background_color);
                delete o->parm.setColor;
                break;
        case gOpcode::setForegroundColor:
                m_foreground_color = o->parm.setColor->color;
+               m_background_color_rgb = getRGB(m_foreground_color);
                delete o->parm.setColor;
                break;
        case gOpcode::setBackgroundColorRGB:
-               m_background_color = m_pixmap->surface->clut.findColor(o->parm.setColorRGB->color);
+               if (m_pixmap->needClut())
+                       m_background_color = m_pixmap->surface->clut.findColor(o->parm.setColorRGB->color);
+               m_background_color_rgb = o->parm.setColorRGB->color;
                delete o->parm.setColorRGB;
                break;
        case gOpcode::setForegroundColorRGB:
-               m_foreground_color = m_pixmap->surface->clut.findColor(o->parm.setColorRGB->color);
+               if (m_pixmap->needClut())
+                       m_foreground_color = m_pixmap->surface->clut.findColor(o->parm.setColorRGB->color);
+               m_foreground_color_rgb = o->parm.setColorRGB->color;
                delete o->parm.setColorRGB;
                break;
        case gOpcode::setFont:
@@ -553,13 +556,14 @@ void gDC::exec(gOpcode *o)
                        int correction = vcentered_top - bbox.top();
                        offset += ePoint(0, correction);
                }
-               para->blit(*this, offset, getRGB(m_background_color), getRGB(m_foreground_color));
+               
+               para->blit(*this, offset, m_background_color_rgb, m_foreground_color_rgb);
                delete o->parm.renderText;
                break;
        }
        case gOpcode::renderPara:
        {
-               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->blit(*this, o->parm.renderPara->offset + m_current_offset, m_background_color_rgb, m_foreground_color_rgb);
                o->parm.renderPara->textpara->Release();
                delete o->parm.renderPara;
                break;
@@ -569,7 +573,10 @@ void gDC::exec(gOpcode *o)
                eRect area = o->parm.fill->area;
                area.moveBy(m_current_offset);
                gRegion clip = m_current_clip & area;
-               m_pixmap->fill(clip, m_foreground_color);
+               if (m_pixmap->needClut())
+                       m_pixmap->fill(clip, m_foreground_color);
+               else
+                       m_pixmap->fill(clip, m_foreground_color_rgb);
                delete o->parm.fill;
                break;
        }
@@ -577,12 +584,18 @@ void gDC::exec(gOpcode *o)
        {
                o->parm.fillRegion->region.moveBy(m_current_offset);
                gRegion clip = m_current_clip & o->parm.fillRegion->region;
-               m_pixmap->fill(clip, m_foreground_color);
+               if (m_pixmap->needClut())
+                       m_pixmap->fill(clip, m_foreground_color);
+               else
+                       m_pixmap->fill(clip, m_foreground_color_rgb);
                delete o->parm.fillRegion;
                break;
        }
        case gOpcode::clear:
-               m_pixmap->fill(m_current_clip, m_background_color);
+               if (m_pixmap->needClut())
+                       m_pixmap->fill(m_current_clip, m_background_color);
+               else
+                       m_pixmap->fill(m_current_clip, m_background_color_rgb);
                delete o->parm.fill;
                break;
        case gOpcode::blit: