Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs

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

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 925b29d7a77a1622a86b11c99584e19f727d5331..7071425ef6ce7e968b96e239c35b4db5cc365e1f 100644 (file)
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -7,6 +7,10 @@
        gPixmap aufsetzt (und damit unbeschleunigt ist).
 */
 
+// for debugging use:
+//#define SYNC_PAINT
+#undef SYNC_PAINT
+
 #include <pthread.h>
 #include <stack>
 #include <list>
@@ -54,6 +58,8 @@ struct gOpcode
                flip,
                notify,
                
+               enableSpinner, disableSpinner, incrementSpinner,
+               
                shutdown
        } opcode;
 
@@ -73,7 +79,7 @@ struct gOpcode
                struct prenderText
                {
                        eRect area;
-                       std::string text;
+                       char *text;
                        int flags;
                } *renderText;
 
@@ -134,13 +140,12 @@ struct gOpcode
        } parm;
 };
 
-#define MAXSIZE 1024
+#define MAXSIZE 2048
 
                /* gRC is the singleton which controls the fifo and dispatches commands */
 class gRC: public iObject, public Object
 {
-DECLARE_REF(gRC);
-private:
+       DECLARE_REF(gRC);
        friend class gPainter;
        static gRC *instance;
 
@@ -157,6 +162,13 @@ private:
 
        eFixedMessagePump<int> m_notify_pump;
        void recv_notify(const int &i);
+
+       ePtr<gDC> m_spinner_dc;
+       int m_spinner_enabled;
+       
+       void enableSpinner();
+       void disableSpinner();
+
 public:
        gRC();
        virtual ~gRC();
@@ -164,7 +176,9 @@ public:
        void submit(const gOpcode &o);
 
        Signal0<void> notify;
-
+       
+       void setSpinnerDC(gDC *dc) { m_spinner_dc = dc; }
+       
        static gRC *getInstance();
 };
 
@@ -181,7 +195,7 @@ class gPainter
 public:
        gPainter(gDC *dc, eRect rect=eRect());
        virtual ~gPainter();
-
+       
        void setBackgroundColor(const gColor &color);
        void setForegroundColor(const gColor &color);
 
@@ -215,7 +229,8 @@ public:
 
        enum
        {
-               BT_ALPHATEST = 1
+               BT_ALPHATEST = 1,
+               BT_ALPHABLEND = 2
        };
 
        void blit(gPixmap *pixmap, ePoint pos, const eRect &what=eRect(), int flags=0);
@@ -234,8 +249,6 @@ public:
        void clip(const gRegion &clip);
        void clippop();
 
-       void flush();
-       
        void waitVSync();
        void flip();
        void notify();
@@ -243,17 +256,22 @@ public:
 
 class gDC: public iObject
 {
-DECLARE_REF(gDC);
+       DECLARE_REF(gDC);
 protected:
        ePtr<gPixmap> m_pixmap;
 
        gColor m_foreground_color, m_background_color;
+       gRGB m_foreground_color_rgb, m_background_color_rgb;
        ePtr<gFont> m_current_font;
        ePoint m_current_offset;
        
        std::stack<gRegion> m_clip_stack;
        gRegion m_current_clip;
        
+       ePtr<gPixmap> m_spinner_saved, m_spinner_temp;
+       ePtr<gPixmap> *m_spinner_pic;
+       eRect m_spinner_pos;
+       int m_spinner_num, m_spinner_i;
 public:
        virtual void exec(gOpcode *opcode);
        gDC(gPixmap *pixmap);
@@ -264,6 +282,11 @@ public:
        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, ePtr<gPixmap> *pic, int len);
 };
 
 #endif