fix mem bug by changing c strings to cpp strings

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

diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp
index f108a1799cecfae0d72fa68688aea801fa169d64..c8af2457e1d67a7911ff1cb6430de257e4b0dbae 100644 (file)
--- a/lib/gdi/grc.cpp
+++ b/lib/gdi/grc.cpp
@@ -106,6 +106,9 @@ void *gRC::thread()
 #endif
                if ( rp != wp )
                {
+                               /* make sure the spinner is not displayed when we something is painted */
+                       disableSpinner();
+
                        gOpcode o(queue[rp++]);
                        if ( rp == MAXSIZE )
                                rp=0;
@@ -116,7 +119,7 @@ void *gRC::thread()
                                break;
                        else if (o.opcode==gOpcode::notify)
                                need_notify = 1;
-                       else
+                       else if(o.dc)
                        {
                                o.dc->exec(&o);
                                // o.dc is a gDC* filled with grabref... so we must release it here
@@ -136,24 +139,21 @@ void *gRC::thread()
                        
                                        /* when the main thread is non-idle for a too long time without any display output,
                                           we want to display a spinner. */
-
-                               struct timeval time;
                                struct timespec timeout;
-                               gettimeofday(&time, NULL);
-                               timeout.tv_sec = time.tv_sec;
-                               timeout.tv_nsec = time.tv_usec * 1000;
-                               
+                               clock_gettime(CLOCK_REALTIME, &timeout);
+
                                if (m_spinner_enabled)
+                               {
                                        timeout.tv_nsec += 100*1000*1000;
-                               else
-                                       timeout.tv_nsec += 500*1000*1000;
-
                                        /* yes, this is required. */
-                               if (timeout.tv_nsec > 1000*1000*1000)
-                               {
-                                       timeout.tv_nsec -= 1000*1000*1000;
-                                       timeout.tv_sec++;
+                                       if (timeout.tv_nsec > 1000*1000*1000)
+                                       {
+                                               timeout.tv_nsec -= 1000*1000*1000;
+                                               timeout.tv_sec++;
+                                       }
                                }
+                               else
+                                       timeout.tv_sec += 2;
 
                                int idle = 1;
 
@@ -162,8 +162,6 @@ void *gRC::thread()
                                        if (eApp && !eApp->isIdle())
                                                idle = 0;
                                }
-                               
-                               pthread_mutex_unlock(&mutex);
 
                                if (!idle)
                                {
@@ -173,6 +171,7 @@ void *gRC::thread()
                                } else
                                        disableSpinner();
                        }
+                       pthread_mutex_unlock(&mutex);
 #endif
                }
        }
@@ -200,11 +199,12 @@ void gRC::enableSpinner()
                return;
        }
 
-       m_spinner_enabled = 1;
-
        gOpcode o;
        o.opcode = m_spinner_enabled ? gOpcode::incrementSpinner : gOpcode::enableSpinner;
        m_spinner_dc->exec(&o);
+       m_spinner_enabled = 1;
+       o.opcode = gOpcode::flush;
+       m_spinner_dc->exec(&o);
 }
 
 void gRC::disableSpinner()
@@ -223,6 +223,8 @@ void gRC::disableSpinner()
        gOpcode o;
        o.opcode = gOpcode::disableSpinner;
        m_spinner_dc->exec(&o);
+       o.opcode = gOpcode::flush;
+       m_spinner_dc->exec(&o);
 }
 
 static int gPainter_instances;
@@ -517,16 +519,6 @@ void gPainter::clippop()
        m_rc->submit(o);
 }
 
-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() )
@@ -569,14 +561,17 @@ void gPainter::end()
 
 gDC::gDC()
 {
+       m_spinner_pic = 0;
 }
 
 gDC::gDC(gPixmap *pixmap): m_pixmap(pixmap)
 {
+       m_spinner_pic = 0;
 }
 
 gDC::~gDC()
 {
+       delete[] m_spinner_pic;
 }
 
 void gDC::exec(gOpcode *o)
@@ -752,10 +747,13 @@ void gDC::exec(gOpcode *o)
        case gOpcode::flush:
                break;
        case gOpcode::enableSpinner:
+               enableSpinner();
                break;
        case gOpcode::disableSpinner:
+               disableSpinner();
                break;
        case gOpcode::incrementSpinner:
+               incrementSpinner();
                break;
        default:
                eFatal("illegal opcode %d. expect memory leak!", o->opcode);
@@ -774,6 +772,76 @@ gRGB gDC::getRGB(gColor col)
        return m_pixmap->surface->clut.data[col];
 }
 
+void gDC::enableSpinner()
+{
+       ASSERT(m_spinner_saved);
+       
+               /* save the background to restore it later. We need to negative position because we want to blit from the middle of the screen. */
+       m_spinner_saved->blit(*m_pixmap, -m_spinner_pos.topLeft(), gRegion(eRect(ePoint(0, 0), m_spinner_saved->size())), 0);
+       
+       incrementSpinner();
+}
+
+void gDC::disableSpinner()
+{
+       ASSERT(m_spinner_saved);
+
+               /* restore background */
+       m_pixmap->blit(*m_spinner_saved, m_spinner_pos.topLeft(), gRegion(m_spinner_pos), 0);
+}
+
+void gDC::incrementSpinner()
+{
+       ASSERT(m_spinner_saved);
+       
+       static int blub;
+       blub++;
+
+#if 0
+       int i;
+       
+       for (i = 0; i < 5; ++i)
+       {
+               int x = i * 20 + m_spinner_pos.left();
+               int y = m_spinner_pos.top();
+               
+               int col = ((blub - i) * 30) % 256;
+
+               m_pixmap->fill(eRect(x, y, 10, 10), gRGB(col, col, col));
+       }
+#endif
+
+       m_spinner_temp->blit(*m_spinner_saved, ePoint(0, 0), eRect(ePoint(0, 0), m_spinner_pos.size()));
+
+       if (m_spinner_pic[m_spinner_i])
+               m_spinner_temp->blit(*m_spinner_pic[m_spinner_i], ePoint(0, 0), eRect(ePoint(0, 0), m_spinner_pos.size()), gPixmap::blitAlphaTest);
+
+       m_pixmap->blit(*m_spinner_temp, m_spinner_pos.topLeft(), gRegion(m_spinner_pos), 0);
+       m_spinner_i++;
+       m_spinner_i %= m_spinner_num;
+}
+
+void gDC::setSpinner(eRect pos, ePtr<gPixmap> *pic, int len)
+{
+       ASSERT(m_pixmap);
+       ASSERT(m_pixmap->surface);
+       m_spinner_saved = new gPixmap(pos.size(), m_pixmap->surface->bpp);
+       m_spinner_temp = new gPixmap(pos.size(), m_pixmap->surface->bpp);
+       m_spinner_pos = pos;
+       
+       m_spinner_i = 0;
+       m_spinner_num = len;
+       
+       int i;
+       if (m_spinner_pic)
+               delete[] m_spinner_pic;
+       
+       m_spinner_pic = new ePtr<gPixmap>[len];
+       
+       for (i = 0; i < len; ++i)
+               m_spinner_pic[i] = pic[i];
+}
+
 DEFINE_REF(gDC);
 
 eAutoInitPtr<gRC> init_grc(eAutoInitNumbers::graphic, "gRC");