just show hdd info when there is one

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

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index d6a3cd70dea21fe3f9279235006f1c80f6cc1ebc..8224348332440c19fd5f29bfa51609b4809e1448 100644 (file)
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -14,9 +14,11 @@
 #include <string>
 #include <lib/base/ringbuffer.h>
 #include <lib/base/elock.h>
+#include <lib/base/message.h>
 #include <lib/gdi/erect.h>
 #include <lib/gdi/gpixmap.h>
 #include <lib/gdi/region.h>
+#include <lib/gdi/gfont.h>
 
 class eTextPara;
 
@@ -40,10 +42,19 @@ struct gOpcode
                setBackgroundColor,
                setForegroundColor,
                
+               setBackgroundColorRGB,
+               setForegroundColorRGB,
+               
                setOffset,
                
                setClip, addClip, popClip,
                
+               flush,
+               
+               waitVSync,
+               flip,
+               notify,
+               
                end,shutdown
        } opcode;
 
@@ -111,21 +122,25 @@ struct gOpcode
                        gColor color;
                } *setColor;
                
+               struct psetColorRGB
+               {
+                       gRGB color;
+               } *setColorRGB;
+               
                struct psetOffset
                {
                        ePoint value;
                        int rel;
                } *setOffset;
        } parm;
-
-       int flags;
 };
 
                /* gRC is the singleton which controls the fifo and dispatches commands */
-class gRC: public iObject
+class gRC: public iObject, public Object
 {
-DECLARE_REF;
+DECLARE_REF(gRC);
 private:
+       friend class gPainter;
        static gRC *instance;
        
        static void *thread_wrapper(void *ptr);
@@ -133,6 +148,9 @@ private:
        void *thread();
 
        queueRingBuffer<gOpcode> queue;
+       
+       eFixedMessagePump<int> m_notify_pump;
+       void recv_notify(const int &i);
 public:
        eLock queuelock;
        gRC();
@@ -153,6 +171,8 @@ public:
                }
        }
 
+       Signal0<void> notify;
+
        static gRC *getInstance();
 };
 
@@ -173,8 +193,27 @@ public:
        void setBackgroundColor(const gColor &color);
        void setForegroundColor(const gColor &color);
 
+       void setBackgroundColor(const gRGB &color);
+       void setForegroundColor(const gRGB &color);
+
        void setFont(gFont *font);
+               /* flags only THESE: */
+       enum
+       {
+                       // todo, make mask. you cannot align both right AND center AND block ;)
+               RT_HALIGN_LEFT = 0,  /* default */
+               RT_HALIGN_RIGHT = 1,
+               RT_HALIGN_CENTER = 2,
+               RT_HALIGN_BLOCK = 4,
+               
+               RT_VALIGN_TOP = 0,  /* default */
+               RT_VALIGN_CENTER = 8,
+               RT_VALIGN_BOTTOM = 16,
+               
+               RT_WRAP = 32
+       };
        void renderText(const eRect &position, const std::string &string, int flags=0);
+       
        void renderPara(eTextPara *para, ePoint offset=ePoint(0, 0));
 
        void fill(const eRect &area);
@@ -185,6 +224,7 @@ public:
        void blit(gPixmap *pixmap, ePoint pos, const eRect &what=eRect(), int flags=0);
 
        void setPalette(gRGB *colors, int start=0, int len=256);
+       void setPalette(gPixmap *source);
        void mergePalette(gPixmap *target);
        
        void line(ePoint start, ePoint end);
@@ -198,11 +238,15 @@ public:
        void clippop();
 
        void flush();
+       
+       void waitVSync();
+       void flip();
+       void notify();
 };
 
 class gDC: public iObject
 {
-DECLARE_REF;
+DECLARE_REF(gDC);
 protected:
        ePtr<gPixmap> m_pixmap;
 
@@ -221,7 +265,7 @@ public:
        gRegion &getClip() { return m_current_clip; }
        int getPixmap(ePtr<gPixmap> &pm) { pm = m_pixmap; return 0; }
        gRGB getRGB(gColor col);
-       virtual eSize getSize() { return m_pixmap->getSize(); }
+       virtual eSize size() { return m_pixmap->size(); }
 };
 
 #endif