git.cweiske.de / enigma2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix newline
[enigma2.git] / lib / gdi / grc.h
diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 225fd9de4da054cad05c2346e19f8318d1b21d44..3231aab3a974e3020d7bee61aaddd0bb5eddc69b 100644 (file)
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -11,12 +11,13 @@
 #include <stack>
 #include <list>
 
 #include <stack>
 #include <list>
 
-#include <lib/base/estring.h>
-#include <lib/base/ringbuffer.h>
+#include <string>
 #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/region.h>
 #include <lib/gdi/erect.h>
 #include <lib/gdi/gpixmap.h>
 #include <lib/gdi/region.h>
+#include <lib/gdi/gfont.h>
 
 class eTextPara;
 
 
 class eTextPara;
 
@@ -29,7 +30,7 @@ struct gOpcode
                renderPara,
                setFont,
                
                renderPara,
                setFont,
                
-               fill, clear,
+               fill, fillRegion, clear,
                blit,
 
                setPalette,
                blit,
 
                setPalette,
@@ -40,11 +41,20 @@ struct gOpcode
                setBackgroundColor,
                setForegroundColor,
                
                setBackgroundColor,
                setForegroundColor,
                
-               setOffset, moveOffset,
+               setBackgroundColorRGB,
+               setForegroundColorRGB,
                
                
-               addClip, popClip,
+               setOffset,
                
                
-               end,shutdown
+               setClip, addClip, popClip,
+               
+               flush,
+               
+               waitVSync,
+               flip,
+               notify,
+               
+               shutdown
        } opcode;
 
        gDC *dc;
        } opcode;
 
        gDC *dc;
@@ -55,10 +65,15 @@ struct gOpcode
                        eRect area;
                } *fill;
 
                        eRect area;
                } *fill;
 
+               struct pfillRegion
+               {
+                       gRegion region;
+               } *fillRegion;
+
                struct prenderText
                {
                        eRect area;
                struct prenderText
                {
                        eRect area;
-                       eString text;
+                       std::string text;
                        int flags;
                } *renderText;
 
                        int flags;
                } *renderText;
 
@@ -83,7 +98,7 @@ struct gOpcode
                        gPixmap *pixmap;
                        ePoint position;
                        int flags;
                        gPixmap *pixmap;
                        ePoint position;
                        int flags;
-                       gRegion *clip;
+                       eRect clip;
                } *blit;
 
                struct pmergePalette
                } *blit;
 
                struct pmergePalette
@@ -98,7 +113,7 @@ struct gOpcode
 
                struct psetClip
                {
 
                struct psetClip
                {
-                       gRegion *region;
+                       gRegion region;
                } *clip;
                
                struct psetColor
                } *clip;
                
                struct psetColor
@@ -106,47 +121,49 @@ struct gOpcode
                        gColor color;
                } *setColor;
                
                        gColor color;
                } *setColor;
                
+               struct psetColorRGB
+               {
+                       gRGB color;
+               } *setColorRGB;
+               
                struct psetOffset
                {
                        ePoint value;
                        int rel;
                } *setOffset;
        } parm;
                struct psetOffset
                {
                        ePoint value;
                        int rel;
                } *setOffset;
        } parm;
-
-       int flags;
 };
 
 };
 
+#define MAXSIZE 1024
+
                /* gRC is the singleton which controls the fifo and dispatches commands */
                /* gRC is the singleton which controls the fifo and dispatches commands */
-class gRC: public virtual iObject
+class gRC: public iObject, public Object
 {
 {
-DECLARE_REF;
+DECLARE_REF(gRC);
 private:
 private:
+       friend class gPainter;
        static gRC *instance;
        static gRC *instance;
-       
+
+#ifndef SYNC_PAINT
        static void *thread_wrapper(void *ptr);
        pthread_t the_thread;
        static void *thread_wrapper(void *ptr);
        pthread_t the_thread;
+       pthread_mutex_t mutex;
+       pthread_cond_t cond;
+#endif
        void *thread();
 
        void *thread();
 
-       queueRingBuffer<gOpcode> queue;
+       gOpcode queue[MAXSIZE];
+       int rp, wp;
+
+       eFixedMessagePump<int> m_notify_pump;
+       void recv_notify(const int &i);
 public:
 public:
-       eLock queuelock;
        gRC();
        virtual ~gRC();
 
        gRC();
        virtual ~gRC();
 
-       void submit(const gOpcode &o)
-       {
-               static int collected=0;
-               queue.enqueue(o);
-               collected++;
-               if (o.opcode==gOpcode::end||o.opcode==gOpcode::shutdown)
-               {
-                       queuelock.unlock(collected);
-#ifdef SYNC_PAINT
-                       thread();
-#endif
-                       collected=0;
-               }
-       }
+       void submit(const gOpcode &o);
+
+       Signal0<void> notify;
 
        static gRC *getInstance();
 };
 
        static gRC *getInstance();
 };
@@ -168,52 +185,84 @@ public:
        void setBackgroundColor(const gColor &color);
        void setForegroundColor(const gColor &color);
 
        void setBackgroundColor(const gColor &color);
        void setForegroundColor(const gColor &color);
 
+       void setBackgroundColor(const gRGB &color);
+       void setForegroundColor(const gRGB &color);
+
        void setFont(gFont *font);
        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 fill(const eRect &area);
        void renderPara(eTextPara *para, ePoint offset=ePoint(0, 0));
 
        void fill(const eRect &area);
+       void fill(const gRegion &area);
        
        void clear();
        
        void clear();
-       
-       void blit(gPixmap *pixmap, ePoint pos, gRegion *clip = 0, int flags=0);
+
+       enum
+       {
+               BT_ALPHATEST = 1
+       };
+
+       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 resetClip(const gRegion &clip);
        void clip(const gRegion &clip);
        void clippop();
 
        void flush();
        void clip(const gRegion &clip);
        void clippop();
 
        void flush();
+       
+       void waitVSync();
+       void flip();
+       void notify();
 };
 
 class gDC: public iObject
 {
 };
 
 class gDC: public iObject
 {
-DECLARE_REF;
+DECLARE_REF(gDC);
 protected:
        ePtr<gPixmap> m_pixmap;
 
 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;
        ePtr<gFont> m_current_font;
        ePoint m_current_offset;
+       
+       std::stack<gRegion> m_clip_stack;
        gRegion m_current_clip;
        
 public:
        gRegion m_current_clip;
        
 public:
-       void exec(gOpcode *opcode);
+       virtual void exec(gOpcode *opcode);
        gDC(gPixmap *pixmap);
        gDC();
        virtual ~gDC();
        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);
        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
 };
 
 #endif
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources