small fix in spinner handling...

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

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 555f2ffb9485e6e0f1d0cfe5b8d12bf9450710de..3b8201add99ab4e7de9d4ecffb262c60e8e8f394 100644 (file)
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -22,6 +22,7 @@
 #include <lib/gdi/gpixmap.h>
 #include <lib/gdi/region.h>
 #include <lib/gdi/gfont.h>
+#include <lib/gdi/compositing.h>
 
 class eTextPara;
 
@@ -60,7 +61,9 @@ struct gOpcode
                
                enableSpinner, disableSpinner, incrementSpinner,
                
-               shutdown
+               shutdown,
+               
+               setCompositing,
        } opcode;
 
        gDC *dc;
@@ -102,8 +105,8 @@ struct gOpcode
                struct pblit
                {
                        gPixmap *pixmap;
-                       ePoint position;
                        int flags;
+                       eRect position;
                        eRect clip;
                } *blit;
 
@@ -137,6 +140,8 @@ struct gOpcode
                        ePoint value;
                        int rel;
                } *setOffset;
+               
+               gCompositingData *setCompositing;
        } parm;
 };
 
@@ -145,8 +150,7 @@ struct gOpcode
                /* 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;
 
@@ -169,7 +173,10 @@ private:
        
        void enableSpinner();
        void disableSpinner();
+       
+       ePtr<gCompositingData> m_compositing;
 
+       int m_prev_idle_count;
 public:
        gRC();
        virtual ~gRC();
@@ -230,10 +237,13 @@ public:
 
        enum
        {
-               BT_ALPHATEST = 1
+               BT_ALPHATEST = 1,
+               BT_ALPHABLEND = 2,
+               BT_SCALE = 4 /* will be automatically set by blitScale */
        };
 
-       void blit(gPixmap *pixmap, ePoint pos, const eRect &what=eRect(), int flags=0);
+       void blit(gPixmap *pixmap, ePoint pos, const eRect &clip=eRect(), int flags=0);
+       void blitScale(gPixmap *pixmap, const eRect &pos, const eRect &clip=eRect(), int flags=0, int aflags = BT_SCALE);
 
        void setPalette(gRGB *colors, int start=0, int len=256);
        void setPalette(gPixmap *source);
@@ -249,16 +259,17 @@ public:
        void clip(const gRegion &clip);
        void clippop();
 
-       void flush();
-       
        void waitVSync();
        void flip();
        void notify();
+       void setCompositing(gCompositingData *comp);
+       
+       void flush();
 };
 
 class gDC: public iObject
 {
-DECLARE_REF(gDC);
+       DECLARE_REF(gDC);
 protected:
        ePtr<gPixmap> m_pixmap;