#ifdeffing the sdl-stuff

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

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index f6829902b9f66f17fa71087f1aa06117dc2958d1..53bf7f09c11fbb4737efbc6f15e70f748cb76943 100644 (file)
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -17,6 +17,7 @@
 #include <lib/gdi/erect.h>
 #include <lib/gdi/gpixmap.h>
 #include <lib/gdi/region.h>
+#include <lib/gdi/gfont.h>
 
 class eTextPara;
 
@@ -40,10 +41,15 @@ struct gOpcode
                setBackgroundColor,
                setForegroundColor,
                
+               setBackgroundColorRGB,
+               setForegroundColorRGB,
+               
                setOffset,
                
                setClip, addClip, popClip,
                
+               flush,
+               
                end,shutdown
        } opcode;
 
@@ -111,6 +117,11 @@ struct gOpcode
                        gColor color;
                } *setColor;
                
+               struct psetColorRGB
+               {
+                       gRGB color;
+               } *setColorRGB;
+               
                struct psetOffset
                {
                        ePoint value;
@@ -173,15 +184,24 @@ 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_CENTER = 8
+               
+               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);
        
@@ -195,6 +215,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);
@@ -231,7 +252,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