git.cweiske.de / enigma2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added Lcd.py
[enigma2.git] / lib / gdi / grc.h
diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 53cd4a8c5b566710029dc6a74f65702b5cb76ab6..8224348332440c19fd5f29bfa51609b4809e1448 100644 (file)
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -11,12 +11,14 @@
 #include <stack>
 #include <list>
 
 #include <stack>
 #include <list>
 
-#include <lib/base/estring.h>
+#include <string>
 #include <lib/base/ringbuffer.h>
 #include <lib/base/ringbuffer.h>
-#include <lib/gdi/erect.h>
 #include <lib/base/elock.h>
 #include <lib/base/elock.h>
+#include <lib/base/message.h>
+#include <lib/gdi/erect.h>
 #include <lib/gdi/gpixmap.h>
 #include <lib/gdi/gpixmap.h>
-
+#include <lib/gdi/region.h>
+#include <lib/gdi/gfont.h>
 
 class eTextPara;
 
 
 class eTextPara;
 
@@ -25,12 +27,11 @@ struct gOpcode
 {
        enum Opcode
        {
 {
        enum Opcode
        {
-               begin,
-               
                renderText,
                renderPara,
                renderText,
                renderPara,
+               setFont,
                
                
-               fill,
+               fill, fillRegion, clear,
                blit,
 
                setPalette,
                blit,
 
                setPalette,
@@ -38,100 +39,120 @@ struct gOpcode
                
                line,
                
                
                line,
                
-               clip,
+               setBackgroundColor,
+               setForegroundColor,
+               
+               setBackgroundColorRGB,
+               setForegroundColorRGB,
+               
+               setOffset,
+               
+               setClip, addClip, popClip,
                
                flush,
                
                flush,
-               end,
                
                
-               shutdown
+               waitVSync,
+               flip,
+               notify,
+               
+               end,shutdown
        } opcode;
 
        } opcode;
 
+       gDC *dc;
        union para
        {
        union para
        {
-               struct pbegin
+               struct pfillRect
                {
                        eRect area;
                {
                        eRect area;
-                       pbegin(const eRect &area): area(area) { }
-               } *begin;
-               
-               struct pfill
-               {
-                       eRect area;
-                       gColor color;
-                       pfill(const eRect &area, gColor color): area(area), color(color) { }
                } *fill;
 
                } *fill;
 
+               struct pfillRegion
+               {
+                       gRegion region;
+               } *fillRegion;
+
                struct prenderText
                {
                struct prenderText
                {
-                       gFont font;
                        eRect area;
                        eRect area;
-                       eString text;
-                       gRGB foregroundColor, backgroundColor;
-                       prenderText(const gFont &font, const eRect &area, const eString &text, const gRGB &foregroundColor, const gRGB &backgroundColor):
-                               font(font), area(area), text(text), foregroundColor(foregroundColor), backgroundColor(backgroundColor) { }
+                       std::string text;
+                       int flags;
                } *renderText;
 
                struct prenderPara
                {
                        ePoint offset;
                        eTextPara *textpara;
                } *renderText;
 
                struct prenderPara
                {
                        ePoint offset;
                        eTextPara *textpara;
-                       gRGB foregroundColor, backgroundColor;
-                       prenderPara(const ePoint &offset, eTextPara *textpara, const gRGB &foregroundColor, const gRGB &backgroundColor)
-                               : offset(offset), textpara(textpara), foregroundColor(foregroundColor), backgroundColor(backgroundColor) { }
                } *renderPara;
                } *renderPara;
+               
+               struct psetFont
+               {
+                       gFont *font;
+               } *setFont;
 
                struct psetPalette
                {
                        gPalette *palette;
 
                struct psetPalette
                {
                        gPalette *palette;
-                       psetPalette(gPalette *palette): palette(palette) { }
                } *setPalette;
                
                struct pblit
                {
                } *setPalette;
                
                struct pblit
                {
-                       ePtr<gPixmap> pixmap;
+                       gPixmap *pixmap;
                        ePoint position;
                        ePoint position;
+                       int flags;
                        eRect clip;
                        eRect clip;
-                       pblit(gPixmap *pixmap, const ePoint &position, const eRect &clip)
-                               : pixmap(pixmap), position(position), clip(clip) { }
                } *blit;
 
                struct pmergePalette
                {
                } *blit;
 
                struct pmergePalette
                {
-                       ePtr<gPixmap> target;
-                       pmergePalette(gPixmap *target): target(target) { }
+                       gPixmap *target;
                } *mergePalette;
                
                struct pline
                {
                        ePoint start, end;
                } *mergePalette;
                
                struct pline
                {
                        ePoint start, end;
-                       gColor color;
-                       pline(const ePoint &start, const ePoint &end, gColor color): start(start), end(end), color(color) { }
                } *line;
 
                } *line;
 
-               struct pclip
+               struct psetClip
                {
                {
-                       eRect clip;
-                       pclip(const eRect &clip): clip(clip) { }
+                       gRegion region;
                } *clip;
                } *clip;
+               
+               struct psetColor
+               {
+                       gColor color;
+               } *setColor;
+               
+               struct psetColorRGB
+               {
+                       gRGB color;
+               } *setColorRGB;
+               
+               struct psetOffset
+               {
+                       ePoint value;
+                       int rel;
+               } *setOffset;
        } parm;
        } parm;
-
-       int flags;
-       
-       gDC *dc;
 };
 
 };
 
-class gRC
+               /* gRC is the singleton which controls the fifo and dispatches commands */
+class gRC: public iObject, public Object
 {
 {
+DECLARE_REF(gRC);
+private:
+       friend class gPainter;
        static gRC *instance;
        
        static void *thread_wrapper(void *ptr);
        pthread_t the_thread;
        void *thread();
        static gRC *instance;
        
        static void *thread_wrapper(void *ptr);
        pthread_t the_thread;
        void *thread();
-       
-       eLock queuelock;
-       
+
        queueRingBuffer<gOpcode> queue;
        queueRingBuffer<gOpcode> queue;
+       
+       eFixedMessagePump<int> m_notify_pump;
+       void recv_notify(const int &i);
 public:
 public:
+       eLock queuelock;
        gRC();
        virtual ~gRC();
 
        gRC();
        virtual ~gRC();
 
@@ -140,7 +161,7 @@ public:
                static int collected=0;
                queue.enqueue(o);
                collected++;
                static int collected=0;
                queue.enqueue(o);
                collected++;
-               if (o.opcode==gOpcode::end)
+//             if (o.opcode==gOpcode::end||o.opcode==gOpcode::shutdown)
                {
                        queuelock.unlock(collected);
 #ifdef SYNC_PAINT
                {
                        queuelock.unlock(collected);
 #ifdef SYNC_PAINT
@@ -150,96 +171,101 @@ public:
                }
        }
 
                }
        }
 
-       static gRC &getInstance();
+       Signal0<void> notify;
+
+       static gRC *getInstance();
 };
 
 };
 
+       /* gPainter is the user frontend, which in turn sends commands through gRC */
 class gPainter
 {
 class gPainter
 {
-       gDC &dc;
-       gRC &rc;
+       ePtr<gDC> m_dc;
+       ePtr<gRC> m_rc;
        friend class gRC;
 
        gOpcode *beginptr;
        friend class gRC;
 
        gOpcode *beginptr;
-                       /* paint states */      
-//     std::stack<eRect, std::list<eRect> > cliparea;
-       std::stack<eRect> cliparea;
-       gFont font;
-       gColor foregroundColor, backgroundColor;
-       ePoint logicalZero;
        void begin(const eRect &rect);
        void end();
 public:
        void begin(const eRect &rect);
        void end();
 public:
-       gPainter(gDC &dc, eRect rect=eRect());
+       gPainter(gDC *dc, eRect rect=eRect());
        virtual ~gPainter();
 
        void setBackgroundColor(const gColor &color);
        void setForegroundColor(const gColor &color);
 
        virtual ~gPainter();
 
        void setBackgroundColor(const gColor &color);
        void setForegroundColor(const gColor &color);
 
-       void setFont(const gFont &font);
+       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 renderText(const eRect &position, const std::string &string, int flags=0);
-       void renderPara(eTextPara &para, ePoint offset=ePoint(0, 0));
+       
+       void renderPara(eTextPara *para, ePoint offset=ePoint(0, 0));
 
        void fill(const eRect &area);
 
        void fill(const eRect &area);
+       void fill(const gRegion &area);
        
        void clear();
        
        
        void clear();
        
-       void gPainter::blit(gPixmap *pixmap, ePoint pos, eRect clip=eRect(), int flags=0)
-       {
-               gOpcode o;
-               o.dc=&dc;
-               o.opcode=gOpcode::blit;
-               pos+=logicalZero;
-               clip.moveBy(logicalZero.x(), logicalZero.y());
-               o.parm.blit=new gOpcode::para::pblit(pixmap, pos, clip);
-               o.flags=flags;
-               rc.submit(o);
-       }
+       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(gRGB *colors, int start=0, int len=256);
+       void setPalette(gPixmap *source);
        void mergePalette(gPixmap *target);
        
        void line(ePoint start, ePoint end);
 
        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 clip(eRect clip);
+       void resetClip(const gRegion &clip);
+       void clip(const gRegion &clip);
        void clippop();
 
        void flush();
        void clippop();
 
        void flush();
+       
+       void waitVSync();
+       void flip();
+       void notify();
 };
 
 };
 
-class gDC
-{
-protected:
-       eLock dclock;
-public:
-       virtual void exec(gOpcode *opcode)=0;
-       virtual RESULT getPixmap(ePtr<gPixmap> &)=0;
-       virtual eSize getSize()=0;
-       virtual const eRect &getClip()=0;
-       virtual gRGB getRGB(gColor col)=0;
-       virtual ~gDC();
-       void lock() { dclock.lock(1); }
-       void unlock() { dclock.unlock(1); }
-};
-
-class gPixmapDC: public gDC
+class gDC: public iObject
 {
 {
+DECLARE_REF(gDC);
 protected:
 protected:
-       ePtr<gPixmap> pixmap;
-       eRect clip;
+       ePtr<gPixmap> m_pixmap;
 
 
-       void exec(gOpcode *opcode);
-       gPixmapDC();
+       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:
 public:
-       gPixmapDC(gPixmap *pixmap);
-       virtual ~gPixmapDC();
-       RESULT getPixmap(ePtr<gPixmap> &ptr) { ptr = pixmap; return 0; }
+       virtual void exec(gOpcode *opcode);
+       gDC(gPixmap *pixmap);
+       gDC();
+       virtual ~gDC();
+       gRegion &getClip() { return m_current_clip; }
+       int getPixmap(ePtr<gPixmap> &pm) { pm = m_pixmap; return 0; }
        gRGB getRGB(gColor col);
        gRGB getRGB(gColor col);
-       const eRect &getClip() { return clip; }
-       virtual eSize getSize() { return eSize(pixmap->x, pixmap->y); }
+       virtual eSize size() { return m_pixmap->size(); }
 };
 
 #endif
 };
 
 #endif
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources