fixes bug #281

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

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index f6829902b9f66f17fa71087f1aa06117dc2958d1..5d0106b3b98102ec36f198fe18797eaf7d3504b4 100644 (file)
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -7,16 +7,22 @@
        gPixmap aufsetzt (und damit unbeschleunigt ist).
 */
 
+// for debugging use:
+//#define SYNC_PAINT
+#undef SYNC_PAINT
+
 #include <pthread.h>
 #include <stack>
 #include <list>
 
 #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>
+#include <lib/gdi/compositing.h>
 
 class eTextPara;
 
@@ -40,11 +46,24 @@ struct gOpcode
                setBackgroundColor,
                setForegroundColor,
                
+               setBackgroundColorRGB,
+               setForegroundColorRGB,
+               
                setOffset,
                
                setClip, addClip, popClip,
                
-               end,shutdown
+               flush,
+               
+               waitVSync,
+               flip,
+               notify,
+               
+               enableSpinner, disableSpinner, incrementSpinner,
+               
+               shutdown,
+               
+               setCompositing,
        } opcode;
 
        gDC *dc;
@@ -63,7 +82,7 @@ struct gOpcode
                struct prenderText
                {
                        eRect area;
-                       std::string text;
+                       char *text;
                        int flags;
                } *renderText;
 
@@ -86,8 +105,8 @@ struct gOpcode
                struct pblit
                {
                        gPixmap *pixmap;
-                       ePoint position;
                        int flags;
+                       eRect position;
                        eRect clip;
                } *blit;
 
@@ -111,48 +130,62 @@ struct gOpcode
                        gColor color;
                } *setColor;
                
+               struct psetColorRGB
+               {
+                       gRGB color;
+               } *setColorRGB;
+               
                struct psetOffset
                {
                        ePoint value;
                        int rel;
                } *setOffset;
+               
+               gCompositingData *setCompositing;
        } parm;
-
-       int flags;
 };
 
+#define MAXSIZE 2048
+
                /* gRC is the singleton which controls the fifo and dispatches commands */
-class gRC: public iObject
+class gRC: public iObject, public Object
 {
-DECLARE_REF(gRC);
-private:
+       DECLARE_REF(gRC);
+       friend class gPainter;
        static gRC *instance;
-       
+
+#ifndef SYNC_PAINT
        static void *thread_wrapper(void *ptr);
        pthread_t the_thread;
+       pthread_mutex_t mutex;
+       pthread_cond_t cond;
+#endif
        void *thread();
 
-       queueRingBuffer<gOpcode> queue;
+       gOpcode queue[MAXSIZE];
+       int rp, wp;
+
+       eFixedMessagePump<int> m_notify_pump;
+       void recv_notify(const int &i);
+
+       ePtr<gDC> m_spinner_dc;
+       int m_spinner_enabled;
+       
+       void enableSpinner();
+       void disableSpinner();
+       
+       ePtr<gCompositingData> m_compositing;
+
 public:
-       eLock queuelock;
        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;
+       
+       void setSpinnerDC(gDC *dc) { m_spinner_dc = dc; }
+       
        static gRC *getInstance();
 };
 
@@ -169,19 +202,28 @@ class gPainter
 public:
        gPainter(gDC *dc, eRect rect=eRect());
        virtual ~gPainter();
-
+       
        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);
        
@@ -191,10 +233,19 @@ public:
        void fill(const gRegion &area);
        
        void clear();
-       
-       void blit(gPixmap *pixmap, ePoint pos, const eRect &what=eRect(), int flags=0);
+
+       enum
+       {
+               BT_ALPHATEST = 1,
+               BT_ALPHABLEND = 2,
+               BT_SCALE = 4 /* will be automatically set by blitScale */
+       };
+
+       void blit(gPixmap *pixmap, ePoint pos, const eRect &clip=eRect(), int flags=0);
+       void blitScale(gPixmap *pixmap, const eRect &pos, const eRect &clip=eRect(), int flags=0, int aflags = BT_SCALE);
 
        void setPalette(gRGB *colors, int start=0, int len=256);
+       void setPalette(gPixmap *source);
        void mergePalette(gPixmap *target);
        
        void line(ePoint start, ePoint end);
@@ -207,22 +258,32 @@ public:
        void clip(const gRegion &clip);
        void clippop();
 
+       void waitVSync();
+       void flip();
+       void notify();
+       void setCompositing(gCompositingData *comp);
+       
        void flush();
 };
 
 class gDC: public iObject
 {
-DECLARE_REF(gDC);
+       DECLARE_REF(gDC);
 protected:
        ePtr<gPixmap> m_pixmap;
 
        gColor m_foreground_color, m_background_color;
+       gRGB m_foreground_color_rgb, m_background_color_rgb;
        ePtr<gFont> m_current_font;
        ePoint m_current_offset;
        
        std::stack<gRegion> m_clip_stack;
        gRegion m_current_clip;
        
+       ePtr<gPixmap> m_spinner_saved, m_spinner_temp;
+       ePtr<gPixmap> *m_spinner_pic;
+       eRect m_spinner_pos;
+       int m_spinner_num, m_spinner_i;
 public:
        virtual void exec(gOpcode *opcode);
        gDC(gPixmap *pixmap);
@@ -231,7 +292,13 @@ 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(); }
+       virtual int islocked() { return 0; }
+       
+       void enableSpinner();
+       void disableSpinner();
+       void incrementSpinner();
+       void setSpinner(eRect pos, ePtr<gPixmap> *pic, int len);
 };
 
 #endif