- fixed console input mode restore

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

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 225fd9de4da054cad05c2346e19f8318d1b21d44..5eb8131425ac54ac0892da96201d93767879d177 100644 (file)
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -11,7 +11,7 @@
 #include <stack>
 #include <list>
 
-#include <lib/base/estring.h>
+#include <string>
 #include <lib/base/ringbuffer.h>
 #include <lib/base/elock.h>
 #include <lib/gdi/erect.h>
@@ -29,7 +29,7 @@ struct gOpcode
                renderPara,
                setFont,
                
-               fill, clear,
+               fill, fillRegion, clear,
                blit,
 
                setPalette,
@@ -40,9 +40,9 @@ struct gOpcode
                setBackgroundColor,
                setForegroundColor,
                
-               setOffset, moveOffset,
+               setOffset,
                
-               addClip, popClip,
+               setClip, addClip, popClip,
                
                end,shutdown
        } opcode;
@@ -55,10 +55,15 @@ struct gOpcode
                        eRect area;
                } *fill;
 
+               struct pfillRegion
+               {
+                       gRegion region;
+               } *fillRegion;
+
                struct prenderText
                {
                        eRect area;
-                       eString text;
+                       std::string text;
                        int flags;
                } *renderText;
 
@@ -83,7 +88,7 @@ struct gOpcode
                        gPixmap *pixmap;
                        ePoint position;
                        int flags;
-                       gRegion *clip;
+                       eRect clip;
                } *blit;
 
                struct pmergePalette
@@ -98,7 +103,7 @@ struct gOpcode
 
                struct psetClip
                {
-                       gRegion *region;
+                       gRegion region;
                } *clip;
                
                struct psetColor
@@ -117,7 +122,7 @@ struct gOpcode
 };
 
                /* gRC is the singleton which controls the fifo and dispatches commands */
-class gRC: public virtual iObject
+class gRC: public iObject
 {
 DECLARE_REF;
 private:
@@ -138,7 +143,7 @@ public:
                static int collected=0;
                queue.enqueue(o);
                collected++;
-               if (o.opcode==gOpcode::end||o.opcode==gOpcode::shutdown)
+//             if (o.opcode==gOpcode::end||o.opcode==gOpcode::shutdown)
                {
                        queuelock.unlock(collected);
 #ifdef SYNC_PAINT
@@ -169,24 +174,36 @@ public:
        void setForegroundColor(const gColor &color);
 
        void setFont(gFont *font);
+               /* flags only THESE: */
+       enum
+       {
+                       // todo, make mask. you cannot align both right AND center AND block ;)
+               RT_HALIGN_RIGHT = 1,
+               RT_HALIGN_CENTER = 2,
+               RT_HALIGN_BLOCK = 4,
+               RT_VALIGN_CENTER = 8
+       };
        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);
+       void fill(const gRegion &area);
        
        void clear();
        
-       void blit(gPixmap *pixmap, ePoint pos, gRegion *clip = 0, int flags=0);
+       void blit(gPixmap *pixmap, ePoint pos, const eRect &what=eRect(), int flags=0);
 
        void setPalette(gRGB *colors, int start=0, int len=256);
        void mergePalette(gPixmap *target);
        
        void line(ePoint start, ePoint end);
 
-       void setLogicalZero(ePoint abs);
-       void moveLogicalZero(ePoint rel);
-       void resetLogicalZero();
+       void setOffset(ePoint abs);
+       void moveOffset(ePoint rel);
+       void resetOffset();
        
+       void resetClip(const gRegion &clip);
        void clip(const gRegion &clip);
        void clippop();
 
@@ -199,18 +216,19 @@ DECLARE_REF;
 protected:
        ePtr<gPixmap> m_pixmap;
 
-       ePtr<gRegion> m_clip_region;
-       gColor m_foregroundColor, m_backgroundColor;
+       gColor m_foreground_color, m_background_color;
        ePtr<gFont> m_current_font;
        ePoint m_current_offset;
+       
+       std::stack<gRegion> m_clip_stack;
        gRegion m_current_clip;
        
 public:
-       void exec(gOpcode *opcode);
+       virtual void exec(gOpcode *opcode);
        gDC(gPixmap *pixmap);
        gDC();
        virtual ~gDC();
-       gRegion &getClip() { return *m_clip_region; }
+       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(); }