add spinner

diff --git a/lib/gdi/grc.cpp b/lib/gdi/grc.cpp
index f108a1799cecfae0d72fa68688aea801fa169d64..e5cab87e03a1f3036002f59823c2eeba910e1c77 100644 (file)
--- a/lib/gdi/grc.cpp
+++ b/lib/gdi/grc.cpp
@@ -106,6 +106,9 @@ void *gRC::thread()
 #endif
                if ( rp != wp )
                {
 #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;
                        gOpcode o(queue[rp++]);
                        if ( rp == MAXSIZE )
                                rp=0;


@@ -200,11 +203,11 @@ void gRC::enableSpinner()
                return;
        }
 
                return;
        }
 

-       m_spinner_enabled = 1;
-

        gOpcode o;
        o.opcode = m_spinner_enabled ? gOpcode::incrementSpinner : gOpcode::enableSpinner;
        m_spinner_dc->exec(&o);
        gOpcode o;
        o.opcode = m_spinner_enabled ? gOpcode::incrementSpinner : gOpcode::enableSpinner;
        m_spinner_dc->exec(&o);

+       m_spinner_enabled = 1;
+

 }
 
 void gRC::disableSpinner()
 }
 
 void gRC::disableSpinner()


@@ -752,10 +755,13 @@ void gDC::exec(gOpcode *o)
        case gOpcode::flush:
                break;
        case gOpcode::enableSpinner:
        case gOpcode::flush:
                break;
        case gOpcode::enableSpinner:

+               enableSpinner();

                break;
        case gOpcode::disableSpinner:
                break;
        case gOpcode::disableSpinner:

+               disableSpinner();

                break;
        case gOpcode::incrementSpinner:
                break;
        case gOpcode::incrementSpinner:

+               incrementSpinner();

                break;
        default:
                eFatal("illegal opcode %d. expect memory leak!", o->opcode);
                break;
        default:
                eFatal("illegal opcode %d. expect memory leak!", o->opcode);


@@ -774,6 +780,52 @@ gRGB gDC::getRGB(gColor col)
        return m_pixmap->surface->clut.data[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++;
+       
+       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));
+       }
+}
+
+void gDC::setSpinner(eRect pos)
+{
+       ASSERT(m_pixmap);
+       ASSERT(m_pixmap->surface);
+       m_spinner_saved = new gPixmap(pos.size(), m_pixmap->surface->bpp);
+       m_spinner_pos = pos;
+}
+

 DEFINE_REF(gDC);
 
 eAutoInitPtr<gRC> init_grc(eAutoInitNumbers::graphic, "gRC");
 DEFINE_REF(gDC);
 
 eAutoInitPtr<gRC> init_grc(eAutoInitNumbers::graphic, "gRC");

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 9f32e9110175baab9c184e21beb401de7bfc5386..adc1d3be82af0aacf7a5fbdb69c86d7f5e5bc704 100644 (file)
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -270,6 +270,9 @@ protected:
        std::stack<gRegion> m_clip_stack;
        gRegion m_current_clip;
        
        std::stack<gRegion> m_clip_stack;
        gRegion m_current_clip;
        

+       ePtr<gPixmap> m_spinner_saved;
+       eRect m_spinner_pos;
+       

 public:
        virtual void exec(gOpcode *opcode);
        gDC(gPixmap *pixmap);
 public:
        virtual void exec(gOpcode *opcode);
        gDC(gPixmap *pixmap);


@@ -280,6 +283,11 @@ public:
        gRGB getRGB(gColor col);
        virtual eSize size() { return m_pixmap->size(); }
        virtual int islocked() { return 0; }
        gRGB getRGB(gColor col);
        virtual eSize size() { return m_pixmap->size(); }
        virtual int islocked() { return 0; }

+       
+       void enableSpinner();
+       void disableSpinner();
+       void incrementSpinner();
+       void setSpinner(eRect pos);

 };
 
 #endif
 };
 
 #endif

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 4af7ca03fb7043b5995ba9069555610fb7f0a89d..45c0c7b37318241e8a28c06390bd7c795a9b431d 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -190,6 +190,7 @@ int main(int argc, char **argv)
        dsk.setRedrawTask(main);
        dsk_lcd.setRedrawTask(main);
        
        dsk.setRedrawTask(main);
        dsk_lcd.setRedrawTask(main);
        

+       my_dc->setSpinner(eRect(100, 100, 120, 40));

        gRC::getInstance()->setSpinnerDC(my_dc);
 
        eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
        gRC::getInstance()->setSpinnerDC(my_dc);
 
        eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));